andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

improve nrf52 port

Browse Source
This commit is contained in:
hathach
2018-04-05 18:36:59 +07:00
parent b6accc622b
commit b9fc708e41
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@@ -105,6 +105,7 @@ void bus_reset(void)
bool dcd_init (uint8_t rhport) bool dcd_init (uint8_t rhport)
{ {
(void) rhport; (void) rhport;
return true;
} }
void dcd_connect (uint8_t rhport) void dcd_connect (uint8_t rhport)

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

@@ -93,8 +93,22 @@ bool tusb_hal_init(void)
sd_power_usbpwrrdy_enable(true); sd_power_usbpwrrdy_enable(true);
sd_power_usbremoved_enable(true); sd_power_usbremoved_enable(true);
// power_usb_event_handler must be called by soc event // USB power may already be ready at this time -> no event generated
// We need to execute the hanlder based on the status
uint32_t usb_reg;
sd_power_usbregstatus_get(&usb_reg);
if (usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk )
{
power_usb_event_handler(POWER_DETECT);
}
if (usb_reg & POWER_USBREGSTATUS_OUTPUTRDY_Msk )
{
power_usb_event_handler(POWER_READY);
}
// power_usb_event_handler must be called by SOC event hanlder
return true; return true;
} }
#endif #endif
@@ -106,6 +120,8 @@ bool tusb_hal_init(void)
.handler = power_usb_event_handler .handler = power_usb_event_handler
}; };
return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) ); return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
#else
return true; // TODO remove
#endif #endif
} }
@@ -170,7 +186,7 @@ static void hfclk_disable(void)
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Controller Start up Sequence (USBD 51.4 specs ) /* Controller Start up Sequence (USBD 51.4 specs)
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
void power_usb_event_handler(uint32_t event) void power_usb_event_handler(uint32_t event)
{ {
@@ -187,17 +203,14 @@ void power_usb_event_handler(uint32_t event)
// Enable HFCLK // Enable HFCLK
hfclk_enable(); hfclk_enable();
/* Waiting for peripheral to enable, this should take a few us */
while ( !(NRF_USBD_EVENTCAUSE_READY_MASK & NRF_USBD->EVENTCAUSE) ) { }
nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
nrf_usbd_event_clear(NRF_USBD_EVENT_USBEVENT);
} }
break; break;
case POWER_READY: case POWER_READY:
// Wait for HFCLK TODO move before pull up /* Waiting for USBD peripheral enabled */
while ( !hfclk_running() ) {} while ( !(NRF_USBD_EVENTCAUSE_READY_MASK & NRF_USBD->EVENTCAUSE) ) { }
nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
nrf_usbd_event_clear(NRF_USBD_EVENT_USBEVENT);
if ( nrf_drv_usbd_errata_166() ) if ( nrf_drv_usbd_errata_166() )
{ {
@@ -224,6 +237,9 @@ void power_usb_event_handler(uint32_t event)
NVIC_ClearPendingIRQ(USBD_IRQn); NVIC_ClearPendingIRQ(USBD_IRQn);
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
// Wait for HFCLK
while ( !hfclk_running() ) {}
// Enable pull up // Enable pull up
nrf_usbd_pullup_enable(); nrf_usbd_pullup_enable();
break; break;