Structure build system to build for multiple boards/apps/environments
diff --git a/firmware/apps/cardem/Makefile b/firmware/apps/cardem/Makefile
new file mode 100644
index 0000000..8a2f29b
--- /dev/null
+++ b/firmware/apps/cardem/Makefile
@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += card_emu.c ccid.c host_communication.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c
new file mode 100644
index 0000000..cdc88cb
--- /dev/null
+++ b/firmware/apps/cardem/main.c
@@ -0,0 +1,207 @@
+// FIXME: Copyright license here
+/*------------------------------------------------------------------------------
+ * Headers
+ *------------------------------------------------------------------------------*/
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "req_ctx.h"
+#include "osmocom/core/timer.h"
+
+uint32_t g_unique_id[4];
+
+/*------------------------------------------------------------------------------
+ * Internal variables
+ *------------------------------------------------------------------------------*/
+typedef struct {
+ /* static initialization, called whether or not the usb config is active */
+ void (*configure) (void);
+ /* initialization function after the config was selected */
+ void (*init) (void);
+ /* de-initialization before selecting new config */
+ void (*exit) (void);
+ /* main loop content for given configuration */
+ void (*run) (void);
+ /* Interrupt handler for USART1 */
+ void (*usart0_irq) (void);
+ /* Interrupt handler for USART1 */
+ void (*usart1_irq) (void);
+} conf_func;
+
+static const conf_func config_func_ptrs[] = {
+ /* array slot 0 is empty, usb configs start at 1 */
+#ifdef HAVE_SNIFFER
+ [CFG_NUM_SNIFF] = {
+ .configure = Sniffer_configure,
+ .init = Sniffer_init,
+ .exit = Sniffer_exit,
+ .run = Sniffer_run,
+ },
+#endif
+#ifdef HAVE_CCID
+ [CFG_NUM_CCID] = {
+ .configure = CCID_configure,
+ .init = CCID_init,
+ .exit = CCID_exit,
+ .run = CCID_run,
+ },
+#endif
+#ifdef HAVE_CARDEM
+ [CFG_NUM_PHONE] = {
+ .configure = mode_cardemu_configure,
+ .init = mode_cardemu_init,
+ .exit = mode_cardemu_exit,
+ .run = mode_cardemu_run,
+ .usart0_irq = mode_cardemu_usart0_irq,
+ .usart1_irq = mode_cardemu_usart1_irq,
+ },
+#endif
+#ifdef HAVE_MITM
+ [CFG_NUM_MITM] = {
+ .configure = MITM_configure,
+ .init = MITM_init,
+ .exit = MITM_exit,
+ .run = MITM_run,
+ },
+#endif
+};
+
+/*------------------------------------------------------------------------------
+ * Internal variables
+ *------------------------------------------------------------------------------*/
+#if defined(HAVE_SNIFFER)
+static volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+#elif defined(HAVE_CARDEM)
+static volatile enum confNum simtrace_config = CFG_NUM_PHONE;
+#elif defined(HAVE_CCID)
+static volatile enum confNum simtrace_config = CFG_NUM_CCID;
+#endif
+
+/*----------------------------------------------------------------------------
+ * Callbacks
+ *----------------------------------------------------------------------------*/
+
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+ TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+ simtrace_config = cfgnum;
+}
+
+void USART1_IrqHandler(void)
+{
+ config_func_ptrs[simtrace_config].usart1_irq();
+}
+
+void USART0_IrqHandler(void)
+{
+ config_func_ptrs[simtrace_config].usart0_irq();
+}
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+ int ch;
+
+ if (!UART_IsRxReady())
+ return;
+
+ ch = UART_GetChar();
+
+ board_exec_dbg_cmd(ch);
+}
+
+/*------------------------------------------------------------------------------
+ * Main
+ *------------------------------------------------------------------------------*/
+#define MAX_USB_ITER BOARD_MCK/72 // This should be around a second
+extern int main(void)
+{
+ uint8_t isUsbConnected = 0;
+ enum confNum last_simtrace_config = simtrace_config;
+ unsigned int i = 0;
+
+ LED_Configure(LED_NUM_RED);
+ LED_Configure(LED_NUM_GREEN);
+ LED_Set(LED_NUM_RED);
+
+ /* Disable watchdog */
+ WDT_Disable(WDT);
+
+ req_ctx_init();
+
+ PIO_InitializeInterrupts(0);
+
+ EEFC_ReadUniqueID(g_unique_id);
+
+ printf("\r\n\r\n"
+ "=============================================================================\r\n"
+ "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\r\n"
+ "=============================================================================\r\n");
+
+ TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+ g_unique_id[0], g_unique_id[1],
+ g_unique_id[2], g_unique_id[3]);
+
+ board_main_top();
+
+ TRACE_INFO("USB init...\r\n");
+ SIMtrace_USB_Initialize();
+
+ while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+ check_exec_dbg_cmd();
+#if 0
+ if (i >= MAX_USB_ITER * 3) {
+ TRACE_ERROR("Resetting board (USB could "
+ "not be configured)\r\n");
+ NVIC_SystemReset();
+ }
+#endif
+ i++;
+ }
+
+ TRACE_INFO("calling configure of all configurations...\r\n");
+ for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+ ++i) {
+ if (config_func_ptrs[i].configure)
+ config_func_ptrs[i].configure();
+ }
+
+ TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
+ config_func_ptrs[simtrace_config].init();
+ last_simtrace_config = simtrace_config;
+
+ TRACE_INFO("entering main loop...\r\n");
+ while (1) {
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+ const char rotor[] = { '-', '\\', '|', '/' };
+ putchar('\b');
+ putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+ check_exec_dbg_cmd();
+ osmo_timers_prepare();
+ osmo_timers_update();
+
+ if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+ if (isUsbConnected) {
+ isUsbConnected = 0;
+ }
+ } else if (isUsbConnected == 0) {
+ TRACE_INFO("USB is now configured\r\n");
+ LED_Set(LED_NUM_GREEN);
+ LED_Clear(LED_NUM_RED);
+
+ isUsbConnected = 1;
+ }
+ if (last_simtrace_config != simtrace_config) {
+ TRACE_INFO("USB config chg %u -> %u\r\n",
+ last_simtrace_config, simtrace_config);
+ config_func_ptrs[last_simtrace_config].exit();
+ config_func_ptrs[simtrace_config].init();
+ last_simtrace_config = simtrace_config;
+ } else {
+ config_func_ptrs[simtrace_config].run();
+ }
+ }
+}
diff --git a/firmware/apps/ccid/main.c b/firmware/apps/ccid/main.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/firmware/apps/ccid/main.c
diff --git a/firmware/apps/dfu/Makefile b/firmware/apps/dfu/Makefile
new file mode 100644
index 0000000..0d19e69
--- /dev/null
+++ b/firmware/apps/dfu/Makefile
@@ -0,0 +1 @@
+C_FILES += $(C_LIBUSB_DFU)
diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c
new file mode 100644
index 0000000..9b2facf
--- /dev/null
+++ b/firmware/apps/dfu/main.c
@@ -0,0 +1,107 @@
+#include "board.h"
+#include "utils.h"
+#include "usb/device/dfu/dfu.h"
+#include "usb/common/dfu/usb_dfu.h"
+#include "manifest.h"
+
+unsigned int g_unique_id[4];
+
+/*----------------------------------------------------------------------------
+ * Callbacks
+ *----------------------------------------------------------------------------*/
+
+#if 0
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+ TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+ simtrace_config = cfgnum;
+}
+#endif
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+ int ch;
+
+ if (!UART_IsRxReady())
+ return;
+
+ ch = UART_GetChar();
+
+ //board_exec_dbg_cmd(ch);
+}
+
+/*------------------------------------------------------------------------------
+ * Main
+ *------------------------------------------------------------------------------*/
+#define MAX_USB_ITER BOARD_MCK/72 // This should be around a second
+extern int main(void)
+{
+ uint8_t isUsbConnected = 0;
+ unsigned int i = 0;
+
+ LED_Configure(LED_NUM_RED);
+ LED_Configure(LED_NUM_GREEN);
+ LED_Set(LED_NUM_RED);
+
+ /* Disable watchdog */
+ WDT_Disable(WDT);
+
+ //req_ctx_init();
+
+ PIO_InitializeInterrupts(0);
+
+ EEFC_ReadUniqueID(g_unique_id);
+
+ printf("\r\n\r\n"
+ "=============================================================================\r\n"
+ "DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\r\n"
+ "=============================================================================\r\n",
+ manifest_revision, manifest_board);
+
+ TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+ g_unique_id[0], g_unique_id[1],
+ g_unique_id[2], g_unique_id[3]);
+
+ //board_main_top();
+
+ TRACE_INFO("USB init...\r\n");
+ USBDFU_Initialize(&dfu_descriptors);
+
+ while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+ check_exec_dbg_cmd();
+#if 0
+ if (i >= MAX_USB_ITER * 3) {
+ TRACE_ERROR("Resetting board (USB could "
+ "not be configured)\r\n");
+ NVIC_SystemReset();
+ }
+#endif
+ i++;
+ }
+
+ TRACE_INFO("entering main loop...\r\n");
+ while (1) {
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+ const char rotor[] = { '-', '\\', '|', '/' };
+ putchar('\b');
+ putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+ check_exec_dbg_cmd();
+ //osmo_timers_prepare();
+ //osmo_timers_update();
+
+ if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+ if (isUsbConnected) {
+ isUsbConnected = 0;
+ }
+ } else if (isUsbConnected == 0) {
+ TRACE_INFO("USB is now configured\r\n");
+ LED_Set(LED_NUM_GREEN);
+ LED_Clear(LED_NUM_RED);
+
+ isUsbConnected = 1;
+ }
+ }
+}
diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/firmware/apps/trace/main.c
diff --git a/firmware/apps/triple_play/Makefile b/firmware/apps/triple_play/Makefile
new file mode 100644
index 0000000..8a2f29b
--- /dev/null
+++ b/firmware/apps/triple_play/Makefile
@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += card_emu.c ccid.c host_communication.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c
new file mode 100644
index 0000000..3b843c8
--- /dev/null
+++ b/firmware/apps/triple_play/main.c
@@ -0,0 +1,207 @@
+// FIXME: Copyright license here
+/*------------------------------------------------------------------------------
+ * Headers
+ *------------------------------------------------------------------------------*/
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "req_ctx.h"
+#include "osmocom/core/timer.h"
+
+uint32_t g_unique_id[4];
+
+/*------------------------------------------------------------------------------
+ * Internal variables
+ *------------------------------------------------------------------------------*/
+typedef struct {
+ /* static initialization, called whether or not the usb config is active */
+ void (*configure) (void);
+ /* initialization function after the config was selected */
+ void (*init) (void);
+ /* de-initialization before selecting new config */
+ void (*exit) (void);
+ /* main loop content for given configuration */
+ void (*run) (void);
+ /* Interrupt handler for USART1 */
+ void (*usart0_irq) (void);
+ /* Interrupt handler for USART1 */
+ void (*usart1_irq) (void);
+} conf_func;
+
+static const conf_func config_func_ptrs[] = {
+ /* array slot 0 is empty, usb configs start at 1 */
+#ifdef HAVE_SNIFFER
+ [CFG_NUM_SNIFF] = {
+ .configure = Sniffer_configure,
+ .init = Sniffer_init,
+ .exit = Sniffer_exit,
+ .run = Sniffer_run,
+ },
+#endif
+#ifdef HAVE_CCID
+ [CFG_NUM_CCID] = {
+ .configure = CCID_configure,
+ .init = CCID_init,
+ .exit = CCID_exit,
+ .run = CCID_run,
+ },
+#endif
+#ifdef HAVE_CARDEM
+ [CFG_NUM_PHONE] = {
+ .configure = mode_cardemu_configure,
+ .init = mode_cardemu_init,
+ .exit = mode_cardemu_exit,
+ .run = mode_cardemu_run,
+ .usart0_irq = mode_cardemu_usart0_irq,
+ .usart1_irq = mode_cardemu_usart1_irq,
+ },
+#endif
+#ifdef HAVE_MITM
+ [CFG_NUM_MITM] = {
+ .configure = MITM_configure,
+ .init = MITM_init,
+ .exit = MITM_exit,
+ .run = MITM_run,
+ },
+#endif
+};
+
+/*------------------------------------------------------------------------------
+ * Internal variables
+ *------------------------------------------------------------------------------*/
+#if defined(HAVE_SNIFFER)
+static volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+#elif defined(HAVE_CARDEM)
+static volatile enum confNum simtrace_config = CFG_NUM_PHONE;
+#elif defined(HAVE_CCID)
+static volatile enum confNum simtrace_config = CFG_NUM_CCID;
+#endif
+
+/*----------------------------------------------------------------------------
+ * Callbacks
+ *----------------------------------------------------------------------------*/
+
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+ TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+ simtrace_config = cfgnum;
+}
+
+void USART1_IrqHandler(void)
+{
+ config_func_ptrs[simtrace_config].usart1_irq();
+}
+
+void USART0_IrqHandler(void)
+{
+ config_func_ptrs[simtrace_config].usart0_irq();
+}
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+ int ch;
+
+ if (!UART_IsRxReady())
+ return;
+
+ ch = UART_GetChar();
+
+ board_exec_dbg_cmd(ch);
+}
+
+/*------------------------------------------------------------------------------
+ * Main
+ *------------------------------------------------------------------------------*/
+#define MAX_USB_ITER BOARD_MCK/72 // This should be around a second
+extern int main(void)
+{
+ uint8_t isUsbConnected = 0;
+ enum confNum last_simtrace_config = simtrace_config;
+ unsigned int i = 0;
+
+ LED_Configure(LED_NUM_RED);
+ LED_Configure(LED_NUM_GREEN);
+ LED_Set(LED_NUM_RED);
+
+ /* Disable watchdog */
+ WDT_Disable(WDT);
+
+ req_ctx_init();
+
+ PIO_InitializeInterrupts(0);
+
+ EEFC_ReadUniqueID(g_unique_id);
+
+ printf("\r\n\r\n"
+ "=============================================================================\r\n"
+ "SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
+ "=============================================================================\r\n");
+
+ TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+ g_unique_id[0], g_unique_id[1],
+ g_unique_id[2], g_unique_id[3]);
+
+ board_main_top();
+
+ TRACE_INFO("USB init...\r\n");
+ SIMtrace_USB_Initialize();
+
+ while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+ check_exec_dbg_cmd();
+#if 0
+ if (i >= MAX_USB_ITER * 3) {
+ TRACE_ERROR("Resetting board (USB could "
+ "not be configured)\r\n");
+ NVIC_SystemReset();
+ }
+#endif
+ i++;
+ }
+
+ TRACE_INFO("calling configure of all configurations...\r\n");
+ for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+ ++i) {
+ if (config_func_ptrs[i].configure)
+ config_func_ptrs[i].configure();
+ }
+
+ TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
+ config_func_ptrs[simtrace_config].init();
+ last_simtrace_config = simtrace_config;
+
+ TRACE_INFO("entering main loop...\r\n");
+ while (1) {
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+ const char rotor[] = { '-', '\\', '|', '/' };
+ putchar('\b');
+ putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+ check_exec_dbg_cmd();
+ osmo_timers_prepare();
+ osmo_timers_update();
+
+ if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+ if (isUsbConnected) {
+ isUsbConnected = 0;
+ }
+ } else if (isUsbConnected == 0) {
+ TRACE_INFO("USB is now configured\r\n");
+ LED_Set(LED_NUM_GREEN);
+ LED_Clear(LED_NUM_RED);
+
+ isUsbConnected = 1;
+ }
+ if (last_simtrace_config != simtrace_config) {
+ TRACE_INFO("USB config chg %u -> %u\r\n",
+ last_simtrace_config, simtrace_config);
+ config_func_ptrs[last_simtrace_config].exit();
+ config_func_ptrs[simtrace_config].init();
+ last_simtrace_config = simtrace_config;
+ } else {
+ config_func_ptrs[simtrace_config].run();
+ }
+ }
+}