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

add usbd_spin_lock/unlock for driver usage

Browse Source
This commit is contained in:
hathach
2025-05-21 11:41:06 +07:00
parent c1d23a0a92
commit 5551a3e430
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/portable/synopsys/dwc2/dcd_dwc2.c
View File

@@ -57,8 +57,6 @@ typedef struct {
static xfer_ctl_t xfer_status[DWC2_EP_MAX][2];
#define XFER_CTL_BASE(_ep, _dir) (&xfer_status[_ep][_dir])
static OSAL_SPINLOCK_DEF(_dcd_spinlock, usbd_int_set);
typedef struct {
// EP0 transfers are limited to 1 packet - larger sizes has to be split
uint16_t ep0_pending[2]; // Index determines direction as tusb_dir_t type
@@ -394,7 +392,6 @@ bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
dwc2_regs_t* dwc2 = DWC2_REG(rhport);
tu_memclr(&_dcd_data, sizeof(_dcd_data));
osal_spin_init(&_dcd_spinlock);
// Core Initialization
const bool is_highspeed = dwc2_core_is_highspeed(dwc2, TUSB_ROLE_DEVICE);
@@ -539,7 +536,7 @@ void dcd_edpt_close_all(uint8_t rhport) {
dwc2_regs_t* dwc2 = DWC2_REG(rhport);
uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
osal_spin_lock(&_dcd_spinlock, false);
usbd_spin_lock(false);
_dcd_data.allocated_epin_count = 0;
@@ -560,7 +557,7 @@ void dcd_edpt_close_all(uint8_t rhport) {
dfifo_flush_rx(dwc2);
dfifo_device_init(rhport); // re-init dfifo
osal_spin_unlock(&_dcd_spinlock, false);
usbd_spin_unlock(false);
}
bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size) {
@@ -581,7 +578,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t* buffer, uint16_t to
xfer_ctl_t* xfer = XFER_CTL_BASE(epnum, dir);
bool ret;
osal_spin_lock(&_dcd_spinlock, false);
usbd_spin_lock(false);
if (xfer->max_size == 0) {
ret = false; // Endpoint is closed
@@ -600,7 +597,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t* buffer, uint16_t to
ret = true;
}
osal_spin_unlock(&_dcd_spinlock, false);
usbd_spin_unlock(false);
return ret;
}
@@ -618,7 +615,7 @@ bool dcd_edpt_xfer_fifo(uint8_t rhport, uint8_t ep_addr, tu_fifo_t* ff, uint16_t
xfer_ctl_t* xfer = XFER_CTL_BASE(epnum, dir);
bool ret;
osal_spin_lock(&_dcd_spinlock, false);
usbd_spin_lock(false);
if (xfer->max_size == 0) {
ret = false; // Endpoint is closed
@@ -633,7 +630,7 @@ bool dcd_edpt_xfer_fifo(uint8_t rhport, uint8_t ep_addr, tu_fifo_t* ff, uint16_t
ret = true;
}
osal_spin_unlock(&_dcd_spinlock, false);
usbd_spin_unlock(false);
return ret;
}
@@ -1022,9 +1019,9 @@ void dcd_int_handler(uint8_t rhport) {
// USBRST is start of reset.
dwc2->gintsts = GINTSTS_USBRST;
osal_spin_lock(&_dcd_spinlock, true);
usbd_spin_lock(true);
handle_bus_reset(rhport);
osal_spin_unlock(&_dcd_spinlock, true);
usbd_spin_unlock(true);
}
if (gintsts & GINTSTS_ENUMDNE) {