diff options
| author | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
| commit | a56f55c10bea2ce0d38de6a04edae41e6c814b9f (patch) | |
| tree | e9a1791ce6ba17a2ac9a411f5c897f0911d28ff1 /src/device | |
| parent | 545690c83435fc9e972a65a4e46539c88f2a2853 (diff) | |
| parent | ea64300a9ad57fbdcafbed189b3d358bf9b6912e (diff) | |
Merge remote-tracking branch 'origin/master' into xfer_isr
# Conflicts:
# examples/device/audio_4_channel_mic_freertos/src/main.c
# examples/device/audio_test_freertos/src/main.c
# src/class/audio/audio_device.c
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 23 | ||||
| -rw-r--r-- | src/device/usbd.h | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 63519dcfd..b8c9d1b9e 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -477,13 +477,30 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) { return true; // skip if already initialized } TU_ASSERT(rh_init); - - TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rhport, - rh_init->speed == TUSB_SPEED_HIGH ? "High" : "Full"); +#if CFG_TUSB_DEBUG >= CFG_TUD_LOG_LEVEL + char const* speed_str = 0; + switch (rh_init->speed) { + case TUSB_SPEED_HIGH: + speed_str = "High"; + break; + case TUSB_SPEED_FULL: + speed_str = "Full"; + break; + case TUSB_SPEED_LOW: + speed_str = "Low"; + break; + case TUSB_SPEED_AUTO: + speed_str = "Auto"; + break; + default: + break; + } + TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rhport, speed_str); TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(usbd_device_t)); TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(dcd_event_t)); TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(tu_fifo_t)); TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(tu_edpt_stream_t)); +#endif tu_varclr(&_usbd_dev); _usbd_queued_setup = 0; diff --git a/src/device/usbd.h b/src/device/usbd.h index de6007fb3..e5a848809 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -244,7 +244,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ /* CDC Union */\ 5, TUSB_DESC_CS_INTERFACE, CDC_FUNC_DESC_UNION, _itfnum, (uint8_t)((_itfnum) + 1),\ /* Endpoint Notification */\ - 7, TUSB_DESC_ENDPOINT, _ep_notif, TUSB_XFER_INTERRUPT, U16_TO_U8S_LE(_ep_notif_size), 16,\ + 7, TUSB_DESC_ENDPOINT, _ep_notif, TUSB_XFER_INTERRUPT, U16_TO_U8S_LE(_ep_notif_size), 1,\ /* CDC Data Interface */\ 9, TUSB_DESC_INTERFACE, (uint8_t)((_itfnum)+1), 0, 2, TUSB_CLASS_CDC_DATA, 0, 0, 0,\ /* Endpoint Out */\ |