diff options
| author | hathach <[email protected]> | 2019-08-08 10:18:32 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-08 10:18:32 +0700 |
| commit | 2b7eadc479fa4853d2e9fd1298e0a46cfebc024b (patch) | |
| tree | b09d37cd6dea02c1598ff461555af50c64df0a59 | |
| parent | 3ae885aaec9472f7d58d2cc2bf3bc64f9ca8f550 (diff) | |
| parent | 30411cfa54f3628136ca9fa35e9e137845e6ee6b (diff) | |
Merge pull request #93 from hathach/develop
logos !!!
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/portable/nordic/nrf5x/dcd_nrf5x.c | 12 |
2 files changed, 8 insertions, 6 deletions
@@ -1,5 +1,7 @@ # TinyUSB + + [](https://travis-ci.org/hathach/tinyusb) [](https://opensource.org/licenses/MIT) TinyUSB is an open-source cross-platform USB Host/Device stack for embedded system. It is designed to be memory-safe with no dynamic allocation and thread-safe with all interrupt events are deferred then handled in the stack's task function. diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c index 931c1ab86..17140ee75 100644 --- a/src/portable/nordic/nrf5x/dcd_nrf5x.c +++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c @@ -619,14 +619,14 @@ void tusb_hal_nrf_power_event (uint32_t event) { // Value is chosen to be as same as NRFX_POWER_USB_EVT_* in nrfx_power.h enum { - POWER_USB_EVT_DETECTED = 0, - POWER_USB_EVT_REMOVED = 1, - POWER_USB_EVT_READY = 2 + USB_EVT_DETECTED = 0, + USB_EVT_REMOVED = 1, + USB_EVT_READY = 2 }; switch ( event ) { - case POWER_USB_EVT_DETECTED: + case USB_EVT_DETECTED: if ( !NRF_USBD->ENABLE ) { /* Prepare for READY event receiving */ @@ -674,7 +674,7 @@ void tusb_hal_nrf_power_event (uint32_t event) } break; - case POWER_USB_EVT_READY: + case USB_EVT_READY: /* Waiting for USBD peripheral enabled */ while ( !(USBD_EVENTCAUSE_READY_Msk & NRF_USBD->EVENTCAUSE) ) { } @@ -740,7 +740,7 @@ void tusb_hal_nrf_power_event (uint32_t event) nrf_usbd_pullup_enable(); break; - case POWER_USB_EVT_REMOVED: + case USB_EVT_REMOVED: if ( NRF_USBD->ENABLE ) { // Abort all transfers |