USBHost: enumerate devices once at a time

Author: facchinm

libraries/USBHOST/src/USBHost.cpp

@@ -14,7 +14,6 @@ uint32_t USBHost::Init(uint8_t id, const tusbh_class_reg_t class_table[]) {
     root_fs.support_classes = class_table;
     tusb_host_init(_fs, &root_fs);
     tusb_open_host(_fs);
-
     start_hub();
   }
 

libraries/USBHOST/src/class/host/tusbh_hub.c

@@ -298,8 +298,10 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
         goto error;
     }
     TUSB_HUB_INFO("HUB port state = %02x\n", port_state);
-    for(;port_state; port_state>>=1, port++) {
-        if( (port_state & 1) == 0 ) continue;
+    while (port_state != 0) {
+        if( (port_state & 1) == 0 ) {
+            goto next_port;
+        }
         usb_hub_port_status_t status;
         TUSB_HUB_INFO("HUB get port %d status\n", port);
         res = tusbh_get_hub_port_staus(dev, port, &status);
@@ -342,7 +344,7 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                 if(status.wPortStatus.PORT_LOW_SPEED){
                     child->speed = PORT_SPEED_LOW;
                 }
-                tusb_delay_ms(200);
+                //tusb_delay_ms(200);
 
                 if(dev->ctrl_in>=0){
                     tusbh_close_pipe(dev, dev->ctrl_in);
@@ -360,7 +362,8 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                 }
                 if(dev->ctrl_out<0){
                     TUSB_HUB_INFO("Fail to re-allocate hub ctrl out\n");
-                } 
+                }
+                goto next_port;
             }else{
                 TUSB_HUB_INFO("Connect\n");
                 tusbh_device_t* child = dev->children[port-1];
@@ -373,6 +376,8 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                 child->hub_port = port;
                 dev->children[port-1] = child;
                 tusbh_set_hub_port_feature(dev, port, HUB_FEATURE_SEL_PORT_RESET);
+                tusb_delay_ms(info->hub_desc.bPowerOnToPowerGood);
+                continue;
             }
         }else{
             TUSB_HUB_INFO("Disconnect\n");
@@ -384,8 +389,11 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                 dev->children[port-1] = 0;
             }
         }
+next_port:
+        port_state>>=1;
+        port++;
     }
-    
+
 error:
     if(dev->ctrl_in>=0){ tusbh_close_pipe(dev, dev->ctrl_in); }
     if(dev->ctrl_out>=0){ tusbh_close_pipe(dev, dev->ctrl_out); }

libraries/USBHOST/src/teeny_usb_stm32_otg_host.c

@@ -1157,7 +1157,7 @@ uint32_t tusb_otg_host_xfer_data_split(tusb_host_t* host, uint8_t hc_num, uint8_
     tusb_otg_host_submit(host, hc_num);
   } while (0);
 
-  delayMicroseconds(300);
+  delayMicroseconds(200);
 
   HC->HCSPLT = 0;
 
@@ -1202,13 +1202,17 @@ uint32_t tusb_otg_host_xfer_data_normal(tusb_host_t* host, uint8_t hc_num, uint8
 #endif
   }
 
+  if ((USBx == USB_OTG_FS) && (hc->speed == PORT_SPEED_LOW)) {
+    //delayMicroseconds(200);
+  }
+
   tusb_otg_host_submit(host, hc_num);
   return 0;
 }
 
 uint32_t tusb_otg_host_xfer_data(tusb_host_t* host, uint8_t hc_num, uint8_t is_data, uint8_t* data, uint32_t len, uint8_t port)
 {
-  if (port == 0 || GetUSB(host) == USB_OTG_FS) {
+  if ((port == 0) || (GetUSB(host) == USB_OTG_FS)) {
     return tusb_otg_host_xfer_data_normal(host, hc_num, is_data, data, len);
   } else {
     return tusb_otg_host_xfer_data_split(host, hc_num, is_data, data, len, port);