diff options
| author | Andrew Leech <andrew.leech@planetinnovation.com.au> | 2024-05-23 17:23:41 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-10-07 11:06:57 +1100 |
| commit | 641f60045f8014ad480e4297b982753edcb5b5c6 (patch) | |
| tree | 7db7aa44837bf59b69898e88988c2513f853edbc | |
| parent | 4247921c4ebfced79aa7ccfbb835c9f60ad6f0fc (diff) | |
shared/tinyusb: Remove MICROPY_HW_USB_EXTERNAL_TINYUSB.
No longer needed as shared tinyusb is now used by the esp32 port.
Signed-off-by: Andrew Leech <andrew@alelec.net>
| -rw-r--r-- | shared/tinyusb/mp_usbd_cdc.c | 8 | ||||
| -rw-r--r-- | shared/tinyusb/mp_usbd_cdc.h | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c index c6a88e467..0fbecb0a8 100644 --- a/shared/tinyusb/mp_usbd_cdc.c +++ b/shared/tinyusb/mp_usbd_cdc.c @@ -149,13 +149,7 @@ static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) { } #endif -void -#if MICROPY_HW_USB_EXTERNAL_TINYUSB -mp_usbd_line_state_cb -#else -tud_cdc_line_state_cb -#endif - (uint8_t itf, bool dtr, bool rts) { +void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) { #if MICROPY_HW_USB_CDC && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC if (dtr) { // A host application has started to open the cdc serial port. diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h index 1abe0fa0a..648cf1288 100644 --- a/shared/tinyusb/mp_usbd_cdc.h +++ b/shared/tinyusb/mp_usbd_cdc.h @@ -35,8 +35,4 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags); void tud_cdc_rx_cb(uint8_t itf); mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len); -#if MICROPY_HW_USB_EXTERNAL_TINYUSB -void mp_usbd_line_state_cb(uint8_t itf, bool dtr, bool rts); -#endif - #endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H |