espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-03 05:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237 from wes3/nrf_hfxo_request

Browse Source 
nimble/ll: Request/release hfxo using mynewt API
This commit is contained in:
wes3
2018-11-13 16:10:55 -08:00
committed by GitHub
parent 29ef0b0b99 7ebe68fbc6
commit dc9fb25e1f
3 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_xcvr.c
+8 -4
View File
@@ -46,15 +46,19 @@ ble_ll_xcvr_rfclk_state(void)
void
ble_ll_xcvr_rfclk_enable(void)
{
g_ble_ll_data.ll_rfclk_state = BLE_RFCLK_STATE_ON;
ble_phy_rfclk_enable();
if (g_ble_ll_data.ll_rfclk_state == BLE_RFCLK_STATE_OFF) {
g_ble_ll_data.ll_rfclk_state = BLE_RFCLK_STATE_ON;
ble_phy_rfclk_enable();
}
}
void
ble_ll_xcvr_rfclk_disable(void)
{
ble_phy_rfclk_disable();
g_ble_ll_data.ll_rfclk_state = BLE_RFCLK_STATE_OFF;
if (g_ble_ll_data.ll_rfclk_state != BLE_RFCLK_STATE_OFF) {
ble_phy_rfclk_disable();
g_ble_ll_data.ll_rfclk_state = BLE_RFCLK_STATE_OFF;
}
}
void
nimble/drivers/nrf51/src/ble_phy.c
+19 -13
View File
@@ -31,6 +31,10 @@
#include "controller/ble_ll.h"
#include "nrfx.h"
#if MYNEWT
#include "mcu/nrf51_clock.h"
#endif
/* XXX: 4) Make sure RF is higher priority interrupt than schedule */
/*
@@ -815,20 +819,14 @@ ble_phy_init(void)
int rc;
#if !defined(BLE_XCVR_RFCLK)
uint32_t os_tmo;
/* BLE wants the HFXO on all the time in this case */
ble_phy_rfclk_enable();
/* Make sure HFXO is started */
NRF_CLOCK->EVENTS_HFCLKSTARTED = 0;
NRF_CLOCK->TASKS_HFCLKSTART = 1;
os_tmo = os_time_get() + (5 * (1000 / OS_TICKS_PER_SEC));
while (1) {
if (NRF_CLOCK->EVENTS_HFCLKSTARTED) {
break;
}
if ((int32_t)(os_time_get() - os_tmo) > 0) {
return BLE_PHY_ERR_INIT;
}
}
/*
* XXX: I do not think we need to wait for settling time here since
* we will probably not use the radio for longer than the settling time
* and it will only degrade performance. Might want to wait here though.
*/
#endif
/* Set phy channel to an invalid channel so first set channel works */
@@ -1479,12 +1477,20 @@ ble_phy_resolv_list_disable(void)
void
ble_phy_rfclk_enable(void)
{
#if MYNEWT
nrf51_clock_hfxo_request();
#else
NRF_CLOCK->TASKS_HFCLKSTART = 1;
#endif
}
void
ble_phy_rfclk_disable(void)
{
#if MYNEWT
nrf51_clock_hfxo_release();
#else
NRF_CLOCK->TASKS_HFCLKSTOP = 1;
#endif
}
#endif
nimble/drivers/nrf52/src/ble_phy.c
+16 -13
View File
@@ -31,6 +31,7 @@
#include "controller/ble_ll.h"
#include "nrfx.h"
#if MYNEWT
#include "mcu/nrf52_clock.h"
#include "mcu/cmsis_nvic.h"
#include "hal/hal_gpio.h"
#else
@@ -1351,20 +1352,14 @@ ble_phy_init(void)
g_ble_phy_data.phy_txtorx_phy_mode = BLE_PHY_MODE_1M;
#if !defined(BLE_XCVR_RFCLK)
uint32_t os_tmo;
/* BLE wants the HFXO on all the time in this case */
ble_phy_rfclk_enable();
/* Make sure HFXO is started */
NRF_CLOCK->EVENTS_HFCLKSTARTED = 0;
NRF_CLOCK->TASKS_HFCLKSTART = 1;
os_tmo = os_time_get() + (5 * (1000 / OS_TICKS_PER_SEC));
while (1) {
if (NRF_CLOCK->EVENTS_HFCLKSTARTED) {
break;
}
if ((int32_t)(os_time_get() - os_tmo) > 0) {
return BLE_PHY_ERR_INIT;
}
}
/*
* XXX: I do not think we need to wait for settling time here since
* we will probably not use the radio for longer than the settling time
* and it will only degrade performance. Might want to wait here though.
*/
#endif
/* Set phy channel to an invalid channel so first set channel works */
@@ -2040,12 +2035,20 @@ void ble_phy_disable_dtm(void)
void
ble_phy_rfclk_enable(void)
{
#if MYNEWT
nrf52_clock_hfxo_request();
#else
NRF_CLOCK->TASKS_HFCLKSTART = 1;
#endif
}
void
ble_phy_rfclk_disable(void)
{
#if MYNEWT
nrf52_clock_hfxo_release();
#else
NRF_CLOCK->TASKS_HFCLKSTOP = 1;
#endif
}
#endif