Handle USB_HIGHSPEED for MIDI also

Author: dhalbert

shared-module/storage/__init__.c

@@ -63,11 +63,11 @@ static const uint8_t usb_msc_descriptor_template[] = {
     0xFF,        // 11 bEndpointAddress (IN/D2H) [SET AT RUNTIME: 0x80 | number]
 #define MSC_IN_ENDPOINT_INDEX (11)
     0x02,        // 12 bmAttributes (Bulk)
-#if USB_HIGHSPEED
+    #if USB_HIGHSPEED
     0x00, 0x02,  // 13,14 wMaxPacketSize 512
-#else
+    #else
     0x40, 0x00,  // 13,14 wMaxPacketSize 64
-#endif
+    #endif
     0x00,        // 15 bInterval 0 (unit depends on device speed)
 
     // MSC Endpoint OUT Descriptor
@@ -76,11 +76,11 @@ static const uint8_t usb_msc_descriptor_template[] = {
     0xFF,        // 18 bEndpointAddress (OUT/H2D) [SET AT RUNTIME]
 #define MSC_OUT_ENDPOINT_INDEX (18)
     0x02,        // 19 bmAttributes (Bulk)
-#if USB_HIGHSPEED
+    #if USB_HIGHSPEED
     0x00, 0x02,  // 20,21 wMaxPacketSize 512
-#else
+    #else
     0x40, 0x00,  // 20,21 wMaxPacketSize 64
-#endif
+    #endif
     0x00,        // 22 bInterval 0 (unit depends on device speed)
 };
 

shared-module/usb_cdc/__init__.c

@@ -121,11 +121,11 @@ static const uint8_t usb_cdc_descriptor_template[] = {
     0xFF,        // 54 bEndpointAddress (OUT/H2D) [SET AT RUNTIME]
 #define CDC_DATA_OUT_ENDPOINT_INDEX 54
     0x02,        // 55 bmAttributes (Bulk)
-#if USB_HIGHSPEED
+    #if USB_HIGHSPEED
     0x00, 0x02,  // 56,57  wMaxPacketSize 512
-#else
+    #else
     0x40, 0x00,  // 56,57  wMaxPacketSize 64
-#endif
+    #endif
     0x00,        // 58 bInterval 0 (unit depends on device speed)
 
     // CDC Data IN Endpoint Descriptor
@@ -134,11 +134,11 @@ static const uint8_t usb_cdc_descriptor_template[] = {
     0xFF,        // 61 bEndpointAddress (IN/D2H) [SET AT RUNTIME: 0x80 | number]
 #define CDC_DATA_IN_ENDPOINT_INDEX 61
     0x02,        // 62 bmAttributes (Bulk)
-#if USB_HIGHSPEED
+    #if USB_HIGHSPEED
     0x00, 0x02,  // 63,64 wMaxPacketSize 512
-#else
+    #else
     0x40, 0x00,  // 63,64 wMaxPacketSize 64
-#endif
+    #endif
     0x00,        // 65 bInterval 0 (unit depends on device speed)
 };
 

shared-module/usb_midi/__init__.c

@@ -127,7 +127,11 @@ static const uint8_t usb_midi_descriptor_template[] = {
     0xFF,        // 66 bEndpointAddress (OUT/H2D) [SET AT RUNTIME]
 #define MIDI_STREAMING_OUT_ENDPOINT_INDEX (66)
     0x02,        // 67 bmAttributes (Bulk)
+    #if USB_HIGHSPEED
+    0x00, 0x02,  // 68,69 wMaxPacketSize (512)
+    #else
     0x40, 0x00,  // 68,69 wMaxPacketSize (64)
+    #endif
     0x00,        // 70 bInterval 0 (unit depends on device speed)
 
     // MIDI Data Endpoint Descriptor
@@ -143,7 +147,11 @@ static const uint8_t usb_midi_descriptor_template[] = {
     0xFF,        // 78 bEndpointAddress (IN/D2H) [SET AT RUNTIME: 0x80 | number]
 #define MIDI_STREAMING_IN_ENDPOINT_INDEX (78)
     0x02,        // 79 bmAttributes (Bulk)
-    0x40, 0x00,  // 8081 wMaxPacketSize 64
+    #if USB_HIGHSPEED
+    0x00, 0x02,  // 80, 81 wMaxPacketSize (512)
+    #else
+    0x40, 0x00,  // 80, 81 wMaxPacketSize (64)
+    #endif
     0x00,        // 82 bInterval 0 (unit depends on device speed)
 
     // MIDI Data Endpoint Descriptor