catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-24 17:28:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

usb: Use different SubClass values for card-emulation and sniffer

Browse Source 
This way, host code can dynamically detect which interface supports
which functionality.

The related #defines should be moved to a header file that's shared with
the host application code.
This commit is contained in:
Harald Welte
2017-03-06 10:06:32 +01:00
parent eab7e456fe
commit 054216d94d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/libcommon/source/usb.c
View File

@@ -39,6 +39,9 @@
#include <usb/common/dfu/usb_dfu.h> #include <usb/common/dfu/usb_dfu.h>
#include <usb/device/dfu/dfu.h> #include <usb/device/dfu/dfu.h>
#define SIMTRACE_SUBCLASS_SNIFFER 1
#define SIMTRACE_SUBCLASS_CARDEM 2
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* USB String descriptors * USB String descriptors
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
@@ -92,7 +95,7 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
.bAlternateSetting = 0, .bAlternateSetting = 0,
.bNumEndpoints = 3, .bNumEndpoints = 3,
.bInterfaceClass = 0xff, .bInterfaceClass = 0xff,
.bInterfaceSubClass = 0, .bInterfaceSubClass = SIMTRACE_SUBCLASS_SNIFFER,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = SNIFFER_CONF_STR, .iInterface = SNIFFER_CONF_STR,
}, },
@@ -280,7 +283,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
.bAlternateSetting = 0, .bAlternateSetting = 0,
.bNumEndpoints = 3, .bNumEndpoints = 3,
.bInterfaceClass = 0xff, .bInterfaceClass = 0xff,
.bInterfaceSubClass = 0, .bInterfaceSubClass = SIMTRACE_SUBCLASS_CARDEM,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = CARDEM_USIM1_INTF_STR, .iInterface = CARDEM_USIM1_INTF_STR,
}, },
@@ -329,7 +332,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
.bAlternateSetting = 0, .bAlternateSetting = 0,
.bNumEndpoints = 3, .bNumEndpoints = 3,
.bInterfaceClass = 0xff, .bInterfaceClass = 0xff,
.bInterfaceSubClass = 0, .bInterfaceSubClass = SIMTRACE_SUBCLASS_CARDEM,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = CARDEM_USIM2_INTF_STR, .iInterface = CARDEM_USIM2_INTF_STR,
}, },
@@ -503,7 +506,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
.bAlternateSetting = 0, .bAlternateSetting = 0,
.bNumEndpoints = 3, .bNumEndpoints = 3,
.bInterfaceClass = 0xff, .bInterfaceClass = 0xff,
.bInterfaceSubClass = 0, .bInterfaceSubClass = SIMTRAC_SUBCLASS_CARDEM,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = PHONE_CONF_STR, .iInterface = PHONE_CONF_STR,
}, },