diff options
| author | hathach <[email protected]> | 2019-01-29 20:13:17 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-29 20:13:17 +0700 |
| commit | 29b49199beb8e9b5fead83e5cd36105f8746f1d7 (patch) | |
| tree | 5fec0508a84fd7b75b21b16b13ef6181d97eaaa5 /src/portable | |
| parent | bd5325612620209e7964f10817a57f916d3bc13f (diff) | |
| parent | 1a84f5da5496e7ea410e9023253b30933c207159 (diff) | |
Merge pull request #34 from hathach/develop
add tusb_inited(), better compatible with nrf SD
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/nordic/nrf5x/hal_nrf5x.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/portable/nordic/nrf5x/hal_nrf5x.c b/src/portable/nordic/nrf5x/hal_nrf5x.c index f0a0b9632..52743ce6f 100644 --- a/src/portable/nordic/nrf5x/hal_nrf5x.c +++ b/src/portable/nordic/nrf5x/hal_nrf5x.c @@ -49,16 +49,9 @@ #ifdef SOFTDEVICE_PRESENT #include "nrf_sdm.h" #include "nrf_soc.h" +#endif -// TODO fully move to nrfx -enum { - NRFX_POWER_USB_EVT_DETECTED, /**< USB power detected on the connector (plugged in). */ - NRFX_POWER_USB_EVT_REMOVED, /**< USB power removed from the connector. */ - NRFX_POWER_USB_EVT_READY /**< USB power regulator ready. */ -}; -#else #include "nrfx_power.h" -#endif #include "tusb_hal.h" #include "device/dcd.h" @@ -66,8 +59,6 @@ enum { /*------------------------------------------------------------------*/ /* MACRO TYPEDEF CONSTANT ENUM *------------------------------------------------------------------*/ -#define USB_NVIC_PRIO 7 - void tusb_hal_nrf_power_event(uint32_t event); /*------------------------------------------------------------------*/ @@ -239,8 +230,7 @@ void tusb_hal_nrf_power_event (uint32_t event) NRF_USBD->INTENSET = USBD_INTEN_USBRESET_Msk | USBD_INTEN_USBEVENT_Msk | USBD_INTEN_EPDATA_Msk | USBD_INTEN_EP0SETUP_Msk | USBD_INTEN_EP0DATADONE_Msk | USBD_INTEN_ENDEPIN0_Msk | USBD_INTEN_ENDEPOUT0_Msk; - // Enable interrupt, Priorities 0,1,4,5 (nRF52) are reserved for SoftDevice - NVIC_SetPriority(USBD_IRQn, USB_NVIC_PRIO); + // Enable interrupt, priorities should be set by application NVIC_ClearPendingIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn); |