TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

ports: Update to build with new tinyusb.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2021-02-08 23:47:49 +11:00
parent 9b7d8b87ee
commit 035d16126a
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ports/nrf/drivers/usb/usb_descriptors.c
View File

@@ -67,7 +67,7 @@ static const tusb_desc_device_t usbd_desc_device = {
};
static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
TUD_CONFIG_DESCRIPTOR(USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
@@ -90,7 +90,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
return usbd_desc_cfg;
}
const uint16_t *tud_descriptor_string_cb(uint8_t index) {
const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
#define DESC_STR_MAX (20)
static uint16_t desc_str[DESC_STR_MAX];