sjanc closed pull request #19: nimble/phy: Allow idle state when starting RX
URL: https://github.com/apache/mynewt-nimble/pull/19
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nimble/drivers/nrf52/src/ble_phy.c
b/nimble/drivers/nrf52/src/ble_phy.c
index 7f478b6b..c6df70ab 100644
--- a/nimble/drivers/nrf52/src/ble_phy.c
+++ b/nimble/drivers/nrf52/src/ble_phy.c
@@ -1309,9 +1309,19 @@ ble_phy_init(void)
int
ble_phy_rx(void)
{
- /* Check radio state */
+ /*
+ * Check radio state.
+ *
+ * In case radio is now disabling we'll wait for it to finish, but if for
+ * any reason it's just in idle state we proceed with RX as usual since
+ * nRF52 radio can ramp-up from idle state as well.
+ *
+ * Note that TX and RX states values are the same except for 3rd bit so we
+ * can make a shortcut here when checking for idle state.
+ */
nrf_wait_disabled();
- if (NRF_RADIO->STATE != RADIO_STATE_STATE_Disabled) {
+ if ((NRF_RADIO->STATE != RADIO_STATE_STATE_Disabled) &&
+ ((NRF_RADIO->STATE & 0x07) != RADIO_STATE_STATE_RxIdle)) {
ble_phy_disable();
STATS_INC(ble_phy_stats, radio_state_errs);
return BLE_PHY_ERR_RADIO_STATE;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
