From 54f4fdab58cf55a6d6cd0d39d4a91e079641163e Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 24 Mar 2020 21:26:00 +0700 Subject: [PATCH] sync with tinyusb master --- lib/tinyusb | 2 +- src/usb/usb_desc.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index 23df777..f2b761f 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 23df777b301af128d3543e286cd865212214b44d +Subproject commit f2b761fee98cf9d09500e2475861e51c6ee58e61 diff --git a/src/usb/usb_desc.c b/src/usb/usb_desc.c index d54b2b8..5d7779b 100644 --- a/src/usb/usb_desc.c +++ b/src/usb/usb_desc.c @@ -150,8 +150,10 @@ static uint16_t _desc_str[64+1]; // 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)