v0.5 debian package release

Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e

Makefile

@@ -0,0 +1,27 @@
+all: fw utils
+
+define RULES
+fw-$(1)-$(2):
+	make -C firmware BOARD=$(1) APP=$(2)
+fw-$(1)-$(2)-clean:
+	make -C firmware BOARD=$(1) APP=$(2) clean
+endef
+
+$(eval $(call RULES,simtrace,dfu))
+$(eval $(call RULES,simtrace,trace))
+$(eval $(call RULES,simtrace,cardem))
+$(eval $(call RULES,qmod,dfu))
+$(eval $(call RULES,qmod,cardem))
+
+fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean
+fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem
+
+utils:
+	make -C host
+
+clean: fw-clean
+	make -C host clean
+
+install:
+	make -C firmware install
+	make -C host install

contrib/jenkins.sh

@@ -9,6 +9,7 @@ fi
 
 set -e
 
+publish="$1"
 base="$PWD"
 deps="$base/deps"
 inst="$deps/install"
@@ -24,7 +25,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
 BUILDS=""
-BUILDS+="simtrace/dfu simtrace/cardem " # simtrace/trace simtrace/triple_play
+BUILDS+="simtrace/dfu simtrace/cardem simtrace/trace " # simtrace/triple_play
 BUILDS+="qmod/dfu qmod/cardem "
 BUILDS+="owhw/dfu owhw/cardem "
 
@@ -35,7 +36,6 @@ for build in $BUILDS; do
 	echo
 	echo "=============== $board / $app START  =============="
 	make BOARD="$board" APP="$app"
-	make BOARD="$board" APP="$app" clean
 	echo "=============== $board / $app RES:$? =============="
 done
 
@@ -54,4 +54,26 @@ make clean
 make
 make clean
 
+if [ "x$publish" = "x--publish" ]; then
+	echo
+	echo "=============== UPLOAD BUILD  =============="
+
+	cat > "$WORKSPACE/known_hosts" <<EOF
+[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
+[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
+[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
+EOF
+	SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
+	rsync -avz --delete -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.bin binaries@rita.osmocom.org:web-files/simtrace2/firmware/
+fi
+
+echo
+echo "=============== FIRMWARE CLEAN  =============="
+cd $TOPDIR/firmware/
+for build in $BUILDS; do
+	board=`echo $build | cut -d "/" -f 1`
+	app=`echo $build | cut -d "/" -f 2`
+	make BOARD="$board" APP="$app" clean
+done
+
 osmo-clean-workspace.sh

debian/changelog

@@ -0,0 +1,5 @@
+simtrace2 (0.5) UNRELEASED; urgency=medium
+
+  * Initial debian package release.
+
+ -- Harald Welte <lafore@gnumonks.org>  Sun, 26 Aug 2018 10:37:19 +0200

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,30 @@
+Source: simtrace2
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Section: devel
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               libosmocore-dev,
+               libnewlib-arm-none-eabi,
+               libusb-1.0-0-dev,
+               gcc-arm-none-eabi
+Standards-Version: 3.9.8
+Vcs-Git: git://git.osmocom.org/simtrace2.git
+Vcs-Browser: http://git.osmocom.org/simtrace2/
+Homepage: http://osmocom.org/projects/simtrace2/wiki
+
+Package: simtrace2-firmware
+Section: devel
+Architecture: all
+Recommends: dfu-util
+Description: Firmware for SAM3 based SIMtrace2 USB Devices.
+ Open Source firmware for the Cortex-M3 microcontroller in the
+ "Osmocom SIMtrace2" USB-attached peripheral device.  Will only work in
+ SAM3S-based SIMtrace2, not in its SAM7S-based predecessor SIMtrace!
+
+Package: simtrace2-utils
+Section: devel
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: simtrace2-firmware
+Description: Host utilities to communicate with SIMtrace2 USB Devices.

debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@

debian/simtrace2-firmware.install

@@ -0,0 +1 @@
+usr/share/simtrace2/*.bin

debian/simtrace2-utils.install

@@ -0,0 +1 @@
+usr/bin/simtrace2-*

firmware/Makefile

@@ -141,13 +141,12 @@ INCLUDES += -Ilibosmocore/include
 INCLUDES += -Isrc_simtrace -Iinclude
 INCLUDES += -Iapps/$(APP)
 
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
+CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
 CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
 CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef
 CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
 CFLAGS += -Waggregate-return #-Wsign-compare
-CFLAGS += -Wformat=0
 CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations
 CFLAGS += #-Wpacked
 CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
@@ -234,3 +233,7 @@ log:
 
 clean:
 	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`
+
+install:
+	mkdir -p $(DESTDIR)/usr/share/simtrace2
+	cp $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(DESTDIR)/usr/share/simtrace2

firmware/apps/cardem/main.c

@@ -1,4 +1,21 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation application
+ *
+ * (C) 2015-2017 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
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -108,6 +125,8 @@ static void check_exec_dbg_cmd(void)
 		return;
 
 	ch = UART_GetChar();
+	/* We must echo the character to make python fdexpect happy, whcih we use in factory testing */
+	fputc(ch, stdout);
 
 	board_exec_dbg_cmd(ch);
 }
@@ -125,9 +144,9 @@ extern int main(void)
 	led_init();
 	led_blink(LED_RED, BLINK_3O_5F);
 
-	/* Enable watchdog for 500ms, with no window */
+	/* Enable watchdog for 2000ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
 
 	PIO_InitializeInterrupts(0);
 
@@ -138,11 +157,25 @@ extern int main(void)
 		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
 		"=============================================================================\n\r");
 
-	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+	static const char* reset_causes[] = {
+		"general reset (first power-up reset)",
+		"backup reset (return from backup mode)",
+		"watchdog reset (watchdog fault occurred)",
+		"software reset (processor reset required by the software)",
+		"user reset (NRST pin detected low)",
+	};
+	if (reset_cause < ARRAY_SIZE(reset_causes)) {
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+	} else {
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	}
+#endif
 
 	board_main_top();
 

firmware/apps/dfu/main.c

@@ -1,8 +1,28 @@
+/* SIMtrace 2 firmware USB DFU bootloader
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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 "board.h"
 #include "utils.h"
 #include "usb/device/dfu/dfu.h"
 #include "usb/common/dfu/usb_dfu.h"
 #include "manifest.h"
+#include "USBD_HAL.h"
 
 #include <osmocom/core/timer.h>
 
@@ -94,7 +114,6 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		rc = DFU_RET_ZLP;
 		break;
 	default:
-		/* FIXME: set error codes */
 		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
 		rc = DFU_RET_STALL;
 		break;
@@ -160,22 +179,30 @@ WEAK int board_override_enter_dfu(void)
 int USBDFU_OverrideEnterDFU(void)
 {
 	uint32_t *app_part = (uint32_t *)FLASH_ADDR(0);
+	/* at the first call we are before the text segment has been relocated,
+	 * so g_dfu is not initialized yet */
+	g_dfu = &_g_dfu;
+	if (USB_DFU_MAGIC == g_dfu->magic) {
+		return 1;
+	}
 
 	/* If the loopback jumper is set, we enter DFU mode */
-	if (board_override_enter_dfu())
+	if (board_override_enter_dfu()) {
-		return 1;
+		return 2;
+	}
 
 	/* if the first word of the application partition doesn't look
 	 * like a stack pointer (i.e. point to RAM), enter DFU mode */
-	if ((app_part[0] < IRAM_ADDR) ||
+	if ((app_part[0] < IRAM_ADDR) || ((uint8_t *)app_part[0] > IRAM_END)) {
-	    ((uint8_t *)app_part[0] > IRAM_END))
+		return 3;
-		return 1;
+	}
 
 	/* if the second word of the application partition doesn't look
 	 * like a function from flash (reset vector), enter DFU mode */
 	if (((uint32_t *)app_part[1] < app_part) ||
-	    ((uint8_t *)app_part[1] > IFLASH_END))
+	    ((uint8_t *)app_part[1] > IFLASH_END)) {
-		return 1;
+		return 4;
+	}
 
 	return 0;
 }
@@ -215,10 +242,6 @@ extern int main(void)
 	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
 #endif
 
-	/* Enable watchdog for 500ms, with no window */
-	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
-
 	PIO_InitializeInterrupts(0);
 
 	EEFC_ReadUniqueID(g_unique_id);
@@ -235,6 +258,35 @@ extern int main(void)
 		   g_unique_id[2], g_unique_id[3]);
 	TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);
 
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	/* Find out why we are in the DFU bootloader, and not the main application */
+	TRACE_INFO("DFU bootloader start reason: ");
+	switch (USBDFU_OverrideEnterDFU()) {
+	case 0:
+		/* 0 normally means that there is no override, but we are in the bootloader,
+		 * thus the first check in board_cstartup_gnu did return something else than 0.
+		 * this can only be g_dfu->magic which is erased when the segment are
+		 * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU.
+		 * no static variable can be used to store this case since this will also be overwritten
+		 */
+	case 1:
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
+		break;
+	case 2:
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
+		break;
+	case 3:
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
+		break;
+	case 4: // the is no reason
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
+		break;
+	default:
+		TRACE_INFO_WP("unknown\n\r");
+		break;
+	}
+#endif
+
 	/* clear g_dfu on power-up reset */
 	if (reset_cause == 0)
 		memset(g_dfu, 0, sizeof(*g_dfu));
@@ -243,11 +295,18 @@ extern int main(void)
 
 	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+#ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
 	PIO_Configure(&usb_dp_pullup, 1);
 	PIO_Set(&usb_dp_pullup);
-	mdelay(15);
+#endif
+	USBD_HAL_Suspend();
+	mdelay(20);
+#ifdef PIN_USB_PULLUP
 	PIO_Clear(&usb_dp_pullup);
+#endif
+	USBD_HAL_Activate();
+
 	USBDFU_Initialize(&dfu_descriptors);
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {

firmware/apps/trace/main.c

@@ -1,21 +1,21 @@
-/*
+/* SIMtrace 2 firmware sniffer application
- * (C) 2010-2017 by Harald Welte <hwelte@sysmocom.de>
- * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
- * All Rights Reserved
  *
- * This program is free software; you can redistribute it and/or modify
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * it under the terms of the GNU Affero General Public License as published by
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- * the Free Software Foundation; either version 3 of the License, or
+ *
- * (at your option) any later version.
+ * 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * 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.
  */
 /*------------------------------------------------------------------------------
  *          Headers
@@ -104,9 +104,6 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
-	if (cfgnum >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-		TRACE_FATAL_WP("no functions defined for configuration %d\n\r", cfgnum);
-	}
 	simtrace_config = cfgnum;
 }
 
@@ -145,10 +142,15 @@ extern int main(void)
 	enum confNum last_simtrace_config = simtrace_config;
 	unsigned int i = 0;
 
-	/* Configure LED output (red = on, green = activity */
+	/* Configure LED output
+	 * red on = power
+	 * red blink = error
+	 * green on = running
+	 * green blink = activity
+	 */
 	led_init();
 	led_blink(LED_RED, BLINK_ALWAYS_ON);
-	led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
+	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
 
 	/* Enable watchdog for 2000 ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
@@ -163,18 +165,17 @@ extern int main(void)
 		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
 		"=============================================================================\n\r");
 
-	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
 	TRACE_INFO("USB configuration used: %d\n\r", simtrace_config);
 
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
-	TRACE_INFO_WP("USBD_Inited\n\r");
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
 		WDT_Restart(WDT);
@@ -191,26 +192,13 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling configure of all configurations...\n\r");
-	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); ++i) {
+	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
-		if (config_func_ptrs[i].configure) {
+		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
-		} else {
-			TRACE_WARNING("no configure function defined for configuration %d\n\r", i);
 	}
-	}
-
-	TRACE_INFO("cfg %d\n\r", simtrace_config);
 
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	if (simtrace_config >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-		TRACE_ERROR("no functions defined for configuration %d\n\r", simtrace_config);
-	} else {
-		if (config_func_ptrs[simtrace_config].init) {
 	config_func_ptrs[simtrace_config].init();
-		} else {
-			TRACE_ERROR("no init function defined for configuration %d\n\r", simtrace_config);
-		}
-	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -238,31 +226,11 @@ extern int main(void)
 		if (last_simtrace_config != simtrace_config) {
 			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
-			if (last_simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-				if (config_func_ptrs[last_simtrace_config].exit) {
 			config_func_ptrs[last_simtrace_config].exit();
-				} else {
-					TRACE_WARNING("exit not defined for configuration %d\n\r", last_simtrace_config);
-				}
-			} else {
-				TRACE_ERROR("no functions defined for configuration %d\n\r", last_simtrace_config);
-			}
-			if (simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-				if (config_func_ptrs[simtrace_config].init) {
 			config_func_ptrs[simtrace_config].init();
-				} else {
-					 TRACE_WARNING("init not defined for configuration %d\n\r", simtrace_config);
-				}
-			} else {
-				TRACE_FATAL("no functions defined for configuration %d\n\r", simtrace_config);
-			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			if (config_func_ptrs[simtrace_config].run) {
 			config_func_ptrs[simtrace_config].run();
-			} else {
-				TRACE_ERROR("run not defined for configuration %d\n\r", simtrace_config);
-			}
 		}
 	}
 }

firmware/apps/triple_play/main.c

@@ -1,4 +1,21 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation, CCID, and sniffer application
+ *
+ * (C) 2015-2017 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
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/

firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -42,6 +43,7 @@
  *----------------------------------------------------------------------------*/
 
 #include "chip.h"
+#define printf printf_sync
 
 /*----------------------------------------------------------------------------
  *        Exported functions

firmware/libboard/common/include/board_common.h

@@ -1,3 +1,19 @@
+/* SIMtrace 2 common board pin definitions
+ *
+ * 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
+ */
 #ifndef _BOARD_
 #define _BOARD_
 
@@ -98,15 +114,8 @@
 #define SIM_PWEN        PIO_PA5
 #define VCC_FWD         PIO_PA26
 
-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
 // Board has UDP controller
 #define BOARD_USB_UDP
-// D+ has external pull-up
-#define BOARD_USB_PULLUP_EXTERNAL
 
 #define BOARD_USB_DFU
 #define BOARD_DFU_BOOT_SIZE	(16 * 1024)

firmware/libboard/common/include/board_lowlevel.h

@@ -26,7 +26,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * ----------------------------------------------------------------------------
  */
-
 /**
  * \file
  *

firmware/libboard/common/include/boardver_adc.h

@@ -1,4 +1,18 @@
+/* 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
+ */
 #pragma once
 
-uint32_t adc2uv(uint16_t adc);
 int get_board_version_adc(void);
+uint32_t adc2uv(uint16_t adc);

firmware/libboard/common/include/led.h

@@ -1,3 +1,17 @@
+/* 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
+ */
 #pragma once
 
 enum led {
@@ -17,6 +31,7 @@ enum led_pattern {
 	BLINK_200O_F		= 7,
 	BLINK_600O_F		= 8,
 	BLINK_CUSTOM		= 9,
+	BLINK_2F_O,
 	_NUM_LED_BLINK
 };
 

firmware/libboard/common/include/manifest.h

@@ -1,4 +1,17 @@
-
+/* 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
+ */
 #ifndef _MANIFEST_H
 #define _MANIFEST_H
 

firmware/libboard/common/include/sim_switch.h

@@ -1,3 +1,17 @@
+/* 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
+ */
 #pragma once
 
 int sim_switch_use_physical(unsigned int nr, int physical);

firmware/libboard/common/include/uart_console.h

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -26,19 +27,17 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * ----------------------------------------------------------------------------
  */
-
-
 #ifndef _UART_CONSOLE_
 #define _UART_CONSOLE_
-
 #include <stdint.h>
 
 extern void UART_Configure( uint32_t dwBaudrate, uint32_t dwMasterClock ) ;
+extern void UART_Exit( void ) ;
 extern void UART_PutChar( uint8_t uc ) ;
+extern void UART_PutChar_Sync( uint8_t uc ) ;
 extern uint32_t UART_GetChar( void ) ;
 extern uint32_t UART_IsRxReady( void ) ;
 
-
 extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize ) ;
 extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress ) ;
 extern uint32_t UART_GetInteger( uint32_t* pdwValue ) ;

firmware/libboard/common/source/board_cstartup_gnu.c

@@ -2,7 +2,8 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2010, Atmel Corporation
- * Copyright (C) 2017, Harald Welte <laforge@gnumonks.org>
+ * Copyright (c) 2017, Harald Welte <laforge@gnumonks.org>
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -133,7 +134,11 @@ static void BootIntoApp(void)
 	void (*appReset)(void);
 
 	pSrc = (unsigned int *) ((unsigned char *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE);
-	SCB->VTOR = ((unsigned int)(pSrc)) | (0x0 << 7);
+	/* set vector table to application vector table (store at the beginning of the application) */
+	SCB->VTOR = (unsigned int)(pSrc);
+	/* set stack pointer to address provided in the beginning of the application (loaded into a register first) */
+	__asm__ volatile ("MSR msp,%0" : :"r"(*pSrc));
+	/* start application (by jumping to the reset function which address is stored as second entry of the vector table) */
 	appReset = (void(*)(void))pSrc[1];
 
 	g_dfu->state = DFU_STATE_appIDLE;
@@ -155,25 +160,13 @@ void ResetException( void )
 
 
 #if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
-    /* we are before the text segment has been relocated, so g_dfu is
+	if (!USBDFU_OverrideEnterDFU()) {
-     * not initialized yet */
+		UART_Exit();
-    g_dfu = &_g_dfu;
+		__disable_irq();
-    if ((g_dfu->magic != USB_DFU_MAGIC) && !USBDFU_OverrideEnterDFU()) {
-        /* start application if valid
-         * the application starts with the vector table
-         * the first entry in the vector table is the initial stack pointer (SP) address
-         * the stack will be placed in RAM, which begins at 0x2000 0000
-         * there is up to 48 KB of RAM (0xc000)
-         * since the stack grown "downwards" it should start at the end of the RAM: max 0x2000 c000
-         * if the SP is not in this range (e.g. flash has been erased) there is no valid application
-         * the second entry in the vector table is the reset address, corresponding to the application start
-         */
-        if (((*((uint32_t*)(IFLASH_ADDR+BOARD_DFU_BOOT_SIZE)))&0xFFFF0000)==0x20000000) {
 		BootIntoApp();
 		/* Infinite loop */
 		while ( 1 ) ;
 	}
-    }
 #endif
 
 	/* Initialize the relocate segment */

firmware/libboard/common/source/boardver_adc.c

@@ -1,3 +1,17 @@
+/* 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 "boardver_adc.h"
 
@@ -72,7 +86,7 @@ int get_board_version_adc(void)
 	/* convert to voltage */
 	sample = ADC->ADC_CDR[2];
 	uv = adc2uv(sample);
-	TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv);
+	TRACE_INFO("VERSION_DET ADC=%u => %lu uV\r\n", sample, uv);
 
 	/* FIXME: convert to board version based on thresholds */
 

firmware/libboard/common/source/led.c

@@ -1,3 +1,22 @@
+/* LED control
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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 <stdint.h>
 #include <string.h>
 #include <assert.h>
@@ -54,16 +73,23 @@ static const struct blink_state bs_3on_1off_3on_30off[] = {
 static const struct blink_state bs_3on_1off_3on_1off_3on_30off[] = {
 	{ 300, 1 }, { 100, 0 }, { 300, 1 }, { 100, 0 }, { 300, 1 }, { 3000, 0 }
 };
+
 static const struct blink_state bs_2on_off[] = {
 	{ 200, 1 }, { 0, 0 },
 };
+
 static const struct blink_state bs_200on_off[] = {
 	{ 20000, 1 }, { 0, 0 },
 };
+
 static const struct blink_state bs_600on_off[] = {
 	{ 60000, 1 }, { 0, 0 },
 };
 
+static const struct blink_state bs_2off_on[] = {
+	{ 200, 0 }, { 0, 1 },
+};
+
 
 /* a blink pattern is an array of blink_states */
 struct blink_pattern {
@@ -109,6 +135,11 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_600on_off,
 		.size = ARRAY_SIZE(bs_600on_off),
 	},
+	[BLINK_2F_O] = {
+		.states = bs_2off_on,
+		.size = ARRAY_SIZE(bs_2off_on),
+	},
+
 };
 
 struct led_state {

firmware/libboard/common/source/manifest.c

@@ -1,4 +1,17 @@
-
+/* 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 "manifest.h"
 
 const char *manifest_application = APPLICATION;

firmware/libboard/common/source/sim_switch.c

@@ -1,5 +1,21 @@
-/* Code to switch between local (physical) and remote (emulated) SIM */
+/* Code to switch between local (physical) and remote (emulated) SIM
-
+ *
+ * (C) 2015-2017 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 "led.h"

firmware/libboard/common/source/uart_console.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -103,13 +104,28 @@ extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
 	_ucIsConsoleInitialized=1 ;
 }
 
+/**
+ * \brief Disables the USART peripheral and related IRQ
+ */
+void UART_Exit(void)
+{
+	if (!_ucIsConsoleInitialized) {
+		return;
+	}
+
+	Uart *pUart = CONSOLE_UART;
+	pUart->UART_IDR = UART_IDR_TXRDY;
+	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS | UART_CR_RSTSTA;
+	PMC->PMC_PCDR0 = 1 << CONSOLE_ID;
+	NVIC_DisableIRQ(CONSOLE_IRQ);
+}
+
 /** Interrupt Service routine to transmit queued data */
 void CONSOLE_ISR(void)
 {
 	Uart *uart = CONSOLE_UART;
 	if (uart->UART_SR & UART_SR_TXRDY) {
 		if (!rbuf_is_empty(&uart_tx_buffer)) {
-			//uart->UART_IER = UART_IER_TXRDY;
 			uart->UART_THR = rbuf_read(&uart_tx_buffer);
 		} else {
 			uart->UART_IDR = UART_IER_TXRDY;
@@ -120,10 +136,10 @@ void CONSOLE_ISR(void)
 /**
  * \brief Outputs a character on the UART line.
  *
- * \note This function is synchronous (i.e. uses polling).
+ * \note This function is asynchronous (i.e. uses a buffer and interrupt to complete the transfer).
  * \param c  Character to send.
  */
-extern void UART_PutChar( uint8_t c )
+void UART_PutChar( uint8_t uc )
 {
 	Uart *pUart = CONSOLE_UART ;
 
@@ -133,18 +149,35 @@ extern void UART_PutChar( uint8_t c )
 		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
 	}
 
-    /* Only store input if buffer is not full, else drop it */
-    bool trigger_isr = false;
-    if (rbuf_is_empty(&uart_tx_buffer)) {
-        trigger_isr = true;
-    }
 	if (!rbuf_is_full(&uart_tx_buffer)) {
-        rbuf_write(&uart_tx_buffer, c);
+		rbuf_write(&uart_tx_buffer, uc);
-    }
+		if (!(pUart->UART_IMR & UART_IMR_TXRDY)) {
-    if (trigger_isr) {
 			pUart->UART_IER = UART_IER_TXRDY;
 			CONSOLE_ISR();
 		}
+	}
+}
+
+/**
+ * \brief Outputs a character on the UART line.
+ *
+ * \note This function is synchronous (i.e. uses polling and blocks until the transfer is complete).
+ * \param c  Character to send.
+ */
+void UART_PutChar_Sync( uint8_t uc )
+{
+	Uart *pUart = CONSOLE_UART ;
+
+	/* Initialize console is not already done */
+	if ( !_ucIsConsoleInitialized )
+	{
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	}
+
+	while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to be empty */
+	pUart->UART_THR = uc; /* Send data to UART peripheral */
+	while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to transferred to shift register */
+	while (!(pUart->UART_SR & UART_SR_TXEMPTY)); /* Wait for transfer shift register to be empty (i.e. transfer is complete) */
 }
 
 /**

firmware/libboard/owhw/include/board.h

@@ -1,3 +1,21 @@
+/* OWHW board definition
+ *
+ * (C) 2015-2017 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
+ */
 #pragma once
 #include "board_common.h"
 #include "simtrace_usb.h"

firmware/libboard/owhw/source/owhw.c

@@ -1,5 +1,6 @@
-/* Card simulator specific functions */
+/* Card simulator specific functions
-/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * (C) 2015-2017 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
@@ -13,8 +14,7 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- *
  */
 
 #include "chip.h"
@@ -36,5 +36,5 @@ void cardsim_set_simpres(uint8_t slot, int present)
 
 void cardsim_gpio_init(void)
 {
-	PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim));
+	PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));
 }

firmware/libboard/qmod/include/board.h

@@ -1,3 +1,21 @@
+/* sysmocom quad-modem sysmoQMOD board definition
+ *
+ * (C) 2016-2017 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
+ */
 #pragma once
 #include "board_common.h"
 #include "simtrace_usb.h"

firmware/libboard/qmod/include/card_pres.h

@@ -1,3 +1,21 @@
+/* card presence utilities
+ *
+ * (C) 2016-2017 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
+ */
 #pragma once
 
 int is_card_present(int port);

firmware/libboard/qmod/include/i2c.h

@@ -1,3 +1,19 @@
+/* I2C EEPROM memory read and write utilities
+ *
+ * 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
+ */
 #pragma once
 
 void i2c_pin_init(void);

firmware/libboard/qmod/include/wwan_led.h

@@ -1,3 +1,19 @@
+/* Code to read/track the status of the WWAN LEDs of attached modems
+ * 
+ * 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
+ */
 #pragma once
 
 int wwan_led_active(int wwan);

firmware/libboard/qmod/include/wwan_perst.h

@@ -1,3 +1,19 @@
+/* Code to control the PERST lines of attached modems
+ *
+ * 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
+ */
 #pragma once
 
 int wwan_perst_set(int modem_nr, int active);

firmware/libboard/qmod/source/board_qmod.c

@@ -1,6 +1,21 @@
-/* Quad-modem speciic application code */
+/* sysmocom quad-modem sysmoQMOD application code
-/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
+ *
-
+ * (C) 2016-2017 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 "simtrace.h"
 #include "utils.h"
@@ -55,8 +70,6 @@ const unsigned char __eeprom_bin[256] = {
 #include "i2c.h"
 static int write_hub_eeprom(void)
 {
-	const unsigned int __eeprom_bin_len = 256;
-
 	int i;
 
 	/* wait */
@@ -64,16 +77,18 @@ static int write_hub_eeprom(void)
 
 	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		/* if the result was negative, repeat that write */
+		if (rc < 0) {
-		if (rc < 0)
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
-			i--;
+				i, __eeprom_bin[i]);
+			return 1;
+		}
 	}
 
 	/* then pursue re-reading it again and again */
 	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
 		TRACE_INFO("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
@@ -87,6 +102,28 @@ static int write_hub_eeprom(void)
 	return 0;
 }
 
+static int erase_hub_eeprom(void)
+{
+	int i;
+
+	/* wait */
+	mdelay(100);
+
+	TRACE_INFO("Erasing EEPROM...\n\r");
+	/* write the EEPROM once */
+	for (i = 0; i < 256; i++) {
+		int rc = eeprom_write_byte(0x50, i, 0xff);
+		if (rc < 0) {
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
+				i, __eeprom_bin[i]);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -99,6 +136,9 @@ static void board_exec_dbg_cmd_st12only(int ch)
 	case 'E':
 		write_hub_eeprom();
 		break;
+	case 'e':
+		erase_hub_eeprom();
+		break;
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -123,13 +163,13 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		UART_GetIntegerMinMax(&addr, 0, 255);
 		printf("Please enter EEPROM value:\n\r");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
 	case 'r':
 		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
@@ -146,6 +186,7 @@ void board_exec_dbg_cmd(int ch)
 		printf("\tR\treset SAM3\n\r");
 		if (qmod_sam3_is_12()) {
 			printf("\tE\tprogram EEPROM\n\r");
+			printf("\te\tErase EEPROM\n\r");
 			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
 			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
 			printf("\tH\tRelease HUB RESET (high)\n\r");
@@ -261,20 +302,32 @@ static int uart_has_loopback_jumper(void)
 	/* Configure UART pins as I/O */
 	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
 
+	/* Send pattern over UART TX and check if it is received on RX
+	 * If the loop doesn't get interrupted, RxD always follows TxD and thus a
+	 * loopback jumper has been placed on RxD/TxD, and we will boot
+	 * into DFU unconditionally
+	 */
+	int has_loopback_jumper = 1;
 	for (i = 0; i < 10; i++) {
 		/* Set TxD high; abort if RxD doesn't go high either */
 		PIO_Set(&uart_loopback_pins[1]);
-		if (!PIO_Get(&uart_loopback_pins[0]))
+		if (!PIO_Get(&uart_loopback_pins[0])) {
-			return 0;
+			has_loopback_jumper = 0;
+			break;
+		}
 		/* Set TxD low, abort if RxD doesn't go low either */
 		PIO_Clear(&uart_loopback_pins[1]);
-		if (PIO_Get(&uart_loopback_pins[0]))
+		if (PIO_Get(&uart_loopback_pins[0])) {
-			return 0;
+			has_loopback_jumper = 0;
+			break;
 		}
-	/* if we reached here, RxD always follows TxD and thus a
+	}
-	 * loopback jumper has been placed on RxD/TxD, and we will boot
+
-	 * into DFU unconditionally */
+	/* Put pins back to UART mode */
-	return 1;
+	const Pin uart_pins[] = {PINS_UART};
+	PIO_Configure(uart_pins, PIO_LISTSIZE(uart_pins));
+
+	return has_loopback_jumper;
 }
 
 int board_override_enter_dfu(void)

firmware/libboard/qmod/source/card_pres.c

@@ -1,3 +1,21 @@
+/* card presence utilities
+ *
+ * (C) 2016-2017 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 <osmocom/core/timer.h>
 #include "board.h"
 #include "utils.h"

firmware/libboard/qmod/source/i2c.c

@@ -1,3 +1,19 @@
+/* I2C EEPROM memory read and write utilities
+ *
+ * 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 <stdbool.h>
 
@@ -169,6 +185,8 @@ int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
 	nack = i2c_write_byte(false, true, byte);
 	if (nack)
 		goto out_stop;
+	/* Wait tWR time to ensure EEPROM is writing correctly (tWR = 5 ms for AT24C02) */
+	mdelay(5);
 
 out_stop:
 	i2c_stop_cond();

firmware/libboard/qmod/source/wwan_led.c

@@ -1,11 +1,24 @@
 /* Code to read/track the status of the WWAN LEDs of attached modems
  *
- * Depending on the board this is running on,  it might be possible
+ * 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
+ */
+/* Depending on the board this is running on,  it might be possible
  * for the controller to read the status of the WWAN LED output lines of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_WWAN1 and/or PIN_WWAN2 defines in its board.h file.
  */
-
 #include "board.h"
 #include "wwan_led.h"
 

firmware/libboard/qmod/source/wwan_perst.c

@@ -1,11 +1,24 @@
 /* Code to control the PERST lines of attached modems
  *
- * Depending on the board this is running on,  it might be possible
+ * 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
+ */
+/* Depending on the board this is running on,  it might be possible
  * for the controller to set the status of the PERST input line of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_PERST1 and/or PIN_PERST2 defines in its board.h file.
  */
-
 #include "board.h"
 #include "trace.h"
 #include "wwan_perst.h"

firmware/libboard/simtrace/include/board.h

@@ -1,3 +1,22 @@
+/* SIMtrace with SAM3S board definition
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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
+ */
 #pragma once
 #include "board_common.h"
 #include "simtrace_usb.h"
@@ -98,6 +117,11 @@
 /* SPI flash write protect pin (active low, pulled low) */
 #define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 
+/** Pin configuration to control USB pull-up on D+
+ *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
+ */
+#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
 /** USB definitions */
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO

firmware/libboard/simtrace/source/board_simtrace.c

@@ -1,6 +1,22 @@
-/* SIMtrace specific application code */
+/* SIMtrace with SAM3S specific application code
-/* (C) 2017 by Harald Welte <laforge@gnumonks.org> */
+ *
-
+ * (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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 "simtrace.h"
 #include "utils.h"

firmware/libcommon/include/card_emu.h

@@ -1,3 +1,22 @@
+/* ISO7816-3 state machine for the card side
+ *
+ * (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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
+ */
 #pragma once
 
 #include <stdint.h>
@@ -36,3 +55,4 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
 int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte);
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan);
+void card_emu_uart_interrupt(uint8_t uart_chan);

firmware/libcommon/include/iso7816_fidi.h

@@ -1,3 +1,21 @@
+/* ISO7816-3 Fi/Di tables + computation
+ *
+ * (C) 2010-2015 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
+ */
 #pragma once
 
 #include <stdint.h>

firmware/libcommon/include/llist_irqsafe.h

@@ -1,3 +1,21 @@
+/* IRQ-safe linked lists
+ *
+ * (C) 2015-2017 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
+ */
 #pragma once
 
 #include <osmocom/core/linuxlist.h>

firmware/libcommon/include/ringbuffer.h

@@ -1,3 +1,19 @@
+/* Ring buffer
+ *
+ * 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
+ */
 #ifndef SIMTRACE_RINGBUF_H
 #define SIMTRACE_RINGBUF_H
 
@@ -16,7 +32,7 @@ typedef struct ringbuf {
 void rbuf_reset(volatile ringbuf * rb);
 uint8_t rbuf_read(volatile ringbuf * rb);
 uint8_t rbuf_peek(volatile ringbuf * rb);
-void rbuf_write(volatile ringbuf * rb, uint8_t item);
+int rbuf_write(volatile ringbuf * rb, uint8_t item);
 bool rbuf_is_empty(volatile ringbuf * rb);
 bool rbuf_is_full(volatile ringbuf * rb);
 

firmware/libcommon/include/simtrace.h

@@ -1,3 +1,21 @@
+/* SIMtrace 2 mode definitions
+ *
+ * (C) 2015-2017 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
+ */
 #ifndef SIMTRACE_H
 #define SIMTRACE_H
 
@@ -68,7 +86,7 @@ extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
  *  @param[io] usart USART peripheral base address
  *  @param[in] fidi FiDi value as provided in TA interface byte
  */
-void update_fidi(Usart *usart, uint8_t fidi);
+void update_fidi(Usart_info *usart, uint8_t fidi);
 
 void ISR_PhoneRST( const Pin *pPin);
 

firmware/libcommon/include/simtrace_prot.h

@@ -1,6 +1,7 @@
-/* SIMtrace2 USB protocol */
+/* SIMtrace2 USB protocol
-
+ *
-/* (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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
@@ -14,8 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- *
  */
 #pragma once
 
@@ -291,9 +291,13 @@ struct st_modem_status {
 /* SIMTRACE_MSGT_SNIFF_CHANGE flags */
 #define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)
 #define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)
-#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)
+#define SNIFF_CHANGE_FLAG_RESET_ASSERT (1<<2)
-#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)
+#define SNIFF_CHANGE_FLAG_RESET_DEASSERT (1<<3)
 #define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)
+/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU flags */
+#define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5)
+#define SNIFF_DATA_FLAG_ERROR_MALFORMED (1<<6)
+#define SNIFF_DATA_FLAG_ERROR_CHECKSUM (1<<7)
 
 /* SIMTRACE_MSGT_SNIFF_CHANGE */
 struct sniff_change {
@@ -309,8 +313,8 @@ struct sniff_fidi {
 
 /* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */
 struct sniff_data {
-	/* if the data is complete (an error might have occurred during transmission */
+	/* data flags */
-	bool complete;
+	uint32_t flags;
 	/* data length */
 	uint16_t length;
 	/* data */

firmware/libcommon/include/simtrace_usb.h

@@ -1,20 +1,21 @@
-/* This program is free software; you can redistribute it and/or modify
+/* SIMtrace 2 USB definitions
- * it under the terms of the GNU Affero General Public License as published by
+ *
- * the Free Software Foundation; either version 3 of the License, or
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
- *
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
- * All Rights Reserved
  */
-
 /* SIMtrace USB IDs */
 #define USB_VENDOR_OPENMOKO			0x1d50
 #define USB_PRODUCT_OWHW_SAM3_DFU	0x4001	/* was 0x4000 */

firmware/libcommon/include/stdio.h

@@ -1,3 +1,31 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support 
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2008, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
 #pragma once
 #include <stddef.h>
 #include <stdarg.h>
@@ -24,9 +52,14 @@ signed int printf(const char *pFormat, ...);
 signed int sprintf(char *pStr, const char *pFormat, ...);
 signed int puts(const char *pStr);
 
-
 int fputc(int c, FILE *stream);
 int fputs(const char *s, FILE *stream);
 
 #define putc(c, stream) fputc(c, stream)
 #define putchar(c) fputc(c, stdout)
+
+signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap);
+signed int vprintf_sync(const char *pFormat, va_list ap);
+signed int printf_sync(const char *pFormat, ...);
+int fputc_sync(int c, FILE *stream);
+int fputs_sync(const char *s, FILE *stream);

firmware/libcommon/include/talloc.h

@@ -1,3 +1,19 @@
+/* Memory allocation library
+ *
+ * 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
+ */
 #pragma once
 
 #include <stdlib.h>

firmware/libcommon/include/usb_buf.h

@@ -1,3 +1,19 @@
+/* USB buffer library
+ *
+ * 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
+ */
 #pragma once
 
 #include <osmocom/core/linuxlist.h>

firmware/libcommon/include/utils.h

@@ -1,3 +1,19 @@
+/* General utilities
+ *
+ * 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
+ */
 #pragma once
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

firmware/libcommon/source/card_emu.c

@@ -1,5 +1,7 @@
-/* ISO7816-3 state machine for the card side */
+/* ISO7816-3 state machine for the card side
-/* (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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
@@ -13,12 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- *
  */
-
-//#define TRACE_LEVEL 6
-
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
@@ -56,6 +54,22 @@ enum iso7816_3_card_state {
 	ISO_S_IN_TPDU,		/* inside a TPDU */
 };
 
+const struct value_string iso7816_3_card_state_names[] = {
+	OSMO_VALUE_STRING(ISO_S_WAIT_POWER),
+	OSMO_VALUE_STRING(ISO_S_WAIT_CLK),
+	OSMO_VALUE_STRING(ISO_S_WAIT_RST),
+	OSMO_VALUE_STRING(ISO_S_WAIT_ATR),
+	OSMO_VALUE_STRING(ISO_S_IN_ATR),
+	OSMO_VALUE_STRING(ISO_S_IN_PTS),
+	OSMO_VALUE_STRING(ISO_S_WAIT_TPDU),
+	OSMO_VALUE_STRING(ISO_S_IN_TPDU),
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+
 /* detailed sub-states of ISO_S_IN_PTS */
 enum pts_state {
 	PTS_S_WAIT_REQ_PTSS,
@@ -87,7 +101,7 @@ enum tpdu_state {
 	TPDU_S_WAIT_P2,		/* waiting for P2 byte from reader */
 	TPDU_S_WAIT_P3,		/* waiting for P3 byte from reader */
 	TPDU_S_WAIT_PB,		/* waiting for Tx of procedure byte */
-	TPDU_S_WAIT_RX,		/* waiitng for more data from reader */
+	TPDU_S_WAIT_RX,		/* waiting for more data from reader */
 	TPDU_S_WAIT_TX,		/* waiting for more data to reader */
 };
 
@@ -98,7 +112,7 @@ enum tpdu_state {
 #define	_P3	4
 
 struct card_handle {
-	uint32_t num;
+	unsigned int num;
 
 	enum iso7816_3_card_state state;
 
@@ -192,7 +206,7 @@ struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 	return msg;
 }
 
-/* Update cardemu_usb_msg_rx_data length + submit bufffer */
+/* Update cardemu_usb_msg_rx_data length + submit buffer */
 static void flush_rx_buffer(struct card_handle *ch)
 {
 	struct msgb *msg;
@@ -205,14 +219,17 @@ static void flush_rx_buffer(struct card_handle *ch)
 
 	ch->uart_rx_msg = NULL;
 
-	/* store length of data payload fild in header */
+	/* store length of data payload field in header */
 	rd = (struct cardemu_usb_msg_rx_data *) msg->l2h;
 	rd->data_len = msgb_l2len(msg) - sizeof(*rd);
 
+	TRACE_INFO("%u: %s (%u)\n\r",
+			ch->num, __func__, rd->data_len);
+
 	usb_buf_upd_len_and_submit(msg);
 }
 
-/* convert a non-contiguous PTS request/responsei into a contiguous
+/* convert a non-contiguous PTS request/response into a contiguous
  * buffer, returning the number of bytes used in the buffer */
 static int serialize_pts(uint8_t *out,  const uint8_t *in)
 {
@@ -287,8 +304,9 @@ static void card_set_state(struct card_handle *ch,
 	if (ch->state == new_state)
 		return;
 
-	TRACE_DEBUG("%u: 7816 card state %u -> %u\r\n", ch->num,
+	TRACE_DEBUG("%u: 7816 card state %u (%s) -> %u (%s)\r\n", ch->num,
-		    ch->state, new_state);
+		    ch->state, get_value_string(iso7816_3_card_state_names, ch->state),
+		    new_state, get_value_string(iso7816_3_card_state_names, new_state));
 	ch->state = new_state;
 
 	switch (new_state) {
@@ -299,32 +317,39 @@ static void card_set_state(struct card_handle *ch,
 		card_emu_uart_enable(ch->uart_chan, 0);
 		break;
 	case ISO_S_WAIT_ATR:
-		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 		/* Reset to initial Fi / Di ratio */
 		ch->fi = 1;
 		ch->di = 1;
 		emu_update_fidi(ch);
-		/* initialize todefault WI, this will be overwritten if we
+		/* the ATR should only be sent 400 to 40k clock cycles after the RESET.
-		 * receive TC2, and it will be programmed into hardware after
+		 * we use the tc_etu mechanism to wait this time.
+		 * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU.
+		 */
+		tc_etu_set_wtime(ch->tc_chan, 2);
+		/* ensure the TC_ETU timer is enabled */
+		tc_etu_enable(ch->tc_chan);
+		break;
+	case ISO_S_IN_ATR:
+		/* initialize to default WI, this will be overwritten if we
+		 * send TC2, and it will be programmed into hardware after
 		 * ATR is finished */
 		ch->wi = ISO7816_3_DEFAULT_WI;
 		/* update waiting time to initial waiting time */
 		ch->waiting_time = ISO7816_3_INIT_WTIME;
+		/* set initial waiting time */
 		tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);
 		/* Set ATR sub-state to initial state */
 		ch->atr.idx = 0;
-		//set_atr_state(ch, ATR_S_WAIT_TS);
+		/* enable USART transmission to reader */
-		/* Notice that we are just coming out of reset */
-		//ch->sh.flags |= SIMTRACE_FLAG_ATR;
 		card_emu_uart_enable(ch->uart_chan, ENABLE_TX);
-		break;
+		/* trigger USART TX IRQ to sent first ATR byte TS */
+		card_emu_uart_interrupt(ch->uart_chan);
 		break;
 	case ISO_S_WAIT_TPDU:
 		/* enable the receiver, disable transmitter */
 		set_tpdu_state(ch, TPDU_S_WAIT_CLA);
 		card_emu_uart_enable(ch->uart_chan, ENABLE_RX);
 		break;
-	case ISO_S_IN_ATR:
 	case ISO_S_IN_PTS:
 	case ISO_S_IN_TPDU:
 		/* do nothing */
@@ -332,12 +357,80 @@ static void card_set_state(struct card_handle *ch,
 	}
 }
 
+/**********************************************************************
+ * ATR handling
+ **********************************************************************/
+
+/*! Transmit ATR data to reader
+ *  @param[in] ch card interface connected to reader
+ *  @return numbers of bytes transmitted
+ */
+static int tx_byte_atr(struct card_handle *ch)
+{
+	if (NULL == ch) {
+		TRACE_ERROR("ATR TX: no card handle provided\n\r");
+		return 0;
+	}
+	if (ISO_S_IN_ATR != ch->state) {
+		TRACE_ERROR("%u: ATR TX: no in ATR state\n\r", ch->num);
+		return 0;
+	}
+
+	/* Transmit ATR */
+	if (ch->atr.idx < ch->atr.len) {
+		uint8_t byte = ch->atr.atr[ch->atr.idx++];
+		card_emu_uart_tx(ch->uart_chan, byte);
+		return 1;
+	} else { /* The ATR has been completely transmitted */
+		/* search for TC2 to updated WI */
+		ch->wi = ISO7816_3_DEFAULT_WI;
+		if (ch->atr.len >= 2 && ch->atr.atr[1] & 0xf0) { /* Y1 has some data */
+			uint8_t atr_td1 = 2;
+			if (ch->atr.atr[1] & 0x10) { /* TA1 is present */
+				atr_td1++;
+			}
+			if (ch->atr.atr[1] & 0x20) { /* TB1 is present */
+				atr_td1++;
+			}
+			if (ch->atr.atr[1] & 0x40) { /* TC1 is present */
+				atr_td1++;
+			}
+			if (ch->atr.atr[1] & 0x80) { /* TD1 is present */
+				if (ch->atr.len > atr_td1 && ch->atr.atr[atr_td1] & 0xf0) { /* Y2 has some data */
+					uint8_t atr_tc2 = atr_td1+1;
+					if (ch->atr.atr[atr_td1] & 0x10) { /* TA2 is present */
+						atr_tc2++;
+					}
+					if (ch->atr.atr[atr_td1] & 0x20) { /* TB2 is present */
+						atr_tc2++;
+					}
+					if (ch->atr.atr[atr_td1] & 0x40) { /* TC2 is present */
+						if (ch->atr.len > atr_tc2 && ch->atr.atr[atr_tc2]) { /* TC2 encodes WI */
+							ch->wi = ch->atr.atr[atr_tc2]; /* set WI */
+						}
+					}
+				}
+			}
+		}
+		/* update waiting time (see ISO 7816-3 10.2) */
+		ch->waiting_time = ch->wi * 960 * ch->fi;
+		tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);
+		/* reset PTS to initial state */
+		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
+		/* go to next state */
+		card_set_state(ch, ISO_S_WAIT_TPDU);
+		return 0;
+	}
+
+	/* return number of bytes transmitted */
+	return 1;
+}
 
 /**********************************************************************
  * PTS / PPS handling
  **********************************************************************/
 
-/* Update the ATR sub-state */
+/* Update the PTS sub-state */
 static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss)
 {
 	TRACE_DEBUG("%u: 7816 PTS state %u -> %u\r\n",
@@ -718,7 +811,7 @@ static int tx_byte_tpdu(struct card_handle *ch)
 
 	card_emu_uart_tx(ch->uart_chan, byte);
 
-	/* this must happen _after_ the byte has been transmittd */
+	/* this must happen _after_ the byte has been transmitted */
 	switch (ch->tpdu.state) {
 	case TPDU_S_WAIT_PB:
 		/* if we just transmitted the procedure byte, we need to decide
@@ -765,14 +858,6 @@ void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte)
 	ch->stats.rx_bytes++;
 
 	switch (ch->state) {
-	case ISO_S_WAIT_POWER:
-	case ISO_S_WAIT_CLK:
-	case ISO_S_WAIT_RST:
-	case ISO_S_WAIT_ATR:
-		TRACE_ERROR("%u: Received UART char in invalid 7816 state "
-			    "%u\r\n", ch->num, ch->state);
-		/* we shouldn't receive any data from the reader yet! */
-		break;
 	case ISO_S_WAIT_TPDU:
 		if (byte == 0xff) {
 			new_state = process_byte_pts(ch, byte);
@@ -786,6 +871,10 @@ void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte)
 	case ISO_S_IN_PTS:
 		new_state = process_byte_pts(ch, byte);
 		goto out_silent;
+	default:
+		TRACE_ERROR("%u: Received UART char in invalid 7816 state "
+			    "%u\r\n", ch->num, ch->state);
+		break;
 	}
 
 out_silent:
@@ -800,17 +889,7 @@ int card_emu_tx_byte(struct card_handle *ch)
 
 	switch (ch->state) {
 	case ISO_S_IN_ATR:
-		if (ch->atr.idx < ch->atr.len) {
+		rc = tx_byte_atr(ch);
-			uint8_t byte;
-			byte = ch->atr.atr[ch->atr.idx++];
-			rc = 1;
-
-			card_emu_uart_tx(ch->uart_chan, byte);
-
-			/* detect end of ATR */
-			if (ch->atr.idx >= ch->atr.len)
-				card_set_state(ch, ISO_S_WAIT_TPDU);
-		}
 		break;
 	case ISO_S_IN_PTS:
 		rc = tx_byte_pts(ch);
@@ -905,9 +984,8 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 			if (ch->vcc_active && ch->clocked) {
 				/* enable the TC/ETU counter once reset has been released */
 				tc_etu_enable(ch->tc_chan);
+				/* prepare to send the ATR */
 				card_set_state(ch, ISO_S_WAIT_ATR);
-				/* FIXME: wait 400 to 40k clock cycles before sending ATR */
-				card_set_state(ch, ISO_S_IN_ATR);
 			}
 		} else if (active && !ch->in_reset) {
 			TRACE_INFO("%u: RST asserted\r\n", ch->num);
@@ -928,7 +1006,15 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len)
 	ch->atr.len = len;
 	ch->atr.idx = 0;
 
-	/* FIXME: race condition with trasmitting ATR to reader? */
+#if TRACE_LEVEL >= TRACE_LEVEL_INFO 
+	uint8_t i;
+	TRACE_INFO("%u: ATR set: ", ch->num);
+	for (i = 0; i < ch->atr.len; i++) {
+		TRACE_INFO_WP("%02x ", atr[i]);
+	}
+	TRACE_INFO_WP("\n\r");
+#endif
+	/* FIXME: race condition with transmitting ATR to reader? */
 
 	return 0;
 }
@@ -959,7 +1045,15 @@ void tc_etu_wtime_half_expired(void *handle)
 void tc_etu_wtime_expired(void *handle)
 {
 	struct card_handle *ch = handle;
+	switch (ch->state) {
+	case ISO_S_WAIT_ATR:
+		/* ISO 7816-3 6.2.1 time tc has passed, we can now send the ATR */
+		card_set_state(ch, ISO_S_IN_ATR);
+		break;
+	default:
 		TRACE_ERROR("%u: wtime_exp\r\n", ch->num);
+		break;
+	}
 }
 
 /* shortest ATR found in smartcard_list.txt */
@@ -981,7 +1075,7 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 
 	INIT_LLIST_HEAD(&ch->uart_tx_queue);
 
-	/* initialize the card_handle with reasonabe defaults */
+	/* initialize the card_handle with reasonable defaults */
 	ch->num = slot_num;
 	ch->irq_ep = irq_ep;
 	ch->in_ep = in_ep;

firmware/libcommon/source/fputs.c

@@ -1,3 +1,19 @@
+/* UART print output
+ *
+ * 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 <stdio.h>
 #include "uart_console.h"
 
@@ -10,6 +26,19 @@ int fputc(int c, FILE *stream)
 int fputs(const char *s, FILE *stream)
 {
 	while (*s != '\0')
-		UART_PutChar(*s++);
+		fputc(*s++, stream);
+	return 0;
+}
+
+int fputc_sync(int c, FILE *stream)
+{
+	UART_PutChar_Sync(c);
+	return c;
+}
+
+int fputs_sync(const char *s, FILE *stream)
+{
+	while (*s != '\0')
+		fputc_sync(*s++, stream);
 	return 0;
 }

firmware/libcommon/source/host_communication.c

@@ -1,3 +1,19 @@
+/* USB communication methods
+ *
+ * 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 "llist_irqsafe.h"
 #include "usb_buf.h"
@@ -134,7 +150,7 @@ int usb_refill_from_host(uint8_t ep)
 	rc = USBD_Read(ep, msg->head, msgb_tailroom(msg),
 			(TransferCallback) &usb_read_cb, msg);
 	if (rc != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("%s error %s\n", __func__, rc);
+		TRACE_ERROR("%s error %d\n", __func__, rc);
 		usb_buf_free(msg);
 		bep->in_progress = 0;
 	}

firmware/libcommon/source/iso7816_4.c

@@ -140,8 +140,8 @@ uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart )
 	while((us_base->US_CSR & (US_CSR_TXRDY)) == 0)  {
 		i++;
 		if (!(i%1000000)) {
-            printf("s: %x ", us_base->US_CSR);
+			printf("s: %lx ", us_base->US_CSR);
-            printf("s: %x\r\n", us_base->US_RHR & 0xFF);
+			printf("s: %lx\r\n", us_base->US_RHR & 0xFF);
 			us_base->US_CR = US_CR_RSTTX;
 			us_base->US_CR = US_CR_RSTRX;
 	  }

firmware/libcommon/source/iso7816_fidi.c

@@ -1,5 +1,6 @@
-/* ISO7816-3 Fi/Di tables + computation */
+/* ISO7816-3 Fi/Di tables + computation
-/* (C) 2010-2015 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * (C) 2010-2015 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
@@ -13,10 +14,8 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- *
  */
-
 #include <stdint.h>
 #include <errno.h>
 

firmware/libcommon/source/mode_cardemu.c

@@ -1,5 +1,22 @@
-//#define TRACE_LEVEL 6
+/* card emulation mode
-
+ *
+ * (C) 2015-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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 "boardver_adc.h"
 #include "simtrace.h"
@@ -33,7 +50,7 @@ static const Pin pin_usim2_vcc	= PIN_USIM2_VCC;
 #endif
 
 struct cardem_inst {
-	uint32_t num;
+	unsigned int num;
 	struct card_handle *ch;
 	struct llist_head usb_out_queue;
 	struct ringbuf rb;
@@ -82,15 +99,11 @@ struct cardem_inst cardem_inst[] = {
 
 static Usart *get_usart_by_chan(uint8_t uart_chan)
 {
-	switch (uart_chan) {
+	if (uart_chan < ARRAY_SIZE(cardem_inst)) {
-	case 0:
+		return cardem_inst[uart_chan].usart_info.base;
-		return USART1;
+	} else {
-#ifdef CARDEMU_SECOND_UART
-	case 1:
-		return USART0;
-#endif
-	}
 		return NULL;
+	}
 }
 
 /***********************************************************************
@@ -104,7 +117,7 @@ static void wait_tx_idle(Usart *usart)
 	/* wait until last char has been fully transmitted */
 	while ((usart->US_CSR & (US_CSR_TXEMPTY)) == 0) {
 		if (!(i%1000000)) {
-			TRACE_ERROR("s: %x \r\n", usart->US_CSR);
+			TRACE_ERROR("s: %lx \r\n", usart->US_CSR);
 		}
 		i++;
 	}
@@ -161,7 +174,7 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 	int i = 1;
 	while ((usart->US_CSR & (US_CSR_TXRDY)) == 0) {
 		if (!(i%1000000)) {
-			TRACE_ERROR("%u: s: %x %02X\r\n",
+			TRACE_ERROR("%u: s: %lx %02lX\r\n",
 				uart_chan, usart->US_CSR,
 				usart->US_RHR & 0xFF);
 			usart->US_CR = US_CR_RSTTX;
@@ -188,7 +201,8 @@ static void usart_irq_rx(uint8_t inst_num)
 
 	if (csr & US_CSR_RXRDY) {
 		byte = (usart->US_RHR) & 0xFF;
-		rbuf_write(&ci->rb, byte);
+		if (rbuf_write(&ci->rb, byte) < 0)
+			TRACE_ERROR("rbuf overrun\r\n");
 	}
 
 	if (csr & US_CSR_TXRDY) {
@@ -199,7 +213,7 @@ static void usart_irq_rx(uint8_t inst_num)
 	if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE|
 		   US_CSR_TIMEOUT|US_CSR_NACK|(1<<10))) {
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-		TRACE_ERROR("%u e 0x%x st: 0x%x\n", ci->num, byte, csr);
+		TRACE_ERROR("%u e 0x%x st: 0x%lx\n", ci->num, byte, csr);
 	}
 }
 
@@ -227,6 +241,20 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
 	return 0;
 }
 
+/* call-back from card_emu.c to force a USART interrupt */
+void card_emu_uart_interrupt(uint8_t uart_chan)
+{
+	Usart *usart = get_usart_by_chan(uart_chan);
+	if (!usart) {
+		return;
+	}
+	if (USART0 == usart) {
+		NVIC_SetPendingIRQ(USART0_IRQn);
+	} else if (USART1 == usart) {
+		NVIC_SetPendingIRQ(USART1_IRQn);
+	}
+}
+
 /***********************************************************************
  * ADC for VCC voltage detection
  ***********************************************************************/
@@ -324,7 +352,7 @@ void ADC_IrqHandler(void)
 #endif /* DETECT_VCC_BY_ADC */
 
 /***********************************************************************
- * Core USB  / mainloop integration
+ * Core USB  / main loop integration
  ***********************************************************************/
 
 static void usim1_rst_irqhandler(const Pin *pPin)
@@ -576,6 +604,7 @@ static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 		usb_buf_free(msg);
 		return;
 	}
+	msg->l2h = msg->l1h + sizeof(*sh);
 
 	switch (sh->msg_class) {
 	case SIMTRACE_MSGC_GENERIC:
@@ -587,7 +616,6 @@ static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 	case SIMTRACE_MSGC_MODEM:
 		/* FIXME: Find out why this fails if used for !=
 		 * MSGC_MODEM ?!? */
-		msg->l2h = msg->l1h + sizeof(*sh);
 		dispatch_usb_command_modem(msg, ci);
 		break;
 	default:

firmware/libcommon/source/pseudo_talloc.c

@@ -1,3 +1,19 @@
+/* Memory allocation library
+ *
+ * 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 <stdint.h>
 
 #include "talloc.h"
@@ -46,7 +62,7 @@ int _talloc_free(void *ptr, const char *location)
 	for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) {
 		if (ptr == msgb_data[i]) {
 			if (!msgb_inuse[i]) {
-				TRACE_ERROR("%s: double_free by \r\n", __func__, location);
+				TRACE_ERROR("%s: double_free by %s\r\n", __func__, location);
 			} else {
 				msgb_inuse[i] = 0;
 			}

firmware/libcommon/source/ringbuffer.c

@@ -1,7 +1,27 @@
+/* Ring buffer
+ *
+ * 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 "ringbuffer.h"
 #include "trace.h"
 #include "utils.h"
 
+/* WARNING: Since console output is internally using this ringbuffer to implement
+ * buffered writes, we cannot use any TRACE_*() or printf() style functions here,
+ * as it would create infinite recursion! */
+
 void rbuf_reset(volatile ringbuf * rb)
 {
 	unsigned long state;
@@ -52,7 +72,7 @@ bool rbuf_is_full(volatile ringbuf * rb)
 	return rc;
 }
 
-void rbuf_write(volatile ringbuf * rb, uint8_t item)
+int rbuf_write(volatile ringbuf * rb, uint8_t item)
 {
 	unsigned long state;
 
@@ -61,9 +81,10 @@ void rbuf_write(volatile ringbuf * rb, uint8_t item)
 		rb->buf[rb->iwr] = item;
 		rb->iwr = (rb->iwr + 1) % RING_BUFLEN;
 		local_irq_restore(state);
+		return 0;
 	} else {
 		local_irq_restore(state);
-		TRACE_ERROR("Ringbuffer full, losing bytes!");
+		return -1;
 	}
 }
 

firmware/libcommon/source/simtrace_iso7816.c

@@ -58,7 +58,7 @@ void ISR_PhoneRST(const Pin * pPin)
 {
 	int ret;
 	// FIXME: no printfs in ISRs?
-	printf("+++ Int!! %x\n\r", pinPhoneRST.pio->PIO_ISR);
+	printf("+++ Int!! %lx\n\r", pinPhoneRST.pio->PIO_ISR);
 	if (((pinPhoneRST.pio->PIO_ISR & pinPhoneRST.mask) != 0)) {
 		if (PIO_Get(&pinPhoneRST) == 0) {
 			printf(" 0 ");
@@ -117,7 +117,7 @@ void mode_trace_usart1_irq(void)
 }
 
 /*  FIDI update functions   */
-void update_fidi(Usart *usart, uint8_t fidi)
+void update_fidi(Usart_info *usart, uint8_t fidi)
 {
 	if (NULL==usart) {
 		return;
@@ -129,14 +129,14 @@ void update_fidi(Usart *usart, uint8_t fidi)
 
 	if (ratio > 0 && ratio < 0x8000) {
 		/* make sure USART uses new F/D ratio */
-		usart->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
+		usart->base->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
 		/* disable write protection */
-		if (usart->US_WPMR) {
+		if (usart->base->US_WPMR) {
-			usart->US_WPMR = US_WPMR_WPKEY(0x555341);
+			usart->base->US_WPMR = US_WPMR_WPKEY(0x555341);
 		}
-		usart->US_FIDI = (ratio & 0x7ff);
+		usart->base->US_FIDI = (ratio & 0x7ff);
-		usart->US_CR |= US_CR_RXEN | US_CR_STTTO;
+		usart->base->US_CR |= US_CR_RXEN | US_CR_STTTO;
-		//TRACE_INFO("updated USART Fi(%u)/Di(%u) ratio(%d): %u\n\r", fi, di, ratio, usart->US_FIDI); /* don't print since this is function is also called by ISRs */
+		//TRACE_INFO("updated USART(%u) Fi(%u)/Di(%u) ratio(%d): %u\n\r", usart->id, fi, di, ratio, usart->base->US_FIDI);
 	} else {
 		//TRACE_WARNING("computed Fi/Di ratio %d unsupported\n\r", ratio); /* don't print since this is function is also called by ISRs */
 	}

firmware/libcommon/source/sniffer.c

@@ -1,25 +1,29 @@
-/*
+/* SIMtrace 2 sniffer mode
- * (C) 2010-2017 by Harald Welte <hwelte@sysmocom.de>
+ *
- * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * All Rights Reserved
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * 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
  */
-/* This code implement the Sniffer mode to sniff the communication between a SIM card (or any ISO 7816 smart card) and a phone (or any ISO 7816 card reader).
+/* This code implement the Sniffer mode to sniff the communication between a 
- * For historical reasons (i.e. SIMtrace hardware) the USART peripheral connected to the SIM card is used.
+ * SIM card (or any ISO 7816 smart card) and a phone (or any ISO 7816 card 
- * TODO put common ISO7816-3 code is separate library (and combine clean with iso7816_4)
+ * reader).
+ * For historical reasons (i.e. SIMtrace hardware) the USART peripheral 
+ * connected to the SIM card is used.
+ * TODO put common ISO7816-3 code is separate library (and combine clean with 
+ * iso7816_4)
  */
 #include "board.h"
 #include "simtrace.h"
@@ -178,6 +182,11 @@ uint8_t tpdu_packet[5+256+2];
 /*! Current index in TPDU packet */
 uint16_t tpdu_packet_i = 0;
 
+/*! Waiting Time (WT)
+ *  @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
+ */
+uint32_t wt = 9600;
+
 /*------------------------------------------------------------------------------
  *         Internal functions
  *------------------------------------------------------------------------------*/
@@ -188,13 +197,75 @@ uint16_t tpdu_packet_i = 0;
  */
 static const uint8_t convention_convert_lut[256] = { 0xff, 0x7f, 0xbf, 0x3f, 0xdf, 0x5f, 0x9f, 0x1f, 0xef, 0x6f, 0xaf, 0x2f, 0xcf, 0x4f, 0x8f, 0x0f, 0xf7, 0x77, 0xb7, 0x37, 0xd7, 0x57, 0x97, 0x17, 0xe7, 0x67, 0xa7, 0x27, 0xc7, 0x47, 0x87, 0x07, 0xfb, 0x7b, 0xbb, 0x3b, 0xdb, 0x5b, 0x9b, 0x1b, 0xeb, 0x6b, 0xab, 0x2b, 0xcb, 0x4b, 0x8b, 0x0b, 0xf3, 0x73, 0xb3, 0x33, 0xd3, 0x53, 0x93, 0x13, 0xe3, 0x63, 0xa3, 0x23, 0xc3, 0x43, 0x83, 0x03, 0xfd, 0x7d, 0xbd, 0x3d, 0xdd, 0x5d, 0x9d, 0x1d, 0xed, 0x6d, 0xad, 0x2d, 0xcd, 0x4d, 0x8d, 0x0d, 0xf5, 0x75, 0xb5, 0x35, 0xd5, 0x55, 0x95, 0x15, 0xe5, 0x65, 0xa5, 0x25, 0xc5, 0x45, 0x85, 0x05, 0xf9, 0x79, 0xb9, 0x39, 0xd9, 0x59, 0x99, 0x19, 0xe9, 0x69, 0xa9, 0x29, 0xc9, 0x49, 0x89, 0x09, 0xf1, 0x71, 0xb1, 0x31, 0xd1, 0x51, 0x91, 0x11, 0xe1, 0x61, 0xa1, 0x21, 0xc1, 0x41, 0x81, 0x01, 0xfe, 0x7e, 0xbe, 0x3e, 0xde, 0x5e, 0x9e, 0x1e, 0xee, 0x6e, 0xae, 0x2e, 0xce, 0x4e, 0x8e, 0x0e, 0xf6, 0x76, 0xb6, 0x36, 0xd6, 0x56, 0x96, 0x16, 0xe6, 0x66, 0xa6, 0x26, 0xc6, 0x46, 0x86, 0x06, 0xfa, 0x7a, 0xba, 0x3a, 0xda, 0x5a, 0x9a, 0x1a, 0xea, 0x6a, 0xaa, 0x2a, 0xca, 0x4a, 0x8a, 0x0a, 0xf2, 0x72, 0xb2, 0x32, 0xd2, 0x52, 0x92, 0x12, 0xe2, 0x62, 0xa2, 0x22, 0xc2, 0x42, 0x82, 0x02, 0xfc, 0x7c, 0xbc, 0x3c, 0xdc, 0x5c, 0x9c, 0x1c, 0xec, 0x6c, 0xac, 0x2c, 0xcc, 0x4c, 0x8c, 0x0c, 0xf4, 0x74, 0xb4, 0x34, 0xd4, 0x54, 0x94, 0x14, 0xe4, 0x64, 0xa4, 0x24, 0xc4, 0x44, 0x84, 0x04, 0xf8, 0x78, 0xb8, 0x38, 0xd8, 0x58, 0x98, 0x18, 0xe8, 0x68, 0xa8, 0x28, 0xc8, 0x48, 0x88, 0x08, 0xf0, 0x70, 0xb0, 0x30, 0xd0, 0x50, 0x90, 0x10, 0xe0, 0x60, 0xa0, 0x20, 0xc0, 0x40, 0x80, 0x00, };
 
+/*! Update Waiting Time (WT)
+ *  @param[in] wi Waiting Integer (0 if unchanged)
+ *  @param[in] d Baud Rate divider (0 if unchanged)
+ *  @note set wt to be used by the receiver timeout
+ *  @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
+ */
+static void update_wt(uint8_t wi, uint8_t d)
+{
+	static uint8_t wt_wi = 10; /* Waiting time Integer (WI), used to calculate the Waiting Time (WT) */
+	static uint8_t wt_d = 1; /* baud rate adjustment integer (the actual value, not the table index) */
+	
+	if (0 != wi) {
+		wt_wi = wi;
+	}
+	if (0 != d) {
+		wt_d = d;
+	}
+	wt = wt_wi*960UL*wt_d;
+	TRACE_INFO("WT updated to %lu\n\r", wt);
+}
+
+/*! Allocate USB buffer and push + initialize simtrace_msg_hdr
+ *  @param[in] ep USB IN endpoint where the message will be sent to
+ *  @param[in] msg_class SIMtrace USB message class
+ *  @param[in] msg_type SIMtrace USB message type
+ *  @return USB message with allocated ans initialized header, or NULL if allocation failed
+ */
+static struct msgb *usb_msg_alloc_hdr(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
+{
+	/* Only allocate message if not too many are already in the queue */
+	struct llist_head *head = usb_get_queue(SIMTRACE_USB_EP_CARD_DATAIN);
+	if (!head) {
+		return NULL;
+	}
+	if (llist_count(head) > 5) {
+		return NULL;
+	}
+	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	if (!usb_msg) {
+		return NULL;
+	}
+	struct simtrace_msg_hdr *usb_msg_header;
+	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
+	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
+	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
+	usb_msg_header->msg_class = msg_class;
+	usb_msg_header->msg_type = msg_type;
+	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
+
+	return usb_msg;
+}
+
+/* update SIMtrace header msg_len and submit USB buffer
+ * param[in] usb_msg USB message to update and send
+ */
+void usb_msg_upd_len_and_submit(struct msgb *usb_msg)
+{
+	struct simtrace_msg_hdr *usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
+	usb_msg_header->msg_len = msgb_length(usb_msg);
+	usb_buf_submit(usb_msg);
+}
+
 /*! Update the ISO 7816-3 state
  *  @param[in] iso_state_new new ISO 7816-3 state to update to
  */
 static void change_state(enum iso7816_3_sniff_state iso_state_new)
 {
 	/* sanity check */
-	if (iso_state_new==iso_state) {
+	if (iso_state_new == iso_state) {
 		TRACE_WARNING("Already in ISO 7816 state %u\n\r", iso_state);
 		return;
 	}
@@ -202,12 +273,11 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
 	/* handle actions to perform when switching state */
 	switch (iso_state_new) {
 	case ISO7816_S_RESET:
-		update_fidi(sniff_usart.base, 0x11); /* reset baud rate to default Di/Fi values */
+		update_fidi(&sniff_usart, 0x11); /* reset baud rate to default Di/Fi values */
-		change_flags |= SNIFF_CHANGE_FLAG_RESET_HOLD; /* set flag and let main loop send it */
+		update_wt(10, 1); /* reset WT time-out */
 		break;
 	case ISO7816_S_WAIT_ATR:
 		rbuf_reset(&sniff_buffer); /* reset buffer for new communication */
-		change_flags |= SNIFF_CHANGE_FLAG_RESET_RELEASE; /* set flag and let main loop send it */
 		break;
 	case ISO7816_S_IN_ATR:
 		atr_i = 0;
@@ -229,55 +299,110 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
 
 	/* save new state */
 	iso_state = iso_state_new;
-	//TRACE_INFO("Changed to ISO 7816-3 state %u\n\r", iso_state); /* don't print since this is function is also called by ISRs */
+	TRACE_INFO("Changed to ISO 7816-3 state %u\n\r", iso_state);
 }
 
-/*! Send current ATR over USB
+const struct value_string data_flags[] = {
- *  @param[in] complete if the ATR is complete
+	{
- *  @note Also print the ATR to debug console
+		.value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,
- */
+		.str = "incomplete",
-static void usb_send_atr(bool complete)
+	},
-{
+	{
-	/* Check state */
+		.value = SNIFF_DATA_FLAG_ERROR_MALFORMED,
-	if (ISO7816_S_IN_ATR!=iso_state) {
+		.str = "malformed",
-		TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);
+	},
-		return;
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_CHECKSUM,
+		.str = "checksum error",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) {
+	uint32_t i;
+	for (i = 0; i < nb_flags; i++) {
+		if (flags & flag_meanings[i].value) {
+			printf("%s", flag_meanings[i].str);
+			flags &= ~flag_meanings[i].value;
+			if (flags) {
+				printf(", ");
 			}
-	if (atr_i>=ARRAY_SIZE(atr)) {
+		}
-		TRACE_ERROR("ATR buffer overflow\n\r");
+	}
+}
+
+static void usb_send_data(enum simtrace_msg_type_sniff type, const uint8_t* data, uint16_t length, uint32_t flags)
+{
+	/* Sanity check */
+	if (type != SIMTRACE_MSGT_SNIFF_ATR && type != SIMTRACE_MSGT_SNIFF_PPS && type != SIMTRACE_MSGT_SNIFF_TPDU) {
 		return;
 	}
 
 	/* Show activity on LED */
-	led_blink(LED_GREEN, BLINK_2O_F);
+	led_blink(LED_GREEN, BLINK_2F_O);
 
-	/* Print ATR */
+	/* Print message */
-	printf("ATR%s: ", complete ? "" : " (incomplete)");
+	switch (type) {
-	for (uint8_t i=0; i<atr_i; i++) {
+	case SIMTRACE_MSGT_SNIFF_ATR:
-		printf("%02x ", atr[i]);
+		printf("ATR");
+		break;
+	case SIMTRACE_MSGT_SNIFF_PPS:
+		printf("PPS");
+		break;
+	case SIMTRACE_MSGT_SNIFF_TPDU:
+		printf("TPDU");
+		break;
+	default:
+		printf("???");
+		break;
+	}
+	if (flags) {
+		printf(" (");
+		print_flags(data_flags, ARRAY_SIZE(data_flags), flags);
+		putchar(')');
+	}
+	printf(": ");
+	uint16_t i;
+	for (i = 0; i < length; i++) {
+		printf("%02x ", data[i]);
 	}
 	printf("\n\r");
 
-	/* Send ATR over USB */
+	/* Send data over USB */
-	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	struct msgb *usb_msg = usb_msg_alloc_hdr(SIMTRACE_USB_EP_CARD_DATAIN, SIMTRACE_MSGC_SNIFF, type);
 	if (!usb_msg) {
 		return;
 	}
-	struct simtrace_msg_hdr *usb_msg_header;
+	struct sniff_data *usb_sniff_data = (struct sniff_data *) msgb_put(usb_msg, sizeof(*usb_sniff_data));
-	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
+	usb_sniff_data->flags = flags;
-	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
+	usb_sniff_data->length = length;
-	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
+	uint8_t *sniff_data = msgb_put(usb_msg, usb_sniff_data->length);
-	usb_msg_header->msg_class = SIMTRACE_MSGC_SNIFF;
+	memcpy(sniff_data, data, length);
-	usb_msg_header->msg_type = SIMTRACE_MSGT_SNIFF_ATR;
+	usb_msg_upd_len_and_submit(usb_msg);
-	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
+
-	struct sniff_data *usb_sniff_data_atr;
+}
-	usb_sniff_data_atr = (struct sniff_data *) msgb_put(usb_msg, sizeof(*usb_sniff_data_atr));
+
-	usb_sniff_data_atr->complete = complete;
+/*! Send current ATR over USB
-	usb_sniff_data_atr->length = atr_i;
+ *  @param[in] flags SNIFF_DATA_FLAG_ data flags 
-	uint8_t *data = msgb_put(usb_msg, usb_sniff_data_atr->length);
+ *  @note Also print the ATR to debug console
-	memcpy(data, atr, atr_i);
+ */
-	usb_msg_header->msg_len = msgb_length(usb_msg);
+static void usb_send_atr(uint32_t flags)
-	usb_buf_submit(usb_msg);
+{
+	/* Check state */
+	if (ISO7816_S_IN_ATR != iso_state) {
+		TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);
+		return;
+	}
+	if (atr_i >= ARRAY_SIZE(atr)) {
+		TRACE_ERROR("ATR buffer overflow\n\r");
+		return;
+	}
+
+	/* Send ATR over USB */
+	usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, atr, atr_i, flags);
 }
 
 /*! Process ATR byte
@@ -287,13 +412,15 @@ static void process_byte_atr(uint8_t byte)
 {
 	static uint8_t atr_hist_len = 0; /* store the number of expected historical bytes */
 	static uint8_t y = 0; /* last mask of the upcoming TA, TB, TC, TD interface bytes */
+	static uint8_t i = 0; /* interface byte subgroup number */
+	static uint32_t flags = 0; /* error flag */
 
 	/* sanity check */
-	if (ISO7816_S_IN_ATR!=iso_state) {
+	if (ISO7816_S_IN_ATR != iso_state) {
 		TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (atr_i>=ARRAY_SIZE(atr)) {
+	if (atr_i >= ARRAY_SIZE(atr)) {
 		TRACE_ERROR("ATR data overflow\n\r");
 		return;
 	}
@@ -304,6 +431,7 @@ static void process_byte_atr(uint8_t byte)
 	/* handle ATR byte depending on current state */
 	switch (atr_state) {
 	case ATR_S_WAIT_TS: /* see ISO/IEC 7816-3:2006 section 8.1 */
+		flags = 0;
 		switch (byte) {
 		case 0x23: /* direct convention used, but decoded using inverse convention (a parity error should also have occurred) */
 		case 0x30: /* inverse convention used, but decoded using direct convention (a parity error should also have occurred) */
@@ -313,34 +441,47 @@ static void process_byte_atr(uint8_t byte)
 			atr_state = ATR_S_WAIT_T0; /* wait for format byte */
 			break;
 		default:
-			atr_i--; /* revert last byte */
 			TRACE_WARNING("Invalid TS received\n\r");
+			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			usb_send_atr(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
+			change_state(ISO7816_S_WAIT_ATR); /* reset state */
+			break;
 		}
+		i = 0; /* first interface byte sub-group is coming (T0 is kind of TD0) */
 		break;
 	case ATR_S_WAIT_T0: /* see ISO/IEC 7816-3:2006 section 8.2.2 */
 	case ATR_S_WAIT_TD: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
-		if (ATR_S_WAIT_T0==atr_state) {
+		if (ATR_S_WAIT_T0 == atr_state) {
-			atr_hist_len = (byte&0x0f); /* save the number of historical bytes */
+			atr_hist_len = (byte & 0x0f); /* save the number of historical bytes */
-		} else if (ATR_S_WAIT_TD==atr_state) {
+		} else if (ATR_S_WAIT_TD == atr_state) {
-			t_protocol_support |= (1<<(byte&0x0f)); /* remember supported protocol to know if TCK will be present */
+			t_protocol_support |= (1<<(byte & 0x0f)); /* remember supported protocol to know if TCK will be present */
 		}
-		y = (byte&0xf0); /* remember upcoming interface bytes */
+		y = (byte & 0xf0); /* remember upcoming interface bytes */
-		if (y&0x10) {
+		i++; /* next interface byte sub-group is coming */
+		if (y & 0x10) {
 			atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */
 			break;
 		}
 	case ATR_S_WAIT_TA: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
-		if (y&0x20) {
+		if (y & 0x20) {
 			atr_state = ATR_S_WAIT_TB; /* wait for interface byte TB */
 			break;
 		}
 	case ATR_S_WAIT_TB: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
-		if (y&0x40) {
+		if (y & 0x40) {
 			atr_state = ATR_S_WAIT_TC; /* wait for interface byte TC */
 			break;
 		}
 	case ATR_S_WAIT_TC: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
-		if (y&0x80) {
+		/* retrieve WI encoded in TC2*/
+		if (ATR_S_WAIT_TC==atr_state && 2==i) {
+			if (0 == byte) {
+				update_wt(10, 0);
+			} else {
+				update_wt(byte, 0);
+			}
+		}
+		if (y & 0x80) {
 			atr_state = ATR_S_WAIT_TD; /* wait for interface byte TD */
 			break;
 		} else if (atr_hist_len) {
@@ -351,8 +492,8 @@ static void process_byte_atr(uint8_t byte)
 		if (atr_hist_len) {
 			atr_hist_len--;
 		}
-		if (0==atr_hist_len) {
+		if (0 == atr_hist_len) {
-			if (t_protocol_support>1) {
+			if (t_protocol_support > 1) {
 				atr_state = ATR_S_WAIT_TCK; /* wait for check bytes */
 				break;
 			}
@@ -360,8 +501,21 @@ static void process_byte_atr(uint8_t byte)
 			break;
 		}
 	case ATR_S_WAIT_TCK:  /* see ISO/IEC 7816-3:2006 section 8.2.5 */
-		/* we could verify the checksum, but we are just here to sniff */
+		/* verify checksum if present */
-		usb_send_atr(true); /* send ATR to host software using USB */
+		if (ATR_S_WAIT_TCK == atr_state) {
+			uint8_t ui;
+			uint8_t checksum = 0;
+			for (ui = 1; ui < atr_i; ui++) {
+				checksum ^= atr[ui];
+			}
+			if (checksum) {
+				flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
+				/* We still consider the data as valid (e.g. for WT) even is the checksum is wrong.
+				 * It is up to the reader to handle this error (e.g. by resetting)
+				 */
+			}
+		}
+		usb_send_atr(flags); /* send ATR to host software using USB */
 		change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 		break;
 	default:
@@ -370,17 +524,17 @@ static void process_byte_atr(uint8_t byte)
 }
 
 /*! Send current PPS over USB
- *  @param[in] complete if the PPS is complete
+ *  @param[in] flags SNIFF_DATA_FLAG_ data flags
  *  @note Also print the PPS over the debug console
  */
-static void usb_send_pps(bool complete)
+static void usb_send_pps(uint32_t flags)
 {
 	uint8_t *pps_cur; /* current PPS (request or response) */
 
 	/* Sanity check */
-	if (ISO7816_S_IN_PPS_REQ==iso_state) {
+	if (ISO7816_S_IN_PPS_REQ == iso_state) {
 		pps_cur = pps_req;
-	} else if (ISO7816_S_IN_PPS_RSP==iso_state) {
+	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
 		pps_cur = pps_rsp;
 	} else {
 		TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);
@@ -390,55 +544,27 @@ static void usb_send_pps(bool complete)
 	/* Get only relevant data */
 	uint8_t pps[6];
 	uint8_t pps_i = 0;
-	if (pps_state>PPS_S_WAIT_PPSS) {
+	if (pps_state > PPS_S_WAIT_PPSS) {
 		pps[pps_i++] = pps_cur[0];
 	}
-	if (pps_state>PPS_S_WAIT_PPS0) {
+	if (pps_state > PPS_S_WAIT_PPS0) {
 		pps[pps_i++] = pps_cur[1];
 	}
-	if (pps_state>PPS_S_WAIT_PPS1 && pps_cur[1]&0x10) {
+	if (pps_state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
 		pps[pps_i++] = pps_cur[2];
 	}
-	if (pps_state>PPS_S_WAIT_PPS2 && pps_cur[1]&0x20) {
+	if (pps_state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
 		pps[pps_i++] = pps_cur[3];
 	}
-	if (pps_state>PPS_S_WAIT_PPS3 && pps_cur[1]&0x40) {
+	if (pps_state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
 		pps[pps_i++] = pps_cur[4];
 	}
-	if (pps_state>PPS_S_WAIT_PCK) {
+	if (pps_state > PPS_S_WAIT_PCK) {
 		pps[pps_i++] = pps_cur[5];
 	}
 
-	/* Show activity on LED */
-	led_blink(LED_GREEN, BLINK_2O_F);
-
-	/* Print PPS */
-	printf("PPS%s: ", complete ? "" : " (incomplete)");
-	for (uint8_t i=0; i<pps_i; i++) {
-		printf("%02x ", pps[i]);
-	}
-	printf("\n\r");
-
 	/* Send message over USB */
-	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_PPS, pps, pps_i, flags);
-	if (!usb_msg) {
-		return;
-	}
-	struct simtrace_msg_hdr *usb_msg_header;
-	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
-	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
-	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
-	usb_msg_header->msg_class = SIMTRACE_MSGC_SNIFF;
-	usb_msg_header->msg_type = SIMTRACE_MSGT_SNIFF_PPS;
-	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
-	struct sniff_data *usb_sniff_data_pps;
-	usb_sniff_data_pps = (struct sniff_data *) msgb_put(usb_msg, sizeof(*usb_sniff_data_pps));
-	usb_sniff_data_pps->complete = complete;
-	usb_sniff_data_pps->length = pps_i;
-	uint8_t *data = msgb_put(usb_msg, usb_sniff_data_pps->length);
-	memcpy(data, pps, pps_i);
-	usb_msg_header->msg_len = msgb_length(usb_msg);
-	usb_buf_submit(usb_msg);
 }
 
 /*! Send Fi/Di change over USB
@@ -447,32 +573,24 @@ static void usb_send_pps(bool complete)
 static void usb_send_fidi(uint8_t fidi)
 {
 	/* Send message over USB */
-	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	struct msgb *usb_msg = usb_msg_alloc_hdr(SIMTRACE_USB_EP_CARD_DATAIN, SIMTRACE_MSGC_SNIFF, SIMTRACE_MSGT_SNIFF_FIDI);
 	if (!usb_msg) {
 		return;
 	}
-	struct simtrace_msg_hdr *usb_msg_header;
+	struct sniff_fidi *usb_sniff_fidi = (struct sniff_fidi *) msgb_put(usb_msg, sizeof(*usb_sniff_fidi));
-	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
-	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
-	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
-	usb_msg_header->msg_class = SIMTRACE_MSGC_SNIFF;
-	usb_msg_header->msg_type = SIMTRACE_MSGT_SNIFF_FIDI;
-	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
-	struct sniff_fidi *usb_sniff_fidi;
-	usb_sniff_fidi = (struct sniff_fidi *) msgb_put(usb_msg, sizeof(*usb_sniff_fidi));
 	usb_sniff_fidi->fidi = fidi;
-	usb_msg_header->msg_len = msgb_length(usb_msg);
+	usb_msg_upd_len_and_submit(usb_msg);
-	usb_buf_submit(usb_msg);
 }
 
 static void process_byte_pps(uint8_t byte)
 {
 	uint8_t *pps_cur; /* current PPS (request or response) */
+	static uint32_t flags = 0; /* error flag */
 
 	/* sanity check */
-	if (ISO7816_S_IN_PPS_REQ==iso_state) {
+	if (ISO7816_S_IN_PPS_REQ == iso_state) {
 		pps_cur = pps_req;
-	} else if (ISO7816_S_IN_PPS_RSP==iso_state) {
+	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
 		pps_cur = pps_rsp;
 	} else {
 		TRACE_ERROR("Processing PPS data in wrong ISO 7816-3 state %u\n\r", iso_state);
@@ -482,29 +600,32 @@ static void process_byte_pps(uint8_t byte)
 	/* handle PPS byte depending on current state */
 	switch (pps_state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
 	case PPS_S_WAIT_PPSS: /*!< initial byte */
+		flags = 0;
 		if (0xff) {
 			pps_cur[0] = byte;
 			pps_state = PPS_S_WAIT_PPS0; /* go to next state */
 		} else {
 			TRACE_INFO("Invalid PPSS received\n\r");
+			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			usb_send_pps(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 		}
 		break;
 	case PPS_S_WAIT_PPS0: /*!< format byte */
 		pps_cur[1] = byte;
-		if (pps_cur[1]&0x10) {
+		if (pps_cur[1] & 0x10) {
 			pps_state = PPS_S_WAIT_PPS1; /* go to next state */
 			break;
 		}
 	case PPS_S_WAIT_PPS1: /*!< first parameter byte */
 		pps_cur[2] = byte; /* not always right but doesn't affect the process */
-		if (pps_cur[1]&0x20) {
+		if (pps_cur[1] & 0x20) {
 			pps_state = PPS_S_WAIT_PPS2; /* go to next state */
 			break;
 		}
 	case PPS_S_WAIT_PPS2: /*!< second parameter byte */
 		pps_cur[3] = byte; /* not always right but doesn't affect the process */
-		if (pps_cur[1]&0x40) {
+		if (pps_cur[1] & 0x40) {
 			pps_state = PPS_S_WAIT_PPS3; /* go to next state */
 			break;
 		}
@@ -518,36 +639,40 @@ static void process_byte_pps(uint8_t byte)
 		uint8_t check = 0; 
 		check ^= pps_cur[0];
 		check ^= pps_cur[1];
-		if (pps_cur[1]&0x10) {
+		if (pps_cur[1] & 0x10) {
 			check ^= pps_cur[2];
 		}
-		if (pps_cur[1]&0x20) {
+		if (pps_cur[1] & 0x20) {
 			check ^= pps_cur[3];
 		}
-		if (pps_cur[1]&0x40) {
+		if (pps_cur[1] & 0x40) {
 			check ^= pps_cur[4];
 		}
 		check ^= pps_cur[5];
+		if (check) {
+			flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
+		}
 		pps_state = PPS_S_WAIT_END;
-		usb_send_pps(true); /* send PPS to host software using USB */
+		usb_send_pps(flags); /* send PPS to host software using USB */
-		if (ISO7816_S_IN_PPS_REQ==iso_state) {
+		if (ISO7816_S_IN_PPS_REQ == iso_state) {
-			if (0==check) { /* checksum is valid */
+			if (0 == check) { /* checksum is valid */
 				change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */
 			} else { /* checksum is invalid */
 				change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 			}
-		} else if (ISO7816_S_IN_PPS_RSP==iso_state) {
+		} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
-			if (0==check) { /* checksum is valid */
+			if (0 == check) { /* checksum is valid */
 				uint8_t fn, dn;
-				if (pps_cur[1]&0x10) {
+				if (pps_cur[1] & 0x10) {
-					fn = (pps_cur[2]>>4);
+					fn = (pps_cur[2] >> 4);
-					dn = (pps_cur[2]&0x0f);
+					dn = (pps_cur[2] & 0x0f);
 				} else {
 					fn = 1;
 					dn = 1;
 				}
 				TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r", fi_table[fn], di_table[dn]);
-				update_fidi(sniff_usart.base, pps_cur[2]);
+				update_fidi(&sniff_usart, pps_cur[2]);
+				update_wt(0, di_table[dn]);
 				usb_send_fidi(pps_cur[2]); /* send Fi/Di change notification to host software over USB */
 			} else { /* checksum is invalid */
 				TRACE_INFO("PPS negotiation failed\n\r");
@@ -565,57 +690,29 @@ static void process_byte_pps(uint8_t byte)
 }
 
 /*! Send current TPDU over USB
- *  @param[in] complete if the TPDU is complete
+ *  @param[in] flags SNIFF_DATA_FLAG_ data flags
  *  @note Also print the TPDU over the debug console
  */
-static void usb_send_tpdu(bool complete)
+static void usb_send_tpdu(uint32_t flags)
 {
 	/* Check state */
-	if (ISO7816_S_IN_TPDU!=iso_state) {
+	if (ISO7816_S_IN_TPDU != iso_state) {
 		TRACE_WARNING("Can't print TPDU in ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
 
-	/* Show activity on LED */
-	led_blink(LED_GREEN, BLINK_2O_F);
-
-	/* Print TPDU */
-	printf("TPDU%s: ", complete ? "" : " (incomplete)");
-	for (uint16_t i=0; i<tpdu_packet_i && i<ARRAY_SIZE(tpdu_packet); i++) {
-		printf("%02x ", tpdu_packet[i]);
-	}
-	printf("\n\r");
-
 	/* Send ATR over USB */
-	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, tpdu_packet, tpdu_packet_i, flags);
-	if (!usb_msg) {
-		return;
-	}
-	struct simtrace_msg_hdr *usb_msg_header;
-	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
-	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
-	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
-	usb_msg_header->msg_class = SIMTRACE_MSGC_SNIFF;
-	usb_msg_header->msg_type = SIMTRACE_MSGT_SNIFF_TPDU;
-	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
-	struct sniff_data *usb_sniff_data_tpdu;
-	usb_sniff_data_tpdu = (struct sniff_data *) msgb_put(usb_msg, sizeof(*usb_sniff_data_tpdu));
-	usb_sniff_data_tpdu->complete = complete;
-	usb_sniff_data_tpdu->length = tpdu_packet_i;
-	uint8_t *data = msgb_put(usb_msg, usb_sniff_data_tpdu->length);
-	memcpy(data, tpdu_packet, tpdu_packet_i);
-	usb_msg_header->msg_len = msgb_length(usb_msg);
-	usb_buf_submit(usb_msg);
 }
 
 static void process_byte_tpdu(uint8_t byte)
 {
 	/* sanity check */
-	if (ISO7816_S_IN_TPDU!=iso_state) {
+	if (ISO7816_S_IN_TPDU != iso_state) {
 		TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (tpdu_packet_i>=ARRAY_SIZE(tpdu_packet)) {
+	if (tpdu_packet_i >= ARRAY_SIZE(tpdu_packet)) {
 		TRACE_ERROR("TPDU data overflow\n\r");
 		return;
 	}
@@ -623,8 +720,10 @@ static void process_byte_tpdu(uint8_t byte)
 	/* handle TPDU byte depending on current state */
 	switch (tpdu_state) {
 	case TPDU_S_CLA:
-		if (0xff==byte) {
+		if (0xff == byte) {
 			TRACE_WARNING("0xff is not a valid class byte\n\r");
+			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
@@ -633,8 +732,10 @@ static void process_byte_tpdu(uint8_t byte)
 		tpdu_state = TPDU_S_INS;
 		break;
 	case TPDU_S_INS:
-		if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) {
+		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
 			TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
+			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
@@ -658,43 +759,45 @@ static void process_byte_tpdu(uint8_t byte)
 		tpdu_state = TPDU_S_PROCEDURE;
 		break;
 	case TPDU_S_PROCEDURE:
-		if (0x60==byte) { /* wait for next procedure byte */
+		if (0x60 == byte) { /* wait for next procedure byte */
 			break;
-		} else if (tpdu_packet[1]==byte) { /* get all remaining data bytes */
+		} else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */
 			tpdu_state = TPDU_S_DATA_REMAINING;
 			break;
-		} else if ((~tpdu_packet[1])==byte) { /* get single data byte */
+		} else if ((~tpdu_packet[1]) == byte) { /* get single data byte */
 			tpdu_state = TPDU_S_DATA_SINGLE;
 			break;
 		}
 	case TPDU_S_SW1:
-		if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) { /* this procedure byte is SW1 */
+		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */
 			tpdu_packet[tpdu_packet_i++] = byte;
 			tpdu_state = TPDU_S_SW2;
 		} else {
 			TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
+			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
 		break;
 	case TPDU_S_SW2:
 		tpdu_packet[tpdu_packet_i++] = byte;
-		usb_send_tpdu(true); /* send TPDU to host software using USB */
+		usb_send_tpdu(0); /* send TPDU to host software using USB */
 		change_state(ISO7816_S_WAIT_TPDU); /* this is the end of the TPDU */
 		break;
 	case TPDU_S_DATA_SINGLE:
 	case TPDU_S_DATA_REMAINING:
 		tpdu_packet[tpdu_packet_i++] = byte;
-		if (0==tpdu_packet[4]) {
+		if (0 == tpdu_packet[4]) {
-			if (5+256<=tpdu_packet_i) {
+			if (5+256 <= tpdu_packet_i) {
 				tpdu_state = TPDU_S_PROCEDURE;
 			}
 		} else {
-			if (5+tpdu_packet[4]<=tpdu_packet_i) {
+			if (5+tpdu_packet[4] <= tpdu_packet_i) {
 				tpdu_state = TPDU_S_PROCEDURE;
 			}
 		}
-		if (TPDU_S_DATA_SINGLE==tpdu_state) {
+		if (TPDU_S_DATA_SINGLE == tpdu_state) {
 			tpdu_state = TPDU_S_PROCEDURE;
 		}
 		break;
@@ -706,6 +809,9 @@ static void process_byte_tpdu(uint8_t byte)
 /*! Interrupt Service Routine called on USART activity */
 void Sniffer_usart_isr(void)
 {
+	/* Remaining Waiting Time (WI) counter (>16 bits) */
+	static volatile uint32_t wt_remaining = 9600;
+
 	/* Read channel status register */
 	uint32_t csr = sniff_usart.base->US_CSR;
 	/* Verify if there was an error */
@@ -717,10 +823,13 @@ void Sniffer_usart_isr(void)
 		TRACE_WARNING("USART framing error\n\r");
 		sniff_usart.base->US_CR |= US_CR_RSTSTA;
 	}
+
 	/* Verify if character has been received */
 	if (csr & US_CSR_RXRDY) {
 		/* Read communication data byte between phone and SIM */
 		uint8_t byte = sniff_usart.base->US_RHR;
+		/* Reset WT timer */
+		wt_remaining = wt;
 		/* Store sniffed data into buffer (also clear interrupt */
 		if (rbuf_is_full(&sniff_buffer)) {
 			TRACE_ERROR("USART buffer full\n\r");
@@ -731,10 +840,25 @@ void Sniffer_usart_isr(void)
 
 	/* Verify it WT timeout occurred, to detect unresponsive card */
 	if (csr & US_CSR_TIMEOUT) {
-		/* Stop timeout until next character is received */
+		if (wt_remaining <= (sniff_usart.base->US_RTOR & 0xffff)) {
-		sniff_usart.base->US_CR |= US_CR_STTTO;
 			/* Just set the flag and let the main loop handle it */
 			change_flags |= SNIFF_CHANGE_FLAG_TIMEOUT_WT;
+			/* Reset timeout value */
+			wt_remaining = wt;
+		} else {
+			wt_remaining -= (sniff_usart.base->US_RTOR & 0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */
+		}
+		if (wt_remaining > 0xffff) {
+			sniff_usart.base->US_RTOR = 0xffff;
+		} else {
+			sniff_usart.base->US_RTOR = wt_remaining;
+		}
+		/* Stop timeout until next character is received (and clears the timeout flag) */
+		sniff_usart.base->US_CR |= US_CR_STTTO;
+		if (!(change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT)) {
+			/* Immediately restart the counter it the WT timeout did not occur (needs the timeout flag to be cleared) */
+			sniff_usart.base->US_CR |= US_CR_RETTO;
+		}
 	}
 }
 
@@ -743,19 +867,15 @@ void Sniffer_usart_isr(void)
 static void Sniffer_reset_isr(const Pin* pPin)
 {
 	/* Ensure an edge on the reset pin cause the interrupt */
-	if (pPin->id!=pin_rst.id || 0==(pPin->mask&pin_rst.mask)) {
+	if (pPin->id != pin_rst.id || 0 == (pPin->mask & pin_rst.mask)) {
 		TRACE_ERROR("Pin other than reset caused a interrupt\n\r");
 		return;
 	}
-	/* Update the ISO state according to the reset change */
+	/* Update the ISO state according to the reset change (reset is active low) */
 	if (PIO_Get(&pin_rst)) {
-		if (ISO7816_S_WAIT_ATR!=iso_state) {
+		change_flags |= SNIFF_CHANGE_FLAG_RESET_DEASSERT; /* set flag and let main loop send it */
-			change_state(ISO7816_S_WAIT_ATR);
-		}
 	} else {
-		if (ISO7816_S_RESET!=iso_state) {
+		change_flags |= SNIFF_CHANGE_FLAG_RESET_ASSERT; /* set flag and let main loop send it */
-			change_state(ISO7816_S_RESET);
-		}
 	}
 }
 
@@ -765,14 +885,14 @@ static void Sniffer_reset_isr(const Pin* pPin)
 
 void Sniffer_usart1_irq(void)
 {
-	if (ID_USART1==sniff_usart.id) {
+	if (ID_USART1 == sniff_usart.id) {
 		Sniffer_usart_isr();
 	}
 }
 
 void Sniffer_usart0_irq(void)
 {
-	if (ID_USART0==sniff_usart.id) {
+	if (ID_USART0 == sniff_usart.id) {
 		Sniffer_usart_isr();
 	}
 }
@@ -825,55 +945,45 @@ void Sniffer_init(void)
 	ISO7816_Init(&sniff_usart, CLK_SLAVE);
 	/* Only receive data when sniffing */
 	USART_SetReceiverEnabled(sniff_usart.base, 1);
-	/* Enable Receiver time-out WT to detect unresponsive cards */
+	/* Enable Receiver time-out to detect waiting time (WT) time-out (e.g. unresponsive cards) */
-	sniff_usart.base->US_RTOR = 9600-12; /* -12 because the timer starts at the end of the 12 ETU frame */
+	sniff_usart.base->US_RTOR = wt;
 	/* Enable interrupt to indicate when data has been received or timeout occurred */
 	USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT);
 	/* Set USB priority lower than USART to not miss sniffing data (both at 0 per default) */
-	if (NVIC_GetPriority(IRQ_USART_SIM)>=NVIC_GetPriority(UDP_IRQn)) {
+	if (NVIC_GetPriority(IRQ_USART_SIM) >= NVIC_GetPriority(UDP_IRQn)) {
-		NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM)+2);
+		NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM) + 2);
 	}
 	/* Enable interrupt requests for the USART peripheral */
 	NVIC_EnableIRQ(IRQ_USART_SIM);
 
 	/* Reset state */
-	if (ISO7816_S_RESET!=iso_state) {
+	if (ISO7816_S_RESET != iso_state) {
 		change_state(ISO7816_S_RESET);
 	}
 }
 
 /*! Send card change flags over USB
  *  @param[in] flags change flags corresponding to SIMTRACE_MSGT_SNIFF_CHANGE 
- *  @note Also print the TPDU over the debug console 
  */
 static void usb_send_change(uint32_t flags)
 {
 	/* Check flags */
-	if(0==flags) { /* no changes */
+	if(0 == flags) { /* no changes */
 		return;
 	}
 
-	if (flags&SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
+	if (flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
 		printf("waiting time (WT) timeout\n\r");
 	}
 
 	/* Send message over USB */
-	struct msgb *usb_msg = usb_buf_alloc(SIMTRACE_USB_EP_CARD_DATAIN);
+	struct msgb *usb_msg = usb_msg_alloc_hdr(SIMTRACE_USB_EP_CARD_DATAIN, SIMTRACE_MSGC_SNIFF, SIMTRACE_MSGT_SNIFF_CHANGE);
 	if (!usb_msg) {
 		return;
 	}
-	struct simtrace_msg_hdr *usb_msg_header;
+	struct sniff_change *usb_sniff_change = (struct sniff_change *) msgb_put(usb_msg, sizeof(*usb_sniff_change));
-	usb_msg->l1h = msgb_put(usb_msg, sizeof(*usb_msg_header));
-	usb_msg_header = (struct simtrace_msg_hdr *) usb_msg->l1h;
-	memset(usb_msg_header, 0, sizeof(*usb_msg_header));
-	usb_msg_header->msg_class = SIMTRACE_MSGC_SNIFF;
-	usb_msg_header->msg_type = SIMTRACE_MSGT_SNIFF_CHANGE;
-	usb_msg->l2h = usb_msg->l1h + sizeof(*usb_msg_header);
-	struct sniff_change *usb_sniff_change;
-	usb_sniff_change = (struct sniff_change *) msgb_put(usb_msg, sizeof(*usb_sniff_change));
 	usb_sniff_change->flags = flags;
-	usb_msg_header->msg_len = msgb_length(usb_msg);
+	usb_msg_upd_len_and_submit(usb_msg);
-	usb_buf_submit(usb_msg);
 }
 
 /* Main (idle/busy) loop of this USB configuration */
@@ -891,6 +1001,10 @@ void Sniffer_run(void)
 	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
+	 * is remaining
+	 */
 	/* Handle sniffed data */
 	if (!rbuf_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
 		uint8_t byte = rbuf_read(&sniff_buffer);
@@ -909,8 +1023,8 @@ void Sniffer_run(void)
 			break;
 		case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
 		case ISO7816_S_WAIT_PPS_RSP:
-			if (byte == 0xff) {
+			if (0xff == byte) {
-				if (ISO7816_S_WAIT_PPS_RSP==iso_state) {
+				if (ISO7816_S_WAIT_PPS_RSP == iso_state) {
 					change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
 				} else {
 					change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */
@@ -919,7 +1033,7 @@ void Sniffer_run(void)
 				break;
 			}
 		case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
-			if (ISO7816_S_WAIT_TPDU==iso_state) {
+			if (ISO7816_S_WAIT_TPDU == iso_state) {
 				change_state(ISO7816_S_IN_TPDU);
 			}
 			process_byte_tpdu(byte);
@@ -935,20 +1049,52 @@ void Sniffer_run(void)
 
 	/* Handle flags */
 	if (change_flags) { /* WARNING this is not synced with the data buffer handling */
-		if (change_flags&SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
+		if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) {
+			switch (iso_state) {
+			case ISO7816_S_IN_ATR:
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
+				break;
+			case ISO7816_S_IN_TPDU:
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
+				break;
+			case ISO7816_S_IN_PPS_REQ:
+			case ISO7816_S_IN_PPS_RSP:
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
+				break;
+			default:
+				break;
+			}
+			if (ISO7816_S_RESET != iso_state) {
+				change_state(ISO7816_S_RESET);
+				printf("reset asserted\n\r");
+			}
+		}
+		if (change_flags & SNIFF_CHANGE_FLAG_RESET_DEASSERT) {
+			if (ISO7816_S_WAIT_ATR != iso_state) {
+				change_state(ISO7816_S_WAIT_ATR);
+				printf("reset de-asserted\n\r");
+			}
+		}
+		if (change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
 			/* Use timeout to detect interrupted data transmission */
 			switch (iso_state) {
 			case ISO7816_S_IN_ATR:
-				usb_send_atr(false); /* send incomplete ATR to host software using USB */
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
 				change_state(ISO7816_S_WAIT_ATR);
 				break;
 			case ISO7816_S_IN_TPDU:
-				usb_send_tpdu(false); /* send incomplete PPS to host software using USB */
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			case ISO7816_S_IN_PPS_REQ:
 			case ISO7816_S_IN_PPS_RSP:
-				usb_send_pps(false); /* send incomplete TPDU to host software using USB */
+				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+				usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			default:

firmware/libcommon/source/stdio.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support 
  * ----------------------------------------------------------------------------
  * Copyright (c) 2008, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -61,8 +62,10 @@
 //------------------------------------------------------------------------------
 //
 FILE* const stdin = NULL;
-FILE* const stdout = NULL;
+/* If we use NULL here, we get compiler warnings of calling stdio functions with
-FILE* const stderr = NULL;
+ * NULL values.  Our fputs() implementation ignores the value of those pointers anyway */
+FILE* const stdout = (FILE *) 0x1;
+FILE* const stderr = (FILE *) 0x2;
 
 
 //------------------------------------------------------------------------------
@@ -435,6 +438,32 @@ signed int vfprintf(FILE *pStream, const char *pFormat, va_list ap)
 	return fputs(pStr, pStream);
 }
 
+//------------------------------------------------------------------------------
+/// Outputs a formatted string on the given stream. Format arguments are given
+/// in a va_list instance.
+/// \note This function is synchronous (i.e. blocks until the print completes)
+/// \param pStream  Output stream.
+/// \param pFormat  Format string
+/// \param ap  Argument list.
+//------------------------------------------------------------------------------
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
+signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap)
+{
+	char pStr[MAX_STRING_SIZE];
+	char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r";
+
+	// Write formatted string in buffer
+	if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) {
+
+		fputs_sync(pError, stderr);
+	}
+
+	// Display string
+	return fputs_sync(pStr, pStream);
+}
+#pragma GCC diagnostic pop
+
 //------------------------------------------------------------------------------
 /// Outputs a formatted string on the DBGU stream. Format arguments are given
 /// in a va_list instance.
@@ -446,6 +475,18 @@ signed int vprintf(const char *pFormat, va_list ap)
 	return vfprintf(stdout, pFormat, ap);
 }
 
+//------------------------------------------------------------------------------
+/// Outputs a formatted string on the DBGU stream. Format arguments are given
+/// in a va_list instance.
+/// \note This function is synchronous (i.e. blocks until the print completes)
+/// \param pFormat  Format string
+/// \param ap  Argument list.
+//------------------------------------------------------------------------------
+signed int vprintf_sync(const char *pFormat, va_list ap)
+{
+	return vfprintf_sync(stdout, pFormat, ap);
+}
+
 //------------------------------------------------------------------------------
 /// Outputs a formatted string on the given stream, using a variable number of
 /// arguments.
@@ -483,6 +524,25 @@ signed int printf(const char *pFormat, ...)
 	return result;
 }
 
+//------------------------------------------------------------------------------
+/// Outputs a formatted string on the DBGU stream, using a variable number of
+/// arguments.
+/// \note This function is synchronous (i.e. blocks until the print completes)
+/// \param pFormat  Format string.
+//------------------------------------------------------------------------------
+signed int printf_sync(const char *pFormat, ...)
+{
+	va_list ap;
+	signed int result;
+
+	// Forward call to vprintf
+	va_start(ap, pFormat);
+	result = vprintf_sync(pFormat, ap);
+	va_end(ap);
+
+	return result;
+}
+
 //------------------------------------------------------------------------------
 /// Writes a formatted string inside another string.
 /// \param pStr  Storage string.

firmware/libcommon/source/tc_etu.c

@@ -1,6 +1,6 @@
-/* SIMtrace TC (Timer / Clock) code for ETU tracking */
+/* SIMtrace TC (Timer / Clock) code for ETU tracking
-
+ *
-/* (C) 2006-2016 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2006-2016 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
@@ -14,10 +14,8 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- *
  */
-
 #include <stdint.h>
 
 #include "utils.h"

firmware/libcommon/source/usb.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -35,6 +36,7 @@
 #include "simtrace.h"
 #include "simtrace_usb.h"
 #include "utils.h"
+#include "USBD_HAL.h"
 
 #include <cciddriverdescriptors.h>
 #include <usb/common/dfu/usb_dfu.h>
@@ -576,11 +578,17 @@ void SIMtrace_USB_Initialize(void)
 {
 
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+#ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
 	PIO_Configure(&usb_dp_pullup, 1);
 	PIO_Set(&usb_dp_pullup);
-	mdelay(15);
+#endif
+	USBD_HAL_Suspend();
+	mdelay(20);
+#ifdef PIN_USB_PULLUP
 	PIO_Clear(&usb_dp_pullup);
+#endif
+	USBD_HAL_Activate();
 
 	// Get std USB driver
 	USBDDriver *pUsbd = USBD_GetDriver();

firmware/libcommon/source/usb_buf.c

@@ -1,3 +1,19 @@
+/* USB buffer library
+ *
+ * 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 "usb_buf.h"

firmware/libosmocore/source/utils.c

@@ -0,0 +1,632 @@
+/*
+ * (C) 2011 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2011 by Sylvain Munaut <tnt@246tNt.com>
+ * (C) 2014 by Nils O. Selåsdal <noselasd@fiane.dyndns.org>
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * 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 <stdbool.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <stdio.h>
+#include <inttypes.h>
+
+#include <osmocom/core/utils.h>
+#include <osmocom/core/bit64gen.h>
+
+
+/*! \addtogroup utils
+ * @{
+ * various utility routines
+ *
+ * \file utils.c */
+
+static char namebuf[255];
+
+/*! get human-readable string for given value
+ *  \param[in] vs Array of value_string tuples
+ *  \param[in] val Value to be converted
+ *  \returns pointer to human-readable string
+ *
+ * If val is found in vs, the array's string entry is returned. Otherwise, an
+ * "unknown" string containing the actual value is composed in a static buffer
+ * that is reused across invocations.
+ */
+const char *get_value_string(const struct value_string *vs, uint32_t val)
+{
+	const char *str = get_value_string_or_null(vs, val);
+	if (str)
+		return str;
+
+	snprintf(namebuf, sizeof(namebuf), "unknown 0x%"PRIx32, val);
+	namebuf[sizeof(namebuf) - 1] = '\0';
+	return namebuf;
+}
+
+/*! get human-readable string or NULL for given value
+ *  \param[in] vs Array of value_string tuples
+ *  \param[in] val Value to be converted
+ *  \returns pointer to human-readable string or NULL if val is not found
+ */
+const char *get_value_string_or_null(const struct value_string *vs,
+				     uint32_t val)
+{
+	int i;
+
+	for (i = 0;; i++) {
+		if (vs[i].value == 0 && vs[i].str == NULL)
+			break;
+		if (vs[i].value == val)
+			return vs[i].str;
+	}
+
+	return NULL;
+}
+
+/*! get numeric value for given human-readable string
+ *  \param[in] vs Array of value_string tuples
+ *  \param[in] str human-readable string
+ *  \returns numeric value (>0) or negative numer in case of error
+ */
+int get_string_value(const struct value_string *vs, const char *str)
+{
+	int i;
+
+	for (i = 0;; i++) {
+		if (vs[i].value == 0 && vs[i].str == NULL)
+			break;
+		if (!strcasecmp(vs[i].str, str))
+			return vs[i].value;
+	}
+	return -EINVAL;
+}
+
+/*! Convert BCD-encoded digit into printable character
+ *  \param[in] bcd A single BCD-encoded digit
+ *  \returns single printable character
+ */
+char osmo_bcd2char(uint8_t bcd)
+{
+	if (bcd < 0xa)
+		return '0' + bcd;
+	else
+		return 'A' + (bcd - 0xa);
+}
+
+/*! Convert number in ASCII to BCD value
+ *  \param[in] c ASCII character
+ *  \returns BCD encoded value of character
+ */
+uint8_t osmo_char2bcd(char c)
+{
+	if (c >= '0' && c <= '9')
+		return c - 0x30;
+	else if (c >= 'A' && c <= 'F')
+		return 0xa + (c - 'A');
+	else if (c >= 'a' && c <= 'f')
+		return 0xa + (c - 'a');
+	else
+		return 0;
+}
+
+/*! Parse a string containing hexadecimal digits
+ *  \param[in] str string containing ASCII encoded hexadecimal digits
+ *  \param[out] b output buffer
+ *  \param[in] max_len maximum space in output buffer
+ *  \returns number of parsed octets, or -1 on error
+ */
+int osmo_hexparse(const char *str, uint8_t *b, int max_len)
+
+{
+	char c;
+	uint8_t v;
+	const char *strpos;
+	unsigned int nibblepos = 0;
+
+	memset(b, 0x00, max_len);
+
+	for (strpos = str; (c = *strpos); strpos++) {
+		/* skip whitespace */
+		if (c == ' ' || c == '\t' || c == '\n' || c == '\r')
+			continue;
+
+		/* If the buffer is too small, error out */
+		if (nibblepos >= (max_len << 1))
+			return -1;
+
+		if (c >= '0' && c <= '9')
+			v = c - '0';
+		else if (c >= 'a' && c <= 'f')
+			v = 10 + (c - 'a');
+		else if (c >= 'A' && c <= 'F')
+			v = 10 + (c - 'A');
+		else
+			return -1;
+
+		b[nibblepos >> 1] |= v << (nibblepos & 1 ? 0 : 4);
+		nibblepos ++;
+	}
+
+	/* In case of uneven amount of digits, the last byte is not complete
+	 * and that's an error. */
+	if (nibblepos & 1)
+		return -1;
+
+	return nibblepos >> 1;
+}
+
+static char hexd_buff[4096];
+static const char hex_chars[] = "0123456789abcdef";
+
+static char *_osmo_hexdump(const unsigned char *buf, int len, const char *delim)
+{
+	int i;
+	char *cur = hexd_buff;
+
+	hexd_buff[0] = 0;
+	for (i = 0; i < len; i++) {
+		const char *delimp = delim;
+		int len_remain = sizeof(hexd_buff) - (cur - hexd_buff);
+		if (len_remain < 3)
+			break;
+
+		*cur++ = hex_chars[buf[i] >> 4];
+		*cur++ = hex_chars[buf[i] & 0xf];
+
+		while (len_remain > 1 && *delimp) {
+			*cur++ = *delimp++;
+			len_remain--;
+		}
+
+		*cur = 0;
+	}
+	hexd_buff[sizeof(hexd_buff)-1] = 0;
+	return hexd_buff;
+}
+
+/*! Convert a sequence of unpacked bits to ASCII string
+ * \param[in] bits A sequence of unpacked bits
+ * \param[in] len Length of bits
+ */
+char *osmo_ubit_dump(const uint8_t *bits, unsigned int len)
+{
+	int i;
+
+	if (len > sizeof(hexd_buff)-1)
+		len = sizeof(hexd_buff)-1;
+	memset(hexd_buff, 0, sizeof(hexd_buff));
+
+	for (i = 0; i < len; i++) {
+		char outch;
+		switch (bits[i]) {
+		case 0:
+			outch = '0';
+			break;
+		case 0xff:
+			outch = '?';
+			break;
+		case 1:
+			outch = '1';
+			break;
+		default:
+			outch = 'E';
+			break;
+		}
+		hexd_buff[i] = outch;
+	}
+	hexd_buff[sizeof(hexd_buff)-1] = 0;
+	return hexd_buff;
+}
+
+/*! Convert binary sequence to hexadecimal ASCII string
+ *  \param[in] buf pointer to sequence of bytes
+ *  \param[in] len length of buf in number of bytes
+ *  \returns pointer to zero-terminated string
+ *
+ * This function will print a sequence of bytes as hexadecimal numbers,
+ * adding one space character between each byte (e.g. "1a ef d9")
+ *
+ * The maximum size of the output buffer is 4096 bytes, i.e. the maximum
+ * number of input bytes that can be printed in one call is 1365!
+ */
+char *osmo_hexdump(const unsigned char *buf, int len)
+{
+	return _osmo_hexdump(buf, len, " ");
+}
+
+/*! Convert binary sequence to hexadecimal ASCII string
+ *  \param[in] buf pointer to sequence of bytes
+ *  \param[in] len length of buf in number of bytes
+ *  \returns pointer to zero-terminated string
+ *
+ * This function will print a sequence of bytes as hexadecimal numbers,
+ * without any space character between each byte (e.g. "1aefd9")
+ *
+ * The maximum size of the output buffer is 4096 bytes, i.e. the maximum
+ * number of input bytes that can be printed in one call is 2048!
+ */
+char *osmo_hexdump_nospc(const unsigned char *buf, int len)
+{
+	return _osmo_hexdump(buf, len, "");
+}
+
+/* Compat with previous typo to preserve abi */
+char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
+#if defined(__MACH__) && defined(__APPLE__)
+	;
+#else
+	__attribute__((weak, alias("osmo_hexdump_nospc")));
+#endif
+
+#include <ctype.h>
+/*! Convert an entire string to lower case
+ *  \param[out] out output string, caller-allocated
+ *  \param[in] in input string
+ */
+void osmo_str2lower(char *out, const char *in)
+{
+	unsigned int i;
+
+	for (i = 0; i < strlen(in); i++)
+		out[i] = tolower((const unsigned char)in[i]);
+	out[strlen(in)] = '\0';
+}
+
+/*! Convert an entire string to upper case
+ *  \param[out] out output string, caller-allocated
+ *  \param[in] in input string
+ */
+void osmo_str2upper(char *out, const char *in)
+{
+	unsigned int i;
+
+	for (i = 0; i < strlen(in); i++)
+		out[i] = toupper((const unsigned char)in[i]);
+	out[strlen(in)] = '\0';
+}
+
+/*! Wishful thinking to generate a constant time compare
+ *  \param[in] exp Expected data
+ *  \param[in] rel Comparison value
+ *  \param[in] count Number of bytes to compare
+ *  \returns 1 in case \a exp equals \a rel; zero otherwise
+ *
+ * Compare count bytes of exp to rel. Return 0 if they are identical, 1
+ * otherwise. Do not return a mismatch on the first mismatching byte,
+ * but always compare all bytes, regardless. The idea is that the amount of
+ * matching bytes cannot be inferred from the time the comparison took. */
+int osmo_constant_time_cmp(const uint8_t *exp, const uint8_t *rel, const int count)
+{
+	int x = 0, i;
+
+	for (i = 0; i < count; ++i)
+		x |= exp[i] ^ rel[i];
+
+	/* if x is zero, all data was identical */
+	return x? 1 : 0;
+}
+
+/*! Generic retrieval of 1..8 bytes as big-endian uint64_t
+ *  \param[in] data Input data as byte-array
+ *  \param[in] data_len Length of \a data in octets
+ *  \returns uint64_t of \a data interpreted as big-endian
+ *
+ * This is like osmo_load64be_ext, except that if data_len is less than
+ * sizeof(uint64_t), the data is interpreted as the least significant bytes
+ * (osmo_load64be_ext loads them as the most significant bytes into the
+ * returned uint64_t). In this way, any integer size up to 64 bits can be
+ * decoded conveniently by using sizeof(), without the need to call specific
+ * numbered functions (osmo_load16, 32, ...). */
+uint64_t osmo_decode_big_endian(const uint8_t *data, size_t data_len)
+{
+	uint64_t value = 0;
+
+	while (data_len > 0) {
+		value = (value << 8) + *data;
+		data += 1;
+		data_len -= 1;
+	}
+
+	return value;
+}
+
+/*! Generic big-endian encoding of big endian number up to 64bit
+ *  \param[in] value unsigned integer value to be stored
+ *  \param[in] data_len number of octets 
+ *  \returns static buffer containing big-endian stored value
+ *
+ * This is like osmo_store64be_ext, except that this returns a static buffer of
+ * the result (for convenience, but not threadsafe). If data_len is less than
+ * sizeof(uint64_t), only the least significant bytes of value are encoded. */
+uint8_t *osmo_encode_big_endian(uint64_t value, size_t data_len)
+{
+	static uint8_t buf[sizeof(uint64_t)];
+	OSMO_ASSERT(data_len <= ARRAY_SIZE(buf));
+	osmo_store64be_ext(value, buf, data_len);
+	return buf;
+}
+
+/*! Copy a C-string into a sized buffer
+ *  \param[in] src source string
+ *  \param[out] dst destination string
+ *  \param[in] siz size of the \a dst buffer
+ *  \returns length of \a src
+ *
+ * Copy at most \a siz bytes from \a src to \a dst, ensuring that the result is
+ * NUL terminated. The NUL character is included in \a siz, i.e. passing the
+ * actual sizeof(*dst) is correct.
+ */
+size_t osmo_strlcpy(char *dst, const char *src, size_t siz)
+{
+	size_t ret = src ? strlen(src) : 0;
+
+	if (siz) {
+		size_t len = (ret >= siz) ? siz - 1 : ret;
+		if (src)
+			memcpy(dst, src, len);
+		dst[len] = '\0';
+	}
+	return ret;
+}
+
+/*! Validate that a given string is a hex string within given size limits.
+ * Note that each hex digit amounts to a nibble, so if checking for a hex
+ * string to result in N bytes, pass amount of digits as 2*N.
+ * \param str  A nul-terminated string to validate, or NULL.
+ * \param min_digits  least permitted amount of digits.
+ * \param max_digits  most permitted amount of digits.
+ * \param require_even  if true, require an even amount of digits.
+ * \returns true when the hex_str contains only hexadecimal digits (no
+ *          whitespace) and matches the requested length; also true
+ *          when min_digits <= 0 and str is NULL.
+ */
+bool osmo_is_hexstr(const char *str, int min_digits, int max_digits,
+		    bool require_even)
+{
+	int len;
+	/* Use unsigned char * to avoid a compiler warning of
+	 * "error: array subscript has type 'char' [-Werror=char-subscripts]" */
+	const unsigned char *pos = (const unsigned char*)str;
+	if (!pos)
+		return min_digits < 1;
+	for (len = 0; *pos && len < max_digits; len++, pos++)
+		if (!isxdigit(*pos))
+			return false;
+	if (len < min_digits)
+		return false;
+	/* With not too many digits, we should have reached *str == nul */
+	if (*pos)
+		return false;
+	if (require_even && (len & 1))
+		return false;
+
+	return true;
+}
+
+/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars
+ *  \param[in] str String to validate
+ *  \param[in] sep_chars Permitted separation characters between identifiers.
+ *  \returns true in case \a str contains only valid identifiers and sep_chars, false otherwise
+ */
+bool osmo_separated_identifiers_valid(const char *str, const char *sep_chars)
+{
+	/* characters that are illegal in names */
+	static const char illegal_chars[] = "., {}[]()<>|~\\^`'\"?=;/+*&%$#!";
+	unsigned int i;
+	size_t len;
+
+	/* an empty string is not a valid identifier */
+	if (!str || (len = strlen(str)) == 0)
+		return false;
+
+	for (i = 0; i < len; i++) {
+		if (sep_chars && strchr(sep_chars, str[i]))
+			continue;
+		/* check for 7-bit ASCII */
+		if (str[i] & 0x80)
+			return false;
+		if (!isprint((int)str[i]))
+			return false;
+		/* check for some explicit reserved control characters */
+		if (strchr(illegal_chars, str[i]))
+			return false;
+	}
+
+	return true;
+}
+
+/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars
+ *  \param[in] str String to validate
+ *  \returns true in case \a str contains valid identifier, false otherwise
+ */
+bool osmo_identifier_valid(const char *str)
+{
+	return osmo_separated_identifiers_valid(str, NULL);
+}
+
+/*! Return the string with all non-printable characters escaped.
+ * \param[in] str  A string that may contain any characters.
+ * \param[in] len  Pass -1 to print until nul char, or >= 0 to force a length.
+ * \param[inout] buf  string buffer to write escaped characters to.
+ * \param[in] bufsize  size of \a buf.
+ * \returns buf containing an escaped representation, possibly truncated, or str itself.
+ */
+const char *osmo_escape_str_buf(const char *str, int in_len, char *buf, size_t bufsize)
+{
+	int in_pos = 0;
+	int next_unprintable = 0;
+	int out_pos = 0;
+	char *out = buf;
+	/* -1 to leave space for a final \0 */
+	int out_len = bufsize-1;
+
+	if (!str)
+		return "(null)";
+
+	if (in_len < 0)
+		in_len = strlen(str);
+
+	while (in_pos < in_len) {
+		for (next_unprintable = in_pos;
+		     next_unprintable < in_len && isprint((int)str[next_unprintable])
+		     && str[next_unprintable] != '"'
+		     && str[next_unprintable] != '\\';
+		     next_unprintable++);
+
+		if (next_unprintable == in_len
+		    && in_pos == 0)
+			return str;
+
+		while (in_pos < next_unprintable && out_pos < out_len)
+			out[out_pos++] = str[in_pos++];
+
+		if (out_pos == out_len || in_pos == in_len)
+			goto done;
+
+		switch (str[next_unprintable]) {
+#define BACKSLASH_CASE(c, repr) \
+		case c: \
+			if (out_pos > out_len-2) \
+				goto done; \
+			out[out_pos++] = '\\'; \
+			out[out_pos++] = repr; \
+			break
+
+		BACKSLASH_CASE('\n', 'n');
+		BACKSLASH_CASE('\r', 'r');
+		BACKSLASH_CASE('\t', 't');
+		BACKSLASH_CASE('\0', '0');
+		BACKSLASH_CASE('\a', 'a');
+		BACKSLASH_CASE('\b', 'b');
+		BACKSLASH_CASE('\v', 'v');
+		BACKSLASH_CASE('\f', 'f');
+		BACKSLASH_CASE('\\', '\\');
+		BACKSLASH_CASE('"', '"');
+#undef BACKSLASH_CASE
+
+		default:
+			out_pos += snprintf(&out[out_pos], out_len - out_pos, "\\%u", (unsigned char)str[in_pos]);
+			if (out_pos > out_len) {
+				out_pos = out_len;
+				goto done;
+			}
+			break;
+		}
+		in_pos ++;
+	}
+
+done:
+	out[out_pos] = '\0';
+	return out;
+}
+
+/*! Return the string with all non-printable characters escaped.
+ * Call osmo_escape_str_buf() with a static buffer.
+ * \param[in] str  A string that may contain any characters.
+ * \param[in] len  Pass -1 to print until nul char, or >= 0 to force a length.
+ * \returns buf containing an escaped representation, possibly truncated, or str itself.
+ */
+const char *osmo_escape_str(const char *str, int in_len)
+{
+	return osmo_escape_str_buf(str, in_len, namebuf, sizeof(namebuf));
+}
+
+/*! Like osmo_escape_str(), but returns double-quotes around a string, or "NULL" for a NULL string.
+ * This allows passing any char* value and get its C representation as string.
+ * \param[in] str  A string that may contain any characters.
+ * \param[in] len  Pass -1 to print until nul char, or >= 0 to force a length.
+ * \returns buf containing an escaped representation, possibly truncated, or str itself.
+ */
+const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize)
+{
+	const char *res;
+	int l;
+	if (!str)
+		return "NULL";
+	if (bufsize < 3)
+		return "<buf-too-small>";
+	buf[0] = '"';
+	res = osmo_escape_str_buf(str, in_len, buf + 1, bufsize - 2);
+	/* if osmo_escape_str_buf() returned the str itself, we need to copy it to buf to be able to
+	 * quote it. */
+	if (res == str) {
+		/* max_len = bufsize - two quotes - nul term */
+		int max_len = bufsize - 2 - 1;
+		if (in_len >= 0)
+			max_len = OSMO_MIN(in_len, max_len);
+		/* It is not allowed to pass unterminated strings into osmo_strlcpy() :/ */
+		strncpy(buf + 1, str, max_len);
+		buf[1 + max_len] = '\0';
+	}
+	l = strlen(buf);
+	buf[l] = '"';
+	buf[l+1] = '\0'; /* both osmo_escape_str_buf() and max_len above ensure room for '\0' */
+	return buf;
+}
+
+const char *osmo_quote_str(const char *str, int in_len)
+{
+	return osmo_quote_str_buf(str, in_len, namebuf, sizeof(namebuf));
+}
+
+/*! perform an integer square root operation on unsigned 32bit integer.
+ *  This implementation is taken from "Hacker's Delight" Figure 11-1 "Integer square root, Newton's
+ *  method", which can also be found at http://www.hackersdelight.org/hdcodetxt/isqrt.c.txt */
+uint32_t osmo_isqrt32(uint32_t x)
+{
+	uint32_t x1;
+	int s, g0, g1;
+
+	if (x <= 1)
+		return x;
+
+	s = 1;
+	x1 = x - 1;
+	if (x1 > 0xffff) {
+		s = s + 8;
+		x1 = x1 >> 16;
+	}
+	if (x1 > 0xff) {
+		s = s + 4;
+		x1 = x1 >> 8;
+	}
+	if (x1 > 0xf) {
+		s = s + 2;
+		x1 = x1 >> 4;
+	}
+	if (x1 > 0x3) {
+		s = s + 1;
+	}
+
+	g0 = 1 << s;			/* g0 = 2**s */
+	g1 = (g0 + (x >> s)) >> 1;	/* g1 = (g0 + x/g0)/2 */
+
+	/* converges after four to five divisions for arguments up to 16,785,407 */
+	while (g1 < g0) {
+		g0 = g1;
+		g1 = (g0 + (x/g0)) >> 1;
+	}
+	return g0;
+}
+
+/*! @} */

firmware/test/card_emu_tests.c

@@ -65,6 +65,11 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 	printf("uart_enable(uart_chan=%u, %s)\n", uart_chan, rts);
 }
 
+void card_emu_uart_interrupt(uint8_t uart_chan)
+{
+	printf("uart_interrupt(uart_chan=%u)\n", uart_chan);
+}
+
 void tc_etu_set_wtime(uint8_t tc_chan, uint16_t wtime)
 {
 	printf("tc_etu_set_wtime(tc_chan=%u, wtime=%u)\n", tc_chan, wtime);
@@ -120,6 +125,8 @@ static void io_start_card(struct card_handle *ch)
 
 	/* release from reset and verify th ATR */
 	card_emu_io_statechg(ch, CARD_IO_RST, 0);
+	/* simulate waiting time before ATR expired */
+	tc_etu_wtime_expired(ch);
 	verify_atr(ch);
 }
 

host/Makefile

@@ -1,7 +1,9 @@
 LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore
 CFLAGS=-Wall -g
 
-all: simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
+APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
+
+all: $(APPS)
 
 simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o
 	$(CC) -o $@ $^ $(LDFLAGS) -losmosim
@@ -19,4 +21,8 @@ simtrace2-sniff: simtrace2-sniff.o simtrace2-discovery.o libusb_util.o
 	$(CC) $(CFLAGS) `pkg-config --cflags libusb-1.0 libosmocore` -o $@ -c $^
 
 clean:
-	@rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list *.o
+	@rm -f *.o $(APPS)
+
+install: $(APPS)
+	mkdir -p $(DESTDIR)/usr/bin
+	cp $(APPS) $(DESTDIR)/usr/bin/

host/apdu_dispatch.c

@@ -2,9 +2,10 @@
  *
  * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or
- *  it under the terms of the GNU General Public License version 2 
+ * modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation
+ * 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
@@ -13,9 +14,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

host/apdu_dispatch.h

@@ -1,3 +1,21 @@
+/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU
+ *
+ * (C) 2016 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.
+ */
 #pragma once
 
 #include <stdint.h>

host/libusb_util.c

@@ -1,3 +1,21 @@
+/* libisb utilities
+ * 
+ * (C) 2010-2016 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>
@@ -232,34 +250,39 @@ libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
 		    (strlen(ifm->path) && !strcmp(path, ifm->path))) {
 			rc = libusb_open(*dev, &usb_devh);
 			if (rc < 0) {
-				perror("Cannot open device");
+				fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc));
+				usb_devh = NULL;
 				break;
 			}
 			rc = libusb_get_configuration(usb_devh, &config);
 			if (rc < 0) {
-				perror("Cannot get current configuration");
+				fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc));
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 			if (config != ifm->configuration) {
 				rc = libusb_set_configuration(usb_devh, ifm->configuration);
 				if (rc < 0) {
-					perror("Cannot set configuration");
+					fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc));
 					libusb_close(usb_devh);
+					usb_devh = NULL;
 					break;
 				}
 			}
 			rc = libusb_claim_interface(usb_devh, ifm->interface);
 			if (rc < 0) {
-				perror("Cannot claim interface");
+				fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc));
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 			rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting);
 			if (rc < 0) {
-				perror("Cannot set interface altsetting");
+				fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc));
 				libusb_release_interface(usb_devh, ifm->interface);
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 		}

host/libusb_util.h

@@ -1,3 +1,21 @@
+/* libisb utilities
+ * 
+ * (C) 2010-2016 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.
+ */
 #pragma once
 
 #include <libusb.h>

host/simtrace2-discovery.c

@@ -1,3 +1,22 @@
+/* simtrace2-discovery - host PC library to scan for matching USB
+ * devices
+ *
+ * (C) 2016 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 <stdint.h>
 
 #include <libusb.h>

host/simtrace2-discovery.h

@@ -1,3 +1,22 @@
+/* simtrace2-discovery - host PC library to scan for matching USB
+ * devices
+ * 
+ * (C) 2016 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.
+ */
 #pragma once
 
 #include <stdint.h>

host/simtrace2-remsim.c

@@ -1,10 +1,12 @@
-/* simtrace2-remsim - main program for the host PC
+/* simtrace2-remsim - main program for the host PC to provide a remote SIM
+ * using the SIMtrace 2 firmware in card emulation mode
  *
- * (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or
- *  it under the terms of the GNU General Public License version 2 
+ * modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation
+ * 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
@@ -13,9 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -172,16 +173,11 @@ static struct simtrace_msg_hdr *st_push_hdr(struct msgb *msg, uint8_t msg_class,
 int st_slot_tx_msg(struct st_slot *slot, struct msgb *msg,
 		   uint8_t msg_class, uint8_t msg_type)
 {
-	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *) msg->data;
-
-	sh->slot_nr = slot->slot_nr;
-
 	st_push_hdr(msg, msg_class, msg_type, slot->slot_nr);
 
 	return st_transp_tx_msg(slot->transp, msg);
 }
 
-
 /***********************************************************************
  * Card Emulation protocol
  ***********************************************************************/
@@ -540,7 +536,7 @@ static void run_mainloop(struct cardem_inst *ci)
 		/* read data from SIMtrace2 device (local or via USB) */
 		if (transp->udp_fd < 0) {
 			rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in,
-						  buf, sizeof(buf), &xfer_len, 100000);
+						  buf, sizeof(buf), &xfer_len, 100);
 			if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT &&
 				      rc != LIBUSB_ERROR_INTERRUPTED &&
 				      rc != LIBUSB_ERROR_IO) {
@@ -557,7 +553,7 @@ static void run_mainloop(struct cardem_inst *ci)
 		}
 		/* dispatch any incoming data */
 		if (xfer_len > 0) {
-			printf("URB: %s\n", osmo_hexdump(buf, rc));
+			printf("URB: %s\n", osmo_hexdump(buf, xfer_len));
 			process_usb_msg(ci, buf, xfer_len);
 			msg_count++;
 			byte_count += xfer_len;

host/simtrace2-sniff.c

@@ -1,7 +1,13 @@
-/* simtrace2-sniff - main program for the host PC to communicate with the SIMtrace 2 firmware in sniffer mode */
+/* simtrace2-sniff - main program for the host PC to communicate with the 
-/* This program is free software; you can redistribute it and/or modify
+ * SIMtrace 2 firmware in sniffer mode
- * it under the terms of the GNU General Public License version 2 
+ * 
- * as published by the Free Software Foundation
+ * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.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
@@ -10,12 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
  */
-
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -63,7 +65,7 @@ struct st_transport {
 /* global GSMTAP instance */
 static struct gsmtap_inst *g_gti;
 
-static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len)
+static int gsmtap_send_sim(uint8_t sub_type, const uint8_t *data, unsigned int len)
 {
 	struct gsmtap_hdr *gh;
 	unsigned int gross_len = len + sizeof(*gh);
@@ -78,8 +80,9 @@ static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len)
 	gh->version = GSMTAP_VERSION;
 	gh->hdr_len = sizeof(*gh)/4;
 	gh->type = GSMTAP_TYPE_SIM;
+	gh->sub_type = sub_type;
 
-	memcpy(buf + sizeof(*gh), apdu, len);
+	memcpy(buf + sizeof(*gh), data, len);
 
 	rc = write(gsmtap_inst_fd(g_gti), buf, gross_len);
 	if (rc < 0) {
@@ -92,31 +95,80 @@ static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len)
 	return 0;
 }
 
+const struct value_string change_flags[] = {
+	{
+		.value = SNIFF_CHANGE_FLAG_CARD_INSERT,
+		.str = "card inserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_CARD_EJECT,
+		.str = "card ejected",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_RESET_ASSERT,
+		.str = "reset asserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_RESET_DEASSERT,
+		.str = "reset de-asserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_TIMEOUT_WT,
+		.str = "data transfer timeout",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+const struct value_string data_flags[] = {
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,
+		.str = "incomplete",
+	},
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_MALFORMED,
+		.str = "malformed",
+	},
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_CHECKSUM,
+		.str = "checksum error",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) {
+	uint32_t i;
+	for (i = 0; i < nb_flags; i++) {
+		if (flags & flag_meanings[i].value) {
+			printf(flag_meanings[i].str);
+			flags &= ~flag_meanings[i].value;
+			if (flags) {
+				printf(", ");
+			}
+		}
+	}
+}
+
 static int process_change(const uint8_t *buf, int len)
 {
 	/* check if there is enough data for the structure */
-	if (len<sizeof(struct sniff_change)) {
+	if (len < sizeof(struct sniff_change)) {
 		return -1;
 	}
 	struct sniff_change *change = (struct sniff_change *)buf;
 
 	printf("Card state change: ");
-	if (change->flags&SNIFF_CHANGE_FLAG_CARD_INSERT) {
+	if (change->flags) {
-		printf("card inserted ");
+		print_flags(change_flags, ARRAY_SIZE(change_flags), change->flags);
-	}
-	if (change->flags&SNIFF_CHANGE_FLAG_CARD_EJECT) {
-		printf("card ejected ");
-	}
-	if (change->flags&SNIFF_CHANGE_FLAG_RESET_HOLD) {
-		printf("reset hold ");
-	}
-	if (change->flags&SNIFF_CHANGE_FLAG_RESET_RELEASE) {
-		printf("reset release ");
-	}
-	if (change->flags&SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
-		printf("data transfer timeout ");
-	}
 		printf("\n");
+	} else {
+		printf("no changes\n");
+	}
 
 	return 0;
 }
@@ -139,70 +191,64 @@ static int process_fidi(const uint8_t *buf, int len)
 	return 0;
 }
 
-static int process_atr(const uint8_t *buf, int len)
+static int process_data(enum simtrace_msg_type_sniff type, const uint8_t *buf, int len)
 {
 	/* check if there is enough data for the structure */
-	if (len<sizeof(struct sniff_data)) {
+	if (len < sizeof(struct sniff_data)) {
 		return -1;
 	}
-	struct sniff_data *atr = (struct sniff_data *)buf;
+	struct sniff_data *data = (struct sniff_data *)buf;
 
 	/* check if the data is available */
-	if (len<sizeof(struct sniff_data)+atr->length) {
+	if (len < sizeof(struct sniff_data) + data->length) {
 		return -2;
 	}
 
-	printf("ATR%s: ", atr->complete ? "" : " (incomplete)");
+	/* check type */
-	for (uint16_t i=0; i<atr->length; i++) {
+	if (type != SIMTRACE_MSGT_SNIFF_ATR && type != SIMTRACE_MSGT_SNIFF_PPS && type != SIMTRACE_MSGT_SNIFF_TPDU) {
-		printf("%02x ", atr->data[i]);
+		return -3;
-	}
-	printf("\n");
-	return 0;
-}
-
-static int process_pps(const uint8_t *buf, int len)
-{
-	/* check if there is enough data for the structure */
-	if (len<sizeof(struct sniff_data)) {
-		return -1;
-	}
-	struct sniff_data *pps = (struct sniff_data *)buf;
-
-	/* check if the data is available */
-	if (len<sizeof(struct sniff_data)+pps->length) {
-		return -2;
 	}
 
-	printf("PPS%s: ", pps->complete ? "" : " (incomplete) ");
+	/* Print message */
-	for (uint16_t i=0; i<pps->length; i++) {
+	switch (type) {
-		printf("%02x ", pps->data[i]);
+	case SIMTRACE_MSGT_SNIFF_ATR:
+		printf("ATR");
+		break;
+	case SIMTRACE_MSGT_SNIFF_PPS:
+		printf("PPS");
+		break;
+	case SIMTRACE_MSGT_SNIFF_TPDU:
+		printf("TPDU");
+		break;
+	default:
+		printf("???");
+		break;
 	}
-	printf("\n");
+	if (data->flags) {
-	return 0;
+		printf(" (");
-}
+		print_flags(data_flags, ARRAY_SIZE(data_flags), data->flags);
-
+		printf(")");
-static int process_tpdu(const uint8_t *buf, int len)
-{
-	/* check if there is enough data for the structure */
-	if (len<sizeof(struct sniff_data)) {
-		return -1;
 	}
-	struct sniff_data *tpdu = (struct sniff_data *)buf;
+	printf(": ");
-
+	uint16_t i;
-	/* check if the data is available */
+	for (i = 0; i < data->length; i++) {
-	if (len<sizeof(struct sniff_data)+tpdu->length) {
+		printf("%02x ", data->data[i]);
-		return -2;
-	}
-
-	/* print TPDU */
-	printf("TPDU%s: ", tpdu->complete ? "" : " (incomplete)");
-	for (uint16_t i=0; i<tpdu->length; i++) {
-		printf("%02x ", tpdu->data[i]);
 	}
 	printf("\n");
 
-	/* send TPDU (now considered as APDU) to GSMTAP */
+	/* Send message as GSNTAP */
-	gsmtap_send_sim(tpdu->data, tpdu->length);
+	switch (type) {
+	case SIMTRACE_MSGT_SNIFF_ATR:
+		gsmtap_send_sim(GSMTAP_SIM_ATR, data->data, data->length);
+		break;
+	case SIMTRACE_MSGT_SNIFF_TPDU:
+		/* TPDU is now considered as APDU since SIMtrace sends complete TPDU */
+		gsmtap_send_sim(GSMTAP_SIM_APDU, data->data, data->length);
+		break;
+	default:
+		break;
+	}
+
 	return 0;
 }
 
@@ -210,19 +256,19 @@ static int process_tpdu(const uint8_t *buf, int len)
 static int process_usb_msg(const uint8_t *buf, int len)
 {
 	/* check if enough data for the header is present */
-	if (len<sizeof(struct simtrace_msg_hdr)) {
+	if (len < sizeof(struct simtrace_msg_hdr)) {
 		return 0;
 	}
 
 	/* check if message is complete */
 	struct simtrace_msg_hdr *msg_hdr = (struct simtrace_msg_hdr *)buf;
-	if (len<msg_hdr->msg_len) {
+	if (len < msg_hdr->msg_len) {
 		return 0;
 	}
 	//printf("msg: %s\n", osmo_hexdump(buf, msg_hdr->msg_len));
 
 	/* check for message class */
-	if (SIMTRACE_MSGC_SNIFF!=msg_hdr->msg_class) { /* we only care about sniffing messages */
+	if (SIMTRACE_MSGC_SNIFF != msg_hdr->msg_class) { /* we only care about sniffing messages */
 		return msg_hdr->msg_len; /* discard non-sniffing messaged */
 	}
 
@@ -237,13 +283,9 @@ static int process_usb_msg(const uint8_t *buf, int len)
 		process_fidi(buf, len);
 		break;
 	case SIMTRACE_MSGT_SNIFF_ATR:
-		process_atr(buf, len);
-		break;
 	case SIMTRACE_MSGT_SNIFF_PPS:
-		process_pps(buf, len);
-		break;
 	case SIMTRACE_MSGT_SNIFF_TPDU:
-		process_tpdu(buf, len);
+		process_data(msg_hdr->msg_type, buf, len);
 		break;
 	default:
 		printf("unknown SIMtrace msg type 0x%02x\n", msg_hdr->msg_type);
@@ -260,7 +302,7 @@ static void run_mainloop()
 {
 	int rc;
 	uint8_t buf[16*256];
-	unsigned int buf_i = 0;
+	unsigned int i, buf_i = 0;
 	int xfer_len;
 
 	printf("Entering main loop\n");
@@ -279,13 +321,16 @@ static void run_mainloop()
 		if (xfer_len > 0) {
 			//printf("URB: %s\n", osmo_hexdump(&buf[buf_i], xfer_len));
 			buf_i += xfer_len;
-			if (buf_i>=sizeof(buf)) {
+			if (buf_i >= sizeof(buf)) {
 				perror("preventing USB buffer overflow");
 				return;
 			}
-			int processed = process_usb_msg(buf, buf_i);
+			int processed;
-			if (processed>0 && processed<=buf_i) {
+			while ((processed = process_usb_msg(buf, buf_i)) > 0) {
-				for (unsigned int i=processed; i<buf_i; i++) {
+				if (processed > buf_i) {
+					break;
+				}
+				for (i = processed; i < buf_i; i++) {
 					buf[i-processed] = buf[i];
 				}
 				buf_i -= processed;
@@ -351,7 +396,7 @@ static void signal_handler(int signal)
 
 int main(int argc, char **argv)
 {
-	int rc, ret;
+	int i, rc, ret;
 	print_welcome();
 
 	/* Parse arguments */
@@ -414,7 +459,7 @@ int main(int argc, char **argv)
 	/* Only keep USB matching arguments */
 	struct usb_interface_match ifm_filtered[ARRAY_SIZE(ifm_scan)];
 	int num_filtered = 0;
-	for (unsigned int i = 0; i < num_interfaces; i++) {
+	for (i = 0; i < num_interfaces; i++) {
 		if (vendor_id>=0 && vendor_id!=ifm_scan[i].vendor) {
 			continue;
 		}
@@ -438,7 +483,7 @@ int main(int argc, char **argv)
 	if (1!=num_filtered) {
 		perror("No individual matching USB devices found");
 		printf("Available USB devices:\n");
-		for (unsigned int i = 0; i < num_interfaces; i++) {
+		for (i = 0; i < num_interfaces; i++) {
 			printf("\t%04x:%04x Addr=%u, Path=%s, Cfg=%u, Intf=%u, Alt=%u: %d/%d/%d ",
 			ifm_scan[i].vendor, ifm_scan[i].product, ifm_scan[i].addr, ifm_scan[i].path,
 			ifm_scan[i].configuration, ifm_scan[i].interface, ifm_scan[i].altsetting,

host/simtrace2_usb.c

@@ -1,3 +1,21 @@
+/* simtrace2_usb - host PC application to list found SIMtrace 2 USB devices
+ *
+ * (C) 2016 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 <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>

host/usb2udp.c

@@ -2,9 +2,10 @@
  *
  * (C) 2010-2016 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or
- *  it under the terms of the GNU General Public License version 2 
+ * modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation
+ * 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
@@ -13,9 +14,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>