projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Show state.product if state.device_type isn't set
[fw/altos]
/
src
/
cc1111
/
ao_radio.c
diff --git
a/src/cc1111/ao_radio.c
b/src/cc1111/ao_radio.c
index b9821a4237ab950caecebb6bac85defb30ccbff2..cead036419f18c97a9ae7277564a849242d5866e 100644
(file)
--- a/
src/cc1111/ao_radio.c
+++ b/
src/cc1111/ao_radio.c
@@
-451,13
+451,9
@@
ao_radio_recv(__xdata void *packet, uint8_t size, uint8_t timeout) __reentrant
/* Wait for DMA to be done, for the radio receive process to
* get aborted or for a receive timeout to fire
*/
/* Wait for DMA to be done, for the radio receive process to
* get aborted or for a receive timeout to fire
*/
- if (timeout)
- ao_alarm(timeout);
__critical while (!ao_radio_dma_done && !ao_radio_abort)
__critical while (!ao_radio_dma_done && !ao_radio_abort)
- if (ao_sleep
(&ao_radio_dma_done
))
+ if (ao_sleep
_for(&ao_radio_dma_done, timeout
))
break;
break;
- if (timeout)
- ao_clear_alarm();
/* If recv was aborted, clean up by stopping the DMA engine
* and idling the radio
/* If recv was aborted, clean up by stopping the DMA engine
* and idling the radio