[ext] Update TinyUSB to v0.16.0

Author: salkinium

examples/generic/usb/msc_disk.c

@@ -27,6 +27,9 @@
 
 #if CFG_TUD_MSC
 
+// whether host does safe-eject
+static bool ejected = false;
+
 // Some MCU doesn't have enough 8KB SRAM to store the whole disk
 // We will use Flash as read-only disk with board that has
 // CFG_EXAMPLE_MSC_READONLY defined
@@ -136,7 +139,14 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun)
 {
   (void) lun;
 
-  return true; // RAM disk is always ready
+  // RAM disk is ready until ejected
+  if (ejected) {
+    // Additional Sense 3A-00 is NOT_FOUND
+    tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
+    return false;
+  }
+
+  return true;
 }
 
 // Invoked when received SCSI_CMD_READ_CAPACITY_10 and SCSI_CMD_READ_FORMAT_CAPACITY to determine the disk size
@@ -165,6 +175,7 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, boo
     }else
     {
       // unload disk storage
+      ejected = true;
     }
   }
 
@@ -177,10 +188,24 @@ int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void* buff
 {
   (void) lun;
 
+  // out of ramdisk
+  if ( lba >= DISK_BLOCK_NUM ) return -1;
+
   uint8_t const* addr = msc_disk[lba] + offset;
   memcpy(buffer, addr, bufsize);
 
-  return bufsize;
+  return (int32_t) bufsize;
+}
+
+bool tud_msc_is_writable_cb (uint8_t lun)
+{
+  (void) lun;
+
+#ifdef CFG_EXAMPLE_MSC_READONLY
+  return false;
+#else
+  return true;
+#endif
 }
 
 // Callback invoked when received WRITE10 command.
@@ -189,14 +214,17 @@ int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint32_t offset, uint8_t*
 {
   (void) lun;
 
+  // out of ramdisk
+  if ( lba >= DISK_BLOCK_NUM ) return -1;
+
 #ifndef CFG_EXAMPLE_MSC_READONLY
   uint8_t* addr = msc_disk[lba] + offset;
   memcpy(addr, buffer, bufsize);
 #else
   (void) lba; (void) offset; (void) buffer;
 #endif
 
-  return bufsize;
+  return (int32_t) bufsize;
 }
 
 // Callback invoked when received an SCSI command not in built-in list below
@@ -207,18 +235,13 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
   // read10 & write10 has their own callback and MUST not be handled here
 
   void const* response = NULL;
-  uint16_t resplen = 0;
+  int32_t resplen = 0;
 
   // most scsi handled is input
   bool in_xfer = true;
 
   switch (scsi_cmd[0])
   {
-    case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
-      // Host is about to read/write etc ... better not to disconnect disk
-      resplen = 0;
-    break;
-
     default:
       // Set Sense = Invalid Command Operation
       tud_msc_set_sense(lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00);
@@ -235,14 +258,14 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
   {
     if(in_xfer)
     {
-      memcpy(buffer, response, resplen);
+      memcpy(buffer, response, (size_t) resplen);
     }else
     {
       // SCSI output
     }
   }
 
-  return resplen;
+  return (int32_t) resplen;
 }
 
 #endif

ext/hathach/module.lb

@@ -98,7 +98,7 @@ def build(env):
             # PMA buffer size: 512B or 1024B
             env.copy("tinyusb/src/portable/st/stm32_fsdev/", "portable/st/stm32_fsdev/")
         else:
-            env.copy("tinyusb/src/portable/st/synopsys", "portable/st/synopsys/")
+            env.copy("tinyusb/src/portable/synopsys/dwc2/", "portable/synopsys/dwc2/")
 
     elif target.platform == "sam":
         if target.family == "g5x":

ext/hathach/tinyusb

@@ -34,11 +34,14 @@
 
 // Redirect TinyUSB asserts to use modm_assert
 #define MODM_ASSERT_1ARGS(_cond) \
-	TU_VERIFY_DEFINE(_cond, modm_assert(0, "tu", \
-		__FILE__ ":" MODM_STRINGIFY(__LINE__) " -> \"" #_cond "\""), false)
+	do { \
+		modm_assert(_cond, "tu", __FILE__ ":" MODM_STRINGIFY(__LINE__) " -> \"" #_cond "\""); \
+	} while(0)
 
 #define MODM_ASSERT_2ARGS(_cond, _ret) \
-	TU_VERIFY_DEFINE(_cond, modm_assert_continue_fail(0, "tu", \
-		__FILE__ ":" MODM_STRINGIFY(__LINE__) " -> \"" #_cond "\""), _ret)
+	do { \
+		if (!modm_assert_continue_fail(_cond, "tu", __FILE__ ":" MODM_STRINGIFY(__LINE__) " -> \"" #_cond "\"")) \
+		{ return _ret; } \
+	} while(0)
 
 #define TU_ASSERT(...) _GET_3RD_ARG(__VA_ARGS__, MODM_ASSERT_2ARGS, MODM_ASSERT_1ARGS,UNUSED)(__VA_ARGS__)

ext/hathach/tusb_config.h.in

@@ -12,6 +12,8 @@
 
 #pragma once
 
+#if defined(CFG_TUD_CDC) && CFG_TUD_CDC
+
 #include <modm/architecture/interface/uart.hpp>
 #include "tusb.h"
 
@@ -118,3 +120,5 @@ using UsbUart2 = UsbUart<2>;
 using UsbUart3 = UsbUart<3>;
 
 } // namespace modm::platform
+
+#endif

ext/hathach/uart.hpp

@@ -24,19 +24,19 @@ irq_set_enabled(int irqn, bool enable)
 }
 
 static inline void
-irq_set_exclusive_handler(int irqn, void (*handler)())
+irq_set_exclusive_handler(int irqn, void (*handler)(void))
 {
 	(void) irqn;
 	(void) handler;
 	// do nothing, irq implemented at modm
 }
 
 static inline void
-irq_add_shared_handler(unsigned int irqn, void (*handler)(), uint8_t order_priority)
+irq_add_shared_handler(unsigned int irqn, void (*handler)(void), uint8_t order_priority)
 {
-    (void) irqn;
-    (void) handler;
-    (void) order_priority;
+	(void) irqn;
+	(void) handler;
+	(void) order_priority;
 }
 
 #define PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY 0xff

ext/rp/irq.h

@@ -47,6 +47,7 @@ def build(env):
         env.copy("irq.h", "hardware/irq.h")
         env.copy("timer.h", "hardware/timer.h")
         env.copy("resets.h", "hardware/resets.h")
+        env.copy("sync.h", "hardware/sync.h")
 
     env.substitutions = {
         "headers": headers,

ext/rp/module.lb

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024, Niklas Hauser
+ *
+ * This file is part of the modm project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+// ----------------------------------------------------------------------------
+
+// Stripped down header "hardware/sync.h" for tinyusb
+
+#define remove_volatile_cast(t, x) ({ __asm volatile ("dmb" ::: "memory"); (t)(x); })