github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 10:36:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove old Manufacturer description code. fix Product description length

Browse source
This commit is contained in:
Proxcloud 2018-02-08 19:37:55 +08:00
commit c179e7b1f8
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/usb_cdc.c
View file

@ -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;