assert: Use printf_sync() to ensure printing of assert / panic

Change-Id: Icc202e60445d9be1cdcd61176db5ed1704d583e7

contrib/jenkins.sh

@@ -31,7 +31,6 @@ BUILDS=""
 BUILDS+="simtrace/dfu simtrace/trace simtrace/cardem "
 BUILDS+="qmod/dfu qmod/cardem "
 BUILDS+="owhw/dfu owhw/cardem "
-BUILDS+="octsimtest/cardem "
 
 cd $TOPDIR/firmware
 for build in $BUILDS; do
@@ -64,6 +63,8 @@ make dist
 #	make -C "$base/doc/manuals" publish
 #fi
 
+rm -rf $TOPDIR/firmware/bin/simtrace-cardem*
+
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="

firmware/apps/cardem/main.c

@@ -221,7 +221,6 @@ extern int main(void)
 			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			//FIXME: usb_proces() for every interface in this configuration?
 			if (config_func_ptrs[simtrace_config].run) {
 				config_func_ptrs[simtrace_config].run();
 			}

firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c

@@ -1672,10 +1672,6 @@ uint8_t USBD_HAL_Halt(uint8_t bEndpoint, uint8_t ctl)
             UDP->UDP_RST_EP |= 1 << bEndpoint;
             UDP->UDP_RST_EP &= ~(1 << bEndpoint);
         }
-
-        /* This fixes a weird bug with regard to ping-pong OUT endpoints */
-        UDP->UDP_RST_EP |= 1 << bEndpoint;
-        UDP->UDP_RST_EP &= ~(1 << bEndpoint);
     }
 
     /* Return Halt status */

firmware/libboard/octsimtest/include/board.h

@@ -50,28 +50,81 @@
 /* Button to force bootloader start (shorted to ground when pressed */
 #define PIN_BOOTLOADER_SW      {PIO_PA5, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
 
+//FIXME SIM_PWEN_PIN collides with PA5/bootloader_sw on octsimtest
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
+#define SIM_PWEN_PIN           {PIO_PA12, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+
 // FIXME PA8 is 32khz xtal on octsimtest
+/* Card presence pin */
+#define SW_SIM                  PIO_PA11
 /* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+//FIXME
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+//FIXME PIO_PA4B_TCLK0 PA4 is LED on octsimtest
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA14, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
 
 /** Phone connection **/
 /* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
 #define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
 /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
 /* Phone I/O data signal input/output (I/O_PHONE in schematic) */
 #define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Phone CLK clock input (CLK_PHONE in schematic) */
 #define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used to switch level shifter in I/O line between rx (0) and tx (1) */
-#define PIN_USIM1_IO_DIR	{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Pin used for phone USIM slot 1 communication */
-#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST, PIN_USIM1_IO_DIR
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
 /* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
 #define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
 #define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
 
 /** Default pin configuration **/
+/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+
+/** Sniffer configuration **/
+/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
+/* Card RST reset signal input (use as input since the phone will drive it) */
+#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+/* Pins used to sniff phone-card communication */
+#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Use phone VCC to power card */
+#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
+
+/** CCID configuration */
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* ISO7816-communication related pins */
+#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
 
 /** External SPI flash interface   **/
 /* SPI MISO pin definition */
@@ -96,32 +149,21 @@
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
 /* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_OCTSIMTEST
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
 /* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_OCTSIMTEST
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
 /* USB release number (bcdDevice, shown as 0.00) */
 #define BOARD_USB_RELEASE	0x000
 /* Indicate SIMtrace is bus power in USB attributes */
 #define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
 
-#define DETECT_VCC_BY_ADC
-/* we have a resistive voltage divider of 47 + 30 kOhms to also detect 5V supply power */
-#define VCC_UV_THRESH_1V8	(1500000*47)/(47+30)
-#define VCC_UV_THRESH_3V	(2500000*47)/(47+30)
-
-#define HAVE_SLOT_MUX
-
-#define HAVE_BOARD_CARDINSERT
-struct cardem_inst;
-void board_set_card_insert(struct cardem_inst *ci, bool card_insert);
-
 /** Supported modes */
 /* SIMtrace board supports sniffer mode */
 //#define HAVE_SNIFFER
 /* SIMtrace board supports CCID mode */
 //#define HAVE_CCID
 /* SIMtrace board supports card emulation mode */
-#define HAVE_CARDEM
+//#define HAVE_CARDEM
 /* SIMtrace board supports man-in-the-middle mode */
 //#define HAVE_MITM
 /* octsimtest board supports gpio_test mode */

firmware/libboard/octsimtest/include/mcp23017.h

@@ -18,10 +18,8 @@
 
 #define MCP23017_ADDRESS 0x20
 
-int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb);
+int mcp23017_init(uint8_t slave);
 int mcp23017_test(uint8_t slave);
 int mcp23017_toggle(uint8_t slave);
-int mcp23017_set_output_a(uint8_t slave, uint8_t val);
-int mcp23017_set_output_b(uint8_t slave, uint8_t val);
 //int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
 //int mcp23017_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/octsimtest/include/mux.h

@@ -1,17 +0,0 @@
-#pragma once
-
-void mux_init(void);
-int mux_set_slot(uint8_t s);
-int mux_get_slot(void);
-void mux_set_freq(uint8_t s);
-
-/* this reflects the wiring between U5 and U4 */
-#define MUX_FREQ_DIV_2		0
-#define MUX_FREQ_DIV_4		1
-#define MUX_FREQ_DIV_16		2
-#define MUX_FREQ_DIV_32		3
-#define MUX_FREQ_DIV_32		3
-#define MUX_FREQ_DIV_128	4
-#define MUX_FREQ_DIV_512	5
-#define MUX_FREQ_DIV_2048	6
-#define MUX_FREQ_DIV_4096	7

firmware/libboard/octsimtest/source/board_octsimtest.c

@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
  */
-#include <stdbool.h>
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
@@ -26,29 +25,16 @@
 #include "usb_buf.h"
 #include "i2c.h"
 #include "mcp23017.h"
-#include "mux.h"
-
-static bool mcp2317_present = false;
 
 void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
 		printf("\t?\thelp\n\r");
-		printf("\t0-8\tselect physical SIM slot\n\r");
 		printf("\tR\treset SAM3\n\r");
 		printf("\tm\trun mcp23017 test\n\r");
-		printf("\ti\tset card insert via I2C\n\r");
+		printf("\tR\ttoggle MSB of gpio on mcp23017\n\r");
-		printf("\tI\tdisable card insert\n\r");
 		break;
-	case '0': mux_set_slot(0); break;
-	case '1': mux_set_slot(1); break;
-	case '2': mux_set_slot(2); break;
-	case '3': mux_set_slot(3); break;
-	case '4': mux_set_slot(4); break;
-	case '5': mux_set_slot(5); break;
-	case '6': mux_set_slot(6); break;
-	case '7': mux_set_slot(7); break;
 	case 'R':
 		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
@@ -57,13 +43,8 @@ void board_exec_dbg_cmd(int ch)
 	case 'm':
 		mcp23017_test(MCP23017_ADDRESS);
 		break;
-	case 'i':
+	case 't':
-		printf("Setting card insert (slot=%u)\r\n", mux_get_slot());
+		mcp23017_toggle(MCP23017_ADDRESS);
-		mcp23017_set_output_a(MCP23017_ADDRESS, (1 << mux_get_slot()));
-		break;
-	case 'I':
-		printf("Releasing card insert (slot=%u)\r\n", mux_get_slot());
-		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
 		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
@@ -76,13 +57,9 @@ void board_main_top(void)
 #ifndef APPLICATION_dfu
 	usb_buf_init();
 
-	mux_init();
 	i2c_pin_init();
-	/* PORT A: all outputs, Port B0 output, B1..B7 unused */
+	if (!mcp23017_init(MCP23017_ADDRESS))
-	if (mcp23017_init(MCP23017_ADDRESS, 0x00, 0xfe) == 0) {
+		printf("mcp23017 not found!\n\r");
-		mcp2317_present = true;
-		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
-	}
 	/* Initialize checking for card insert/remove events */
 	//card_present_init();
 #endif
@@ -102,23 +79,3 @@ int board_override_enter_dfu(void)
 	} else
 		return 0;
 }
-
-void board_set_card_insert(struct cardem_inst *ci, bool card_insert)
-{
-	int s = mux_get_slot();
-
-	/* A0 .. A7 of the MCP are each connected to the gate of a FET which closes
-	 * the sim-present signal of the respective slot */
-
-	if (mcp2317_present) {
-		if (card_insert) {
-			/* we must enable card-presence of the active slot and disable it on all others */
-			mcp23017_set_output_a(MCP23017_ADDRESS, (1 << s));
-		} else {
-			/* we disable all card insert signals */
-			mcp23017_set_output_a(MCP23017_ADDRESS, 0);
-		}
-	} else {
-		TRACE_WARNING("No MCP23017 present; cannot set CARD_INSERT\r\n");
-	}
-}

firmware/libboard/octsimtest/source/mcp23017.c

@@ -92,25 +92,19 @@ out_stop:
 		return 0;
 }
 
-int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
+int mcp23017_init(uint8_t slave)
 {
-	TRACE_DEBUG("mcp23017_init\n\r");
+	printf("mcp23017_init\n\r");
-
 	// all gpio input
-	if (mcp23017_write_byte(slave, MCP23017_IODIRA, iodira))
+	if (mcp23017_write_byte(slave, MCP23017_IODIRA, 0xff))
-		goto out_err;
+		return false;
 	// msb of portb output, rest input
-	if (mcp23017_write_byte(slave, MCP23017_IODIRB, iodirb))
+	if (mcp23017_write_byte(slave, MCP23017_IODIRB, 0x7f))
-		goto out_err;
+		return false;
 	if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP (autoinc addressing)
-		goto out_err;
+		return false;
-
+	printf("mcp23017 found\n\r");
-	TRACE_DEBUG("mcp23017 found\n\r");
+	return true;
-	return 0;
-
-out_err:
-	TRACE_WARNING("mcp23017 NOT found!\n\r");
-	return -1;
 }
 
 int mcp23017_test(uint8_t slave)
@@ -126,16 +120,6 @@ int mcp23017_test(uint8_t slave)
 	return 0;
 }
 
-int mcp23017_set_output_a(uint8_t slave, uint8_t val)
-{
-	return mcp23017_write_byte(slave, MCP23017_OLATA, val);
-}
-
-int mcp23017_set_output_b(uint8_t slave, uint8_t val)
-{
-	return mcp23017_write_byte(slave, MCP23017_OLATB, val);
-}
-
 int mcp23017_toggle(uint8_t slave)
 {
 	// example writing MSB of gpio

firmware/libboard/octsimtest/source/mux.c

@@ -1,113 +0,0 @@
-/* sysmoOCTSIMTEST support for multiplexers
- *
- * (C) 2021 by Harald Welte <laforge@gnumonks.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-
-#include "board.h"
-#include "mux.h"
-#include <stdbool.h>
-#include <errno.h>
-
-/* 3-bit S0..S2 signal for slot selection */
-static const Pin pin_in_sel[3] = {
-	{ PIO_PA1, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA2, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA3, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-};
-
-/* 3-bit S0..S2 signal for frequency divider selection */
-static const Pin pin_freq_sel[3] = {
-	{ PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA17, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA18, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-};
-
-/* low-active output enable for all muxes */
-static const Pin pin_oe = { PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT };
-
-static uint8_t g_mux_slot = 0;
-
-/* initialize the external 1:8 multiplexers */
-void mux_init(void)
-{
-	PIO_Configure(&pin_oe, PIO_LISTSIZE(pin_oe));
-	PIO_Configure(pin_in_sel, PIO_LISTSIZE(pin_in_sel));
-	PIO_Configure(pin_freq_sel, PIO_LISTSIZE(pin_freq_sel));
-
-	mux_set_slot(0);
-}
-
-/* set the slot selection mux */
-int mux_set_slot(uint8_t s)
-{
-	TRACE_INFO("%s(%u)\r\n", __func__, s);
-
-	if (s > 7)
-		return -EINVAL;
-
-	/* !OE = H: disconnect input and output of muxes */
-	PIO_Set(&pin_oe);
-
-	if (s & 1)
-		PIO_Set(&pin_in_sel[0]);
-	else
-		PIO_Clear(&pin_in_sel[0]);
-	if (s & 2)
-		PIO_Set(&pin_in_sel[1]);
-	else
-		PIO_Clear(&pin_in_sel[1]);
-	if (s & 4)
-		PIO_Set(&pin_in_sel[2]);
-	else
-		PIO_Clear(&pin_in_sel[2]);
-
-	/* !OE = L: (re-)enable the output of muxes */
-	PIO_Clear(&pin_oe);
-
-	g_mux_slot = s;
-	return s;
-}
-
-int mux_get_slot(void)
-{
-	return g_mux_slot;
-}
-
-/* set the frequency divider mux */
-void mux_set_freq(uint8_t s)
-{
-	TRACE_INFO("%s(%u)\r\n", __func__, s);
-
-	/* no need for 'break before make' here, this would also affect
-	 * the SIM card I/O signals which we don't want to disturb */
-
-	if (s & 1)
-		PIO_Set(&pin_freq_sel[0]);
-	else
-		PIO_Clear(&pin_freq_sel[0]);
-	if (s & 2)
-		PIO_Set(&pin_freq_sel[1]);
-	else
-		PIO_Clear(&pin_freq_sel[1]);
-	if (s & 4)
-		PIO_Set(&pin_freq_sel[2]);
-	else
-		PIO_Clear(&pin_freq_sel[2]);
-
-	/* !OE = L: ensure enable the output of muxes */
-	PIO_Clear(&pin_oe);
-}

firmware/libboard/octsimtest/source/sim_switch.c

@@ -1,37 +0,0 @@
-/* Code to switch between local (physical) and remote (emulated) SIM
- *
- * (C) 2021 by Harald Welte <hwelte@hmw-consulting.de>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#include "board.h"
-#include "trace.h"
-#include "sim_switch.h"
-
-int sim_switch_use_physical(unsigned int nr, int physical)
-{
-	if (physical) {
-		TRACE_ERROR("%u: Use local/physical SIM - UNSUPPORTED!\r\n", nr);
-	} else {
-		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
-	}
-
-	return 0;
-}
-
-int sim_switch_init(void)
-{
-	return 1; // SIMtrace hardware has only one switchable interface
-}

firmware/libboard/qmod/include/board.h

@@ -91,8 +91,8 @@
 #define PINS_WWAN_IN		{ PIN_WWAN1, PIN_WWAN2 }
 
 /* outputs controlling RESET input of modems */
-#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP}
+#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
-#define PIN_PERST2		{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP}
+#define PIN_PERST2		{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
 #define PINS_PERST		{ PIN_PERST1, PIN_PERST2 }
 
 #define PIN_VERSION_DET		{PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT}
@@ -109,9 +109,6 @@
 #define BOARD_USB_RELEASE	0x010
 
 #define CARDEMU_SECOND_UART
-
 #define DETECT_VCC_BY_ADC
-#define VCC_UV_THRESH_1V8	1500000
-#define VCC_UV_THRESH_3V	2500000
 
 #define HAVE_CARDEM

firmware/libcommon/include/simtrace_prot.h

@@ -269,8 +269,6 @@ struct cardemu_usb_msg_error {
 struct cardemu_usb_msg_config {
 	/* bit-mask of CEMU_FEAT_F flags */
 	uint32_t features;
-	/* the selected slot number (if an external mux is present) */
-	uint8_t slot_mux_nr;
 } __attribute__ ((packed));
 
 /***********************************************************************

firmware/libcommon/include/simtrace_usb.h

@@ -25,7 +25,6 @@
 #define USB_PRODUCT_QMOD_SAM3		0x4004
 #define USB_PRODUCT_SIMTRACE2_DFU	0x60e3	/* was 0x60e2 */
 #define USB_PRODUCT_SIMTRACE2		0x60e3
-#define USB_PRODUCT_OCTSIMTEST		0x616d
 
 /* USB proprietary class */
 #define USB_CLASS_PROPRIETARY			0xff

firmware/libcommon/include/usb_buf.h

@@ -42,15 +42,5 @@ int usb_drain_queue(uint8_t ep);
 void usb_buf_init(void);
 struct usb_buffered_ep *usb_get_buf_ep(uint8_t ep);
 
-struct usb_if {
+int usb_refill_to_host(uint8_t ep);
-	uint8_t if_num;		/* interface number */
+int usb_refill_from_host(uint8_t ep);
-	uint8_t ep_out;		/* OUT endpoint (0 if none) */
-	uint8_t ep_in;		/* IN endpint (0 if none) */
-	uint8_t ep_int;		/* INT endpoint (0 if none) */
-	void *data;		/* opaque data, passed through */
-	struct {
-		/* call-back to be called for inclming messages on OUT EP */
-		void (*rx_out)(struct msgb *msg, const struct usb_if *usb_if);
-	} ops;
-};
-void usb_process(const struct usb_if *usb_if);

firmware/libcommon/source/card_emu.c

@@ -33,9 +33,6 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/msgb.h>
 
-#ifdef HAVE_SLOT_MUX
-#include "mux.h"
-#endif
 
 #define NUM_SLOTS		2
 
@@ -1082,12 +1079,6 @@ static void card_emu_report_config(struct card_handle *ch)
 
 	cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));
 	cfg->features = ch->features;
-#ifdef HAVE_SLOT_MUX
-	cfg->slot_mux_nr = mux_get_slot();
-#else
-	cfg->slot_mux_nr = 0;
-#endif
-
 
 	usb_buf_upd_len_and_submit(msg);
 }
@@ -1250,12 +1241,6 @@ int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_con
 	if (scfg_len >= sizeof(uint32_t))
 		ch->features = (scfg->features & SUPPORTED_FEATURES);
 
-#ifdef HAVE_SLOT_MUX
-	if (scfg_len >= sizeof(uint32_t)+sizeof(uint8_t)) {
-		mux_set_slot(scfg->slot_mux_nr);
-	}
-#endif
-
 	/* send back a report of our current configuration */
 	card_emu_report_config(ch);
 

firmware/libcommon/source/host_communication.c

@@ -57,7 +57,7 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 }
 
 /* check if the spcified IN endpoint is idle and submit the next buffer from queue */
-static int usb_refill_to_host(uint8_t ep)
+int usb_refill_to_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
@@ -130,7 +130,7 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 }
 
 /* refill the read queue for data received from host PC on OUT EP, if needed */
-static int usb_refill_from_host(uint8_t ep)
+int usb_refill_from_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
@@ -198,45 +198,3 @@ int usb_drain_queue(uint8_t ep)
 
 	return ret;
 }
-
-
-
-/* iterate over the queue of incoming USB commands and dispatch/execute
- * them */
-static void process_any_usb_commands(const struct usb_if *usb_if)
-{
-	struct llist_head *queue = usb_get_queue(usb_if->ep_out);
-	struct llist_head *lh;
-	struct msgb *msg;
-	int i;
-
-	/* limit the number of iterations to 10, to ensure we don't get
-	 * stuck here without returning to main loop processing */
-	for (i = 0; i < 10; i++) {
-		/* de-queue the list head in an irq-safe way */
-		lh = llist_head_dequeue_irqsafe(queue);
-		if (!lh)
-			break;
-		msg = llist_entry(lh, struct msgb, list);
-		usb_if->ops.rx_out(msg, usb_if);
-	}
-}
-
-/* perform any action related to USB processing (IRQ/INT/OUT EP refill, handling OUT) */
-void usb_process(const struct usb_if *usb_if)
-{
-	/* first try to send any pending messages on IRQ */
-	if (usb_if->ep_int)
-		usb_refill_to_host(usb_if->ep_int);
-
-	/* then try to send any pending messages on IN */
-	if (usb_if->ep_in)
-		usb_refill_to_host(usb_if->ep_in);
-
-	/* ensure we can handle incoming USB messages from the
-	 * host */
-	if (usb_if->ep_out) {
-		usb_refill_from_host(usb_if->ep_out);
-		process_any_usb_commands(usb_if);
-	}
-}

firmware/libcommon/source/mode_cardemu.c

@@ -34,8 +34,6 @@
 
 #define TRACE_ENTRY()	TRACE_DEBUG("%s entering\r\n", __func__)
 
-static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if);
-
 #ifdef PINS_CARDSIM
 static const Pin pins_cardsim[] = PINS_CARDSIM;
 #endif
@@ -44,10 +42,6 @@ static const Pin pins_cardsim[] = PINS_CARDSIM;
 static const Pin pins_usim1[]	= {PINS_USIM1};
 static const Pin pin_usim1_rst	= PIN_USIM1_nRST;
 static const Pin pin_usim1_vcc	= PIN_USIM1_VCC;
-#ifdef PIN_USIM1_IO_DIR
-static const Pin pin_io_dir 	= PIN_USIM1_IO_DIR;
-#endif
-
 
 #ifdef CARDEMU_SECOND_UART
 static const Pin pins_usim2[]	= {PINS_USIM2};
@@ -70,7 +64,9 @@ struct cardem_inst {
 		bool half_time_notified;
 	} wt;
 	int usb_pending_old;
-	struct usb_if usb_if;
+	uint8_t ep_out;
+	uint8_t ep_in;
+	uint8_t ep_int;
 	const Pin pin_insert;
 #ifdef DETECT_VCC_BY_ADC
 	uint32_t vcc_uv;
@@ -90,16 +86,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART1,
 			.state = USART_RCV
 		},
-		.usb_if = {
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
-			.if_num = 0,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
-			.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
-			.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
-			.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
-			.data = &cardem_inst[0],
-			.ops = {
-				.rx_out = dispatch_received_usb_msg,
-			},
-		},
 #ifdef PIN_SET_USIM1_PRES
 		.pin_insert = PIN_SET_USIM1_PRES,
 #endif
@@ -112,16 +101,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART0,
 			.state = USART_RCV
 		},
-		.usb_if = {
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
-			.if_num = 1,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
-			.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
-			.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
-			.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
-			.data = &cardem_inst[1],
-			.ops = {
-				.rx_out = dispatch_received_usb_msg,
-			},
-		},
 #ifdef PIN_SET_USIM2_PRES
 		.pin_insert = PIN_SET_USIM2_PRES,
 #endif
@@ -161,27 +143,12 @@ void card_emu_uart_wait_tx_idle(uint8_t uart_chan)
 	wait_tx_idle(usart);
 }
 
-static void card_emu_uart_set_direction(uint8_t uart_chan, bool tx)
-{
-	/* only on some boards (octsimtest) we hae an external level
-	 * shifter that requires us to switch the direction between RX and TX */
-#ifdef PIN_USIM1_IO_DIR
-	if (uart_chan == 0) {
-		if (tx)
-			PIO_Set(&pin_io_dir);
-		else
-			PIO_Clear(&pin_io_dir);
-	}
-#endif
-}
-
 /* call-back from card_emu.c to enable/disable transmit and/or receive */
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 {
 	Usart *usart = get_usart_by_chan(uart_chan);
 	switch (rxtx) {
 	case ENABLE_TX:
-		card_emu_uart_set_direction(uart_chan, true);
 		USART_DisableIt(usart, ~(US_IER_TXRDY | US_IER_TIMEOUT));
 		/* as irritating as it is, we actually want to keep the
 		 * receiver enabled during transmit */
@@ -207,7 +174,6 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 		 * transmitter enabled during receive */
 		USART_SetTransmitterEnabled(usart, 1);
 		wait_tx_idle(usart);
-		card_emu_uart_set_direction(uart_chan, false);;
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
 		USART_EnableIt(usart, US_IER_RXRDY);
 		USART_SetReceiverEnabled(usart, 1);
@@ -424,9 +390,6 @@ void card_emu_uart_interrupt(uint8_t uart_chan)
  ***********************************************************************/
 
 #ifdef DETECT_VCC_BY_ADC
-#if !defined(VCC_UV_THRESH_1V8) || !defined(VCC_UV_THRESH_3V)
-#error "You must define VCC_UV_THRESH_{1V1,3V} if you use ADC VCC detection"
-#endif
 
 static volatile int adc_triggered = 0;
 static int adc_sam3s_reva_errata = 0;
@@ -475,6 +438,9 @@ static int card_vcc_adc_init(void)
 	return 0;
 }
 
+#define VCC_UV_THRESH_1V8	1500000
+#define VCC_UV_THRESH_3V	2500000
+
 static void process_vcc_adc(struct cardem_inst *ci)
 {
 	if (ci->vcc_uv >= VCC_UV_THRESH_3V &&
@@ -672,26 +638,6 @@ static void dispatch_usb_command_generic(struct msgb *msg, struct cardem_inst *c
 	usb_buf_free(msg);
 }
 
-static void process_card_insert(struct cardem_inst *ci, bool card_insert)
-{
-	TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, card_insert ? "INSERTED" : "REMOVED");
-
-#ifdef HAVE_BOARD_CARDINSERT
-	board_set_card_insert(ci, card_insert);
-#else
-	if (!ci->pin_insert.pio) {
-		TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
-			   ci->num, card_insert ? "INSERTED" : "REMOVED");
-		return;
-	}
-
-	if (card_insert)
-		PIO_Set(&ci->pin_insert);
-	else
-		PIO_Clear(&ci->pin_insert);
-#endif
-}
-
 /* handle a single USB command as received from the USB host */
 static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci)
 {
@@ -715,7 +661,18 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 		break;
 	case SIMTRACE_MSGT_DT_CEMU_CARDINSERT:
 		cardins = (struct cardemu_usb_msg_cardinsert *) msg->l2h;
-		process_card_insert(ci, cardins->card_insert);
+		if (!ci->pin_insert.pio) {
+			TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
+				   ci->num, cardins->card_insert ? "INSERTED" : "REMOVED");
+			usb_buf_free(msg);
+			break;
+		}
+		TRACE_INFO("%u: set card_insert to %s\r\n", ci->num,
+			   cardins->card_insert ? "INSERTED" : "REMOVED");
+		if (cardins->card_insert)
+			PIO_Set(&ci->pin_insert);
+		else
+			PIO_Clear(&ci->pin_insert);
 		usb_buf_free(msg);
 		break;
 	case SIMTRACE_MSGT_BD_CEMU_STATUS:
@@ -801,9 +758,8 @@ static void dispatch_usb_command_modem(struct msgb *msg, struct cardem_inst *ci)
 }
 
 /* handle a single USB command as received from the USB host */
-static void dispatch_usb_command(struct msgb *msg, const struct usb_if *usb_if)
+static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 {
-	struct cardem_inst *ci = usb_if->data;
 	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *) msg->l1h;
 
 	if (msgb_length(msg) < sizeof(*sh)) {
@@ -832,8 +788,7 @@ static void dispatch_usb_command(struct msgb *msg, const struct usb_if *usb_if)
 	}
 }
 
-/* handle a single USB transfer as received from the USB host */
+static void dispatch_received_msg(struct msgb *msg, struct cardem_inst *ci)
-static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if)
 {
 	struct msgb *segm;
 	struct simtrace_msg_hdr *mh;
@@ -844,7 +799,7 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	mh = (struct simtrace_msg_hdr *) msg->data;
 	if (mh->msg_len == msgb_length(msg)) {
 		/* fast path: only one message in buffer */
-		dispatch_usb_command(msg, usb_if);
+		dispatch_usb_command(msg, ci);
 		return;
 	}
 
@@ -853,23 +808,23 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	while (1) {
 		mh = (struct simtrace_msg_hdr *) msg->data;
 
-		segm = usb_buf_alloc(usb_if->ep_out);
+		segm = usb_buf_alloc(ci->ep_out);
 		if (!segm) {
 			TRACE_ERROR("%u: ENOMEM during msg segmentation\r\n",
-				    usb_if->if_num);
+				    ci->num);
 			break;
 		}
 
 		if (mh->msg_len > msgb_length(msg)) {
 			TRACE_ERROR("%u: Unexpected large message (%u bytes)\r\n",
-					usb_if->if_num, mh->msg_len);
+					ci->num, mh->msg_len);
 			usb_buf_free(segm);
 			break;
 		} else {
 			uint8_t *cur = msgb_put(segm, mh->msg_len);
 			segm->l1h = segm->head;
 			memcpy(cur, mh, mh->msg_len);
-			dispatch_usb_command(segm, usb_if);
+			dispatch_usb_command(segm, ci);
 		}
 		/* pull this message */
 		msgb_pull(msg, mh->msg_len);
@@ -881,14 +836,35 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	usb_buf_free(msg);
 }
 
+/* iterate over the queue of incoming USB commands and dispatch/execute
+ * them */
+static void process_any_usb_commands(struct llist_head *main_q,
+				     struct cardem_inst *ci)
+{
+	struct llist_head *lh;
+	struct msgb *msg;
+	int i;
+
+	/* limit the number of iterations to 10, to ensure we don't get
+	 * stuck here without returning to main loop processing */
+	for (i = 0; i < 10; i++) {
+		/* de-queue the list head in an irq-safe way */
+		lh = llist_head_dequeue_irqsafe(main_q);
+		if (!lh)
+			break;
+		msg = llist_entry(lh, struct msgb, list);
+		dispatch_received_msg(msg, ci);
+	}
+}
+
 /* main loop function, called repeatedly */
 void mode_cardemu_run(void)
 {
+	struct llist_head *queue;
 	unsigned int i;
 
 	for (i = 0; i < ARRAY_SIZE(cardem_inst); i++) {
 		struct cardem_inst *ci = &cardem_inst[i];
-		struct usb_if *usb_if = &ci->usb_if;
 
 		/* drain the ring buffer from UART into card_emu */
 		while (1) {
@@ -905,6 +881,16 @@ void mode_cardemu_run(void)
 
 		process_io_statechg(ci);
 
-		usb_process(&ci->usb_if);
+		/* first try to send any pending messages on IRQ */
+		usb_refill_to_host(ci->ep_int);
+
+		/* then try to send any pending messages on IN */
+		usb_refill_to_host(ci->ep_in);
+
+		/* ensure we can handle incoming USB messages from the
+		 * host */
+		usb_refill_from_host(ci->ep_out);
+		queue = usb_get_queue(ci->ep_out);
+		process_any_usb_commands(queue, ci);
 	}
 }

firmware/libcommon/source/sniffer.c

@@ -975,42 +975,20 @@ static void usb_send_change(uint32_t flags)
 	usb_msg_upd_len_and_submit(usb_msg);
 }
 
-/* handle incoming message from USB OUT EP */
-static void dispatch_usb_out(struct msgb *msg, const struct usb_if *usb_if)
-{
-	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *) msg->l1h;
-
-	if (msgb_length(msg) < sizeof(*sh)) {
-		usb_buf_free(msg);
-		return;
-	}
-	msg->l2h = msg->l1h + sizeof(*sh);
-
-	switch (sh->msg_class) {
-	case SIMTRACE_MSGC_GENERIC:
-		break;
-	default:
-		break;
-	}
-
-	usb_buf_free(msg);
-}
-
-static const struct usb_if sniffer_usb_if = {
-	.if_num = 0,
-	.ep_in = SIMTRACE_USB_EP_CARD_DATAIN,
-	.ep_int = SIMTRACE_USB_EP_CARD_INT,
-	.ep_out = SIMTRACE_USB_EP_CARD_DATAOUT,
-	.ops = {
-		.rx_out = dispatch_usb_out,
-	}
-};
-
 /* Main (idle/busy) loop of this USB configuration */
 void Sniffer_run(void)
 {
 	/* Handle USB queue */
-	usb_process(&sniffer_usb_if);
+	/* first try to send any pending messages on INT */
+	usb_refill_to_host(SIMTRACE_USB_EP_CARD_INT);
+	/* then try to send any pending messages on IN */
+	usb_refill_to_host(SIMTRACE_USB_EP_CARD_DATAIN);
+	/* ensure we can handle incoming USB messages from the host */
+	/* currently we don't need any incoming data
+	usb_refill_from_host(SIMTRACE_USB_EP_CARD_DATAOUT);
+	struct llist_head *queue = usb_get_queue(SIMTRACE_USB_EP_CARD_DATAOUT);
+	process_any_usb_commands(queue);
+	*/
 
 	/* WARNING: the signal data and flags are not synchronized. We have to hope 
 	 * the processing is fast enough to not land in the wrong state while data

host/lib/simtrace2_api.c

@@ -44,13 +44,9 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/core/msgb.h>
-#include <osmocom/core/logging.h>
 #include <osmocom/sim/class_tables.h>
 #include <osmocom/sim/sim.h>
 
-#define LOGSLOT(slot, lvl, fmt, args...) \
-	LOGP(DLINP, lvl, "[%u] " fmt, (slot)->slot_nr, ## args)
-
 /***********************************************************************
  * SIMTRACE core protocol
  ***********************************************************************/
@@ -145,6 +141,7 @@ int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
 	OSMO_ASSERT(transp);
 
 	st_push_hdr(msg, msg_class, msg_type, slot->slot_nr);
+	printf("SIMtrace <- %s\n", msgb_hexdump(msg));
 
 	if (transp->udp_fd < 0) {
 		if (transp->usb_async)
@@ -169,8 +166,6 @@ int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool in
 	struct msgb *msg = st_msgb_alloc();
 	struct cardemu_usb_msg_cardinsert *cins;
 
-	LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(inserted=%d)\n", __func__, inserted);
-
 	cins = (struct cardemu_usb_msg_cardinsert *) msgb_put(msg, sizeof(*cins));
 	memset(cins, 0, sizeof(*cins));
 	if (inserted)
@@ -186,7 +181,7 @@ int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t p
 	struct cardemu_usb_msg_tx_data *txd;
 	txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));
 
-	LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(pb=%02x, le=%u)\n", __func__, pb, le);
+	printf("<= %s(%02x, %d)\n", __func__, pb, le);
 
 	memset(txd, 0, sizeof(*txd));
 	txd->data_len = 1;
@@ -207,7 +202,7 @@ int osmo_st2_cardem_request_pb_and_tx(struct osmo_st2_cardem_inst *ci, uint8_t p
 
 	txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));
 
-	LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(pb=%02x, tx=%s, len=%d)\n", __func__, pb,
+	printf("<= %s(%02x, %s, %d)\n", __func__, pb,
 		osmo_hexdump(data, data_len_in), data_len_in);
 
 	memset(txd, 0, sizeof(*txd));
@@ -231,7 +226,7 @@ int osmo_st2_cardem_request_sw_tx(struct osmo_st2_cardem_inst *ci, const uint8_t
 
 	txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));
 
-	LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(sw=%02x%02x)\n", __func__, sw[0], sw[1]);
+	printf("<= %s(%02x %02x)\n", __func__, sw[0], sw[1]);
 
 	memset(txd, 0, sizeof(*txd));
 	txd->data_len = 2;
@@ -251,7 +246,7 @@ int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8
 
 	satr = (struct cardemu_usb_msg_set_atr *) msgb_put(msg, sizeof(*satr));
 
-	LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(%s)\n", __func__, osmo_hexdump(atr, atr_len));
+	printf("<= %s(%s)\n", __func__, osmo_hexdump(atr, atr_len));
 
 	memset(satr, 0, sizeof(*satr));
 	satr->atr_len = atr_len;
@@ -268,7 +263,7 @@ int osmo_st2_cardem_request_config(struct osmo_st2_cardem_inst *ci, uint32_t fea
 
 	cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));
 
-	LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(features=%08x)\n", __func__, features);
+	printf("<= %s(%08x)\n", __func__, features);
 
 	memset(cfg, 0, sizeof(*cfg));
 	cfg->features = features;
@@ -285,9 +280,6 @@ static int _modem_reset(struct osmo_st2_slot *slot, uint8_t asserted, uint16_t p
 	struct msgb *msg = st_msgb_alloc();
 	struct st_modem_reset *sr ;
 
-	LOGSLOT(slot, LOGL_NOTICE, "<= %s(asserted=%u, pulse_ms=%u)\n", __func__,
-		asserted, pulse_ms);
-
 	sr = (struct st_modem_reset *) msgb_put(msg, sizeof(*sr));
 	sr->asserted = asserted;
 	sr->pulse_duration_msec = pulse_ms;
@@ -318,8 +310,6 @@ static int _modem_sim_select(struct osmo_st2_slot *slot, uint8_t remote_sim)
 	struct msgb *msg = st_msgb_alloc();
 	struct st_modem_sim_select *ss;
 
-	LOGSLOT(slot, LOGL_NOTICE, "<= %s(remote_sim=%u)\n", __func__, remote_sim);
-
 	ss = (struct st_modem_sim_select *) msgb_put(msg, sizeof(*ss));
 	ss->remote_sim = remote_sim;
 

host/lib/usb_util.c

@@ -32,6 +32,5 @@ const struct dev_id osmo_st2_compatible_dev_ids[] = {
 	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },
 	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 },
 	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 },
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OCTSIMTEST },
 	{ 0, 0 }
 };

host/src/Makefile.am

@@ -5,12 +5,10 @@ AM_LDFLAGS=$(COVERAGE_LDFLAGS)
 LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \
        $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS)
 
-bin_PROGRAMS = simtrace2-cardem-pcsc simtrace2-list simtrace2-sniff simtrace2-tool
+bin_PROGRAMS = simtrace2-cardem-pcsc simtrace2-list simtrace2-sniff
 
 simtrace2_cardem_pcsc_SOURCES = simtrace2-cardem-pcsc.c
 
 simtrace2_list_SOURCES = simtrace2_usb.c
 
 simtrace2_sniff_SOURCES = simtrace2-sniff.c
-
-simtrace2_tool_SOURCES = simtrace2-tool.c

host/src/simtrace2-cardem-pcsc.c

@@ -48,8 +48,6 @@
 #include <osmocom/core/socket.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/select.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/core/application.h>
 #include <osmocom/sim/class_tables.h>
 #include <osmocom/sim/sim.h>
 
@@ -66,37 +64,6 @@ static void atr_update_csum(uint8_t *atr, unsigned int atr_len)
 	atr[atr_len-1] = csum;
 }
 
-static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags)
-{
-	snprintf(out, out_len, "%s%s%s%s%s",
-		 flags & CEMU_STATUS_F_RESET_ACTIVE ? "RESET " : "",
-		 flags & CEMU_STATUS_F_VCC_PRESENT ? "VCC " : "",
-		 flags & CEMU_STATUS_F_CLK_ACTIVE ? "CLK " : "",
-		 flags & CEMU_STATUS_F_CARD_INSERT ? "CARD_PRES " : "",
-		 flags & CEMU_STATUS_F_RCEMU_ACTIVE ? "RCEMU " : "");
-}
-
-static uint32_t last_flags = 0;
-
-static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags)
-{
-	struct osim_card_hdl *card = ci->chan->card;
-
-	if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) &&
-	    !(flags & CEMU_STATUS_F_RESET_ACTIVE)) {
-		if (last_flags & CEMU_STATUS_F_RESET_ACTIVE) {
-			/* a reset has just ended, forward it to the real card */
-			bool cold_reset = true;
-			if (last_flags & CEMU_STATUS_F_VCC_PRESENT)
-				cold_reset = false;
-			LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n",
-				cold_reset ? "Cold" : "Warm");
-			osim_card_reset(card, cold_reset);
-		}
-	}
-	last_flags = flags;
-}
-
 /***********************************************************************
  * Incoming Messages
  ***********************************************************************/
@@ -104,15 +71,12 @@ static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags)
 /*! \brief Process a STATUS message from the SIMtrace2 */
 static int process_do_status(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)
 {
-	struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf;
+	struct cardemu_usb_msg_status *status;
-	char fbuf[80];
+	status = (struct cardemu_usb_msg_status *) buf;
 
-	cemu_flags2str(fbuf, sizeof(fbuf), status->flags);
+	printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",
-	printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
 		status->flags, status->fi, status->di, status->wi,
-		status->waiting_time, fbuf);
+		status->waiting_time);
-
-	update_flags(ci, status->flags);
 
 	return 0;
 }
@@ -213,14 +177,10 @@ static int process_usb_msg(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int le
 static int process_irq_status(struct osmo_st2_cardem_inst *ci, const uint8_t *buf, int len)
 {
 	const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf;
-	char fbuf[80];
 
-	cemu_flags2str(fbuf, sizeof(fbuf), status->flags);
+	LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",
-	LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
 		status->flags, status->fi, status->di, status->wi,
-		status->waiting_time, fbuf);
+		status->waiting_time);
-
-	update_flags(ci, status->flags);
 
 	return 0;
 }
@@ -427,8 +387,6 @@ static void signal_handler(int signal)
 	}
 }
 
-static struct log_info log_info = {};
-
 int main(int argc, char **argv)
 {
 	struct osmo_st2_transport *transp = ci->slot->transp;
@@ -455,8 +413,6 @@ int main(int argc, char **argv)
 		return rc;
 	}
 
-	osmo_init_logging2(NULL, &log_info);
-
 	while (1) {
 		int option_index = 0;
 

host/src/simtrace2-tool.c

@@ -1,338 +0,0 @@
-/* simtrace2-tool - main program for the host PC to provide a remote SIM
- * using the SIMtrace 2 firmware in card emulation mode
- *
- * (C) 2019 by Harald Welte <hwelte@hmw-consulting.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <signal.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
-#include <sys/types.h>
-
-#include <libusb.h>
-
-#include <osmocom/usb/libusb.h>
-#include <osmocom/simtrace2/simtrace2_api.h>
-#include <osmocom/simtrace2/simtrace_prot.h>
-#include <osmocom/simtrace2/gsmtap.h>
-
-#include <osmocom/core/utils.h>
-#include <osmocom/core/msgb.h>
-
-/***********************************************************************
- * Incoming Messages
- ***********************************************************************/
-
-static void print_welcome(void)
-{
-	printf("simtrace2-tool\n"
-	       "(C) 2019 Harald Welte <laforge@gnumonks.org>\n");
-}
-
-static void print_help(void)
-{
-	printf( "simtrace2-tool [OPTIONS] COMMAND\n\n");
-	printf( "Options:\n"
-		"\t-h\t--help\n"
-		"\t-V\t--usb-vendor\tVENDOR_ID\n"
-		"\t-P\t--usb-product\tPRODUCT_ID\n"
-		"\t-C\t--usb-config\tCONFIG_ID\n"
-		"\t-I\t--usb-interface\tINTERFACE_ID\n"
-		"\t-S\t--usb-altsetting ALTSETTING_ID\n"
-		"\t-A\t--usb-address\tADDRESS\n"
-		"\t-H\t--usb-path\tPATH\n"
-		"\n"
-		);
-	printf( "Commands:\n"
-		"\tmodem reset (enable|disable|cycle)\n"
-		"\tmodem sim-switch (local|remote)\n"
-		"\n");
-}
-
-static const struct option opts[] = {
-	{ "help", 0, 0, 'h' },
-	{ "usb-vendor", 1, 0, 'V' },
-	{ "usb-product", 1, 0, 'P' },
-	{ "usb-config", 1, 0, 'C' },
-	{ "usb-interface", 1, 0, 'I' },
-	{ "usb-altsetting", 1, 0, 'S' },
-	{ "usb-address", 1, 0, 'A' },
-	{ "usb-path", 1, 0, 'H' },
-	{ NULL, 0, 0, 0 }
-};
-
-static void run_mainloop(struct osmo_st2_cardem_inst *ci)
-{
-	struct osmo_st2_transport *transp = ci->slot->transp;
-	uint8_t buf[16*265];
-	int xfer_len;
-	int rc;
-
-	while (1) {
-		/* read data from SIMtrace2 device */
-		rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in,
-					  buf, sizeof(buf), &xfer_len, 100);
-		if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT &&
-			      rc != LIBUSB_ERROR_INTERRUPTED &&
-			      rc != LIBUSB_ERROR_IO) {
-			fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);
-			return;
-		}
-		/* break the loop if no new messages arrive within 100ms */
-		if (rc == LIBUSB_ERROR_TIMEOUT)
-			return;
-	}
-}
-
-static struct osmo_st2_transport _transp;
-
-static struct osmo_st2_slot _slot = {
-	.transp = &_transp,
-	.slot_nr = 0,
-};
-
-struct osmo_st2_cardem_inst _ci = {
-	.slot = &_slot,
-};
-
-struct osmo_st2_cardem_inst *ci = &_ci;
-
-/* perform a modem reset */
-static int do_modem_reset(int argc, char **argv)
-{
-	char *command;
-	if (argc < 1)
-		command = "cycle";
-	else {
-		command = argv[0];
-		argc--;
-		argv++;
-	}
-
-	if (!strcmp(command, "enable")) {
-		printf("Activating Modem RESET\n");
-		return osmo_st2_modem_reset_active(ci->slot);
-	} else if (!strcmp(command, "disable")) {
-		printf("Deactivating Modem RESET\n");
-		return osmo_st2_modem_reset_inactive(ci->slot);
-	} else if (!strcmp(command, "cycle")) {
-		printf("Pulsing Modem RESET (1s)\n");
-		return osmo_st2_modem_reset_pulse(ci->slot, 1000);
-	} else {
-		fprintf(stderr, "Unsupported modem reset command: '%s'\n", command);
-		return -EINVAL;
-	}
-	return 0;
-}
-
-/* switch between local and remote (emulated) SIM */
-static int do_modem_sim_switch(int argc, char **argv)
-{
-	char *command;
-	if (argc < 1)
-		return -EINVAL;
-	command = argv[0];
-	argc--;
-	argv++;
-
-	if (!strcmp(command, "local")) {
-		printf("Setting SIM=LOCAL; Modem reset recommended\n");
-		return osmo_st2_modem_sim_select_local(ci->slot);
-	} else if (!strcmp(command, "remote")) {
-		printf("Setting SIM=REMOTE; Modem reset recommended\n");
-		return osmo_st2_modem_sim_select_remote(ci->slot);
-	} else {
-		fprintf(stderr, "Unsupported modem sim-switch command: '%s'\n", command);
-		return -EINVAL;
-	}
-	return 0;
-}
-
-static int do_subsys_modem(int argc, char **argv)
-{
-	char *command;
-	int rc;
-
-	if (argc < 1)
-		return -EINVAL;
-	command = argv[0];
-	argc--;
-	argv++;
-
-	if (!strcmp(command, "reset")) {
-		rc = do_modem_reset(argc, argv);
-	} else if (!strcmp(command, "sim-switch")) {
-		rc = do_modem_sim_switch(argc, argv);
-	} else {
-		fprintf(stderr, "Unsupported command for subsystem modem: '%s'\n", command);
-		return -EINVAL;
-	}
-
-	return rc;
-}
-
-static int do_command(int argc, char **argv)
-{
-	char *subsys;
-	int rc;
-
-	if (argc < 1)
-		return -EINVAL;
-	subsys = argv[0];
-	argc--;
-	argv++;
-
-	if (!strcmp(subsys, "modem"))
-		rc = do_subsys_modem(argc, argv);
-	else {
-		fprintf(stderr, "Unsupported subsystem '%s'\n", subsys);
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-
-int main(int argc, char **argv)
-{
-	struct osmo_st2_transport *transp = ci->slot->transp;
-	int rc;
-	int c, ret = 1;
-	int if_num = 0, vendor_id = -1, product_id = -1;
-	int config_id = -1, altsetting = 0, addr = -1;
-	char *path = NULL;
-
-	while (1) {
-		int option_index = 0;
-
-		c = getopt_long(argc, argv, "hV:P:C:I:S:A:H:", opts, &option_index);
-		if (c == -1)
-			break;
-		switch (c) {
-		case 'h':
-			print_help();
-			exit(0);
-			break;
-		case 'V':
-			vendor_id = strtol(optarg, NULL, 16);
-			break;
-		case 'P':
-			product_id = strtol(optarg, NULL, 16);
-			break;
-		case 'C':
-			config_id = atoi(optarg);
-			break;
-		case 'I':
-			if_num = atoi(optarg);
-			break;
-		case 'S':
-			altsetting = atoi(optarg);
-			break;
-		case 'A':
-			addr = atoi(optarg);
-			break;
-		case 'H':
-			path = optarg;
-			break;
-		}
-	}
-
-	if ((vendor_id < 0 || product_id < 0)) {
-		fprintf(stderr, "You have to specify the vendor and product ID\n");
-		goto do_exit;
-	}
-
-	transp->udp_fd = -1;
-
-	rc = libusb_init(NULL);
-	if (rc < 0) {
-		fprintf(stderr, "libusb initialization failed\n");
-		goto do_exit;
-	}
-
-	print_welcome();
-
-	do {
-		if (transp->udp_fd < 0) {
-			struct usb_interface_match _ifm, *ifm = &_ifm;
-			ifm->vendor = vendor_id;
-			ifm->product = product_id;
-			ifm->configuration = config_id;
-			ifm->interface = if_num;
-			ifm->altsetting = altsetting;
-			ifm->addr = addr;
-			if (path)
-				osmo_strlcpy(ifm->path, path, sizeof(ifm->path));
-			transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);
-			if (!transp->usb_devh) {
-				fprintf(stderr, "can't open USB device\n");
-				goto close_exit;
-			}
-
-			rc = libusb_claim_interface(transp->usb_devh, if_num);
-			if (rc < 0) {
-				fprintf(stderr, "can't claim interface %d; rc=%d\n", if_num, rc);
-				goto close_exit;
-			}
-
-			rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out,
-					      &transp->usb_ep.in, &transp->usb_ep.irq_in);
-			if (rc < 0) {
-				fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);
-				goto close_exit;
-			}
-		}
-
-		if (argc - optind <= 0) {
-			fprintf(stderr, "You have to specify a command to execute\n");
-			exit(1);
-		}
-
-		rc = do_command(argc-optind, argv+optind);
-		switch (rc) {
-		case 0:
-			break;
-		case -EINVAL:
-			fprintf(stderr, "Error: Invalid command/syntax\n");
-			exit(1);
-			break;
-		default:
-			fprintf(stderr, "Error executing command: %d\n", rc);
-			exit(1);
-			break;
-		}
-
-		run_mainloop(ci);
-		ret = 0;
-
-		libusb_release_interface(transp->usb_devh, 0);
-close_exit:
-		if (transp->usb_devh)
-			libusb_close(transp->usb_devh);
-	} while (0);
-
-	libusb_exit(NULL);
-do_exit:
-	return ret;
-}

host/src/simtrace2_usb.c

@@ -25,7 +25,13 @@
 
 #include <osmocom/usb/libusb.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
-#include <osmocom/simtrace2/usb_util.h>
+
+static const struct dev_id compatible_dev_ids[] = {
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 },
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 },
+	{ 0, 0 }
+};
 
 static int find_devices(void)
 {
@@ -33,7 +39,7 @@ static int find_devices(void)
 	int rc, i, num_interfaces;
 
 	/* scan for USB devices matching SIMtrace USB ID with proprietary class */
-	rc = osmo_libusb_find_matching_interfaces(NULL, osmo_st2_compatible_dev_ids,
+	rc = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids,
 						  USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm));
 	printf("USB matches: %d\n", rc);
 	if (rc < 0)