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

qmod: Use different Interface Strings for Modem1+2 / Modem 3+4

Browse Source 
This makes it obvious in 'lsusb' and to other software on the USB host
which interface is for which of the modems.
This commit is contained in:
Harald Welte
2017-03-06 09:28:13 +01:00
parent 809e5840f9
commit 912b183b29
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/Makefile
View File

@@ -95,7 +95,7 @@ C_OSMOCORE = $(notdir $(wildcard libosmocore/source/*.c))
C_LIBCHIP = $(notdir $(wildcard $(AT91LIB)/libchip_sam3s/source/*.c) $(wildcard $(AT91LIB)/libchip_sam3s/cmsis/*.c)) C_LIBCHIP = $(notdir $(wildcard $(AT91LIB)/libchip_sam3s/source/*.c) $(wildcard $(AT91LIB)/libchip_sam3s/cmsis/*.c))
C_LIBUSB = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c C_LIBUSB = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c
C_LIBUSB_RT = dfu.c dfu_desc.c dfu_runtime.c C_LIBUSB_RT = dfu.c dfu_runtime.c
C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c
C_LIBCOMMON = string.c stdio.c fputs.c req_ctx.c ringbuffer.c C_LIBCOMMON = string.c stdio.c fputs.c req_ctx.c ringbuffer.c

6
firmware/apps/cardem/usb_strings.txt
View File

@@ -4,5 +4,7 @@ SIMtrace Sniffer
SIMtrace CCID SIMtrace CCID
SIMtrace Phone SIMtrace Phone
SIMtrace MITM SIMtrace MITM
CardEmulator USIM1 CardEmulator Modem 1
CardEmulator USIM2 CardEmulator Modem 2
CardEmulator Modem 3
CardEmulator Modem 4

8
firmware/libboard/qmod/source/board_qmod.c
View File

@@ -19,6 +19,9 @@ static const Pin pin_peer_erase = {PIO_PA11, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DE
static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}; static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT};
static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}; static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT};
/* array of generated USB Strings */
extern unsigned char *usb_strings[];
static void qmod_use_physical_sim(unsigned int nr, int physical) static void qmod_use_physical_sim(unsigned int nr, int physical)
{ {
const Pin *pin; const Pin *pin;
@@ -230,6 +233,11 @@ void board_main_top(void)
TRACE_INFO("Detected Quad-Modem ST12\n\r"); TRACE_INFO("Detected Quad-Modem ST12\n\r");
} else { } else {
TRACE_INFO("Detected Quad-Modem ST34\n\r"); TRACE_INFO("Detected Quad-Modem ST34\n\r");
/* make sure we use the second set of USB Strings
* calling the interfaces "Modem 3" and "Modem 4" rather
* than 1+2 */
usb_strings[7] = usb_strings[9];
usb_strings[8] = usb_strings[10];
} }
/* Obtain the circuit board version (currently just prints voltage */ /* Obtain the circuit board version (currently just prints voltage */