Merge pull request #267 from adafruit/more-tinyusb-update

hathach · web-flow · commit 421d053d19f8 · 2023-03-22T13:14:40.000+07:00
More tinyusb update to commit 07976ad26d4fbcad0694aa3a08294af7fd5f759f
diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
@@ -30,8 +30,8 @@ jobs:
     - name: pre-install
       run: bash ci/actions_install.sh
 
-    - name: clang
-      run: python3 ci/run-clang-format.py -r src/arduino
+#    - name: clang
+#      run: python3 ci/run-clang-format.py -r src/arduino
 
     - name: doxygen
       env:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,8 +3,27 @@
 # SPDX-License-Identifier: Unlicense
 
 repos:
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v15.0.7
+  hooks:
+  - id: clang-format
+    exclude: |
+      (?x)^(
+        examples/|
+        src/class|
+        src/common|
+        src/device|
+        src/host|
+        src/osal|
+        src/portable|
+        src/tusb_option.h|
+        src/tusb.c|
+        src/tusb.h
+      )
+    types_or: [c++, c, header]
+
 - repo: https://github.com/codespell-project/codespell
   rev: v2.2.4
   hooks:
   - id: codespell
-    #args: [-w]
+    args: [-w]
diff --git a/examples/DualRole/CDC/serial_host_bridge/serial_host_bridge.ino b/examples/DualRole/CDC/serial_host_bridge/serial_host_bridge.ino
@@ -91,8 +91,8 @@ void setup1() {
     while ( !Serial ) {
       delay(10);   // wait for native usb
     }
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) {
       delay(1);
     }
diff --git a/examples/DualRole/HID/hid_device_report/hid_device_report.ino b/examples/DualRole/HID/hid_device_report/hid_device_report.ino
@@ -68,8 +68,8 @@ void setup1() {
   uint32_t cpu_hz = clock_get_hz(clk_sys);
   if ( cpu_hz != 120000000UL && cpu_hz != 240000000UL ) {
     while ( !Serial ) delay(10);   // wait for native usb
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) delay(1);
   }
 
diff --git a/examples/DualRole/HID/hid_remapper/hid_remapper.ino b/examples/DualRole/HID/hid_remapper/hid_remapper.ino
@@ -86,8 +86,8 @@ void setup1() {
   uint32_t cpu_hz = clock_get_hz(clk_sys);
   if ( cpu_hz != 120000000UL && cpu_hz != 240000000UL ) {
     while ( !Serial ) delay(10);   // wait for native usb
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) delay(1);
   }
 
diff --git a/examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino b/examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino
@@ -112,8 +112,8 @@ void setup1() {
     while ( !Serial ) {
       delay(10);   // wait for native usb
     }
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) {
       delay(1);
     }
diff --git a/examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino b/examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino
@@ -79,8 +79,8 @@ void setup1() {
     while ( !Serial ) {
       delay(10);   // wait for native usb
     }
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) {
       delay(1);
     }
diff --git a/examples/DualRole/device_info_rp2040/device_info_rp2040.ino b/examples/DualRole/device_info_rp2040/device_info_rp2040.ino
@@ -94,8 +94,8 @@ void setup1() {
     while ( !Serial ) {
       delay(10);   // wait for native usb
     }
-    Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
-    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);
+    Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
+    Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
     while(1) {
       delay(1);
     }
diff --git a/src/Adafruit_TinyUSB.h b/src/Adafruit_TinyUSB.h
@@ -26,8 +26,9 @@
 #define ADAFRUIT_TINYUSB_H_
 
 // Error message for Core that must select TinyUSB via menu
-#if !defined(USE_TINYUSB) && ( defined(ARDUINO_ARCH_SAMD) || \
-                               (defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)) )
+#if !defined(USE_TINYUSB) &&                                                   \
+    (defined(ARDUINO_ARCH_SAMD) ||                                             \
+     (defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)))
 #error TinyUSB is not selected, please select it in "Tools->Menu->USB Stack"
 #endif
 
@@ -39,23 +40,23 @@
 #include "arduino/Adafruit_USBD_Device.h"
 
 #if CFG_TUD_CDC
-  #include "arduino/Adafruit_USBD_CDC.h"
+#include "arduino/Adafruit_USBD_CDC.h"
 #endif
 
 #if CFG_TUD_HID
-  #include "arduino/hid/Adafruit_USBD_HID.h"
+#include "arduino/hid/Adafruit_USBD_HID.h"
 #endif
 
 #if CFG_TUD_MIDI
-  #include "arduino/midi/Adafruit_USBD_MIDI.h"
+#include "arduino/midi/Adafruit_USBD_MIDI.h"
 #endif
 
 #if CFG_TUD_MSC
-  #include "arduino/msc/Adafruit_USBD_MSC.h"
+#include "arduino/msc/Adafruit_USBD_MSC.h"
 #endif
 
 #if CFG_TUD_VENDOR
-  #include "arduino/webusb/Adafruit_USBD_WebUSB.h"
+#include "arduino/webusb/Adafruit_USBD_WebUSB.h"
 #endif
 
 // Initialize device hardware, stack, also Serial as CDC
@@ -70,11 +71,11 @@ void TinyUSB_Device_Init(uint8_t rhport);
 #include "arduino/Adafruit_USBH_Host.h"
 
 #if CFG_TUH_CDC
-  #include "arduino/cdc/Adafruit_USBH_CDC.h"
+#include "arduino/cdc/Adafruit_USBH_CDC.h"
 #endif
 
 #if CFG_TUH_MSC
-  #include "arduino/msc/Adafruit_USBH_MSC.h"
+#include "arduino/msc/Adafruit_USBH_MSC.h"
 #endif
 
 #endif
diff --git a/src/arduino/Adafruit_USBH_Host.h b/src/arduino/Adafruit_USBH_Host.h
@@ -59,8 +59,8 @@ class Adafruit_USBH_Host {
 //
 //// USBHost has a high chance to conflict with other usb stack
 //// only define if supported BSP
-//#ifdef USE_TINYUSB
-//#define USBHost TinyUSBHost
-//#endif
+// #ifdef USE_TINYUSB
+// #define USBHost TinyUSBHost
+// #endif
 
 #endif /* ADAFRUIT_USBH_HOST_H_ */
diff --git a/src/arduino/ports/rp2040/tusb_config_rp2040.h b/src/arduino/ports/rp2040/tusb_config_rp2040.h
@@ -100,17 +100,18 @@ extern int serial1_printf(const char *__restrict __format, ...);
 // Number of hub devices
 #define CFG_TUH_HUB 1
 
-// max device support (excluding hub device)
-#define CFG_TUH_DEVICE_MAX (CFG_TUH_HUB ? 4 : 1) // hub typically has 4 ports
+// max device support (excluding hub device): 1 hub typically has 4 ports
+#define CFG_TUH_DEVICE_MAX (3 * CFG_TUH_HUB + 1)
 
 // Enable tuh_edpt_xfer() API
-//#define CFG_TUH_API_EDPT_XFER       1
+// #define CFG_TUH_API_EDPT_XFER       1
 
 // Number of mass storage
 #define CFG_TUH_MSC 1
 
 // Number of HIDs
-#define CFG_TUH_HID 4
+// typical keyboard + mouse device can have 3,4 HID interfaces
+#define CFG_TUH_HID (3 * CFG_TUH_DEVICE_MAX)
 
 // Number of CDC interfaces
 #define CFG_TUH_CDC 1
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
@@ -127,15 +127,25 @@ uint8_t tuh_cdc_itf_get_index(uint8_t daddr, uint8_t itf_num)
   return TUSB_INDEX_INVALID_8;
 }
 
-bool tuh_cdc_itf_get_info(uint8_t idx, tuh_cdc_itf_info_t* info)
+bool tuh_cdc_itf_get_info(uint8_t idx, tuh_itf_info_t* info)
 {
   cdch_interface_t* p_cdc = get_itf(idx);
   TU_VERIFY(p_cdc && info);
 
-  info->daddr              = p_cdc->daddr;
-  info->bInterfaceNumber   = p_cdc->bInterfaceNumber;
-  info->bInterfaceSubClass = p_cdc->bInterfaceSubClass;
-  info->bInterfaceProtocol = p_cdc->bInterfaceProtocol;
+  info->daddr = p_cdc->daddr;
+
+  // re-construct descriptor
+  tusb_desc_interface_t* desc = &info->desc;
+  desc->bLength            = sizeof(tusb_desc_interface_t);
+  desc->bDescriptorType    = TUSB_DESC_INTERFACE;
+
+  desc->bInterfaceNumber   = p_cdc->bInterfaceNumber;
+  desc->bAlternateSetting  = 0;
+  desc->bNumEndpoints      = 2u + (p_cdc->ep_notif ? 1u : 0u);
+  desc->bInterfaceClass    = TUSB_CLASS_CDC;
+  desc->bInterfaceSubClass = p_cdc->bInterfaceSubClass;
+  desc->bInterfaceProtocol = p_cdc->bInterfaceProtocol;
+  desc->iInterface         = 0; // not used yet
 
   return true;
 }
diff --git a/src/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
@@ -71,21 +71,13 @@
 // Application API
 //--------------------------------------------------------------------+
 
-typedef struct
-{
-  uint8_t daddr;
-  uint8_t bInterfaceNumber;
-  uint8_t bInterfaceSubClass;
-  uint8_t bInterfaceProtocol;
-} tuh_cdc_itf_info_t;
-
 // Get Interface index from device address + interface number
 // return TUSB_INDEX_INVALID_8 (0xFF) if not found
 uint8_t tuh_cdc_itf_get_index(uint8_t daddr, uint8_t itf_num);
 
 // Get Interface information
 // return true if index is correct and interface is currently mounted
-bool tuh_cdc_itf_get_info(uint8_t idx, tuh_cdc_itf_info_t* info);
+bool tuh_cdc_itf_get_info(uint8_t idx, tuh_itf_info_t* info);
 
 // Check if a interface is mounted
 bool tuh_cdc_mounted(uint8_t idx);
diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
diff --git a/src/class/hid/hid_host.h b/src/class/hid/hid_host.h
diff --git a/src/device/usbd.c b/src/device/usbd.c
diff --git a/src/host/usbh.c b/src/host/usbh.c
diff --git a/src/host/usbh.h b/src/host/usbh.h

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ void setup1() {`
`91`	`91`	`while ( !Serial ) {`
`92`	`92`	`delay(10); // wait for native usb`
`93`	`93`	`}`
`94`		`- Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
`95`		`- Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);`
	`94`	`+ Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
	`95`	`+ Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");`
`96`	`96`	`while(1) {`
`97`	`97`	`delay(1);`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ void setup1() {`
`112`	`112`	`while ( !Serial ) {`
`113`	`113`	`delay(10); // wait for native usb`
`114`	`114`	`}`
`115`		`- Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
`116`		`- Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);`
	`115`	`+ Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
	`116`	`+ Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");`
`117`	`117`	`while(1) {`
`118`	`118`	`delay(1);`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ void setup1() {`
`79`	`79`	`while ( !Serial ) {`
`80`	`80`	`delay(10); // wait for native usb`
`81`	`81`	`}`
`82`		`- Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
`83`		`- Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);`
	`82`	`+ Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
	`83`	`+ Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");`
`84`	`84`	`while(1) {`
`85`	`85`	`delay(1);`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ void setup1() {`
`94`	`94`	`while ( !Serial ) {`
`95`	`95`	`delay(10); // wait for native usb`
`96`	`96`	`}`
`97`		`- Serial.printf("Error: CPU Clock = %u, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
`98`		`- Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n", cpu_hz);`
	`97`	`+ Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);`
	`98`	`+ Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");`
`99`	`99`	`while(1) {`
`100`	`100`	`delay(1);`
`101`	`101`	`}`