Merge branch 'master' into master

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index d3f5cd0c50fd6a7f0f8c2534e3bc56b6be9fcf65..d33bca7bcbd5dd0e0975c2742470bc47e358b364 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -183,10 +183,16 @@ static const char StrDescManufacturer[] = {
 };\r
 \r
 static const char StrDescProduct[] = {\r
-  4,                   // Length\r
+  20,                  // Length\r
   0x03,                        // Type is string\r
-  'P', 0x00,\r
-  'M', 0x00,\r
+  'p', 0x00,\r
+  'r', 0x00,\r
+  'o', 0x00,\r
+  'x', 0x00,\r
+  'm', 0x00,\r
+  'a', 0x00,\r
+  'r', 0x00,\r
+  'k', 0x00,\r
   '3', 0x00\r
 };\r
 \r
@@ -555,10 +561,9 @@ void AT91F_CDC_Enumerate() {
                        if (strDescriptor != NULL) {\r
                                AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));\r
                        } else {\r
-                               AT91F_USB_SendData(pUdp, StrDescManufacturer, MIN(sizeof(StrDescManufacturer), wLength));\r
+                               AT91F_USB_SendStall(pUdp);\r
                        }\r
                }\r
-               \r
                else\r
                        AT91F_USB_SendStall(pUdp);\r
                break;\r