OWHW: fix operation with second modem/UART
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.
diff --git a/firmware/include_board/owhw/board.h b/firmware/include_board/owhw/board.h
index a136c82..80529cf 100644
--- a/firmware/include_board/owhw/board.h
+++ b/firmware/include_board/owhw/board.h
@@ -44,4 +44,6 @@
#define USB_VENDOR_ID SIMTRACE_VENDOR_ID
#define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID
+#define CARDEMU_SECOND_UART
+
#define HAVE_CARDEM
diff --git a/firmware/src_simtrace/mode_cardemu.c b/firmware/src_simtrace/mode_cardemu.c
index 2e01237..c05c964 100644
--- a/firmware/src_simtrace/mode_cardemu.c
+++ b/firmware/src_simtrace/mode_cardemu.c
@@ -21,7 +21,7 @@
static const Pin pin_usim1_vcc = PIN_USIM1_VCC;
#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_vcc = PIN_USIM2_VCC;
#endif
diff --git a/firmware/src_simtrace/usb.c b/firmware/src_simtrace/usb.c
index d99cce0..c757659 100644
--- a/firmware/src_simtrace/usb.c
+++ b/firmware/src_simtrace/usb.c
@@ -511,7 +511,7 @@
{
sizeof(USBInterfaceDescriptor),
USBGenericDescriptor_INTERFACE,
- 1, /* This is interface #0 */
+ 1, /* This is interface #1 */
0, /* This is alternate setting #0 for this interface */
3, /* Number of endpoints */
0xff, /* Descriptor Class: Vendor specific */