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

code style fixes and insert macros from .h

Browse source
This commit is contained in:
thomas-ha 2016-04-15 15:50:20 +02:00
parent 3bf05d664e
commit 6262025ef3
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,6 +119,15 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 }; /** Snif */
#else #else
#define CC2538_RF_AUTOACK 1 #define CC2538_RF_AUTOACK 1
#endif #endif
/*---------------------------------------------------------------------------
* MAC timer
*---------------------------------------------------------------------------*/
/* Timer conversion */
#define RADIO_TO_RTIMER(X) ((X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ)
#define CLOCK_STABLE() do { \
while ( !(REG(SYS_CTRL_CLOCK_STA) & (SYS_CTRL_CLOCK_STA_XOSC_STB))); \
} while(0)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Are we currently in poll mode? Disabled by default */ /* Are we currently in poll mode? Disabled by default */
static uint8_t volatile poll_mode = 0; static uint8_t volatile poll_mode = 0;
@ -1071,7 +1080,7 @@ cc2538_rf_rx_tx_isr(void)
process_poll(&cc2538_rf_process); process_poll(&cc2538_rf_process);
} }
/* We only acknowledge FIFOP or SFD so we can safely wipe out the entire SFR */ /* We only acknowledge FIFOP so we can safely wipe out the entire SFR */
REG(RFCORE_SFR_RFIRQF0) = 0; REG(RFCORE_SFR_RFIRQF0) = 0;
ENERGEST_OFF(ENERGEST_TYPE_IRQ); ENERGEST_OFF(ENERGEST_TYPE_IRQ);
@ -1149,7 +1158,8 @@ void mac_timer_init(void)
while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE)); while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
REG(RFCORE_SFR_MTCTRL) &= ~RFCORE_SFR_MTCTRL_RUN; REG(RFCORE_SFR_MTCTRL) &= ~RFCORE_SFR_MTCTRL_RUN;
while(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE); while(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE);
REG(RFCORE_SFR_MTCTRL) |= (RFCORE_SFR_MTCTRL_RUN | RFCORE_SFR_MTCTRL_SYNC); REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_SYNC;
REG(RFCORE_SFR_MTCTRL) |= (RFCORE_SFR_MTCTRL_RUN);
while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE)); while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/