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

only turn off if we are not in CC1020_OFF state. (patch by Jesper Karlsson)

Browse source
This commit is contained in:
nvt-se 2009-09-04 11:00:48 +00:00
parent 4d21a3e203
commit cd96248306
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
platform/msb430/dev/cc1020.c
View file

@ -364,20 +364,22 @@ cc1020_off(void)
{
int s;
if(cc1020_state & CC1020_RX_SEARCHING) {
/* Discard the current read buffer when the radio is shutting down. */
cc1020_rxlen = 0;
if(cc1020_state != CC1020_OFF) {
if(cc1020_state & CC1020_RX_SEARCHING) {
/* Discard the current read buffer when the radio is shutting down. */
cc1020_rxlen = 0;
LNA_POWER_OFF(); /* power down lna */
s = splhigh();
DISABLE_RX_IRQ();
cc1020_state = CC1020_OFF;
splx(s);
cc1020_setupPD(); /* power down radio */
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
cc1020_state = CC1020_OFF;
} else {
cc1020_state |= CC1020_TURN_OFF;
LNA_POWER_OFF(); /* power down lna */
s = splhigh();
DISABLE_RX_IRQ();
cc1020_state = CC1020_OFF;
splx(s);
cc1020_setupPD(); /* power down radio */
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
cc1020_state = CC1020_OFF;
} else {
cc1020_state |= CC1020_TURN_OFF;
}
}
return 1;
}
@ -720,7 +722,7 @@ static void
cc1020_setupPD(void)
{
/*
* Power down components an reset all registers except MAIN
* Power down components and reset all registers except MAIN
* to their default values.
*/
cc1020_write_reg(CC1020_MAIN,
@ -776,3 +778,4 @@ cc1020_wakeupTX(int analog)
MS_DELAY(1);
cc1020_write_reg(CC1020_MAIN, 0xD1);
}