Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-17 05:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #480 from hathach/fix-nrf-disconnect

Browse Source 
manually submit unplugged event for nrf dcd_disconnect()
This commit is contained in:
Ha Thach 2020-08-04 14:48:25 +07:00 committed by GitHub
commit 9b9ea8453d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@ -271,6 +271,10 @@ void dcd_disconnect(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
NRF_USBD->USBPULLUP = 0; NRF_USBD->USBPULLUP = 0;
// Disable Pull-up does not trigger Power USB Removed, in fact it have no
// impact on the USB Power status at all -> need to submit unplugged event to the stack.
dcd_event_bus_signal(0, DCD_EVENT_UNPLUGGED, false);
} }
// connect by enabling internal pull-up resistor on D+/D- // connect by enabling internal pull-up resistor on D+/D-
@ -693,6 +697,8 @@ void tusb_hal_nrf_power_event (uint32_t event)
switch ( event ) switch ( event )
{ {
case USB_EVT_DETECTED: case USB_EVT_DETECTED:
TU_LOG2("Power USB Detect\r\n");
if ( !NRF_USBD->ENABLE ) if ( !NRF_USBD->ENABLE )
{ {
/* Prepare for READY event receiving */ /* Prepare for READY event receiving */
@ -743,6 +749,12 @@ void tusb_hal_nrf_power_event (uint32_t event)
break; break;
case USB_EVT_READY: case USB_EVT_READY:
TU_LOG2("Power USB Ready\r\n");
// Skip if pull-up is enabled and HCLK is already running.
// Application probably call this more than necessary.
if ( NRF_USBD->USBPULLUP && hfclk_running() ) break;
/* Waiting for USBD peripheral enabled */ /* Waiting for USBD peripheral enabled */
while ( !(USBD_EVENTCAUSE_READY_Msk & NRF_USBD->EVENTCAUSE) ) { } while ( !(USBD_EVENTCAUSE_READY_Msk & NRF_USBD->EVENTCAUSE) ) { }
@ -810,6 +822,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
break; break;
case USB_EVT_REMOVED: case USB_EVT_REMOVED:
TU_LOG2("Power USB Removed\r\n");
if ( NRF_USBD->ENABLE ) if ( NRF_USBD->ENABLE )
{ {
// Abort all transfers // Abort all transfers