Merge pull request #1274 from kasjer/kasjer/nrf5x-request-clock-in-mynewt

nrf5x: Request HFXO via OS
This commit is contained in:
Ha Thach 2022-01-18 20:00:23 +07:00 committed by GitHub
commit 92c36f187d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions

View File

@ -38,6 +38,10 @@
#include "device/usbd.h" #include "device/usbd.h"
#include "device/usbd_pvt.h" // to use defer function helper #include "device/usbd_pvt.h" // to use defer function helper
#if CFG_TUSB_OS == OPT_OS_MYNEWT
#include "mcu/mcu.h"
#endif
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* MACRO TYPEDEF CONSTANT ENUM /* MACRO TYPEDEF CONSTANT ENUM
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
@ -891,6 +895,11 @@ static bool hfclk_running(void)
static void hfclk_enable(void) static void hfclk_enable(void)
{ {
#if CFG_TUSB_OS == OPT_OS_MYNEWT
usb_clock_request();
return;
#else
// already running, nothing to do // already running, nothing to do
if ( hfclk_running() ) return; if ( hfclk_running() ) return;
@ -904,10 +913,16 @@ static void hfclk_enable(void)
nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED); nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED);
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTART); nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTART);
#endif
} }
static void hfclk_disable(void) static void hfclk_disable(void)
{ {
#if CFG_TUSB_OS == OPT_OS_MYNEWT
usb_clock_release();
return;
#else
#ifdef SOFTDEVICE_PRESENT #ifdef SOFTDEVICE_PRESENT
if ( is_sd_enabled() ) if ( is_sd_enabled() )
{ {
@ -917,6 +932,7 @@ static void hfclk_disable(void)
#endif #endif
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTOP); nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTOP);
#endif
} }
// Power & Clock Peripheral on nRF5x to manage USB // Power & Clock Peripheral on nRF5x to manage USB