summaryrefslogtreecommitdiff
path: root/src/drivers/ao_packet.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
committerBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
commit4af4e36cda96d053458eeb040e35886890917385 (patch)
tree2b1b870b5b15af2fea0297b8cc9a5dff73d265df /src/drivers/ao_packet.c
parent91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff)
parent106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/drivers/ao_packet.c')
-rw-r--r--src/drivers/ao_packet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 8cdf85a9..18330ead 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -54,14 +54,14 @@ ao_packet_send(void)
}
uint8_t
-ao_packet_recv(void)
+ao_packet_recv(uint16_t timeout)
{
uint8_t dma_done;
#ifdef AO_LED_GREEN
ao_led_on(AO_LED_GREEN);
#endif
- dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv), 0);
+ dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv), timeout);
#ifdef AO_LED_GREEN
ao_led_off(AO_LED_GREEN);
#endif