Merge pull request #305 from hathach/develop

fix mac address for rndis response
2020-03-25 10:18:18 +07:00 · 2020-03-25 10:18:18 +07:00 · 834daa3df9
parent f2b761fee9 9a48e98fad
commit 834daa3df9
4 changed files with 37 additions and 39 deletions
--- 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
 };

@ -134,19 +136,15 @@ 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 [] =
 {
-  [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];
@ -155,16 +153,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;
+  unsigned int chr_count = 0;

-  if (STR_LANGID == index)
+  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 (STR_MAC == index)
+  else if (STRID_MAC == index)
  {
    // Convert MAC address into UTF-16

@ -186,7 +184,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<chr_count; i++)
+    for (unsigned int i=0; i<chr_count; i++)
    {
      _desc_str[1+i] = str[i];
    }
--- a/examples/make.mk
+++ b/examples/make.mk
@ -75,7 +75,6 @@ CFLAGS += \
 	-Wmissing-format-attribute \
 	-Wno-deprecated-declarations \
 	-Wunreachable-code \
-	-Wno-error=lto-type-mismatch \
 	-ffunction-sections \
 	-fdata-sections

--- a/lib/networking/rndis_reports.c
+++ b/lib/networking/rndis_reports.c
@ -120,8 +120,8 @@ static void rndis_query(void)
  {
    case OID_GEN_SUPPORTED_LIST:         rndis_query_cmplt(RNDIS_STATUS_SUCCESS, OIDSupportedList, 4 * OID_LIST_LENGTH); return;
    case OID_GEN_VENDOR_DRIVER_VERSION:  rndis_query_cmplt32(RNDIS_STATUS_SUCCESS, 0x00001000);  return;
-    case OID_802_3_CURRENT_ADDRESS:      rndis_query_cmplt(RNDIS_STATUS_SUCCESS, &station_hwaddr, 6); return;
-    case OID_802_3_PERMANENT_ADDRESS:    rndis_query_cmplt(RNDIS_STATUS_SUCCESS, &permanent_hwaddr, 6); return;
+    case OID_802_3_CURRENT_ADDRESS:      rndis_query_cmplt(RNDIS_STATUS_SUCCESS, station_hwaddr, 6); return;
+    case OID_802_3_PERMANENT_ADDRESS:    rndis_query_cmplt(RNDIS_STATUS_SUCCESS, permanent_hwaddr, 6); return;
    case OID_GEN_MEDIA_SUPPORTED:        rndis_query_cmplt32(RNDIS_STATUS_SUCCESS, NDIS_MEDIUM_802_3); return;
    case OID_GEN_MEDIA_IN_USE:           rndis_query_cmplt32(RNDIS_STATUS_SUCCESS, NDIS_MEDIUM_802_3); return;
    case OID_GEN_PHYSICAL_MEDIUM:        rndis_query_cmplt32(RNDIS_STATUS_SUCCESS, NDIS_MEDIUM_802_3); return;
--- 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()