Merge pull request arduino#298 from adafruit/rework-tinyusb

hathach · web-flow · commit 7585cb7b7646 · 2021-05-19T13:23:48.000+07:00
Rework tinyusb lib
diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
@@ -7,8 +7,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arduino-platform: ['metro_m0', 'hallowing', 'circuitplayground_m0',
-                           'metro_m4', 'pybadge_m4', 'pygamer_m4', 'hallowing_m4', 'pyportal_m4', 'pyportal_m4_titano']
+        arduino-platform:
+          # Alphabetical order
+          - 'metro_m0'
+          - 'hallowing'
+          - 'circuitplayground_m0'
+          - 'metro_m4'
+          - 'pybadge_m4'
+          - 'pygamer_m4'
+          - 'hallowing_m4'
+          - 'pyportal_m4'
+          - 'pyportal_m4_titano'
+          - 'feather_m4_can'
 
     runs-on: ubuntu-latest
     
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 *.atsuo
 
 bootloaders/*/build/
-*~
+*~
+/libraries/**/build/
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore"]
-	path = cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
-	url = https://github.com/adafruit/Adafruit_TinyUSB_ArduinoCore.git
+[submodule "libraries/Adafruit_TinyUSB_Arduino"]
+	path = libraries/Adafruit_TinyUSB_Arduino
+	url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
@@ -150,12 +150,13 @@ void loop( void ) ;
 
 // USB
 #ifdef USE_TINYUSB
-#include "Adafruit_TinyUSB_Core.h"
+  // Needed for declaring Serial
+  #include "Adafruit_USBD_CDC.h"
 #else
-#include "USB/USBDesc.h"
-#include "USB/USBCore.h"
-#include "USB/USBAPI.h"
-#include "USB/USB_host.h"
+  #include "USB/USBDesc.h"
+  #include "USB/USBCore.h"
+  #include "USB/USBAPI.h"
+  #include "USB/USB_host.h"
 #endif
 
 #endif // Arduino_h
diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore b/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp b/cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
@@ -117,6 +117,17 @@ void SysTick_DefaultHandler(void)
   tickReset();
 }
 
+#if defined(USE_TINYUSB)
+
+// run TinyUSB background task when yield()
+void yield(void)
+{
+  TinyUSB_Device_Task();
+  TinyUSB_Device_FlushCDC();
+}
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
@@ -41,7 +41,7 @@ int main( void )
   delay(1);
 
 #if defined(USE_TINYUSB)
-  Adafruit_TinyUSB_Core_init();
+  TinyUSB_Device_Init(0);
 #elif defined(USBCON)
   USBDevice.init();
   USBDevice.attach();
@@ -59,14 +59,3 @@ int main( void )
 
   return 0;
 }
-
-#if defined(USE_TINYUSB)
-
-// run TinyUSB background task when yield()
-extern  "C" void yield(void)
-{
-  tud_task();
-  tud_cdc_write_flush();
-}
-
-#endif
diff --git a/cores/arduino/tusb_config.h b/cores/arduino/tusb_config.h
diff --git a/extras/build_all.py b/extras/build_all.py
@@ -27,7 +27,7 @@
     metavar='board',
     nargs='*',
     help='list of boards to be built -- Note that the fqbn is created by prepending "{}"'.format(FQBN_PREFIX),
-    default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0' ]
+    default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0', 'feather_m4_can' ]
     )
 args = parser.parse_args()
 
@@ -59,6 +59,10 @@ def build_examples(variant: str):
     fqbn = "{}{}".format(FQBN_PREFIX, variant)
 
     for sketch in glob.iglob('libraries/**/*.ino', recursive=True):
+        # TODO skip TinyUSB library examples for now
+        if "libraries/Adafruit_TinyUSB_Arduino" in sketch:
+            continue
+
         start_time = time.monotonic()
 
         # Skip if contains: ".board.test.skip" or ".all.test.skip"
diff --git a/libraries/Adafruit_TinyUSB_Arduino b/libraries/Adafruit_TinyUSB_Arduino
@@ -0,0 +1 @@
+Subproject commit 1b8b9c9b071065235341d0e503f2d6d05de19524
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
@@ -332,21 +332,25 @@ void SPIClass::dmaAllocate(void) {
           totalDescriptors * sizeof(DmacDescriptor)))) {
           use_dma = true; // Everything allocated successfully
           extraWriteDescriptors = &extraReadDescriptors[numReadDescriptors];
+
+          // dmac.h didn't include extern "C" which cause
+          // DmacDescriptor and its members are defined as C++ struct therefore
+          // memcpy will throw warning on copying where simple assignment won't work
+          #pragma GCC diagnostic push
+          #pragma GCC diagnostic ignored "-Wclass-memaccess"
+
           // Initialize descriptors (copy from first ones)
           for(int i=0; i<numReadDescriptors; i++) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wclass-memaccess"
             memcpy(&extraReadDescriptors[i], firstReadDescriptor,
               sizeof(DmacDescriptor));
-#pragma GCC diagnostic pop
           }
           for(int i=0; i<numWriteDescriptors; i++) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wclass-memaccess"
             memcpy(&extraWriteDescriptors[i], firstWriteDescriptor,
               sizeof(DmacDescriptor));
-#pragma GCC diagnostic pop
           }
+
+          #pragma GCC diagnostic pop
+
         } // end malloc
       } // end extra descriptor check
 
diff --git a/platform.txt b/platform.txt
@@ -77,7 +77,7 @@ compiler.libraries.ldflags=
 
 # USB Flags
 # ---------
-build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{build.core.path}/TinyUSB" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src"
+build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # Default advertised device power setting in mA
 build.usb_power=100
diff --git a/variants/circuitplay/variant.h b/variants/circuitplay/variant.h
@@ -242,10 +242,7 @@ extern Uart Serial1;
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_USBVIRTUAL      SerialUSB
-#define SERIAL_PORT_MONITOR         SerialUSB
+#define SERIAL_PORT_USBVIRTUAL      Serial
+#define SERIAL_PORT_MONITOR         Serial
 #define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial1
-
-// Alias Serial to SerialUSB
-#define Serial                      SerialUSB
