- Fixed USB endpoint descriptor problems. All USB classes should now be usable. - Had to adjust some shared modules to account for MAX32 devices not supporting IN/OUT endpoints on the same EP #

Author: Brandon-Hurst

ports/analog/boards/APARD/mpconfigboard.mk

@@ -18,8 +18,10 @@ USB_VID=0x0456
 USB_PID=0x003C
 USB_MANUFACTURER="Analog Devices, Inc."
 USB_PRODUCT="MAX32690 APARD"
-USB_NUM_ENDPOINT_PAIRS=12
 USB_HIGHSPEED=1
+
+# NOTE: MAX32 devices do not support IN/OUT pairs on the same EP
+USB_NUM_ENDPOINT_PAIRS=12
 ###
 
 # define UID len for memory safety (buffer gets passed as a raw ptr)

ports/analog/mpconfigport.mk

@@ -17,17 +17,9 @@ INTERNAL_FLASH_FILESYSTEM = 1
 SPI_FLASH_FILESYSTEM = 0
 QSPI_FLASH_FILESYSTEM = 0
 
-# TODO: Test/Debug fs once USB-MSC is ready
+# TODO: Test/Debug FS
 DISABLE_FILESYSTEM = 0
 
-# TODO: Test/Debug TinyUSB!
-# CIRCUITPY_TINYUSB = 1
-# CIRCUITPY_USB_DEVICE ?= 1
-# CIRCUITPY_USB_CDC ?= 1
-# CIRCUITPY_USB_VENDOR ?=1
-# CIRCUITPY_USB_HID ?= 0
-# CIRCUITPY_USB_MIDI ?= 0
-
 ####################################################################################
 # Suggested config for first-time porting
 ####################################################################################

shared-module/storage/__init__.c

@@ -92,6 +92,11 @@ size_t storage_usb_add_descriptor(uint8_t *descriptor_buf, descriptor_counts_t *
     descriptor_buf[MSC_IN_ENDPOINT_INDEX] =
         0x80 | (USB_MSC_EP_NUM_IN ? USB_MSC_EP_NUM_IN : descriptor_counts->current_endpoint);
     descriptor_counts->num_in_endpoints++;
+    // Some TinyUSB devices have issues with bi-directional endpoints
+    #ifdef TUD_ENDPOINT_ONE_DIRECTION_ONLY
+    descriptor_counts->current_endpoint++;
+    #endif
+
     descriptor_buf[MSC_OUT_ENDPOINT_INDEX] =
         USB_MSC_EP_NUM_OUT ? USB_MSC_EP_NUM_OUT : descriptor_counts->current_endpoint;
     descriptor_counts->num_out_endpoints++;

shared-module/usb_cdc/__init__.c

@@ -192,6 +192,11 @@ size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, descriptor_counts_t *desc
         ? (USB_CDC_EP_NUM_DATA_IN ? USB_CDC_EP_NUM_DATA_IN : descriptor_counts->current_endpoint)
         : (USB_CDC2_EP_NUM_DATA_IN ? USB_CDC2_EP_NUM_DATA_IN : descriptor_counts->current_endpoint));
     descriptor_counts->num_in_endpoints++;
+    // Some TinyUSB devices have issues with bi-directional endpoints
+    #ifdef TUD_ENDPOINT_ONE_DIRECTION_ONLY
+    descriptor_counts->current_endpoint++;
+    #endif
+
     descriptor_buf[CDC_DATA_OUT_ENDPOINT_INDEX] =
         console
         ? (USB_CDC_EP_NUM_DATA_OUT ? USB_CDC_EP_NUM_DATA_OUT : descriptor_counts->current_endpoint)

shared-module/usb_hid/__init__.c

@@ -172,6 +172,12 @@ size_t usb_hid_add_descriptor(uint8_t *descriptor_buf, descriptor_counts_t *desc
     descriptor_buf[HID_IN_ENDPOINT_INDEX] =
         0x80 | (USB_HID_EP_NUM_IN ? USB_HID_EP_NUM_IN : descriptor_counts->current_endpoint);
     descriptor_counts->num_in_endpoints++;
+
+    // Some TinyUSB devices have issues with bi-directional endpoints
+    #ifdef TUD_ENDPOINT_ONE_DIRECTION_ONLY
+    descriptor_counts->current_endpoint++;
+    #endif
+
     descriptor_buf[HID_OUT_ENDPOINT_INDEX] =
         USB_HID_EP_NUM_OUT ? USB_HID_EP_NUM_OUT : descriptor_counts->current_endpoint;
     descriptor_counts->num_out_endpoints++;

shared-module/usb_midi/__init__.c

@@ -176,6 +176,12 @@ size_t usb_midi_add_descriptor(uint8_t *descriptor_buf, descriptor_counts_t *des
     descriptor_buf[MIDI_STREAMING_IN_ENDPOINT_INDEX] =
         0x80 | (USB_MIDI_EP_NUM_IN ? USB_MIDI_EP_NUM_IN : descriptor_counts->current_endpoint);
     descriptor_counts->num_in_endpoints++;
+
+    // Some TinyUSB devices have issues with bi-directional endpoints
+    #ifdef TUD_ENDPOINT_ONE_DIRECTION_ONLY
+    descriptor_counts->current_endpoint++;
+    #endif
+
     descriptor_buf[MIDI_STREAMING_OUT_ENDPOINT_INDEX] =
         USB_MIDI_EP_NUM_OUT ? USB_MIDI_EP_NUM_OUT : descriptor_counts->current_endpoint;
     descriptor_counts->num_out_endpoints++;