mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert nvic changes

Browse Source
This commit is contained in:
hathach 2024-04-16 11:23:38 +07:00
parent c535a4d42b
commit 37a05e0264
No known key found for this signature in database
GPG Key ID: 26FAB84F615C3C52
1 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,27 +258,13 @@ void dcd_init (uint8_t rhport)
void dcd_int_enable(uint8_t rhport) void dcd_int_enable(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
#if defined(SOFTDEVICE_PRESENT) && defined(NORDIC_SDK_OLD_API)
if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS)
{
NVIC_EnableIRQ(USBD_IRQn);
}
#else
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
#endif
} }
void dcd_int_disable(uint8_t rhport) void dcd_int_disable(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
#if defined(SOFTDEVICE_PRESENT) && defined(NORDIC_SDK_OLD_API)
if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS)
{
NVIC_DisableIRQ(USBD_IRQn);
}
#else
NVIC_DisableIRQ(USBD_IRQn); NVIC_DisableIRQ(USBD_IRQn);
#endif
} }
void dcd_set_address (uint8_t rhport, uint8_t dev_addr) void dcd_set_address (uint8_t rhport, uint8_t dev_addr)
@ -1132,27 +1118,14 @@ 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
#if defined(SOFTDEVICE_PRESENT) && defined(NORDIC_SDK_OLD_API)
if (sd_nvic_ClearPendingIRQ(USBD_IRQn) != NRF_SUCCESS)
{
NVIC_ClearPendingIRQ(USBD_IRQn);
}
#else
NVIC_ClearPendingIRQ(USBD_IRQn); NVIC_ClearPendingIRQ(USBD_IRQn);
#endif
// Don't enable USBD interrupt yet, if dcd_init() did not finish yet // Don't enable USBD interrupt yet, if dcd_init() did not finish yet
// Interrupt will be enabled by tud_init(), when USB stack is ready // Interrupt will be enabled by tud_init(), when USB stack is ready
// to handle interrupts. // to handle interrupts.
if (tud_inited()) if (tud_inited())
{ {
#if defined(SOFTDEVICE_PRESENT) && defined(NORDIC_SDK_OLD_API)
if (sd_nvic_EnableIRQ(USBD_IRQn) != NRF_SUCCESS)
{
NVIC_EnableIRQ(USBD_IRQn);
}
#else
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
#endif
} }
// Wait for HFCLK // Wait for HFCLK
@ -1173,14 +1146,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
__ISB(); __DSB(); // for sync __ISB(); __DSB(); // for sync
// Disable Interrupt // Disable Interrupt
#if defined(SOFTDEVICE_PRESENT) && defined(NORDIC_SDK_OLD_API)
if (sd_nvic_DisableIRQ(USBD_IRQn) != NRF_SUCCESS)
{
NVIC_DisableIRQ(USBD_IRQn);
}
#else
NVIC_DisableIRQ(USBD_IRQn); NVIC_DisableIRQ(USBD_IRQn);
#endif
// disable all interrupt // disable all interrupt
NRF_USBD->INTENCLR = NRF_USBD->INTEN; NRF_USBD->INTENCLR = NRF_USBD->INTEN;