diff options
| author | hathach <[email protected]> | 2019-01-29 19:42:31 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-01-29 19:42:31 +0700 |
| commit | 1a84f5da5496e7ea410e9023253b30933c207159 (patch) | |
| tree | 5fec0508a84fd7b75b21b16b13ef6181d97eaaa5 | |
| parent | 59c1b4b42773075690ae5a6c4262a18425e88cd7 (diff) | |
nrf5x Let application decide USBD_IRQn priority
| -rw-r--r-- | hw/bsp/pca10056/board_pca10056.c | 2 | ||||
| -rw-r--r-- | src/portable/nordic/nrf5x/hal_nrf5x.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/bsp/pca10056/board_pca10056.c b/hw/bsp/pca10056/board_pca10056.c index 7144d8d5b..b781ad3ad 100644 --- a/hw/bsp/pca10056/board_pca10056.c +++ b/hw/bsp/pca10056/board_pca10056.c @@ -183,6 +183,8 @@ void board_init(void) nrfx_qspi_cinstr_xfer(&cinstr_cfg, &sr_quad_en, NULL); #endif + NVIC_SetPriority(USBD_IRQn, 2); + // USB power may already be ready at this time -> no event generated // We need to invoke the handler based on the status initially uint32_t usb_reg; diff --git a/src/portable/nordic/nrf5x/hal_nrf5x.c b/src/portable/nordic/nrf5x/hal_nrf5x.c index 47b33fb93..52743ce6f 100644 --- a/src/portable/nordic/nrf5x/hal_nrf5x.c +++ b/src/portable/nordic/nrf5x/hal_nrf5x.c @@ -59,8 +59,6 @@ /*------------------------------------------------------------------*/ /* MACRO TYPEDEF CONSTANT ENUM *------------------------------------------------------------------*/ -#define USB_NVIC_PRIO 7 - void tusb_hal_nrf_power_event(uint32_t event); /*------------------------------------------------------------------*/ @@ -232,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); |