Merge pull request #443 from adafruit/update-tinyusb-fsdev

update tinyusb to improve fsdev driver for ch32v203
adafruit · Aug 8, 2024 · 0061a40 · 0061a40
2 parents 51a9de8 + 9aaf9b5
commit 0061a40
Show file tree

Hide file tree

Showing 31 changed files with 1,417 additions and 1,825 deletions.
diff --git a/src/arduino/Adafruit_TinyUSB_API.cpp b/src/arduino/Adafruit_TinyUSB_API.cpp
@@ -63,7 +63,9 @@ void TinyUSB_Device_FlushCDC(void) {
     !defined(ARDUINO_ARCH_ESP32)
 
 // #define USE_SEGGER_RTT
+#ifndef SERIAL_TUSB_DEBUG
 #define SERIAL_TUSB_DEBUG Serial1
+#endif
 
 #ifdef USE_SEGGER_RTT
 #include "SEGGER_RTT/RTT/SEGGER_RTT.h"

diff --git a/src/arduino/ports/ch32/Adafruit_TinyUSB_ch32.cpp b/src/arduino/ports/ch32/Adafruit_TinyUSB_ch32.cpp
@@ -118,14 +118,14 @@ void TinyUSB_Port_InitDevice(uint8_t rhport) {
   switch (SystemCoreClock) {
 #if defined(CH32V20x) || defined(CH32V30x)
   case 48000000:
-    usb_div = 0;
-    break; // div1
+    usb_div = 0; // div1
+    break;
   case 96000000:
-    usb_div = 1;
-    break; // div2
+    usb_div = 1; // div2
+    break;
   case 144000000:
-    usb_div = 2;
-    break; // div3
+    usb_div = 2; // div3
+    break;
 #elif defined(CH32V10x)
   case 48000000:
     usb_div = RCC_USBCLKSource_PLLCLK_Div1;
@@ -167,14 +167,21 @@ void TinyUSB_Port_InitDevice(uint8_t rhport) {
 }
 
 void TinyUSB_Port_EnterDFU(void) {
-  // Reset to Bootloader
-  // enterSerialDfu();
+  // Reset to Boot ROM
+  // Serial1.println("Reset to Boot ROM");
+  //__disable_irq();
+  // tud_deinit(0);
+  //
+  // // define function pointer to BOOT ROM address
+  // void (*bootloader_entry)(void) = (void (*)(void))0x1FFF8000;
+  // bootloader_entry();
+  // while(1) {}
 }
 
 uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) {
   volatile uint32_t *ch32_uuid = ((volatile uint32_t *)0x1FFFF7E8UL);
   uint32_t *serial_32 = (uint32_t *)serial_id;
-  serial_32[0] = ch32_uuid[0]; // TODO maybe __builtin_bswap32()
+  serial_32[0] = ch32_uuid[0];
   serial_32[1] = ch32_uuid[1];
   serial_32[2] = ch32_uuid[2];
 

diff --git a/src/arduino/ports/ch32/tusb_config_ch32.h b/src/arduino/ports/ch32/tusb_config_ch32.h
@@ -47,6 +47,8 @@ extern "C" {
 #define CFG_TUSB_DEBUG 0
 #endif
 
+// #define SERIAL_TUSB_DEBUG Serial2
+
 // For selectively disable device log (when > CFG_TUSB_DEBUG)
 // #define CFG_TUD_LOG_LEVEL 3
 // #define CFG_TUH_LOG_LEVEL 3
@@ -97,11 +99,11 @@ extern "C" {
 #endif
 
 #ifndef CFG_TUD_VIDEO
-#define CFG_TUD_VIDEO 1 // number of video control interfaces
+#define CFG_TUD_VIDEO 0 // number of video control interfaces
 #endif
 
 #ifndef CFG_TUD_VIDEO_STREAMING
-#define CFG_TUD_VIDEO_STREAMING 1 // number of video streaming interfaces
+#define CFG_TUD_VIDEO_STREAMING 0 // number of video streaming interfaces
 #endif
 
 // video streaming endpoint buffer size

diff --git a/src/arduino/webusb/Adafruit_USBD_WebUSB.cpp b/src/arduino/webusb/Adafruit_USBD_WebUSB.cpp
@@ -251,8 +251,9 @@ uint8_t const *tud_descriptor_bos_cb(void) { return desc_bos; }
 // Driver response accordingly to the request and the transfer stage
 // (setup/data/ack) return false to stall control endpoint (e.g unsupported
 // request)
-bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage,
-                                tusb_control_request_t const *request) {
+TU_ATTR_WEAK bool
+tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage,
+                           tusb_control_request_t const *request) {
   if (!_webusb_dev) {
     return false;
   }

diff --git a/src/class/audio/audio.h b/src/class/audio/audio.h
@@ -489,7 +489,7 @@ typedef enum
   AUDIO_DATA_FORMAT_TYPE_I_IEEE_FLOAT     = (uint32_t) (1 << 2),
   AUDIO_DATA_FORMAT_TYPE_I_ALAW           = (uint32_t) (1 << 3),
   AUDIO_DATA_FORMAT_TYPE_I_MULAW          = (uint32_t) (1 << 4),
-  AUDIO_DATA_FORMAT_TYPE_I_RAW_DATA       = 0x80000000,
+  AUDIO_DATA_FORMAT_TYPE_I_RAW_DATA       = 0x80000000u,
 } audio_data_format_type_I_t;
 
 /// All remaining definitions are taken from the descriptor descriptions in the UAC2 main specification
@@ -640,7 +640,7 @@ typedef enum
   AUDIO_CHANNEL_CONFIG_BOTTOM_CENTER              = 0x01000000,
   AUDIO_CHANNEL_CONFIG_BACK_LEFT_OF_CENTER        = 0x02000000,
   AUDIO_CHANNEL_CONFIG_BACK_RIGHT_OF_CENTER       = 0x04000000,
-  AUDIO_CHANNEL_CONFIG_RAW_DATA                   = 0x80000000,
+  AUDIO_CHANNEL_CONFIG_RAW_DATA                   = 0x80000000u,
 } audio_channel_config_t;
 
 /// AUDIO Channel Cluster Descriptor (4.1)