andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #286 from chang196700/feature-langid

Browse Source 
Add feature: langid Support
This commit is contained in:
Ha Thach
2020-03-03 10:03:49 +07:00
committed by GitHub
parent cb3de67663 8d97e58192
commit 43025b2ae3
14 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/device/cdc_dual_ports/src/usb_descriptors.c
View File

@@ -130,8 +130,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/cdc_msc/src/usb_descriptors.c
View File

@@ -155,8 +155,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c
View File

@@ -184,8 +184,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/dfu_rt/src/usb_descriptors.c
View File

@@ -193,8 +193,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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;
size_t chr_count; size_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/hid_composite/src/usb_descriptors.c
View File

@@ -134,8 +134,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/hid_generic_inout/src/usb_descriptors.c
View File

@@ -132,8 +132,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/midi_test/src/usb_descriptors.c
View File

@@ -123,8 +123,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/msc_dual_lun/src/usb_descriptors.c
View File

@@ -121,8 +121,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/usbtmc/src/usb_descriptors.c
View File

@@ -216,8 +216,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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;
size_t chr_count; size_t chr_count;
if ( index == 0) if ( index == 0)

4
examples/device/webusb_serial/src/usb_descriptors.c
View File

@@ -204,8 +204,10 @@ static uint16_t _desc_str[32];
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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; uint8_t chr_count;
if ( index == 0) if ( index == 0)

2
src/device/usbd.c
View File

@@ -809,7 +809,7 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const
return false; return false;
}else }else
{ {
uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index); uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index, p_request->wIndex);
TU_ASSERT(desc_str); TU_ASSERT(desc_str);
// first byte of descriptor is its size // first byte of descriptor is its size

2
src/device/usbd.h
View File

@@ -91,7 +91,7 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index);
// Invoked when received GET STRING DESCRIPTOR request // Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete // 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);
// Invoked when device is mounted (configured) // Invoked when device is mounted (configured)
TU_ATTR_WEAK void tud_mount_cb(void); TU_ATTR_WEAK void tud_mount_cb(void);

4
test/test/device/msc/test_msc_device.c
View File

@@ -184,8 +184,10 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
return desc_configuration; return desc_configuration;
} }
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;
return NULL; return NULL;
} }

4
test/test/device/usbd/test_usbd.c
View File

@@ -111,8 +111,10 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
return desc_configuration; return desc_configuration;
} }
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;
return NULL; return NULL;
} }