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 /test | |
| parent | 53732805b76882b3e0eba561ce854e0a95dd6dfe (diff) | |
| parent | a0eb8a26517040850a0e4185aef398183b04ddc7 (diff) | |
merge with current master
Diffstat (limited to 'test')
| -rw-r--r-- | test/test/device/msc/test_msc_device.c | 4 | ||||
| -rw-r--r-- | test/test/device/usbd/test_usbd.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/test/device/msc/test_msc_device.c b/test/test/device/msc/test_msc_device.c index 5003ac839..43a8e7438 100644 --- a/test/test/device/msc/test_msc_device.c +++ b/test/test/device/msc/test_msc_device.c @@ -184,8 +184,10 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) 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; } diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c index 245353106..af30aaf8f 100644 --- a/test/test/device/usbd/test_usbd.c +++ b/test/test/device/usbd/test_usbd.c @@ -111,8 +111,10 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) 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; } |