From ba2ad563cc0e389213a3f6f6ebe79dc21dfb26a3 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Tue, 28 Nov 2017 19:49:41 +0100
Subject: [PATCH] fix build of APP=cardem on BOARD=simtrace

---
 firmware/libboard/simtrace/include/board.h      | 12 ++++++------
 .../libboard/simtrace/source/board_simtrace.c   | 17 +++++++++++++++++
 firmware/libcommon/source/pseudo_talloc.c       |  1 +
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 firmware/libboard/simtrace/source/board_simtrace.c

diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h
index 6ed4cc54..53877b30 100644
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -51,14 +51,14 @@
 
 #define PINS_TC             PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
 
-#define VCC_PHONE                   {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_ISO7816_RST_PHONE       {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
+#define PIN_USIM1_VCC		{PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+#define PIN_USIM1_nRST		{PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
 #define PIN_PHONE_IO_INPUT          {PIO_PA21, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
 #define PIN_PHONE_IO                {PIO_PA22, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 #define PIN_PHONE_CLK               {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}     // External Clock Input on PA28
 //#define PIN_PHONE_CLK               {PIO_PA23A_SCK1, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}     // External Clock Input on PA28
 #define PIN_PHONE_CLK_INPUT         {PIO_PA29, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PINS_ISO7816_PHONE          PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, VCC_PHONE, PIN_PHONE_IO_INPUT, PIN_ISO7816_RST_PHONE
+#define PINS_USIM1		PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
 //, VCC_PHONE
 
 
@@ -81,7 +81,7 @@
 #define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
 #define BOARD_USB_RELEASE	0x000
 
-#define HAVE_SNIFFER
-#define HAVE_CCID
+//#define HAVE_SNIFFER
+//#define HAVE_CCID
 #define HAVE_CARDEM
-#define HAVE_MITM
+//#define HAVE_MITM
diff --git a/firmware/libboard/simtrace/source/board_simtrace.c b/firmware/libboard/simtrace/source/board_simtrace.c
new file mode 100644
index 00000000..438a581d
--- /dev/null
+++ b/firmware/libboard/simtrace/source/board_simtrace.c
@@ -0,0 +1,17 @@
+/* SIMtrace specific application code */
+/* (C) 2017 by Harald Welte <laforge@gnumonks.org> */
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "sim_switch.h"
+#include "osmocom/core/timer.h"
+#include "usb_buf.h"
+
+void board_exec_dbg_cmd(int ch)
+{
+}
+
+void board_main_top(void)
+{
+}
diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c
index ead6ca03..fd5cd136 100644
--- a/firmware/libcommon/source/pseudo_talloc.c
+++ b/firmware/libcommon/source/pseudo_talloc.c
@@ -2,6 +2,7 @@
 
 #include "talloc.h"
 #include "trace.h"
+#include "utils.h"
 #include "osmocom/core/utils.h"
 
 #define NUM_RCTX_SMALL 10