Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2016 from ipopov/master

Browse Source 
Even when we get an empty "status change" interrupt from the hub, schedule another interrupt poll
This commit is contained in:
Ha Thach 2023-05-29 13:47:23 +07:00 committed by GitHub
commit ddc029ce54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/host/hub.c
View File

@ -327,34 +327,35 @@ static void connection_clear_conn_change_complete (tuh_xfer_t* xfer);
static void connection_port_reset_complete (tuh_xfer_t* xfer); static void connection_port_reset_complete (tuh_xfer_t* xfer);
// callback as response of interrupt endpoint polling // callback as response of interrupt endpoint polling
bool hub_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes) bool hub_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes) {
{
(void) xferred_bytes; // TODO can be more than 1 for hub with lots of ports (void) xferred_bytes; // TODO can be more than 1 for hub with lots of ports
(void) ep_addr; (void) ep_addr;
TU_ASSERT(result == XFER_RESULT_SUCCESS); TU_ASSERT(result == XFER_RESULT_SUCCESS);
hub_interface_t* p_hub = get_itf(dev_addr); hub_interface_t* p_hub = get_itf(dev_addr);
TU_LOG2(" Hub Status Change = 0x%02X\r\n", p_hub->status_change); uint8_t const status_change = p_hub->status_change;
TU_LOG2(" Hub Status Change = 0x%02X\r\n", status_change);
if ( status_change == 0 ) {
// The status change event was neither for the hub, nor for any of its ports.
// This shouldn't happen, but it does with some devices.
// Initiate the next interrupt poll here.
return hub_edpt_status_xfer(dev_addr);
}
if (tu_bit_test(status_change, 0)) {
// Hub bit 0 is for the hub device events // Hub bit 0 is for the hub device events
if (tu_bit_test(p_hub->status_change, 0)) if (hub_port_get_status(dev_addr, 0, &p_hub->hub_status, hub_get_status_complete, 0) == false) {
{
if (hub_port_get_status(dev_addr, 0, &p_hub->hub_status, hub_get_status_complete, 0) == false)
{
//Hub status control transfer failed, retry //Hub status control transfer failed, retry
hub_edpt_status_xfer(dev_addr); hub_edpt_status_xfer(dev_addr);
} }
} }
else else {
{
// Hub bits 1 to n are hub port events // Hub bits 1 to n are hub port events
for (uint8_t port=1; port <= p_hub->port_count; port++) for (uint8_t port=1; port <= p_hub->port_count; port++) {
{ if ( tu_bit_test(status_change, port) ) {
if ( tu_bit_test(p_hub->status_change, port) ) if (hub_port_get_status(dev_addr, port, &p_hub->port_status, hub_port_get_status_complete, 0) == false) {
{
if (hub_port_get_status(dev_addr, port, &p_hub->port_status, hub_port_get_status_complete, 0) == false)
{
//Hub status control transfer failed, retry //Hub status control transfer failed, retry
hub_edpt_status_xfer(dev_addr); hub_edpt_status_xfer(dev_addr);
} }
@ -364,7 +365,6 @@ bool hub_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t result, uint32
} }
// NOTE: next status transfer is queued by usbh.c after handling this request // NOTE: next status transfer is queued by usbh.c after handling this request
return true; return true;
} }