summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/portable/nordic/nrf5x/dcd_nrf5x.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
index e70565a02..024ea0d90 100644
--- a/src/portable/nordic/nrf5x/dcd_nrf5x.c
+++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -463,11 +463,17 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
xfer_td_t* xfer = get_td(epnum, dir);
- dcd_int_disable(rhport);
+ if (!is_in_isr()) {
+ osal_mutex_lock(dcd_mutex, OSAL_TIMEOUT_WAIT_FOREVER);
+ dcd_int_disable(rhport);
+ }
xfer->buffer = buffer;
xfer->total_len = total_bytes;
xfer->actual_len = 0;
- dcd_int_enable(rhport);
+ if (!is_in_isr()) {
+ dcd_int_enable(rhport);
+ osal_mutex_unlock(dcd_mutex);
+ }
// Control endpoint with zero-length packet and opposite direction to 1st request byte --> status stage
bool const control_status = (epnum == 0 && total_bytes == 0 && dir != tu_edpt_dir(NRF_USBD->BMREQUESTTYPE));