WIP TinyUSB

Author: salkinium

examples/generic/usb/main.cpp

@@ -41,7 +41,13 @@ int main()
 	Board::initializeUsbFs();
 	// DISCO-F746NG also has a HS port:
 	// Board::initializeUsbHs();
-	tusb_init();
+	static constexpr tusb_rhport_init_t dev_init = {
+		.role = TUSB_ROLE_DEVICE,
+		.speed = TUSB_SPEED_FULL
+		// .speed = TUSB_SPEED_HIGH
+	};
+	tusb_init(0, &dev_init);
+	// tusb_init(1, &dev_init);
 
 	while (true)
 	{

examples/generic/usb/project.xml

@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill-f103</extends>
+  <!-- <extends>modm:blue-pill-f103</extends> -->
   <!-- <extends>modm:black-pill-f401</extends> -->
-  <!-- <extends>modm:black-pill-f411</extends> -->
+  <extends>modm:black-pill-f411</extends>
   <!-- <extends>modm:disco-f072rb</extends> -->
   <!-- <extends>modm:disco-f303vc</extends> -->
   <!-- <extends>modm:disco-f407vg</extends> -->
@@ -20,12 +20,6 @@
     <option name="modm:build:build.path">../../../build/generic/usb</option>
     <option name="modm:tinyusb:config">device.cdc,device.msc</option>
     <!-- <option name="modm:tinyusb:config">device.cdc,device.midi</option> -->
-
-    <!-- Required for modm:disco-f429zi -->
-    <!-- <option name="modm:tinyusb:device:port">hs</option> -->
-
-    <!-- Required for modm:nucleo-h723zg, modm:disco-f429zi -->
-    <!-- <option name="modm:tinyusb:max-speed">full</option> -->
   </options>
   <modules>
     <module>modm:build:scons</module>
@@ -35,6 +29,6 @@
   </modules>
   <collectors>
     <!-- <collect name="modm:build:cppdefines">CFG_TUSB_DEBUG=3</collect> -->
-    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+    <!-- <collect name="modm:build:openocd.source">interface/stlink.cfg</collect> -->
   </collectors>
 </library>

ext/hathach/module.lb

@@ -62,7 +62,8 @@ def prepare(module, options):
     # Generate the host and device modules
     module.add_submodule(TinyUsbDeviceModule(ports))
     module.add_submodule(TinyUsbHostModule(ports))
-    module.depends(":cmsis:device", ":architecture:atomic", ":architecture:interrupt", ":platform:usb")
+    module.depends(":cmsis:device", ":architecture:atomic", ":architecture:delay",
+                   ":architecture:interrupt", ":platform:usb")
     return True
 
 
@@ -126,6 +127,10 @@ def build(env):
             tusb_config["TUD_OPT_RP2040_USB_DEVICE_UFRAME_FIX"] = "0"
             env.copy("tinyusb/src/portable/raspberrypi/rp2040/", "portable/raspberrypi/rp2040/")
 
+    if env.get(":platform:cortex-m:enable_dcache"):
+        tusb_config["CFG_TUD_MEM_DCACHE_ENABLE"] = 1
+        tusb_config["CFG_TUH_MEM_DCACHE_ENABLE"] = 1
+
     # TinyUSB has a OS abstraction layer for FreeRTOS, but it is causes problems with modm
     # if env.has_module(":freertos"):
     #    tusb_config["CFG_TUSB_OS"] = "OPT_OS_FREERTOS"
@@ -146,11 +151,10 @@ def build(env):
     for mode in ["device", "host"]:
         if env.has_module(f":tinyusb:{mode}"):
             port = env.get(f":tinyusb:{mode}:port", default_port)
+            tusb_config[f"CFG_TU{mode[0].upper()}_ENABLED"] = 1
             ports[port] = mode[0]
-            mode = f"OPT_MODE_{mode.upper()}"
             if port == 1 and (speed := env.get("max-speed")) is not None:
-                mode = f"({mode} | OPT_MODE_{speed.upper()}_SPEED)"
-            tusb_config[f"CFG_TUSB_RHPORT{port}_MODE"] = mode
+                tusb_config[f"CFG_TU{mode[0].upper()}_MAX_SPEED"] = f"OPT_MODE_{speed.upper()}_SPEED"
 
     itf_config = env["config"]
     # Enumerate the configurations

ext/hathach/tusb_port.cpp.in

@@ -11,14 +11,15 @@
 // ----------------------------------------------------------------------------
 
 #include <modm/platform/device.hpp>
-#include <modm/architecture/interface/interrupt.hpp>
 #include <modm/architecture/interface/atomic_lock.hpp>
+#include <modm/architecture/interface/delay.hpp>
+#include <modm/architecture/interface/interrupt.hpp>
 #include "tusb.h"
 
-%% for irq, port, mode in irqs | sort
+%% for irq, port, _ in irqs | sort
 MODM_ISR({{irq}})
 {
-	tu{{mode}}_int_handler({{port}});
+	tusb_int_handler({{port}}, true);
 }
 %% endfor
 
@@ -99,6 +100,12 @@ tusb_get_device_serial(uint16_t *serial_str)
 	return sizeof(raw_id) * 2;
 }
 
+extern "C" void
+tusb_time_delay_ms_api(uint32_t ms)
+{
+	modm::delay_ms(ms);
+}
+
 %% if with_debug
 #ifdef CFG_TUSB_DEBUG
 #include <modm/debug.hpp>