ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added critical section around rf_start_cca

pull/5270/head
Ryan Kurte 2017-10-12 10:15:12 +13:00
parent 5f76ff996b
commit c64c7b8624
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/nanostack/FEATURE_NANOSTACK/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
View File

@ -211,7 +211,6 @@ static void rf_thread_loop(const void *arg)
memoryFree(handle); memoryFree(handle);
rx_queue[rx_queue_tail] = NULL; rx_queue[rx_queue_tail] = NULL;
rx_queue_tail = (rx_queue_tail + 1) % RF_QUEUE_SIZE; rx_queue_tail = (rx_queue_tail + 1) % RF_QUEUE_SIZE;
} }
@ -423,6 +422,8 @@ static int8_t rf_start_cca(uint8_t *data_ptr, uint16_t data_length, uint8_t tx_h
} }
} }
platform_enter_critical();
data_ptr[0] = data_length + 2; data_ptr[0] = data_length + 2;
RAIL_RfIdleExt(RAIL_IDLE_ABORT , true); RAIL_RfIdleExt(RAIL_IDLE_ABORT , true);
RAIL_TxDataLoad(&txData); RAIL_TxDataLoad(&txData);
@ -443,15 +444,18 @@ static int8_t rf_start_cca(uint8_t *data_ptr, uint16_t data_length, uint8_t tx_h
//Save packet number and sequence //Save packet number and sequence
current_tx_handle = tx_handle; current_tx_handle = tx_handle;
current_tx_sequence = data_ptr[3]; current_tx_sequence = data_ptr[3];
platform_exit_critical();
return 0; return 0;
} else { } else {
RAIL_RfIdle(); RAIL_RfIdle();
RAIL_RxStart(channel); RAIL_RxStart(channel);
radio_state = RADIO_RX; radio_state = RADIO_RX;
platform_exit_critical();
return -1; return -1;
} }
} }
//Should never get here... //Should never get here...
platform_exit_critical();
return -1; return -1;
} }