WIP - USB requests span multiple packets

arduino-libraries#33 Mostly the code from this issue

Author: KurtE

src/USBHost/USBDeviceConnected.cpp

@@ -58,6 +58,7 @@ INTERFACE * USBDeviceConnected::getInterface(uint8_t index) {
 }
 
 bool USBDeviceConnected::addInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol) {
+    USB_DBG("addInterface(%u %u %u %u) %p", intf_nb, intf_class, intf_subclass, intf_protocol, this);
     if ((intf_nb >= MAX_INTF) || (intf[intf_nb].in_use)) {
         return false;
     }
@@ -70,11 +71,13 @@ bool USBDeviceConnected::addInterface(uint8_t intf_nb, uint8_t intf_class, uint8
 }
 
 bool USBDeviceConnected::addEndpoint(uint8_t intf_nb, USBEndpoint * ept) {
+    USB_DBG("addEndpoint(%u %p) %p %u %u", intf_nb, ept, this, intf[intf_nb].in_use, intf[intf_nb].nb_endpoint);
     if ((intf_nb >= MAX_INTF) || (intf[intf_nb].in_use == false) || (intf[intf_nb].nb_endpoint >= MAX_ENDPOINT_PER_INTERFACE)) {
         return false;
     }
     intf[intf_nb].nb_endpoint++;
 
+
     for (int i = 0; i < MAX_ENDPOINT_PER_INTERFACE; i++) {
         if (intf[intf_nb].ep[i] == NULL) {
             intf[intf_nb].ep[i] = ept;
@@ -101,10 +104,19 @@ void USBDeviceConnected::disconnect() {
 
 
 USBEndpoint * USBDeviceConnected::getEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir, uint8_t index) {
+    USB_DBG("getEndpoint(%u %u %u %u) %p %u %u", intf_nb, type, dir, index, this, intf[intf_nb].in_use, intf[intf_nb].nb_endpoint);
     if (intf_nb >= MAX_INTF) {
         return NULL;
     }
+#if (DEBUG > 3)
+    for (int i = 0; i < MAX_ENDPOINT_PER_INTERFACE; i++) {
+        USB_DBG("index: %d %p", i, intf[intf_nb].ep[i]);
+    }
+#endif
+
     for (int i = 0; i < MAX_ENDPOINT_PER_INTERFACE; i++) {
+        USB_DBG("index: %d %p", i, intf[intf_nb].ep[i]);
+        if ( intf[intf_nb].ep[i] == nullptr) continue; // don't walk through NULL
         if ((intf[intf_nb].ep[i]->getType() == type) && (intf[intf_nb].ep[i]->getDir() == dir)) {
             if(index) {
                 index--;

src/USBHost/USBHost.cpp

@@ -644,6 +644,7 @@ USB_TYPE USBHost::resetDevice(USBDeviceConnected * dev)
 bool USBHost::addEndpoint(USBDeviceConnected * dev, uint8_t intf_nb, USBEndpoint * ep)
 {
 
+    USB_DBG("USBHost::addEndpoint(%p %u %p) %p", dev, intf_nb, ep, this);
     if (ep == NULL) {
         return false;
     }
@@ -877,11 +878,15 @@ USB_TYPE USBHost::getConfigurationDescriptor(USBDeviceConnected * dev, uint8_t *
 
     USB_DBG("TOTAL_LENGTH: %d \t NUM_INTERF: %d", total_conf_descr_length, buf[4]);
 
-    return controlRead(  dev,
+    res = controlRead(  dev,
                          USB_DEVICE_TO_HOST | USB_RECIPIENT_DEVICE,
                          GET_DESCRIPTOR,
                          (CONFIGURATION_DESCRIPTOR << 8) | (0),
                          0, buf, total_conf_descr_length);
+    if (res != USB_TYPE_OK) {
+        USB_ERR("controlRead FAILED(%u)", res);
+        return res;
+    }
 }
 
 
@@ -931,6 +936,7 @@ USB_TYPE USBHost::enumerate(USBDeviceConnected * dev, IUSBEnumerator* pEnumerato
         // don't enumerate a device which all interfaces are registered to a specific driver
         int index = findDevice(dev);
 
+        USB_DBG("Enumerate dev: %p index: %d", dev, index);
         if (index == -1) {
             return USB_TYPE_ERROR;
         }
@@ -946,12 +952,20 @@ USB_TYPE USBHost::enumerate(USBDeviceConnected * dev, IUSBEnumerator* pEnumerato
         USB_DBG("Enumerate dev: %p", dev);
 
         // third step: get the whole device descriptor to see vid, pid
-        res = getDeviceDescriptor(dev, data, DEVICE_DESCRIPTOR_LENGTH);
+        uint16_t cb_read;
+        res = getDeviceDescriptor(dev, data, DEVICE_DESCRIPTOR_LENGTH, &cb_read);
 
         if (res != USB_TYPE_OK) {
             USB_DBG("GET DEV DESCR FAILED");
             return res;
         }
+#if (DEBUG > 3)
+        USB_DBG("DEVICE DESCRIPTOR(%u):\r\n", cb_read);
+        for (int i = 0; i < DEVICE_DESCRIPTOR_LENGTH; i++) {
+            printf("%02X ", data[i]);
+        }
+        printf("\r\n\r\n");
+#endif
 
         dev->setClass(data[4]);
         dev->setSubClass(data[5]);

src/USBHost/USBHostConf.h

@@ -17,9 +17,9 @@
 #ifndef USBHOST_CONF_H
 #define USBHOST_CONF_H
 
-#undef MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL
-#define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL  0
-#include "Callback.h"
+//#undef MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL
+//#define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL  0
+//#include "Callback.h"
 #include "Arduino.h"
 
 #if defined(TARGET_STM)

src/USBHost/dbg.h

@@ -18,7 +18,7 @@
 #define USB_DEBUG_H
 
 //Debug is disabled by default
-#define DEBUG 0 /*INFO,ERR,WARN*/
+#define DEBUG 2 /*INFO,ERR,WARN*/
 #define DEBUG_TRANSFER 0
 #define DEBUG_EP_STATE 0
 #define DEBUG_EVENT 0

src/targets/TARGET_STM/USBEndpoint_STM.cpp

@@ -178,7 +178,11 @@ USB_TYPE USBEndpoint::queueTransfer()
     }
     ep_queue.get(0);
     MBED_ASSERT(*addr == 0);
+    #ifdef USE_RELEASED_CODE
     transfer_len =   td_current->size <= max_size ? td_current->size : max_size;
+    #else
+    transfer_len =   td_current->size;
+    #endif
     buf_start = (uint8_t *)td_current->currBufPtr;
 
     //Now add this free TD at this end of the queue
@@ -193,6 +197,9 @@ USB_TYPE USBEndpoint::queueTransfer()
     /*  dir /setup is inverted for ST */
     /* token is useful only ctrl endpoint */
     /*  last parameter is ping ? */
+    USB_DBG_TRANSFER("HAL_HCD_HC_SubmitRequest(%p, %u, %u, %u, %u, %p, %u, %u)\n\r", 
+        (HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, dir - 1, type, !setup, (uint8_t *) td_current->currBufPtr, transfer_len, 1);
+
     HAL_HCD_HC_SubmitRequest((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, dir - 1, type, !setup, (uint8_t *) td_current->currBufPtr, transfer_len, 1);
     HAL_HCD_EnableInt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
 

src/targets/TARGET_STM/USBHALHost_STM.cpp

@@ -104,7 +104,7 @@ void HAL_HCD_HC_NotifyURBChange_Callback(HCD_HandleTypeDef *hhcd, uint8_t chnum,
     uint32_t length;
     if ((addr != 0)) {
         HCTD *td = (HCTD *)addr;
-
+#ifdef USE_RELEASED_CODE
         if ((type == EP_TYPE_BULK) || (type == EP_TYPE_CTRL)) {
             switch (urb_state) {
                 case URB_DONE:
@@ -139,6 +139,8 @@ void HAL_HCD_HC_NotifyURBChange_Callback(HCD_HandleTypeDef *hhcd, uint8_t chnum,
                     break;
             }
         }
+#endif // USE_RELEASED_CODE
+
         if ((type == EP_TYPE_INTR)) {
             /*  reply a packet of length NULL, this will be analyze in call back
              *  for mouse or hub */