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

fix enumerate one device at a time

Browse Source
This commit is contained in:
hathach
2023-03-17 13:58:01 +07:00
parent 6b84a29f8c
commit f349ae7702
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/host/usbh.c
View File

@@ -1,4 +1,4 @@
/* /*
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2019 Ha Thach (tinyusb.org) * Copyright (c) 2019 Ha Thach (tinyusb.org)
@@ -54,8 +54,6 @@
// USBH-HCD common data structure // USBH-HCD common data structure
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// device0 struct must be strictly a subset of normal device struct
// TODO refactor later
typedef struct typedef struct
{ {
// port // port
@@ -63,15 +61,13 @@ typedef struct
uint8_t hub_addr; uint8_t hub_addr;
uint8_t hub_port; uint8_t hub_port;
uint8_t speed; uint8_t speed;
volatile uint8_t enumerating;
struct TU_ATTR_PACKED // struct TU_ATTR_PACKED {
{ // uint8_t speed : 4; // packed speed to save footprint
volatile uint8_t connected : 1; // volatile uint8_t enumerating : 1;
volatile uint8_t addressed : 1; // uint8_t TU_RESERVED : 3;
volatile uint8_t configured : 1; // };
volatile uint8_t suspended : 1;
};
} usbh_dev0_t; } usbh_dev0_t;
typedef struct { typedef struct {
@@ -402,10 +398,18 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr)
switch (event.event_id) switch (event.event_id)
{ {
case HCD_EVENT_DEVICE_ATTACH: case HCD_EVENT_DEVICE_ATTACH:
// TODO due to the shared _usbh_ctrl_buf, we must complete enumerating // due to the shared _usbh_ctrl_buf, we must complete enumerating
// one device before enumerating another one. // one device before enumerating another one.
TU_LOG_USBH("[%u:] USBH DEVICE ATTACH\r\n", event.rhport); if ( _dev0.enumerating )
enum_new_device(&event); {
TU_LOG1("[%u:] USBH Defer Attach until current enumeration complete\r\n", event.rhport);
osal_queue_send(_usbh_q, &event, in_isr);
}else
{
TU_LOG1("[%u:] USBH DEVICE ATTACH\r\n", event.rhport);
_dev0.enumerating = 1;
enum_new_device(&event);
}
break; break;
case HCD_EVENT_DEVICE_REMOVE: case HCD_EVENT_DEVICE_REMOVE:
@@ -1623,6 +1627,9 @@ void usbh_driver_set_config_complete(uint8_t dev_addr, uint8_t itf_num)
static void enum_full_complete(void) static void enum_full_complete(void)
{ {
// mark enumeration as complete
_dev0.enumerating = 0;
#if CFG_TUH_HUB #if CFG_TUH_HUB
// get next hub status // get next hub status
if (_dev0.hub_addr) hub_edpt_status_xfer(_dev0.hub_addr); if (_dev0.hub_addr) hub_edpt_status_xfer(_dev0.hub_addr);