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

Merge pull request #967 from g-oikonomou/cc2538-contrib-rf-local-vars

Browse source 
Use local variable to store RF on/off state
This commit is contained in:
George Oikonomou 2015-05-09 22:23:31 +01:00
parent 94299af9f7 5288725af7
commit a2d6df225e
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cpu/cc2538/dev/cc2538-rf.c
View file

@ -80,7 +80,6 @@
/* Local RF Flags */ /* Local RF Flags */
#define RX_ACTIVE 0x80 #define RX_ACTIVE 0x80
#define RF_MUST_RESET 0x40 #define RF_MUST_RESET 0x40
#define WAS_OFF 0x10
#define RF_ON 0x01 #define RF_ON 0x01
/* Bit Masks for the last byte in the RX FIFO */ /* Bit Masks for the last byte in the RX FIFO */
@ -180,6 +179,8 @@ get_channel()
static int8_t static int8_t
set_channel(uint8_t channel) set_channel(uint8_t channel)
{ {
uint8_t was_on = 0;
PRINTF("RF: Set Channel\n"); PRINTF("RF: Set Channel\n");
if((channel < CC2538_RF_CHANNEL_MIN) || (channel > CC2538_RF_CHANNEL_MAX)) { if((channel < CC2538_RF_CHANNEL_MIN) || (channel > CC2538_RF_CHANNEL_MAX)) {
@ -189,16 +190,14 @@ set_channel(uint8_t channel)
/* Changes to FREQCTRL take effect after the next recalibration */ /* Changes to FREQCTRL take effect after the next recalibration */
/* If we are off, save state, otherwise switch off and save state */ /* If we are off, save state, otherwise switch off and save state */
if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) == 0) { if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) != 0) {
rf_flags |= WAS_OFF; was_on = 1;
} else {
rf_flags &= ~WAS_OFF;
off(); off();
} }
REG(RFCORE_XREG_FREQCTRL) = (CC2538_RF_CHANNEL_MIN REG(RFCORE_XREG_FREQCTRL) = (CC2538_RF_CHANNEL_MIN
+ (channel - CC2538_RF_CHANNEL_MIN) * CC2538_RF_CHANNEL_SPACING); + (channel - CC2538_RF_CHANNEL_MIN) * CC2538_RF_CHANNEL_SPACING);
/* switch radio back on only if radio was on before - otherwise will turn on radio foor sleepy nodes */ /* switch radio back on only if radio was on before - otherwise will turn on radio foor sleepy nodes */
if((rf_flags & WAS_OFF) != WAS_OFF) { if(was_on) {
on(); on();
} }
@ -244,10 +243,11 @@ static radio_value_t
get_rssi(void) get_rssi(void)
{ {
int8_t rssi; int8_t rssi;
uint8_t was_off = 0;
/* If we are off, turn on first */ /* If we are off, turn on first */
if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) == 0) { if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) == 0) {
rf_flags |= WAS_OFF; was_off = 1;
on(); on();
} }
@ -257,8 +257,7 @@ get_rssi(void)
rssi = (int8_t)(REG(RFCORE_XREG_RSSI) & RFCORE_XREG_RSSI_RSSI_VAL) - RSSI_OFFSET; rssi = (int8_t)(REG(RFCORE_XREG_RSSI) & RFCORE_XREG_RSSI_RSSI_VAL) - RSSI_OFFSET;
/* If we were off, turn back off */ /* If we were off, turn back off */
if((rf_flags & WAS_OFF) == WAS_OFF) { if(was_off) {
rf_flags &= ~WAS_OFF;
off(); off();
} }
@ -345,12 +344,13 @@ static int
channel_clear(void) channel_clear(void)
{ {
int cca; int cca;
uint8_t was_off = 0;
PRINTF("RF: CCA\n"); PRINTF("RF: CCA\n");
/* If we are off, turn on first */ /* If we are off, turn on first */
if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) == 0) { if((REG(RFCORE_XREG_FSMSTAT0) & RFCORE_XREG_FSMSTAT0_FSM_FFCTRL_STATE) == 0) {
rf_flags |= WAS_OFF; was_off = 1;
on(); on();
} }
@ -364,8 +364,7 @@ channel_clear(void)
} }
/* If we were off, turn back off */ /* If we were off, turn back off */
if((rf_flags & WAS_OFF) == WAS_OFF) { if(was_off) {
rf_flags &= ~WAS_OFF;
off(); off();
} }
@ -561,13 +560,14 @@ transmit(unsigned short transmit_len)
uint8_t counter; uint8_t counter;
int ret = RADIO_TX_ERR; int ret = RADIO_TX_ERR;
rtimer_clock_t t0; rtimer_clock_t t0;
uint8_t was_off = 0;
PRINTF("RF: Transmit\n"); PRINTF("RF: Transmit\n");
if(!(rf_flags & RX_ACTIVE)) { if(!(rf_flags & RX_ACTIVE)) {
t0 = RTIMER_NOW(); t0 = RTIMER_NOW();
on(); on();
rf_flags |= WAS_OFF; was_off = 1;
while(RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + ONOFF_TIME)); while(RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + ONOFF_TIME));
} }
@ -609,8 +609,7 @@ transmit(unsigned short transmit_len)
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT); ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN); ENERGEST_ON(ENERGEST_TYPE_LISTEN);
if(rf_flags & WAS_OFF) { if(was_off) {
rf_flags &= ~WAS_OFF;
off(); off();
} }