diff options
| author | Damien George <damien@micropython.org> | 2024-06-02 22:16:29 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-06-02 23:27:33 +1000 |
| commit | 84a8f7ea6dfa3529b024d31fa25bb91153bbfc35 (patch) | |
| tree | 964c548c3019a21224f3b5614acedb08987ccd63 /shared/tinyusb/mp_usbd_cdc.c | |
| parent | c1a6b95bf2653b5bf4a9ad9fed84610e749e40f9 (diff) | |
shared/tinyusb: Allow ports to use 1200bps-touch without other CDC code.
This fixes the build for some esp32 and nrf boards (for example
`ARDUINO_NANO_33_BLE_SENSE` and `ARDUINO_NANO_ESP32`) due to commit
c98789a6d8e05acb608afe4b30cf3ca563419b2d. Changes are:
- Allow the CDC TX/RX functions in `mp_usbd_cdc.c` to be enabled
separately to those needed for `MICROPY_HW_USB_CDC_1200BPS_TOUCH`.
- Add `MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC` option as a temporary
workaround for the nrf port to use.
- Declare `mp_usbd_line_state_cb()` in a header as a public function.
- Fix warning with type cast of `.callback_line_state_changed`.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'shared/tinyusb/mp_usbd_cdc.c')
| -rw-r--r-- | shared/tinyusb/mp_usbd_cdc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c index 4135cd720..6d789ff5e 100644 --- a/shared/tinyusb/mp_usbd_cdc.c +++ b/shared/tinyusb/mp_usbd_cdc.c @@ -26,16 +26,13 @@ #include "py/runtime.h" #include "py/mphal.h" -#include "py/mpconfig.h" #include "py/stream.h" #include "extmod/modmachine.h" -#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV -#include "tusb.h" -#include "device/usbd.h" - -#include "mp_usbd_cdc.h" #include "mp_usbd.h" +#include "mp_usbd_cdc.h" + +#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC static uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll @@ -122,6 +119,8 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) { return i; } +#endif + #if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV static mp_sched_node_t mp_bootloader_sched_node; @@ -150,4 +149,3 @@ tud_cdc_line_state_cb } #endif -#endif |