diff options
| author | Peter Lawrence <[email protected]> | 2020-03-15 18:28:13 -0500 |
|---|---|---|
| committer | Peter Lawrence <[email protected]> | 2020-03-15 18:28:13 -0500 |
| commit | e7efcb6fd57b689d25a3b42d01c14ffe39e76500 (patch) | |
| tree | 20e9d5b48207299aadeaf8d37bcfe826608997c9 /examples/device/webusb_serial/src | |
| parent | 53732805b76882b3e0eba561ce854e0a95dd6dfe (diff) | |
| parent | a0eb8a26517040850a0e4185aef398183b04ddc7 (diff) | |
merge with current master
Diffstat (limited to 'examples/device/webusb_serial/src')
| -rw-r--r-- | examples/device/webusb_serial/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | examples/device/webusb_serial/src/usb_descriptors.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/device/webusb_serial/src/tusb_config.h b/examples/device/webusb_serial/src/tusb_config.h index 30acdaccf..b3f449f93 100644 --- a/examples/device/webusb_serial/src/tusb_config.h +++ b/examples/device/webusb_serial/src/tusb_config.h @@ -39,7 +39,7 @@ #error CFG_TUSB_MCU must be defined #endif -#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX +#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || CFG_TUSB_MCU == OPT_MCU_NUC505 #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED) #else #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE diff --git a/examples/device/webusb_serial/src/usb_descriptors.c b/examples/device/webusb_serial/src/usb_descriptors.c index 740defe4e..2925a66c4 100644 --- a/examples/device/webusb_serial/src/usb_descriptors.c +++ b/examples/device/webusb_serial/src/usb_descriptors.c @@ -204,8 +204,10 @@ static uint16_t _desc_str[32]; // Invoked when received GET STRING DESCRIPTOR request // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete -uint16_t const* tud_descriptor_string_cb(uint8_t index) +uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) { + (void) langid; + uint8_t chr_count; if ( index == 0) |