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

fix race condition where reset event cleaar setup count

Browse Source
This commit is contained in:
hathach
2024-07-25 16:49:01 +07:00
parent 0eb0baed19
commit a5bc0430f7
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/device/dcd.h
View File

@@ -40,19 +40,15 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
typedef enum { typedef enum {
DCD_EVENT_INVALID = 0, DCD_EVENT_INVALID = 0, // 0
DCD_EVENT_BUS_RESET, DCD_EVENT_BUS_RESET, // 1
DCD_EVENT_UNPLUGGED, DCD_EVENT_UNPLUGGED, // 2
DCD_EVENT_SOF, DCD_EVENT_SOF, // 3
DCD_EVENT_SUSPEND, // TODO LPM Sleep L1 support DCD_EVENT_SUSPEND, // 4 TODO LPM Sleep L1 support
DCD_EVENT_RESUME, DCD_EVENT_RESUME, // 5
DCD_EVENT_SETUP_RECEIVED, // 6
DCD_EVENT_SETUP_RECEIVED, DCD_EVENT_XFER_COMPLETE, // 7
DCD_EVENT_XFER_COMPLETE, USBD_EVENT_FUNC_CALL, // 8 Not an DCD event, just a convenient way to defer ISR function
// Not an DCD event, just a convenient way to defer ISR function
USBD_EVENT_FUNC_CALL,
DCD_EVENT_COUNT DCD_EVENT_COUNT
} dcd_eventid_t; } dcd_eventid_t;

11
src/device/usbd.c
View File

@@ -120,7 +120,6 @@ typedef struct {
}; };
volatile uint8_t cfg_num; // current active configuration (0x00 is not configured) volatile uint8_t cfg_num; // current active configuration (0x00 is not configured)
uint8_t speed; uint8_t speed;
volatile uint8_t setup_count;
volatile uint8_t sof_consumer; volatile uint8_t sof_consumer;
uint8_t itf2drv[CFG_TUD_INTERFACE_MAX]; // map interface number to driver (0xff is invalid) uint8_t itf2drv[CFG_TUD_INTERFACE_MAX]; // map interface number to driver (0xff is invalid)
@@ -131,6 +130,7 @@ typedef struct {
}usbd_device_t; }usbd_device_t;
tu_static usbd_device_t _usbd_dev; tu_static usbd_device_t _usbd_dev;
static volatile uint8_t _usbd_queued_setup;
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Class Driver // Class Driver
@@ -459,6 +459,7 @@ bool tud_init(uint8_t rhport) {
TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(tu_edpt_stream_t)); TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(tu_edpt_stream_t));
tu_varclr(&_usbd_dev); tu_varclr(&_usbd_dev);
_usbd_queued_setup = 0;
#if OSAL_MUTEX_REQUIRED #if OSAL_MUTEX_REQUIRED
// Init device mutex // Init device mutex
@@ -594,9 +595,10 @@ void tud_task_ext(uint32_t timeout_ms, bool in_isr) {
break; break;
case DCD_EVENT_SETUP_RECEIVED: case DCD_EVENT_SETUP_RECEIVED:
_usbd_dev.setup_count--; TU_ASSERT(_usbd_queued_setup > 0,);
_usbd_queued_setup--;
TU_LOG_BUF(CFG_TUD_LOG_LEVEL, &event.setup_received, 8); TU_LOG_BUF(CFG_TUD_LOG_LEVEL, &event.setup_received, 8);
if (_usbd_dev.setup_count) { if (_usbd_queued_setup) {
TU_LOG_USBD(" Skipped since there is other SETUP in queue\r\n"); TU_LOG_USBD(" Skipped since there is other SETUP in queue\r\n");
break; break;
} }
@@ -1199,7 +1201,8 @@ TU_ATTR_FAST_FUNC void dcd_event_handler(dcd_event_t const* event, bool in_isr)
break; break;
case DCD_EVENT_SETUP_RECEIVED: case DCD_EVENT_SETUP_RECEIVED:
_usbd_dev.setup_count++; // TU_ASSERT(event->setup_received.bRequest != 0,);
_usbd_queued_setup++;
send = true; send = true;
break; break;