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

OWHW: fix operation with second modem/UART

Browse Source 
We can now enable CARDEMU_SECOND_UART in owhw/board.h, as it no
longer interferes with operation of the first port (USIM1).  Whether
the second port actuall works still remains to be tested at this point.
This commit is contained in:
Harald Welte
2016-03-19 14:01:31 +01:00
parent 419eb8acf2
commit 6dcacf3efe
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/include_board/owhw/board.h
View File

@@ -44,4 +44,6 @@
#define USB_VENDOR_ID SIMTRACE_VENDOR_ID #define USB_VENDOR_ID SIMTRACE_VENDOR_ID
#define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID #define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID
#define CARDEMU_SECOND_UART
#define HAVE_CARDEM #define HAVE_CARDEM

2
firmware/src_simtrace/mode_cardemu.c
View File

@@ -21,7 +21,7 @@ static const Pin pin_usim1_rst = PIN_USIM1_nRST;
static const Pin pin_usim1_vcc = PIN_USIM1_VCC; static const Pin pin_usim1_vcc = PIN_USIM1_VCC;
#ifdef CARDEMU_SECOND_UART #ifdef CARDEMU_SECOND_UART
static const Pin pins_usim2[] = {PINS_USIM1}; static const Pin pins_usim2[] = {PINS_USIM2};
static const Pin pin_usim2_rst = PIN_USIM2_nRST; static const Pin pin_usim2_rst = PIN_USIM2_nRST;
static const Pin pin_usim2_vcc = PIN_USIM2_VCC; static const Pin pin_usim2_vcc = PIN_USIM2_VCC;
#endif #endif

2
firmware/src_simtrace/usb.c
View File

@@ -511,7 +511,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
{ {
sizeof(USBInterfaceDescriptor), sizeof(USBInterfaceDescriptor),
USBGenericDescriptor_INTERFACE, USBGenericDescriptor_INTERFACE,
1, /* This is interface #0 */ 1, /* This is interface #1 */
0, /* This is alternate setting #0 for this interface */ 0, /* This is alternate setting #0 for this interface */
3, /* Number of endpoints */ 3, /* Number of endpoints */
0xff, /* Descriptor Class: Vendor specific */ 0xff, /* Descriptor Class: Vendor specific */