From: Proxcloud <help@proxcloud.eu>
Date: Thu, 8 Feb 2018 11:37:55 +0000 (+0800)
Subject: remove old Manufacturer description code. fix Product description length
X-Git-Tag: v3.1.0~68^2~3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c179e7b1f886f5ca0c2f924197349195a8925215?ds=inline

remove old Manufacturer description code. fix Product description length
---

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 3553d850..d3f5cd0c 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -183,7 +183,7 @@ static const char StrDescManufacturer[] = {
 };
 
 static const char StrDescProduct[] = {
-  8,			// Length
+  4,			// Length
   0x03,			// Type is string
   'P', 0x00,
   'M', 0x00,
@@ -550,16 +550,15 @@ void AT91F_CDC_Enumerate() {
 			AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
 		else if (wValue == 0x200)  // Return Configuration Descriptor
 			AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
-		else if ((wValue & 0x300) == 0x300)  // Return Manufacturer Descriptor - this is needed by Android
-			AT91F_USB_SendData(pUdp, StrDescManufacturer, MIN(sizeof(StrDescManufacturer), wLength));
 		else if ((wValue & 0xF00) == 0x300) { // Return String Descriptor
 			const char *strDescriptor = getStringDescriptor(wValue & 0xff);
 			if (strDescriptor != NULL) {
 				AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));
 			} else {
-				AT91F_USB_SendStall(pUdp);
+				AT91F_USB_SendData(pUdp, StrDescManufacturer, MIN(sizeof(StrDescManufacturer), wLength));
 			}
 		}
+		
 		else
 			AT91F_USB_SendStall(pUdp);
 		break;