[ext] Update TinyUSB to v0.17

modm-io · Nov 3, 2024 · 31f8141 · 31f8141
1 parent bd36edf
commit 31f8141
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/ext/hathach/tinyusb b/ext/hathach/tinyusb
diff --git a/ext/rp/irq.h b/ext/rp/irq.h
@@ -28,7 +28,7 @@ irq_set_exclusive_handler(int irqn, void (*handler)(void))
 {
 	(void) irqn;
 	(void) handler;
-	// do nothing, irq implemented at modm
+	// do nothing, irq implemented in modm
 }
 
 static inline void
@@ -37,6 +37,15 @@ irq_add_shared_handler(unsigned int irqn, void (*handler)(void), uint8_t order_p
 	(void) irqn;
 	(void) handler;
 	(void) order_priority;
+	// do nothing, irq implemented in modm
+}
+
+static inline void
+irq_remove_handler(unsigned int irqn, void (*handler)(void))
+{
+	(void) irqn;
+	(void) handler;
+	// do nothing, irq implemented in modm
 }
 
 #define PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY 0xff
diff --git a/ext/rp/pico.cpp.in b/ext/rp/pico.cpp.in
@@ -1,5 +1,6 @@
 #include "pico.h"
 #include "hardware/resets.h"
+#include "hardware/regs/sysinfo.h"
 
 #include <modm/platform/core/resets.hpp>
 %% if with_debug
@@ -31,3 +32,9 @@ extern "C" void panic(const char *fmt, ...)
 %% endif
 	modm_assert(0, "pico", "Pico-SDK panic!");
 }
+
+extern "C" uint8_t rp2040_chip_version(void)
+{
+	const uint32_t chip_id = *((const uint32_t*)(SYSINFO_BASE + SYSINFO_CHIP_ID_OFFSET));
+	return (chip_id & SYSINFO_CHIP_ID_REVISION_BITS) >> SYSINFO_CHIP_ID_REVISION_LSB;
+}
diff --git a/ext/rp/pico.h b/ext/rp/pico.h
@@ -37,6 +37,18 @@ typedef unsigned int uint;
 void
 panic(const char* /*fmt*/, ...);
 
+uint8_t rp2040_chip_version(void);
+
+static inline void
+busy_wait_at_least_cycles(uint32_t minimum_cycles)
+{
+	asm volatile(
+		"1: sub %0, #3\t\n"
+		"bcs 1b\t\n"
+		: "+l" (minimum_cycles) : : "cc", "memory"
+	);
+}
+
 #ifdef __cplusplus
 }
 #endif