xobs
/
simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync with tinyusb master

This commit is contained in:
hathach 2020-03-24 21:26:00 +07:00
parent cb735eaf8b
commit 54f4fdab58
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinyusb

@ -1 +1 @@
Subproject commit 23df777b301af128d3543e286cd865212214b44d
Subproject commit f2b761fee98cf9d09500e2475861e51c6ee58e61

4
src/usb/usb_desc.c
View File

@ -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)