deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Flush the rxfifo when turning off the radio instead of when turning it on. This seems to fix a bug that was seen in mspsim and seemed to appear on real hardware too.

Browse source
This commit is contained in:
adamdunkels 2010-04-03 16:01:00 +00:00
parent 83eaa70f03
commit a637ddaf4e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/dev/cc2420.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: cc2420.c,v 1.48 2010/03/31 19:08:56 adamdunkels Exp $ * @(#)$Id: cc2420.c,v 1.49 2010/04/03 16:01:00 adamdunkels Exp $
*/ */
/* /*
* This code is almost device independent and should be easy to port. * This code is almost device independent and should be easy to port.
@ -189,7 +189,7 @@ on(void)
ENABLE_FIFOP_INT(); ENABLE_FIFOP_INT();
strobe(CC2420_SRXON); strobe(CC2420_SRXON);
flushrx();
} }
static void static void
off(void) off(void)
@ -201,6 +201,7 @@ off(void)
/* Wait for transmission to end before turning radio off. */ /* Wait for transmission to end before turning radio off. */
while(status() & BV(CC2420_TX_ACTIVE)); while(status() & BV(CC2420_TX_ACTIVE));
flushrx();
strobe(CC2420_SRFOFF); strobe(CC2420_SRFOFF);
DISABLE_FIFOP_INT(); DISABLE_FIFOP_INT();
ENERGEST_OFF(ENERGEST_TYPE_LISTEN); ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
@ -215,6 +216,7 @@ static void RELEASE_LOCK(void) {
lock_on = 0; lock_on = 0;
} }
if(lock_off) { if(lock_off) {
leds_off(LEDS_BLUE);
off(); off();
lock_off = 0; lock_off = 0;
} }