Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-07 05:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

get nrf5x hal work with SD and non_SD configure

Browse Source
This commit is contained in:
hathach 2018-05-15 12:37:48 +07:00
parent 03d442a861
commit 1d428b7fef
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/bsp/pca10056/board_pca10056.c
View File

@ -75,10 +75,26 @@ void board_init(void)
NRF_CLOCK->LFCLKSRC = (uint32_t)((CLOCK_CONFIG_LF_SRC << CLOCK_LFCLKSRC_SRC_Pos) & CLOCK_LFCLKSRC_SRC_Msk); NRF_CLOCK->LFCLKSRC = (uint32_t)((CLOCK_CONFIG_LF_SRC << CLOCK_LFCLKSRC_SRC_Pos) & CLOCK_LFCLKSRC_SRC_Msk);
NRF_CLOCK->TASKS_LFCLKSTART = 1UL; NRF_CLOCK->TASKS_LFCLKSTART = 1UL;
nrf_drv_power_init(NULL);
nrf_gpio_cfg_output(LED_1); nrf_gpio_cfg_output(LED_1);
#ifdef SOFTDEVICE_PRESENT
// TODO support Softdevice config
#else
// Softdevice is not present, init power module and register tusb power event function
// for vusb detect, ready, removed
extern void tusb_hal_nrf_power_event(uint32_t event);
nrf_drv_power_init(NULL);
// USB Power detection
const nrf_drv_power_usbevt_config_t config =
{
.handler = (nrf_drv_power_usb_event_handler_t) tusb_hal_nrf_power_event
};
TU_ASSERT( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
#endif
// Tick init
SysTick_Config(SystemCoreClock/1000); SysTick_Config(SystemCoreClock/1000);
NVIC_EnableIRQ(SysTick_IRQn); NVIC_EnableIRQ(SysTick_IRQn);
} }

21
tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
View File

@ -136,6 +136,8 @@ static void hfclk_disable(void)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* TUSB HAL /* TUSB HAL
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
// tusb_hal_nrf_power_event must be called by SOC event handler
bool tusb_hal_init(void) bool tusb_hal_init(void)
{ {
#ifdef SOFTDEVICE_PRESENT #ifdef SOFTDEVICE_PRESENT
@ -159,23 +161,10 @@ bool tusb_hal_init(void)
{ {
tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY); tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY);
} }
// tusb_hal_nrf_power_event must be called by SOC event handler
return true;
}else
#endif
{
#if 0
// USB Power detection
const nrf_drv_power_usbevt_config_t config =
{
.handler = (nrf_drv_power_usb_event_handler_t) tusb_hal_nrf_power_event
};
return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
#else
return true;
#endif
} }
#endif
return true;
} }
void tusb_hal_int_enable(uint8_t rhport) void tusb_hal_int_enable(uint8_t rhport)