RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #5244 from thomaseichinger/pr/rf2xx_better_state_check

Browse Source 
drivers/at86rf2xx: improve precondition checks on state transition
This commit is contained in:
Martine Lenders 2016-11-04 20:26:53 +01:00 committed by GitHub
commit 64c62e837a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/at86rf2xx/at86rf2xx_getset.c
View File

@ -421,7 +421,16 @@ void at86rf2xx_set_option(at86rf2xx_t *dev, uint16_t option, bool state)
static inline void _set_state(at86rf2xx_t *dev, uint8_t state) static inline void _set_state(at86rf2xx_t *dev, uint8_t state)
{ {
at86rf2xx_reg_write(dev, AT86RF2XX_REG__TRX_STATE, state); at86rf2xx_reg_write(dev, AT86RF2XX_REG__TRX_STATE, state);
/* To prevent a possible race condition when changing to
* RX_AACK_ON state the state doesn't get read back in that
* case. See discussion
* in https://github.com/RIOT-OS/RIOT/pull/5244
*/
if (state != AT86RF2XX_STATE_RX_AACK_ON) {
while (at86rf2xx_get_status(dev) != state); while (at86rf2xx_get_status(dev) != state);
}
dev->state = state; dev->state = state;
} }
@ -429,9 +438,6 @@ void at86rf2xx_set_state(at86rf2xx_t *dev, uint8_t state)
{ {
uint8_t old_state = at86rf2xx_get_status(dev); uint8_t old_state = at86rf2xx_get_status(dev);
if (state == old_state) {
return;
}
/* make sure there is no ongoing transmission, or state transition already /* make sure there is no ongoing transmission, or state transition already
* in progress */ * in progress */
while (old_state == AT86RF2XX_STATE_BUSY_RX_AACK || while (old_state == AT86RF2XX_STATE_BUSY_RX_AACK ||
@ -440,6 +446,10 @@ void at86rf2xx_set_state(at86rf2xx_t *dev, uint8_t state)
old_state = at86rf2xx_get_status(dev); old_state = at86rf2xx_get_status(dev);
} }
if (state == old_state) {
return;
}
/* we need to go via PLL_ON if we are moving between RX_AACK_ON <-> TX_ARET_ON */ /* we need to go via PLL_ON if we are moving between RX_AACK_ON <-> TX_ARET_ON */
if ((old_state == AT86RF2XX_STATE_RX_AACK_ON && if ((old_state == AT86RF2XX_STATE_RX_AACK_ON &&
state == AT86RF2XX_STATE_TX_ARET_ON) || state == AT86RF2XX_STATE_TX_ARET_ON) ||