From 76a27cf49a16adade29abd94a7f64a374c96219f Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 23 Mar 2020 15:21:22 +0700 Subject: [PATCH 1/5] fix rndis response to get mac address - remove cflags -fshort-enums - clean up webserver descriptor --- examples/device/net_lwip_webserver/src/usb_descriptors.c | 8 +++++--- examples/rules.mk | 2 +- lib/networking/rndis_reports.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/device/net_lwip_webserver/src/usb_descriptors.c b/examples/device/net_lwip_webserver/src/usb_descriptors.c index 26f8aeba..93d8e133 100644 --- a/examples/device/net_lwip_webserver/src/usb_descriptors.c +++ b/examples/device/net_lwip_webserver/src/usb_descriptors.c @@ -155,15 +155,16 @@ static uint16_t _desc_str[32]; // 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 langid) { - (void)langid; + (void) langid; - unsigned chr_count = 0; + uint8_t chr_count = 0; if (STR_LANGID == index) { memcpy(&_desc_str[1], string_desc_arr[0], 2); chr_count = 1; } +#if CFG_TUD_NET == OPT_NET_ECM else if (STR_MAC == index) { // Convert MAC address into UTF-16 @@ -174,6 +175,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) _desc_str[1+chr_count++] = "0123456789ABCDEF"[(tud_network_mac_address[i] >> 0) & 0xf]; } } +#endif else { // Convert ASCII string into UTF-16 @@ -186,7 +188,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) chr_count = strlen(str); if ( chr_count > (TU_ARRAY_SIZE(_desc_str) - 1)) chr_count = TU_ARRAY_SIZE(_desc_str) - 1; - for (unsigned i=0; i Date: Mon, 23 Mar 2020 15:24:30 +0700 Subject: [PATCH 2/5] add TODO note to remove tud_network_mac_address --- src/class/net/net_device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/class/net/net_device.h b/src/class/net/net_device.h index 71483364..67cd9993 100644 --- a/src/class/net/net_device.h +++ b/src/class/net/net_device.h @@ -57,6 +57,7 @@ void tud_network_init_cb(void); bool tud_network_recv_cb(struct pbuf *p); // client must provide this: 48-bit MAC address +// TODO removed later since it is not part of tinyusb stack extern const uint8_t tud_network_mac_address[6]; // indicate to network driver that client has finished with the packet provided to network_recv_cb() From bc0779de0a703c0d048a6d745343a378700d341a Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 23 Mar 2020 23:22:52 +0700 Subject: [PATCH 3/5] per review - remove -Wno-error=lto-type-mismatch - change back to unsigned int --- examples/device/net_lwip_webserver/src/usb_descriptors.c | 4 ++-- examples/make.mk | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/device/net_lwip_webserver/src/usb_descriptors.c b/examples/device/net_lwip_webserver/src/usb_descriptors.c index 93d8e133..cdf2c039 100644 --- a/examples/device/net_lwip_webserver/src/usb_descriptors.c +++ b/examples/device/net_lwip_webserver/src/usb_descriptors.c @@ -157,7 +157,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) { (void) langid; - uint8_t chr_count = 0; + unsigned int chr_count = 0; if (STR_LANGID == index) { @@ -188,7 +188,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) chr_count = strlen(str); if ( chr_count > (TU_ARRAY_SIZE(_desc_str) - 1)) chr_count = TU_ARRAY_SIZE(_desc_str) - 1; - for (uint8_t i=0; i Date: Mon, 23 Mar 2020 23:46:12 +0700 Subject: [PATCH 4/5] enhance string index --- .../net_lwip_webserver/src/usb_descriptors.c | 62 +++++++++---------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/examples/device/net_lwip_webserver/src/usb_descriptors.c b/examples/device/net_lwip_webserver/src/usb_descriptors.c index cdf2c039..18d1854f 100644 --- a/examples/device/net_lwip_webserver/src/usb_descriptors.c +++ b/examples/device/net_lwip_webserver/src/usb_descriptors.c @@ -36,6 +36,17 @@ #define USB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \ _PID_MAP(MIDI, 3) | _PID_MAP(VENDOR, 4) | _PID_MAP(NET, 5) ) +// String Descriptor Index +enum +{ + STRID_LANGID = 0, + STRID_MANUFACTURER, + STRID_PRODUCT, + STRID_SERIAL, + STRID_INTERFACE, + STRID_MAC +}; + //--------------------------------------------------------------------+ // Device Descriptors //--------------------------------------------------------------------+ @@ -54,9 +65,9 @@ tusb_desc_device_t const desc_device = .idProduct = USB_PID, .bcdDevice = 0x0100, - .iManufacturer = 0x01, - .iProduct = 0x02, - .iSerialNumber = 0x03, + .iManufacturer = STRID_MANUFACTURER, + .iProduct = STRID_PRODUCT, + .iSerialNumber = STRID_SERIAL, .bNumConfigurations = 0x01 }; @@ -78,21 +89,12 @@ enum ITF_NUM_TOTAL }; -enum -{ - STR_LANGID = 0, - STR_MANUFACTURER, - STR_PRODUCT, - STR_ITFNAME, - STR_MAC, -}; - #if CFG_TUD_NET == OPT_NET_ECM -#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_ECM_DESC_LEN) + #define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_ECM_DESC_LEN) #elif CFG_TUD_NET == OPT_NET_RNDIS -#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_RNDIS_DESC_LEN) + #define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_RNDIS_DESC_LEN) #elif CFG_TUD_NET == OPT_NET_EEM -#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_EEM_DESC_LEN) + #define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_EEM_DESC_LEN) #endif #if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX @@ -110,13 +112,13 @@ uint8_t const desc_configuration[] = #if CFG_TUD_NET == OPT_NET_ECM // Interface number, description string index, MAC address string index, EP notification address and size, EP data address (out, in), and size, max segment size. - TUD_CDC_ECM_DESCRIPTOR(ITF_NUM_CDC, STR_ITFNAME, STR_MAC, 0x81, 8, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE, CFG_TUD_NET_MTU), + TUD_CDC_ECM_DESCRIPTOR(ITF_NUM_CDC, STRID_INTERFACE, STRID_MAC, 0x81, 8, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE, CFG_TUD_NET_MTU), #elif CFG_TUD_NET == OPT_NET_RNDIS // Interface number, string index, EP notification address and size, EP data address (out, in) and size. - TUD_RNDIS_DESCRIPTOR(ITF_NUM_CDC, STR_ITFNAME, 0x81, 8, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE), + TUD_RNDIS_DESCRIPTOR(ITF_NUM_CDC, STRID_INTERFACE, 0x81, 8, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE), #elif CFG_TUD_NET == OPT_NET_EEM // Interface number, description string index, EP data address (out, in) and size. - TUD_CDC_EEM_DESCRIPTOR(ITF_NUM_CDC, STR_ITFNAME, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE), + TUD_CDC_EEM_DESCRIPTOR(ITF_NUM_CDC, STRID_INTERFACE, EPNUM_CDC, 0x80 | EPNUM_CDC, CFG_TUD_NET_ENDPOINT_SIZE), #endif }; @@ -136,17 +138,13 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) // array of pointer to string descriptors char const* string_desc_arr [] = { - [STR_LANGID] = (const char[]) { 0x09, 0x04 }, // supported language is English (0x0409) - [STR_MANUFACTURER] = "TinyUSB", // Manufacturer - [STR_PRODUCT] = "TinyUSB Device", // Product - [STR_ITFNAME] = // CDC-ECM Interface -#if CFG_TUD_NET == OPT_NET_ECM - "TinyUSB CDC-ECM", -#elif CFG_TUD_NET == OPT_NET_RNDIS - "TinyUSB RNDIS", -#elif CFG_TUD_NET == OPT_NET_EEM - "TinyUSB CDC-EEM", -#endif + [STRID_LANGID] = (const char[]) { 0x09, 0x04 }, // supported language is English (0x0409) + [STRID_MANUFACTURER] = "TinyUSB", // Manufacturer + [STRID_PRODUCT] = "TinyUSB Device", // Product + [STRID_SERIAL] = "123456", // Serials + [STRID_INTERFACE] = "TinyUSB Network Interface" // CDC-ECM Interface + + // STRID_MAC index is handled separately }; static uint16_t _desc_str[32]; @@ -159,13 +157,12 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) unsigned int chr_count = 0; - if (STR_LANGID == index) + if (STRID_LANGID == index) { memcpy(&_desc_str[1], string_desc_arr[0], 2); chr_count = 1; } -#if CFG_TUD_NET == OPT_NET_ECM - else if (STR_MAC == index) + else if (STRID_MAC == index) { // Convert MAC address into UTF-16 @@ -175,7 +172,6 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) _desc_str[1+chr_count++] = "0123456789ABCDEF"[(tud_network_mac_address[i] >> 0) & 0xf]; } } -#endif else { // Convert ASCII string into UTF-16 From fca4a6eabf0f2de5003700deb9df0871565cf32a Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 24 Mar 2020 00:07:34 +0700 Subject: [PATCH 5/5] more string id --- examples/device/net_lwip_webserver/src/usb_descriptors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/device/net_lwip_webserver/src/usb_descriptors.c b/examples/device/net_lwip_webserver/src/usb_descriptors.c index 18d1854f..c7a8cc76 100644 --- a/examples/device/net_lwip_webserver/src/usb_descriptors.c +++ b/examples/device/net_lwip_webserver/src/usb_descriptors.c @@ -136,7 +136,7 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) //--------------------------------------------------------------------+ // array of pointer to string descriptors -char const* string_desc_arr [] = +static char const* string_desc_arr [] = { [STRID_LANGID] = (const char[]) { 0x09, 0x04 }, // supported language is English (0x0409) [STRID_MANUFACTURER] = "TinyUSB", // Manufacturer @@ -159,7 +159,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) if (STRID_LANGID == index) { - memcpy(&_desc_str[1], string_desc_arr[0], 2); + memcpy(&_desc_str[1], string_desc_arr[STRID_LANGID], 2); chr_count = 1; } else if (STRID_MAC == index)