[GitHub] wes3 closed pull request #257: net/nimble/drivers: Fix compile error if BLE_XTAL_SETTLE_TIME = 0

[GitBox <gi...@apache.org>]

wes3 closed pull request #257: net/nimble/drivers: Fix compile error if BLE_XTAL_SETTLE_TIME = 0
URL: https://github.com/apache/mynewt-nimble/pull/257
 
 
   

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/nrf51/src/ble_phy.c b/nimble/drivers/nrf51/src/ble_phy.c
index 4d3234f5..4a8331f1 100644
--- a/nimble/drivers/nrf51/src/ble_phy.c
+++ b/nimble/drivers/nrf51/src/ble_phy.c
@@ -1473,7 +1473,6 @@ ble_phy_resolv_list_disable(void)
 }
 #endif
 
-#ifdef BLE_XCVR_RFCLK
 void
 ble_phy_rfclk_enable(void)
 {
@@ -1493,4 +1492,3 @@ ble_phy_rfclk_disable(void)
     NRF_CLOCK->TASKS_HFCLKSTOP = 1;
 #endif
 }
-#endif
diff --git a/nimble/drivers/nrf52/src/ble_phy.c b/nimble/drivers/nrf52/src/ble_phy.c
index 066e8b30..07ac65c9 100644
--- a/nimble/drivers/nrf52/src/ble_phy.c
+++ b/nimble/drivers/nrf52/src/ble_phy.c
@@ -2031,7 +2031,7 @@ void ble_phy_disable_dtm(void)
     NRF_RADIO->PCNF1 |= RADIO_PCNF1_WHITEEN_Msk;
 }
 #endif
-#ifdef BLE_XCVR_RFCLK
+
 void
 ble_phy_rfclk_enable(void)
 {
@@ -2051,4 +2051,3 @@ ble_phy_rfclk_disable(void)
     NRF_CLOCK->TASKS_HFCLKSTOP = 1;
 #endif
 }
-#endif


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services