WIP: tinyusb: Support Python-defined runtime USB devices.

This work was funded through GitHub Sponsors.
micropython · Jul 10, 2023 · 623b8e7 · 623b8e7
1 parent 813d559
commit 623b8e7
Show file tree

Hide file tree

Showing 10 changed files with 443 additions and 2 deletions.
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
@@ -148,6 +148,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
     ${MICROPY_PORT_DIR}/machine_adc.c
     ${MICROPY_PORT_DIR}/machine_i2c.c
     ${MICROPY_PORT_DIR}/machine_i2s.c

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
@@ -266,6 +266,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    { MP_ROM_QSTR(MP_QSTR_USBD),                MP_ROM_PTR(&mp_type_usbd) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
 
     { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(RP2_RESET_PWRON) },

diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
@@ -12,6 +12,7 @@ extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_wdt_type;
+extern const mp_obj_type_t mp_type_usbd;
 
 void machine_pin_init(void);
 void machine_pin_deinit(void);

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
@@ -43,6 +43,8 @@
 #define MICROPY_HW_ENABLE_USBDEV                (1)
 #endif
 
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // TODO: should probably disable this by default
+
 #if MICROPY_HW_ENABLE_USBDEV
 // Enable USB-CDC serial port
 #ifndef MICROPY_HW_USB_CDC

diff --git a/py/objstr.h b/py/objstr.h
@@ -100,6 +100,8 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     mp_obj_t index, bool is_slice);
 const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction);
 
+#define MP_DEFINE_BYTES_OBJ(obj_name, target, len) mp_obj_str_t obj_name = {{&mp_type_bytes}, 0, (len), (const byte *)(target)}
+
 mp_obj_t mp_obj_bytes_hex(size_t n_args, const mp_obj_t *args, const mp_obj_type_t *type);
 mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data);
 

diff --git a/py/runtime.c b/py/runtime.c
@@ -171,6 +171,10 @@ void mp_init(void) {
     MP_STATE_VM(bluetooth) = MP_OBJ_NULL;
     #endif
 
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    MP_STATE_VM(usbd) = MP_OBJ_NULL;
+    #endif
+
     #if MICROPY_PY_THREAD_GIL
     mp_thread_mutex_init(&MP_STATE_VM(gil_mutex));
     #endif