Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/tinyusb
Submodule tinyusb updated 312 files
10 changes: 9 additions & 1 deletion shared/tinyusb/mp_usbd.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@
#include "device/dcd.h"
#endif

// Initialise TinyUSB device.
static inline void mp_usbd_init_tud(void) {
tusb_init();
tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0, .tx_persistent = 1 };
tud_cdc_configure_fifo(&cfg);
}

// Run the TinyUSB device task
void mp_usbd_task(void);

Expand Down Expand Up @@ -125,7 +132,8 @@ inline static bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd

static inline void mp_usbd_init(void) {
// Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
tusb_init();
// which is called in the below helper function.
mp_usbd_init_tud();
}

#endif
Expand Down
6 changes: 4 additions & 2 deletions shared/tinyusb/mp_usbd_runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,10 @@ void mp_usbd_init(void) {
}

if (need_usb) {
tusb_init(); // Safe to call redundantly
tud_connect(); // Reconnect if mp_usbd_deinit() has disconnected
// The following will call tusb_init(), which is safe to call redundantly.
mp_usbd_init_tud();
// Reconnect if mp_usbd_deinit() has disconnected.
tud_connect();
}
}

Expand Down
1 change: 0 additions & 1 deletion shared/tinyusb/tusb_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
#ifndef CFG_TUD_CDC_TX_BUFSIZE
#define CFG_TUD_CDC_TX_BUFSIZE ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
#endif
#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
#endif

// MSC Configuration
Expand Down
Loading