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

softdevice nvic calls only if old SDK

Browse Source
This commit is contained in:
Hardy Griech
2023-09-22 18:39:00 +02:00
committed by hathach
parent 1b0ec6b1bd
commit 2567fe3fd8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ void dcd_init (uint8_t rhport)
void dcd_int_enable(uint8_t rhport) void dcd_int_enable(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
#ifdef SOFTDEVICE_PRESENT #if defined(SOFTDEVICE_PRESENT) && defined(OLD_NORDIC_SDK)
if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS) if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS)
{ {
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
@@ -257,7 +257,7 @@ void dcd_int_enable(uint8_t rhport)
void dcd_int_disable(uint8_t rhport) void dcd_int_disable(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
#ifdef SOFTDEVICE_PRESENT #if defined(SOFTDEVICE_PRESENT) && defined(OLD_NORDIC_SDK)
if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS) if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS)
{ {
NVIC_DisableIRQ(USBD_IRQn); NVIC_DisableIRQ(USBD_IRQn);
@@ -1118,7 +1118,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
NRF_USBD->INTENSET = USBD_INTEN_USBRESET_Msk; NRF_USBD->INTENSET = USBD_INTEN_USBRESET_Msk;
// Enable interrupt, priorities should be set by application // Enable interrupt, priorities should be set by application
#ifdef SOFTDEVICE_PRESENT #if defined(SOFTDEVICE_PRESENT) && defined(OLD_NORDIC_SDK)
if (sd_nvic_ClearPendingIRQ(USBD_IRQn) != NRF_SUCCESS) if (sd_nvic_ClearPendingIRQ(USBD_IRQn) != NRF_SUCCESS)
{ {
NVIC_ClearPendingIRQ(USBD_IRQn); NVIC_ClearPendingIRQ(USBD_IRQn);
@@ -1131,7 +1131,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
// to handle interrupts. // to handle interrupts.
if (tud_inited()) if (tud_inited())
{ {
#ifdef SOFTDEVICE_PRESENT #if defined(SOFTDEVICE_PRESENT) && defined(OLD_NORDIC_SDK)
if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS) if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS)
{ {
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
@@ -1159,7 +1159,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
__ISB(); __DSB(); // for sync __ISB(); __DSB(); // for sync
// Disable Interrupt // Disable Interrupt
#ifdef SOFTDEVICE_PRESENT #if defined(SOFTDEVICE_PRESENT) && defined(OLD_NORDIC_SDK)
if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS) if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS)
{ {
NVIC_DisableIRQ(USBD_IRQn); NVIC_DisableIRQ(USBD_IRQn);