catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-27 10:48:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

USB: Add manufacturer name string descriptor

Browse Source 
... and use indexed array initializers for more safety/clarity
This commit is contained in:
Harald Welte
2015-11-07 19:01:30 +01:00
parent 8a5b580a72
commit 6d44c1fdd3
1 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
firmware/src_simtrace/usb.c
View File

@@ -47,6 +47,36 @@ static const unsigned char langDesc[] = {
USBStringDescriptor_ENGLISH_US USBStringDescriptor_ENGLISH_US
}; };
const unsigned char manufStringDescriptor[] = {
USBStringDescriptor_LENGTH(24),
USBGenericDescriptor_STRING,
USBStringDescriptor_UNICODE('s'),
USBStringDescriptor_UNICODE('y'),
USBStringDescriptor_UNICODE('s'),
USBStringDescriptor_UNICODE('m'),
USBStringDescriptor_UNICODE('o'),
USBStringDescriptor_UNICODE('c'),
USBStringDescriptor_UNICODE('o'),
USBStringDescriptor_UNICODE('m'),
USBStringDescriptor_UNICODE(' '),
USBStringDescriptor_UNICODE('-'),
USBStringDescriptor_UNICODE(' '),
USBStringDescriptor_UNICODE('s'),
USBStringDescriptor_UNICODE('.'),
USBStringDescriptor_UNICODE('f'),
USBStringDescriptor_UNICODE('.'),
USBStringDescriptor_UNICODE('m'),
USBStringDescriptor_UNICODE('.'),
USBStringDescriptor_UNICODE('c'),
USBStringDescriptor_UNICODE('.'),
USBStringDescriptor_UNICODE(' '),
USBStringDescriptor_UNICODE('G'),
USBStringDescriptor_UNICODE('m'),
USBStringDescriptor_UNICODE('b'),
USBStringDescriptor_UNICODE('H'),
};
const unsigned char productStringDescriptor[] = { const unsigned char productStringDescriptor[] = {
USBStringDescriptor_LENGTH(10), USBStringDescriptor_LENGTH(10),
@@ -145,17 +175,18 @@ const unsigned char MITMConfigStringDescriptor[] = {
}; };
enum strDescNum { enum strDescNum {
PRODUCT_STRING = 1, SNIFFER_CONF_STR, CCID_CONF_STR, PHONE_CONF_STR, MITM_CONF_STR, STRING_DESC_CNT PRODUCT_STRING = 1, MANUF_STR, SNIFFER_CONF_STR, CCID_CONF_STR, PHONE_CONF_STR, MITM_CONF_STR, STRING_DESC_CNT
}; };
/** List of string descriptors used by the device */ /** List of string descriptors used by the device */
static const unsigned char *stringDescriptors[] = { static const unsigned char *stringDescriptors[] = {
langDesc, langDesc,
productStringDescriptor, [PRODUCT_STRING] = productStringDescriptor,
snifferConfigStringDescriptor, [MANUF_STR] = manufStringDescriptor,
CCIDConfigStringDescriptor, [SNIFFER_CONF_STR] = snifferConfigStringDescriptor,
phoneConfigStringDescriptor, [CCID_CONF_STR] = CCIDConfigStringDescriptor,
MITMConfigStringDescriptor [PHONE_CONF_STR] = phoneConfigStringDescriptor,
[MITM_CONF_STR] = MITMConfigStringDescriptor
}; };
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
@@ -573,7 +604,7 @@ const USBDeviceDescriptor deviceDescriptor = {
SIMTRACE_VENDOR_ID, SIMTRACE_VENDOR_ID,
SIMTRACE_PRODUCT_ID, SIMTRACE_PRODUCT_ID,
1, /* Release number */ 1, /* Release number */
0, /* No string descriptor for manufacturer */ MANUF_STR, /* Indesx of manufacturer string descriptor */
PRODUCT_STRING, /* Index of product string descriptor */ PRODUCT_STRING, /* Index of product string descriptor */
0, /* No string descriptor for serial number */ 0, /* No string descriptor for serial number */
4 /* Device has 4 possible configurations */ 4 /* Device has 4 possible configurations */