X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8b9de94afe7436eb14bf6e6c801bd4054842abe2..d03a573eee1e2d9f87990524fee3502d5e730665:/common/usb_cdc.c diff --git a/common/usb_cdc.c b/common/usb_cdc.c index 3553d850..82522623 100644 --- a/common/usb_cdc.c +++ b/common/usb_cdc.c @@ -183,11 +183,12 @@ static const char StrDescManufacturer[] = { }; static const char StrDescProduct[] = { - 8, // Length + 9, // Length 0x03, // Type is string 'P', 0x00, 'M', 0x00, - '3', 0x00 + '3', 0x00, + 0x00 }; const char* getStringDescriptor(uint8_t idx) @@ -550,8 +551,6 @@ 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) {