diff options
| author | hathach <[email protected]> | 2025-11-19 11:32:44 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-11-19 11:32:44 +0700 |
| commit | fd3161087d76c84fb21e8e2f2d30a81d6b11bfba (patch) | |
| tree | 527172cad87c76062490e4ecc9277e21d3691224 /examples/device/dfu/src | |
| parent | be4b38c54dc4e23af322ae04eda1f30e5ced0289 (diff) | |
| parent | d46f71bdde8b3160b0efaf83598d6b4cf596f787 (diff) | |
Merge branch 'refs/heads/master' into dwc2_ep0
# Conflicts:
# examples/device/dfu/src/usb_descriptors.c
# examples/device/dfu_runtime/src/usb_descriptors.c
# src/device/usbd_control.c
# src/portable/synopsys/dwc2/dcd_dwc2.c
Diffstat (limited to 'examples/device/dfu/src')
| -rw-r--r-- | examples/device/dfu/src/usb_descriptors.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/device/dfu/src/usb_descriptors.c b/examples/device/dfu/src/usb_descriptors.c index 5962f4fe3..faacdae7f 100644 --- a/examples/device/dfu/src/usb_descriptors.c +++ b/examples/device/dfu/src/usb_descriptors.c @@ -24,7 +24,6 @@ */ #include "bsp/board_api.h" -#include "class/dfu/dfu_device.h" #include "tusb.h" /* A combination of interfaces must have a unique product id, since PC will save device driver after the first plug. @@ -248,7 +247,7 @@ uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid) { // Cap at max char chr_count = strlen(str); - size_t const max_count = sizeof(_desc_str) / sizeof(_desc_str[0]) - 1;// -1 for string type + size_t const max_count = sizeof(_desc_str) / sizeof(_desc_str[0]) - 1; // -1 for string type if (chr_count > max_count) { chr_count = max_count; } |