HID and CDC can work together, SerialUSB breaks on open()

Author: facchinm

cores/arduino/PluggableUSBDevice.cpp

@@ -129,6 +129,10 @@ void PluggableUSBDevice::callback_request(const setup_packet_t *setup)
 
     for (node = rootNode; node; node = node->next) {
         size = node->callback_request(setup, &result, &data);
+        if (result != USBDevice::PassThrough) {
+            complete_request(result, data, size);
+            return;
+        }
     }
     complete_request(result, data, size);
 }
@@ -139,13 +143,16 @@ void PluggableUSBDevice::callback_request_xfer_done(const setup_packet_t *setup,
         complete_request_xfer_done(false);
         return;
     }
-
+    bool ret = false;
     arduino::internal::PluggableUSBModule* node;
     for (node = rootNode; node; node = node->next) {
-        node->callback_request_xfer_done(setup, aborted);
+        ret = node->callback_request_xfer_done(setup, aborted);
+        if (ret) {
+            complete_request_xfer_done(ret);
+            return;
+        }
     }
-    // FIXME!
-    complete_request_xfer_done(true);
+    complete_request_xfer_done(ret);
 }
 
 void PluggableUSBDevice::callback_set_configuration(uint8_t configuration)
@@ -154,6 +161,10 @@ void PluggableUSBDevice::callback_set_configuration(uint8_t configuration)
     bool ret = false;
     for (node = rootNode; node; node = node->next) {
         ret = node->callback_set_configuration(configuration);
+        if (ret) {
+            complete_set_configuration(ret);
+            return;
+        }
     }
     complete_set_configuration(ret);
 }

libraries/USBHID/USBHID.cpp

@@ -300,6 +300,9 @@ uint32_t USBHID::callback_request(const setup_packet_t *setup, USBDevice::Reques
     uint32_t size = 0;
 
     // Process additional standard requests
+    if (setup->wIndex != pluggedInterface) {
+        return size;
+    }
 
     if ((setup->bmRequestType.Type == STANDARD_TYPE)) {
         switch (setup->bRequest) {
@@ -355,6 +358,9 @@ uint32_t USBHID::callback_request(const setup_packet_t *setup, USBDevice::Reques
 bool USBHID::callback_request_xfer_done(const setup_packet_t *setup, bool aborted)
 {
     (void)aborted;
+    if (setup->wIndex != pluggedInterface) {
+        return false;
+    }
     return true;
 }
 
@@ -367,10 +373,6 @@ bool USBHID::callback_request_xfer_done(const setup_packet_t *setup, bool aborte
 // configuration is not supported
 bool USBHID::callback_set_configuration(uint8_t configuration)
 {
-    if (configuration == DEFAULT_CONFIGURATION) {
-        return false;
-    }
-
     // Configure endpoints > 0
     PluggableUSBD().endpoint_add(_int_in, MAX_HID_REPORT_SIZE, USB_EP_TYPE_INT, mbed::callback(this, &USBHID::_send_isr));
     PluggableUSBD().endpoint_add(_int_out, MAX_HID_REPORT_SIZE, USB_EP_TYPE_INT, mbed::callback(this, &USBHID::_read_isr));
@@ -461,7 +463,7 @@ const uint8_t *USBHID::configuration_desc(uint8_t index)
 
         INTERFACE_DESCRIPTOR_LENGTH,        // bLength
         INTERFACE_DESCRIPTOR,               // bDescriptorType
-        0x00,                               // bInterfaceNumber
+        pluggedInterface,                   // bInterfaceNumber
         0x00,                               // bAlternateSetting
         0x02,                               // bNumEndpoints
         HID_CLASS,                          // bInterfaceClass

libraries/USBSerial/USBCDC.cpp

@@ -208,6 +208,10 @@ uint32_t USBCDC::callback_request(const USBDevice::setup_packet_t *setup, USBDev
     *result = USBDevice::PassThrough;
     uint32_t size = 0;
 
+    if (setup->wIndex != pluggedInterface) {
+        return size;
+    }
+
     /* Only process class-specific requests */
     if (setup->bmRequestType.Type == CLASS_TYPE) {
         switch (setup->bRequest) {
@@ -245,6 +249,10 @@ bool USBCDC::callback_request_xfer_done(const USBDevice::setup_packet_t *setup,
 
     bool success = false;
 
+    if (setup->wIndex != pluggedInterface) {
+        return success;
+    }
+
     /* Process class-specific requests */
     if (setup->bmRequestType.Type == CLASS_TYPE) {
         if ((setup->bRequest == CDC_SET_LINE_CODING) && (setup->wLength == 7)) {