USBHOST: dynamically change device port if connected through hub

Author: facchinm

libraries/USBHOST/examples/Shell/Shell.ino

@@ -74,7 +74,7 @@ static tusbh_root_hub_t root_fs;
 static tusbh_root_hub_t root_hs;
 static const tusbh_boot_key_class_t cls_boot_key = {
   .backend = &tusbh_boot_keyboard_backend,
-  .on_key = process_key
+  //.on_key = process_key
 };
 
 static const tusbh_boot_mouse_class_t cls_boot_mouse = {
@@ -313,17 +313,22 @@ void setup()
   hs = 0;
 #endif
 
+  //usb_fakeirq.start(mbed::callback(usb_irq_thread));
+
+  //NVIC_DisableIRQ(OTG_HS_IRQn);
+
   cmd_len = 0;
 }
 
 bool once = true;
 
 void loop() {
   if (millis() > 5000 && once) {
-    cmd_lsusb(NULL, 0);
+    //cmd_lsusb(NULL, 0);
     once = false;
   }
   //command_loop();
+
   // there is only one message q for every thing
   tusbh_msg_loop(mq);
 }
@@ -347,6 +352,7 @@ static const char tabB[] = "\t _+{}|~:\"~<>?";
 // route the key event to stdin
 static int process_key(tusbh_ep_info_t* ep, const uint8_t* keys)
 {
+  printf("\n");
   uint8_t modify = keys[0];
   uint8_t key = keys[2];
   uint8_t last_leds = key_leds;
@@ -386,8 +392,9 @@ static int process_key(tusbh_ep_info_t* ep, const uint8_t* keys)
 
 
 
+#if 1
 
-#ifdef DEBUG
+extern "C" {
 
 #define LOG_SIZE   1024
 static int hc_log_index;
@@ -410,6 +417,12 @@ void hc_log_begin(tusb_host_t* host, uint8_t hc_num)
   hc_info.HCTSIZ   = HC->HCTSIZ;
   hc_info.HCDMA    = HC->HCDMA;
   hc_log_index = 0;
+  //printf("hc_no            %x\n", hc_num);
+  //printf("hc_info.HCCHAR   %x\n", HC->HCCHAR);
+  //printf("hc_info.HCSPLT   %x\n", HC->HCSPLT);
+  //printf("hc_info.HCINTMSK %x\n", HC->HCINTMSK);
+  //printf("hc_info.HCTSIZ   %x\n", HC->HCTSIZ);
+  //printf("hc_info.HCDMA    %x\n", HC->HCDMA);
 }
 
 void hc_log_data(tusb_host_t* host, uint8_t hc_num, uint32_t data)
@@ -424,4 +437,5 @@ void hc_log_end(tusb_host_t* host, uint8_t hc_num)
 {
 }
 
+}
 #endif

libraries/USBHOST/src/USBHOST.h

@@ -62,7 +62,7 @@ void tusb_host_port_changed(tusb_host_t* host, uint8_t port, host_port_state_t n
         POST_MESSAGE(root->mq, tusbh_msg_root_disconnected, 0, host, 0);
     }else{
         root->en_mask &= ~(1<<0);
-        POST_MESSAGE(root->mq, tusbh_msg_root_disable, 0, host, 0);
+        POST_MESSAGE(root->mq, tusbh_msg_root_disable, 0, host, new_state);
     }
 }
 
@@ -152,7 +152,6 @@ void tusbh_close_pipe(tusbh_device_t* dev, int pipe_num)
     tusb_pipe_close(&pipe);
 }
 
-#if 1
 static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_num, uint8_t is_data, void* data, uint16_t len, uint32_t timeout)
 {
     void* bak = dev->host->hc[pipe_num].user_data;
@@ -168,49 +167,24 @@ static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_nu
     channel_state_t s;
 
     do{
-        tusb_host_xfer_data(dev->host, pipe_num, is_data, p, remain);
+        tusb_host_xfer_data(dev->host, pipe_num, is_data, p, remain, dev->hub_port);
         tusbh_evt_wait(dev->xfer_evt.event, timeout);
         tusb_hc_data_t* hc = &dev->host->hc[pipe_num];
         s = (channel_state_t)hc->state;
-        if (s != TUSB_CS_TRANSFER_CSPLIT) {
-            if(s != TUSB_CS_TRANSFER_COMPLETE){
-                res = -(int)s;
-                goto error;
-            }
-            remain -= hc->count;
-            p += hc->count;
+        if(s != TUSB_CS_TRANSFER_COMPLETE){
+            res = -(int)s;
+            goto error;
         }
-    }while((remain && len) || (s == TUSB_CS_TRANSFER_CSPLIT));
+        remain -= hc->count;
+        p += hc->count;
+    }while((remain && len));
     res = p - ((uint8_t*)data);
 error:
     dev->host->hc[pipe_num].user_data = bak;
     r = (channel_state_t)dev->host->hc[pipe_num].state;
     return r;
 }
 
-#else
-
-static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_num, uint8_t is_data, void* data, uint16_t len, uint32_t timeout)
-{   
-    void* bak = dev->host->hc[pipe_num].user_data;
-    dev->host->hc[pipe_num].user_data = &dev->xfer_evt;
-    
-    tusb_host_xfer_data(dev->host, pipe_num, is_data, data, len);
-    
-    channel_state_t r = TUSB_CS_UNKNOWN_ERROR;
-    
-    //int res = 
-    tusbh_evt_wait(dev->xfer_evt.event, timeout);
-    
-    //if(res == 0){
-        r = (channel_state_t)dev->host->hc[pipe_num].state;
-    //}
-    dev->host->hc[pipe_num].user_data = bak;
-    
-    return r;
-}
-#endif
-
 int tusbh_ep_xfer(tusbh_ep_info_t* ep, void* data, uint16_t len, uint32_t timeout)
 {
     return tusbh_ep_xfer_with_event(ep, data, len, &ep_device(ep)->xfer_evt, timeout);
@@ -223,15 +197,17 @@ static int tusbh_ep_in_xfer_with_event(tusbh_ep_info_t* ep, void* data, uint16_t
     uint16_t remain = len;
     uint8_t* p = (uint8_t*)data;
     int res = 0;
+
+    channel_state_t s;
     do{
         uint16_t xfer_len = EP_MPS(ep->desc);
         if(xfer_len > remain){
             xfer_len = remain;
         }
-        tusb_host_xfer_data(ep_host(ep), ep->pipe_num, 1, p, xfer_len);
+        tusb_host_xfer_data(ep_host(ep), ep->pipe_num, 1, p, xfer_len, ep_device(ep)->hub_port);
         tusbh_evt_wait(action->event, timeout);
         tusb_hc_data_t* hc = &ep_device(ep)->host->hc[ep->pipe_num];
-        channel_state_t s = (channel_state_t)hc->state;
+        s = (channel_state_t)hc->state;
         if(s != TUSB_CS_TRANSFER_COMPLETE){
             res = -(int)s;
             goto error;
@@ -273,7 +249,7 @@ static int tusbh_ep_out_xfer_with_event(tusbh_ep_info_t* ep, void* data, uint16_
         }else{
             xfer_len = remain;
         }
-        tusb_host_xfer_data(ep_host(ep), ep->pipe_num, 1, p, xfer_len);
+        tusb_host_xfer_data(ep_host(ep), ep->pipe_num, 1, p, xfer_len, ep_device(ep)->hub_port);
         tusbh_evt_wait(action->event, timeout);
         tusb_hc_data_t* hc = &ep_device(ep)->host->hc[ep->pipe_num];
         channel_state_t s = (channel_state_t)hc->state;
@@ -876,7 +852,7 @@ static void tusbh_msg_root_disable(tusbh_message_t* msg)
     tusbh_root_hub_t* root = (tusbh_root_hub_t*)host->user_data;
     (void)port;
     (void)root;
-    TUSB_ROOT_INFO("Disable\n");
+    TUSB_ROOT_INFO("Disable %d\n", msg->len);
 }
 
 static void tusbh_ep_data_xfered(tusbh_message_t* msg)
@@ -949,7 +925,7 @@ static void start_period_in(tusbh_device_t* dev, tusbh_ep_info_t* ep)
     if(ep->pipe_num >= 0){
         uint16_t mps = EP_MPS(ep->desc);
         ep->xfer_in_progress = 1;
-        tusb_host_xfer_data(dev->host, ep->pipe_num, 1, ep->data, mps);
+        tusb_host_xfer_data(dev->host, ep->pipe_num, 1, ep->data, mps, dev->hub_port);
     }
 }
 

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

@@ -172,6 +172,7 @@ struct _tusbh_device{
     uint8_t speed;                                     /**< device speed   */
     uint8_t config;                                    /**< device current configuartion */
     uint8_t interface_num;                             /**< Interface number, interfaces under IAD treat as 1 interface */
+    uint8_t hub_port;                                  /**< If connected through a hub */
 };
 
 #define dev_root(dev)  ((tusbh_root_hub_t*)(dev->host->user_data))

libraries/USBHOST/src/class/host/tusbh.h

@@ -324,7 +324,7 @@ int tusbh_hid_send_data(tusbh_ep_info_t* ep, void* data, uint32_t len)
     if( pipe_num < 0 ){
         return pipe_num;
     }
-    tusb_host_xfer_data(ep_host(ep), pipe_num, 1, data, len);
+    tusb_host_xfer_data(ep_host(ep), pipe_num, 1, data, len, ep_device(ep)->hub_port);
     return 0;
 }
 

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

@@ -298,7 +298,7 @@ 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++){
+    for(;port_state; port_state>>=1, port++) {
         if( (port_state & 1) == 0 ) continue;
         usb_hub_port_status_t status;
         TUSB_HUB_INFO("HUB get port %d status\n", port);
@@ -337,6 +337,7 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                 child->speed = PORT_SPEED_FULL;
                 if(status.wPortStatus.PORT_HIGH_SPEED){
                     child->speed = PORT_SPEED_HIGH;
+                    child->hub_port = 0;
                 }
                 if(status.wPortStatus.PORT_LOW_SPEED){
                     child->speed = PORT_SPEED_LOW;
@@ -369,6 +370,7 @@ static int hub_data_xfered(tusbh_ep_info_t* ep)
                     dev->children[port-1] = 0;
                 }
                 child = tusbh_new_device();
+                child->hub_port = port;
                 dev->children[port-1] = child;
                 tusbh_set_hub_port_feature(dev, port, HUB_FEATURE_SEL_PORT_RESET);
             }

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

@@ -117,7 +117,7 @@ int tusbh_vendor_xfer_data(tusbh_ep_info_t* ep, void* data, uint32_t len)
     if( pipe_num < 0 ){
         return pipe_num;
     }
-    tusb_host_xfer_data(ep_host(ep), pipe_num, 1, data, len);
+    tusb_host_xfer_data(ep_host(ep), pipe_num, 1, data, len, ep_device(ep)->hub_port);
     return 0;
 }
 

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

@@ -386,6 +386,7 @@ static void tusb_otg_core_init(tusb_core_t* core)
 
     NVIC_SetPriority(OTG_HS_IRQn, 0);
     NVIC_EnableIRQ(OTG_HS_IRQn);
+    //NVIC_DisableIRQ(OTG_HS_IRQn);
 
     NVIC_SetVector(OTG_HS_IRQn, (uint32_t)&OTG_HS_IRQHandler);
 

libraries/USBHOST/src/stm32_otg_init.c

@@ -606,7 +606,7 @@ int tusb_pipe_cancel(tusb_pipe_t* pipe);
  *  \param[in] data           data buffer for read/write
  *  \param[in] len            data length / data buffer size
  */
-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);
+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);
 #define  tusb_host_xfer_data   tusb_otg_host_xfer_data
 
 /** Send a setup packet