qmod: lower VCC threshold to 2.5V

on the QMOD board the VCC signal from the modem is measured using
an ADC (SIMtrace board just use card detect).
the threshold to consider VCC as activated was set to 2.8V, which
gives a bit of margin for the expected 3.0V.
still, we had one board where the voltage was 2.8V.
to be resilient against lower than expected voltages from
modems (or boards), we lowered the threshold to 2.5V.
this is still save for the SAM3S to correctly identify high/low
levels.

Change-Id: Iac2778903690045e4e63fef29f812205d00c28ed

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
 
@@ -50,8 +50,41 @@ make clean
 echo
 echo "=============== HOST START  =============="
 cd $TOPDIR/host
-make clean
+autoreconf --install --force
-make
+./configure --enable-sanitize --enable-werror
-make clean
+$MAKE $PARALLEL_MAKE
+#$MAKE distcheck || cat-testlogs.sh
+make dist
+
+#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
+#	make -C "$base/doc/manuals" publish
+#fi
+
+if [ "x$publish" = "x--publish" ]; then
+	echo
+	echo "=============== UPLOAD BUILD  =============="
+
+	cat > "/build/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=/build/known_hosts' -p 48"
+	rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/latest/
+	rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/
+fi
+
+echo
+echo "=============== HOST CLEAN  =============="
+$MAKE maintainer-clean
+
+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,11 @@
+simtrace2 (0.5.1) unstable; urgency=medium
+
+  * Backwards-compatibility with older (released, non-master) libosmocore
+
+ -- Harald Welte <lafore@gnumonks.org>  Sun, 26 Aug 2018 11:50:36 +0200
+
+simtrace2 (0.5) unstable; 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,31 @@
+Source: simtrace2
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Section: devel
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               libosmocore-dev,
+               libpcsclite-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

@@ -28,6 +28,7 @@
 
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 
+GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
@@ -43,7 +44,7 @@ MEMORIES ?= flash dfu
 # Output file basename
 APP ?= dfu
 
-# Output directories
+# Output directories and filename
 OUTPUT = $(BOARD)-$(APP)
 BIN = bin
 OBJ = obj/$(BOARD)
@@ -73,7 +74,6 @@ GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
 TOP=..
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 
 #-------------------------------------------------------------------------------
 #		Files
@@ -120,15 +120,15 @@ C_OBJECTS  = $(C_FILES:%.c=%.o)
 # TRACE_LEVEL_NO_TRACE   0
 TRACE_LEVEL ?= 4
 
-DEBUG_PHONE_SNIFF?=0
+# allow asserting the peer SAM3S ERASE signal to completely erase the flash
+# only applicable for qmod board
+ALLOW_PEER_ERASE?=0
 
 #CFLAGS+=-DUSB_NO_DEBUG=1
 
 # Optimization level, put in comment for debugging
 OPTIMIZATION ?= -Os
 
-
-
 # Flags
 INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
 
@@ -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
@@ -164,7 +163,7 @@ CFLAGS += -Wno-suggest-attribute=noreturn
 #CFLAGS += -Wa,-a,-ad
 CFLAGS += -D__ARM
 CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
-CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDEBUG_PHONE_SNIFF=$(DEBUG_PHONE_SNIFF)
+CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
@@ -172,8 +171,7 @@ ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP)
 LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB)
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
 
-
+# Append BIN directories to output filename
-# Append OBJ and BIN directories to output filename
 OUTPUT := $(BIN)/$(OUTPUT)
 
 #-------------------------------------------------------------------------------
@@ -206,8 +204,12 @@ ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
 
 $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
 	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf
 	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
 	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin
 	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
@@ -234,3 +236,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/README.txt

@@ -24,6 +24,7 @@ Current boards supported are:
 * `simtrace`: The good old Osmocom SIMtrace PCB with SAM3 instead of SAM7, open hardware.
 * `qmod`: A sysmocom-proprietary quad mPCIe carrier board, publicly available
 * `owhw`: An undisclosed sysmocom-internal board, not publicly available
+* `octsimtest`: A sysmocom-proprietary production testing board, not publicly available
 
 = Firmware
 
@@ -51,6 +52,7 @@ Current applications supported are:
 * `cardem`: To provide remote SIM operation capabilities.
 * `trace`:  To monitor the communication between a SIM card and a phone (corresponds to the functionality provide by the first SIMtrace)
 * `triple_play`: To support the three previous functionalities, using USB configurations.
+* `gpio_test`: internal test code
 
 == Memories
 
@@ -76,6 +78,10 @@ $ make TRACE_LEVEL=4
 ```
 Accepted values: 0 (NO_TRACE) to 5 (DEBUG)
 
+The qmod specific option `ALLOW_PEER_ERASE` controls if the UART debug command to assert the peer SAM3S ERASE line is present in the code.
+Per default this is set to 0 to prevent accidentally erasing all firmware, including the DFU bootloader, which would then need to be flashed using SAM-BA or JTAG/SWD.
+Setting `ALLOW_PEER_ERASE` to 1 enables back the debug command and should be used only for debugging or development purposes.
+
 = Flashing
 
 To flash a firmware image follow the instructions provided in the [wiki](https://projects.osmocom.org/projects/simtrace2/wiki/).

firmware/apps/cardem/main.c

@@ -1,4 +1,22 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, 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
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -84,7 +102,11 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+	if (cfgnum < ARRAY_SIZE(config_func_ptrs)) {
 		simtrace_config = cfgnum;
+	} else {
+		TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum);
+	}
 }
 
 void USART1_IrqHandler(void)
@@ -108,7 +130,8 @@ static void check_exec_dbg_cmd(void)
 		return;
 
 	ch = UART_GetChar();
-
+	/* We must echo the character to make python fdexpect happy, which we use in factory testing */
+	fputc(ch, stdout);
 	board_exec_dbg_cmd(ch);
 }
 
@@ -125,9 +148,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 +161,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();
 
@@ -171,7 +208,9 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	if (config_func_ptrs[simtrace_config].init) {
 		config_func_ptrs[simtrace_config].init();
+	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -199,11 +238,17 @@ 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 (config_func_ptrs[last_simtrace_config].exit) {
 				config_func_ptrs[last_simtrace_config].exit();
+			}
+			if (config_func_ptrs[simtrace_config].init) {
 				config_func_ptrs[simtrace_config].init();
+			}
 			last_simtrace_config = simtrace_config;
 		} else {
+			if (config_func_ptrs[simtrace_config].run) {
 				config_func_ptrs[simtrace_config].run();
 			}
 		}
 	}
+}

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);
@@ -233,7 +256,36 @@ extern int main(void)
 	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", reset_cause);
+	TRACE_INFO("Reset Cause: 0x%lx\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)
@@ -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/freq_ctr/Makefile

@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += freq_ctr.c

firmware/apps/freq_ctr/freq_ctr.c

@@ -0,0 +1,55 @@
+#include <stdint.h>
+#include "utils.h"
+#include "tc_etu.h"
+#include "chip.h"
+
+
+/* pins for Channel 0 of TC-block 0 */
+#define PIN_TIOA0	{PIO_PA0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+
+/* pins for Channel 1 of TC-block 0 */
+#define PIN_TIOA1	{PIO_PA15, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PIN_TCLK1	{PIO_PA28, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+
+static const Pin pins_tc[] = { PIN_TIOA0, PIN_TIOA1, PIN_TCLK1 };
+
+static TcChannel *tc1 = &TC0->TC_CHANNEL[1];
+
+void TC1_IrqHandler(void)
+{
+	uint32_t sr = tc1->TC_SR;
+	printf("TC1=%lu; SR=0x%08lx\r\n", tc1->TC_RA, sr);
+}
+
+void freq_ctr_init(void)
+{
+	TcChannel *tc0 = &TC0->TC_CHANNEL[0];
+
+	PIO_Configure(pins_tc, ARRAY_SIZE(pins_tc));
+
+	PMC_EnablePeripheral(ID_TC0);
+	PMC_EnablePeripheral(ID_TC1);
+
+	/* route TCLK1 to XC1 */
+	TC0->TC_BMR &= ~TC_BMR_TC1XC1S_Msk;
+	TC0->TC_BMR |= TC_BMR_TC1XC1S_TCLK1;
+
+	/* TC0 in wveform mode: Run from SCLK. Raise TIOA on RA; lower TIOA on RC + trigger */
+	tc0->TC_CMR = TC_CMR_TCCLKS_TIMER_CLOCK5 | TC_CMR_BURST_NONE |
+		      TC_CMR_EEVTEDG_NONE | TC_CMR_WAVSEL_UP_RC | TC_CMR_WAVE |
+		      TC_CMR_ACPA_SET | TC_CMR_ACPC_CLEAR;
+	tc0->TC_RA = 16384; /* set high at 16384 */
+	tc0->TC_RC = 32786; /* set low at 32786 */
+
+	/* TC1 in capture mode: Run from XC1. Trigger on TIOA rising. Load RA on rising */
+	tc1->TC_CMR = TC_CMR_TCCLKS_XC1 | TC_CMR_BURST_NONE |
+		      TC_CMR_ETRGEDG_RISING | TC_CMR_ABETRG | TC_CMR_LDRA_RISING;
+	/* Interrupt us if the external trigger happens */
+	tc1->TC_IER = TC_IER_ETRGS;
+	NVIC_EnableIRQ(TC1_IRQn);
+
+	TC0->TC_BCR = TC_BCR_SYNC;
+
+	tc0->TC_CCR = TC_CCR_CLKEN|TC_CCR_SWTRG;
+	tc1->TC_CCR = TC_CCR_CLKEN|TC_CCR_SWTRG;
+}

firmware/apps/freq_ctr/main.c

@@ -0,0 +1,54 @@
+
+#include "board.h"
+#include "utils.h"
+#include "osmocom/core/timer.h"
+
+extern void freq_ctr_init(void);
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+	int ch;
+
+	if (!UART_IsRxReady())
+		return;
+
+	ch = UART_GetChar();
+
+	board_exec_dbg_cmd(ch);
+}
+
+
+extern int main(void)
+{
+	led_init();
+	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	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 |
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+
+	PIO_InitializeInterrupts(0);
+
+
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\n\r"
+		"=============================================================================\n\r");
+
+	board_main_top();
+
+	TRACE_INFO("starting frequency counter...\n\r");
+	freq_ctr_init();
+
+	TRACE_INFO("entering main loop...\n\r");
+	while (1) {
+		WDT_Restart(WDT);
+
+		check_exec_dbg_cmd();
+		osmo_timers_prepare();
+		osmo_timers_update();
+	}
+
+}

firmware/apps/freq_ctr/usb_strings.txt

@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+SIMtrace 2 compatible device
+SIMtrace Sniffer
+SIMtrace CCID
+SIMtrace Phone
+SIMtrace MITM
+CardEmulator Modem 1
+CardEmulator Modem 2
+CardEmulator Modem 3
+CardEmulator Modem 4

firmware/apps/gpio_test/Makefile

@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += gpio_test.c

firmware/apps/gpio_test/gpio_test.c

@@ -0,0 +1,8 @@
+#include <stdint.h>
+#include "utils.h"
+#include "chip.h"
+
+void gpio_test_init(void)
+{
+	printf("FIXME run tests here\n\r");
+}

firmware/apps/gpio_test/main.c

@@ -0,0 +1,54 @@
+
+#include "board.h"
+#include "utils.h"
+#include "osmocom/core/timer.h"
+
+extern void gpio_test_init(void);
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+	int ch;
+
+	if (!UART_IsRxReady())
+		return;
+
+	ch = UART_GetChar();
+
+	board_exec_dbg_cmd(ch);
+}
+
+
+extern int main(void)
+{
+	led_init();
+	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	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 |
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+
+	PIO_InitializeInterrupts(0);
+
+
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\n\r"
+		"=============================================================================\n\r");
+
+	board_main_top();
+
+	TRACE_INFO("starting gpio test...\n\r");
+	gpio_test_init();
+
+	TRACE_INFO("entering main loop...\n\r");
+	while (1) {
+		WDT_Restart(WDT);
+
+		check_exec_dbg_cmd();
+		osmo_timers_prepare();
+		osmo_timers_update();
+	}
+
+}

firmware/apps/gpio_test/usb_strings.txt

@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+SIMtrace 2 compatible device
+SIMtrace Sniffer
+SIMtrace CCID
+SIMtrace Phone
+SIMtrace MITM
+CardEmulator Modem 1
+CardEmulator Modem 2
+CardEmulator Modem 3
+CardEmulator Modem 4

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/atmel_softpack_libraries/usb/device/dfu/dfu.h

@@ -101,7 +101,7 @@ struct dfudata {
 extern struct dfudata _g_dfu;
 extern struct dfudata *g_dfu;
 
-void set_usb_serial_str(const uint8_t *serial_usbstr);
+void set_usb_serial_str(void);
 
 void DFURT_SwitchToDFU(void);
 

firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c

@@ -13,14 +13,87 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
+#include "usb_strings_generated.h"
+
 enum {
 	STR_MANUF	= 1,
 	STR_PROD,
 	STR_CONFIG,
 	_STR_FIRST_ALT,
+	// serial string
 	STR_SERIAL	= (_STR_FIRST_ALT+BOARD_DFU_NUM_IF),
+	// version string (on additional interface)
+	VERSION_CONF_STR,
+	VERSION_STR,
+	// count
+	STRING_DESC_CNT,
 };
 
+/* USB string for the serial (using 128-bit device ID) */
+static unsigned char usb_string_serial[] = {
+	USBStringDescriptor_LENGTH(32),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('f'),
+};
+
+/* USB string for the version */
+static const unsigned char usb_string_version_conf[] = {
+	USBStringDescriptor_LENGTH(16),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('m'),
+	USBStringDescriptor_UNICODE('w'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE(' '),
+	USBStringDescriptor_UNICODE('v'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('s'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('o'),
+	USBStringDescriptor_UNICODE('n'),
+};
+
+static const char git_version[] = GIT_VERSION;
+static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2];
+/** array of static (from usb_strings) and runtime (serial, version) USB strings */
+static const unsigned char *usb_strings_extended[STRING_DESC_CNT];
+
 static const USBDeviceDescriptor fsDevice = {
 	.bLength = 		sizeof(USBDeviceDescriptor),
 	.bDescriptorType = 	USBGenericDescriptor_DEVICE,
@@ -34,12 +107,8 @@ static const USBDeviceDescriptor fsDevice = {
 	.bcdDevice = 		BOARD_USB_RELEASE,
 	.iManufacturer =	STR_MANUF,
 	.iProduct =		STR_PROD,
-#ifdef BOARD_USB_SERIAL
 	.iSerialNumber =	STR_SERIAL,
-#else
+	.bNumConfigurations =	2, // DFU + version configurations
-	.iSerialNumber =	0,
-#endif
-	.bNumConfigurations =	1,
 };
 
 /* Alternate Interface Descriptor, we use one per partition/memory type */
@@ -85,17 +154,74 @@ const struct dfu_desc dfu_cfg_descriptor = {
 	.func_dfu = DFU_FUNC_DESC
 };
 
-#include "usb_strings_generated.h"
+void set_usb_serial_str(void)
-
-#if 0
-void set_usb_serial_str(const uint8_t *serial_usbstr)
 {
-	usb_strings[STR_SERIAL] = serial_usbstr;
+	unsigned int i;
+
+	// put device ID into USB serial number description
+	unsigned int device_id[4];
+	EEFC_ReadUniqueID(device_id);
+	char device_id_string[32 + 1];
+	snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x",
+		device_id[0], device_id[1], device_id[2], device_id[3]);
+	for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) {
+		usb_string_serial[2 + 2 * i] = device_id_string[i];
 	}
-#endif
+
+	// put version into USB string
+	usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1);
+	usb_string_version[1] = USBGenericDescriptor_STRING;
+	for (i = 0; i < ARRAY_SIZE(git_version) - 1; i++) {
+		usb_string_version[2 + i * 2 + 0] = git_version[i];
+		usb_string_version[2 + i * 2 + 1] = 0;
+	}
+
+	// fill extended USB strings
+	for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) {
+		usb_strings_extended[i] = usb_strings[i];
+	}
+	usb_strings_extended[STR_SERIAL] = usb_string_serial;
+	usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf;
+	usb_strings_extended[VERSION_STR] = usb_string_version;
+}
+
+/* USB descriptor just to show the version */
+typedef struct _SIMTraceDriverConfigurationDescriptorVersion {
+	/** Standard configuration descriptor. */
+	USBConfigurationDescriptor configuration;
+	USBInterfaceDescriptor version;
+} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion;
+
+static const SIMTraceDriverConfigurationDescriptorVersion
+				configurationDescriptorVersion = {
+	/* Standard configuration descriptor for the interface descriptor*/
+	.configuration = {
+		.bLength 		= sizeof(USBConfigurationDescriptor),
+		.bDescriptorType	= USBGenericDescriptor_CONFIGURATION,
+		.wTotalLength		= sizeof(SIMTraceDriverConfigurationDescriptorVersion),
+		.bNumInterfaces		= 1,
+		.bConfigurationValue	= 2,
+		.iConfiguration		= VERSION_CONF_STR,
+		.bmAttributes		= USBD_BMATTRIBUTES,
+		.bMaxPower		= USBConfigurationDescriptor_POWER(100),
+	},
+	/* Interface standard descriptor just holding the version information */
+	.version = {
+		.bLength = sizeof(USBInterfaceDescriptor),
+		.bDescriptorType 	= USBGenericDescriptor_INTERFACE,
+		.bInterfaceNumber	= 0,
+		.bAlternateSetting	= 0,
+		.bNumEndpoints		= 0,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
+		.bInterfaceSubClass	= 0xff,
+		.bInterfaceProtocol	= 0,
+		.iInterface		= VERSION_STR,
+	},
+};
 
 static const USBConfigurationDescriptor *conf_desc_arr[] = {
 	&dfu_cfg_descriptor.ucfg,
+	&configurationDescriptorVersion.configuration,
 };
 
 const USBDDriverDescriptors dfu_descriptors = {
@@ -108,6 +234,6 @@ const USBDDriverDescriptors dfu_descriptors = {
 	.pHsConfiguration = NULL,
 	.pHsQualifier = NULL,
 	.pHsOtherSpeed = NULL,
-	.pStrings = usb_strings,
+	.pStrings = usb_strings_extended,
-	.numStrings = ARRAY_SIZE(usb_strings),
+	.numStrings = ARRAY_SIZE(usb_strings_extended),
 };

firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c

@@ -447,6 +447,7 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors)
 	/* We already start in DFU idle mode */
 	g_dfu->state = DFU_STATE_dfuIDLE;
 
+	set_usb_serial_str();
 	USBDDriver_Initialize(&usbdDriver, pDescriptors, if_altsettings);
 	USBD_Init();
 	USBD_Connect();

firmware/libboard/common/include/board_common.h

@@ -1,3 +1,22 @@
+/* SIMtrace 2 common board pin definitions
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, 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
+ */
 #ifndef _BOARD_
 #define _BOARD_
 
@@ -37,18 +56,12 @@
 /** Core definition */
 #define cortexm3
 
-#define BOARD_MCK     48000000
+/* LEDs are used to indicate the status
-
+ * the LED definition is board specific
-#define PIO_LED_RED     PIO_PA17
+ * most boards have two LEDs, one green and one red
-#define PIO_LED_GREEN   PIO_PA18
+ * the red LED indicates of the main firmware is ready (on) or if there is an error (blinking)
-
+ * the green LED indicates if the firmware is idling (on) or if there is activity (blinking)
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+ */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-
-#define LED_NUM_RED     0
-#define LED_NUM_GREEN   1
-
 /** USART0 pin RX */
 #define PIN_USART0_RXD    {PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /** USART0 pin TX */
@@ -63,8 +76,8 @@
 #define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 
 /** UART0 */
-/** Console baudrate always using 115200. */
+/** Console baud rate in bps */
-#define CONSOLE_BAUDRATE    115200
+#define CONSOLE_BAUDRATE    921600
 /** UART peripheral used by the console (UART0). */
 #define CONSOLE_UART       UART0
 /** UART peripheral ID used by the console (UART0). */
@@ -95,18 +108,8 @@
 /* Interrupt request ID of USART peripheral connected to the phone */
 #define IRQ_USART_PHONE USART1_IRQn
 
-#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/board_lowlevel.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.
  *
@@ -46,39 +47,39 @@
 #define BOARD_OSCOUNT   (CKGR_MOR_MOSCXTST(0x8))
 #define BOARD_MCKR      (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK)
 
-#if (BOARD_MCK == 48000000)
+/** configure PLL to generate main clock based on main oscillator frequency */
-#if (BOARD_MAINOSC == 18432000)
+#if (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 48000000)
-/* Clock settings at 48MHz  for 18 MHz crystal */
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(13-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(5))
-#elif (BOARD_MAINOSC == 12000000)
-/* QMod has 12 MHz clock, so multply by 8 (96 MHz) and divide by 2 */
 #define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
 					   | CKGR_PLLAR_MULA(8-1) \
 					   | CKGR_PLLAR_PLLACOUNT(0x1) \
 					   | CKGR_PLLAR_DIVA(2))
-#else
+#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 58000000)
-#error "Please define PLLA config for your MAINOSC frequency"
-#endif /* MAINOSC */
-#elif (BOARD_MCK == 64000000)
-#if (BOARD_MAINOSC == 18432000)
-/* Clock settings at 64MHz  for 18 MHz crystal: 64.512 MHz */
 #define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(7-1) \
+					   | CKGR_PLLAR_MULA(29-1) \
 					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
+					   | CKGR_PLLAR_DIVA(6))
-#elif (BOARD_MAINOSC == 12000000)
+#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 60000000)
-/* QMod has 12 MHz clock, so multply by 10 / div by 2: 60 MHz */
 #define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
 					   | CKGR_PLLAR_MULA(10-1) \
 					   | CKGR_PLLAR_PLLACOUNT(0x1) \
 					   | CKGR_PLLAR_DIVA(2))
-#error "Please define PLLA config for your MAINOSC frequency"
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 47923200)
-#endif /* MAINOSC */
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(13-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(5))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 58982400)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(16-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(5))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 64512000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(7-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(2))
 #else
-    #error "No PLL settings for current BOARD_MCK."
+	#error "Please define PLLA config for your BOARD_MCK/MAINOSC frequency"
 #endif
 
 #if (BOARD_MAINOSC == 12000000)
@@ -126,6 +127,9 @@ extern WEAK void LowLevelInit( void )
 	SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
 	    	      SUPC_SMMR_SMRSTEN_ENABLE;
 
+	/* disable ERASE pin to prevent accidental flash erase */
+	MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12;
+
 	/* enable both LED and green LED */
 	PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
 	PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;

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.
  *
@@ -84,7 +85,12 @@ extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
 
 	/* Configure baudrate */
 	/* Asynchronous, no oversampling */
-    pUart->UART_BRGR = (masterClock / baudrate) / 16;
+	//pUart->UART_BRGR = (masterClock / baudrate) / 16;
+	if ((masterClock / baudrate) % 16 >= 7) {
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1;
+	} else {
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0;
+	}
 
 	/* Disable PDC channel */
 	pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
@@ -103,13 +109,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 +141,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,19 +154,36 @@ 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) */
+}
 
 /**
  * \brief Input a character from the UART line.

firmware/libboard/octsimtest/include/board.h

@@ -0,0 +1,170 @@
+/* octSIMtest with SAM3S board definition
+ *
+ * (C) 2019 by sysmocom -s.f.m.c. GmbH, Author:Joachim Steiger <jsteiger@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"
+
+/* Name of the board */
+#define BOARD_NAME "OCTSIMTEST"
+/* Board definition */
+#define octsimtest
+
+/** oscillator used as main clock source (in Hz) */
+#define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
+
+/** Pin configuration **/
+
+/** there is no red LED, but the code needs this second LED, thus we provide an unused pin */
+#define PIO_LED_RED     PIO_PB13
+/** MCU pin connected to green LED, which is actually amber, and the logic is inverted since it is connected to an NPN transistor (used as open drain) */
+#define PIO_LED_GREEN   PIO_PA4
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOB, ID_PIOB, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
+
+/* Button to force bootloader start (shorted to ground when pressed */
+#define PIN_BOOTLOADER_SW      {PIO_PA5, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
+
+//FIXME SIM_PWEN_PIN collides with PA5/bootloader_sw on octsimtest
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
+#define SIM_PWEN_PIN           {PIO_PA12, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+
+// FIXME PA8 is 32khz xtal on octsimtest
+/* Card presence pin */
+#define SW_SIM                  PIO_PA11
+/* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+//FIXME
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+//FIXME PIO_PA4B_TCLK0 PA4 is LED on octsimtest
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA14, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
+
+/** Phone connection **/
+/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
+/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
+#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Phone CLK clock input (CLK_PHONE in schematic) */
+#define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Pin used for phone USIM slot 1 communication */
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
+/* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
+#define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
+#define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+
+/** Default pin configuration **/
+/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+
+/** Sniffer configuration **/
+/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
+/* Card RST reset signal input (use as input since the phone will drive it) */
+#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+/* Pins used to sniff phone-card communication */
+#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Use phone VCC to power card */
+#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
+
+/** CCID configuration */
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* ISO7816-communication related pins */
+#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
+
+/** External SPI flash interface   **/
+/* SPI MISO pin definition */
+#define PIN_SPI_MISO  {PIO_PA12A_MISO, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
+/* SPI MOSI pin definition */
+#define PIN_SPI_MOSI  {PIO_PA13A_MOSI, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI SCK pin definition */
+#define PIN_SPI_SCK   {PIO_PA14A_SPCK, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI pins definition. Contains MISO, MOSI & SCK */
+#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SCK
+/* SPI chip select 0 pin definition */
+#define PIN_SPI_NPCS0 {PIO_PA11A_NPCS0, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* 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
+/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
+/* USB release number (bcdDevice, shown as 0.00) */
+#define BOARD_USB_RELEASE	0x000
+/* Indicate SIMtrace is bus power in USB attributes */
+#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
+
+/** Supported modes */
+/* SIMtrace board supports sniffer mode */
+//#define HAVE_SNIFFER
+/* SIMtrace board supports CCID mode */
+//#define HAVE_CCID
+/* SIMtrace board supports card emulation mode */
+//#define HAVE_CARDEM
+/* SIMtrace board supports man-in-the-middle mode */
+//#define HAVE_MITM
+/* octsimtest board supports gpio_test mode */
+#define HAVE_GPIO_TEST

firmware/libboard/octsimtest/include/i2c.h

@@ -0,0 +1,28 @@
+/* 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
+
+#include <stdbool.h>
+
+void i2c_pin_init(void);
+
+bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte);
+uint8_t i2c_read_byte(bool nack, bool send_stop);
+void i2c_stop_cond(void);
+
+int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
+int eeprom_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/octsimtest/include/mcp23017.h

@@ -0,0 +1,25 @@
+/* mcp23017 i2c gpio expander 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
+
+#define MCP23017_ADDRESS 0x20
+
+int mcp23017_init(uint8_t slave);
+int mcp23017_test(uint8_t slave);
+int mcp23017_toggle(uint8_t slave);
+//int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
+//int mcp23017_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/octsimtest/source/board_octsimtest.c

@@ -0,0 +1,81 @@
+/* SIMtrace with SAM3S specific application code
+ *
+ * (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"
+#include "sim_switch.h"
+#include <osmocom/core/timer.h>
+#include "usb_buf.h"
+#include "i2c.h"
+#include "mcp23017.h"
+
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		printf("\tm\trun mcp23017 test\n\r");
+		printf("\tR\ttoggle MSB of gpio on mcp23017\n\r");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\n\r");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	case 'm':
+		mcp23017_test(MCP23017_ADDRESS);
+		break;
+	case 't':
+		mcp23017_toggle(MCP23017_ADDRESS);
+		break;
+	default:
+		printf("Unknown command '%c'\n\r", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+
+	i2c_pin_init();
+	if (!mcp23017_init(MCP23017_ADDRESS))
+		printf("mcp23017 not found!\n\r");
+	/* Initialize checking for card insert/remove events */
+	//card_present_init();
+#endif
+}
+
+int board_override_enter_dfu(void)
+{
+	const Pin bl_sw_pin = PIN_BOOTLOADER_SW;
+
+	PIO_Configure(&bl_sw_pin, 1);
+
+	/* Enter DFU bootloader in case the respective button is pressed */
+	if (PIO_Get(&bl_sw_pin) == 0) {
+		/* do not print to early since the console is not initialized yet */
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
+		return 1;
+	} else
+		return 0;
+}

firmware/libboard/octsimtest/source/i2c.c

@@ -0,0 +1,225 @@
+/* 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>
+
+/* Low-Level I2C Routines */
+
+static const Pin pin_sda = {PIO_PA30, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
+static const Pin pin_sda_in = {PIO_PA30, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT };
+static const Pin pin_scl = {PIO_PA31, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
+
+static void i2c_delay()
+{
+	volatile int v;
+	int i;
+
+	/* 100 cycles results in SCL peak length of 44us, so it's about
+	 * 440ns per cycle here */
+	for (i = 0; i < 14; i++) {
+		v = 0;
+	}
+}
+
+void i2c_pin_init(void)
+{
+	PIO_Configure(&pin_scl, PIO_LISTSIZE(pin_scl));
+	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
+}
+
+static void set_scl(void)
+{
+	PIO_Set(&pin_scl);
+	i2c_delay();
+}
+
+static void set_sda(void)
+{
+	PIO_Set(&pin_sda);
+	i2c_delay();
+}
+
+static void clear_scl(void)
+{
+	PIO_Clear(&pin_scl);
+	i2c_delay();
+}
+
+static void clear_sda(void)
+{
+	PIO_Clear(&pin_sda);
+	i2c_delay();
+}
+
+static bool read_sda(void)
+{
+	bool ret;
+
+	PIO_Configure(&pin_sda_in, PIO_LISTSIZE(pin_sda_in));
+	if (PIO_Get(&pin_sda_in))
+		ret = true;
+	else
+		ret = false;
+	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
+
+	return ret;
+}
+
+/* Core I2C Routines */
+
+static bool i2c_started = false;
+
+static void i2c_start_cond(void)
+{
+	if (i2c_started) {
+		set_sda();
+		set_scl();
+	}
+
+	clear_sda();
+	i2c_delay();
+	clear_scl();
+	i2c_started = true;
+}
+
+void i2c_stop_cond(void)
+{
+	clear_sda();
+	set_scl();
+	set_sda();
+	i2c_delay();
+	i2c_started = false;
+}
+
+static void i2c_write_bit(bool bit)
+{
+	if (bit)
+		set_sda();
+	else
+		clear_sda();
+	i2c_delay(); // ?
+	set_scl();
+	clear_scl();
+}
+
+static bool i2c_read_bit(void)
+{
+	bool bit;
+
+	set_sda();
+	set_scl();
+	bit = read_sda();
+	clear_scl();
+
+	return bit;
+}
+
+bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte)
+{
+	uint8_t bit;
+	bool nack;
+
+	if (send_start)
+		i2c_start_cond();
+
+	for (bit = 0; bit < 8; bit++) {
+		i2c_write_bit((byte & 0x80) != 0);
+		byte <<= 1;
+	}
+
+	nack = i2c_read_bit();
+
+	if (send_stop)
+		i2c_stop_cond();
+
+	return nack;
+}
+
+uint8_t i2c_read_byte(bool nack, bool send_stop)
+{
+	uint8_t byte = 0;
+	uint8_t bit;
+
+	for (bit = 0; bit < 8; bit++) {
+		byte = (byte << 1) | i2c_read_bit();
+	}
+
+	i2c_write_bit(nack);
+
+	if (send_stop)
+		i2c_stop_cond();
+
+	return byte;
+}
+
+
+/* EEPROM related code */
+
+int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
+{
+	bool nack;
+
+	WDT_Restart(WDT);
+
+	/* Write slave address */
+	nack = i2c_write_byte(true, false, slave << 1);
+	if (nack)
+		goto out_stop;
+	nack = i2c_write_byte(false, false, addr);
+	if (nack)
+		goto out_stop;
+	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();
+	if (nack)
+		return -1;
+	else
+		return 0;
+}
+
+int eeprom_read_byte(uint8_t slave, uint8_t addr)
+{
+	bool nack;
+
+	WDT_Restart(WDT);
+
+	/* dummy write cycle */
+	nack = i2c_write_byte(true, false, slave << 1);
+	if (nack)
+		goto out_stop;
+	nack = i2c_write_byte(false, false, addr);
+	if (nack)
+		goto out_stop;
+	/* Re-start with read */
+	nack = i2c_write_byte(true, false, (slave << 1) | 1);
+	if (nack)
+		goto out_stop;
+
+	return i2c_read_byte(true, true);
+
+out_stop:
+	i2c_stop_cond();
+	if (nack)
+		return -1;
+	else
+		return 0;
+}

firmware/libboard/octsimtest/source/mcp23017.c

@@ -0,0 +1,140 @@
+#include "board.h"
+#include <stdbool.h>
+#include "i2c.h"
+#include "mcp23017.h"
+
+
+//defines from https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h under BSD license
+
+// registers
+#define MCP23017_IODIRA 0x00
+#define MCP23017_IPOLA 0x02
+#define MCP23017_GPINTENA 0x04
+#define MCP23017_DEFVALA 0x06
+#define MCP23017_INTCONA 0x08
+#define MCP23017_IOCONA 0x0A
+#define MCP23017_GPPUA 0x0C
+#define MCP23017_INTFA 0x0E
+#define MCP23017_INTCAPA 0x10
+#define MCP23017_GPIOA 0x12
+#define MCP23017_OLATA 0x14
+
+
+#define MCP23017_IODIRB 0x01
+#define MCP23017_IPOLB 0x03
+#define MCP23017_GPINTENB 0x05
+#define MCP23017_DEFVALB 0x07
+#define MCP23017_INTCONB 0x09
+#define MCP23017_IOCONB 0x0B
+#define MCP23017_GPPUB 0x0D
+#define MCP23017_INTFB 0x0F
+#define MCP23017_INTCAPB 0x11
+#define MCP23017_GPIOB 0x13
+#define MCP23017_OLATB 0x15
+
+#define MCP23017_INT_ERR 255
+
+
+//bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte)
+//uint8_t i2c_read_byte(bool nack, bool send_stop)
+//static void i2c_stop_cond(void)
+
+int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
+{
+	bool nack;
+
+	WDT_Restart(WDT);
+
+//	 Write slave address 
+	nack = i2c_write_byte(true, false, slave << 1);
+	if (nack)
+		goto out_stop;
+	nack = i2c_write_byte(false, false, addr);
+	if (nack)
+		goto out_stop;
+	nack = i2c_write_byte(false, true, byte);
+	if (nack)
+		goto out_stop;
+
+out_stop:
+	i2c_stop_cond();
+	if (nack)
+		return -1;
+	else
+		return 0;
+}
+
+int mcp23017_read_byte(uint8_t slave, uint8_t addr)
+{
+	bool nack;
+
+	WDT_Restart(WDT);
+
+	// dummy write cycle
+	nack = i2c_write_byte(true, false, slave << 1);
+	if (nack)
+		goto out_stop;
+	nack = i2c_write_byte(false, false, addr);
+	if (nack)
+		goto out_stop;
+	// Re-start with read
+	nack = i2c_write_byte(true, false, (slave << 1) | 1);
+	if (nack)
+		goto out_stop;
+
+	return i2c_read_byte(true, true);
+
+out_stop:
+	i2c_stop_cond();
+	if (nack)
+		return -1;
+	else
+		return 0;
+}
+
+int mcp23017_init(uint8_t slave)
+{
+	printf("mcp23017_init\n\r");
+	// all gpio input
+	if (mcp23017_write_byte(slave, MCP23017_IODIRA, 0xff))
+		return false;
+	// msb of portb output, rest input
+	if (mcp23017_write_byte(slave, MCP23017_IODIRB, 0x7f))
+		return false;
+	if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP (autoinc addressing)
+		return false;
+	printf("mcp23017 found\n\r");
+	return true;
+}
+
+int mcp23017_test(uint8_t slave)
+{
+	printf("mcp23017_test\n\r");
+	printf("GPIOA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOA));
+	printf("GPIOB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOB));
+	printf("IODIRA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRA));
+	printf("IODIRB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRB));
+	printf("IOCONA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONA));
+	printf("IOCONB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONB));
+
+	return 0;
+}
+
+int mcp23017_toggle(uint8_t slave)
+{
+	// example writing MSB of gpio
+	static bool foo=false;
+	if (foo)
+	{
+		printf("+\n\r");
+		mcp23017_write_byte(slave, MCP23017_OLATB, 0x80);
+		foo=false;
+	}
+	else
+	{
+		printf("-\n\r");
+		mcp23017_write_byte(slave, MCP23017_OLATB, 0x00);
+		foo=true;
+	}
+	return 0;
+}

firmware/libboard/owhw/include/board.h

@@ -1,3 +1,22 @@
+/* OWHW board definition
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, 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"
@@ -7,7 +26,28 @@
 /** Board definition */
 #define owhw
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
+
+/** MCU pin connected to red LED */
+#define PIO_LED_RED     PIO_PA17
+/** MCU pin connected to green LED */
+#define PIO_LED_GREEN   PIO_PA18
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
+
+/* pin connected to the SIMTRACE_BOOTLOADER signal. set high to force DFU bootloader start */
+#define PIN_BOOTLOADER		{PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
 
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}

firmware/libboard/owhw/source/owhw.c

@@ -1,5 +1,7 @@
-/* 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>
+ * (C) 2018-2019, 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,16 +15,41 @@
  *
  * 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"
 #include "board.h"
 #include "utils.h"
+#include "usb_buf.h"
 
 static const Pin pins_cardsim[] = PINS_CARDSIM;
 
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\n\r");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	default:
+		printf("Unknown command '%c'\n\r", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+#endif
+}
+
 void cardsim_set_simpres(uint8_t slot, int present)
 {
 	if (slot > 1)
@@ -36,5 +63,18 @@ 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));
+}
+
+int board_override_enter_dfu(void)
+{
+	const Pin bl_pin = PIN_BOOTLOADER;
+
+	PIO_Configure(&bl_pin, 1);
+
+	if (PIO_Get(&bl_pin) == 0) { // signal low
+		return 0; // do not override enter DFU
+	} else {
+		return 1; // override enter DFU
+	}
 }

firmware/libboard/qmod/include/board.h

@@ -1,16 +1,53 @@
+/* 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"
 
-#define LED_USIM1	LED_GREEN
-#define LED_USIM2	LED_RED
-
 /** Name of the board */
 #define BOARD_NAME "QMOD"
 /** Board definition */
 #define qmod
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 12000000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58000000 // 18.432 * 29 / 6
+
+/** MCU pin connected to red LED */
+#define PIO_LED_RED     PIO_PA17
+/** MCU pin connected to green LED */
+#define PIO_LED_GREEN   PIO_PA18
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
+/** the green LED is actually red and used as indication for USIM1 */
+#define LED_USIM1	LED_GREEN
+/** the green LED is actually red and used as indication for USIM2 */
+#define LED_USIM2	LED_RED
 
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}

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,9 +1,26 @@
-/* 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>
+ * (C) 2018-2019, 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"
+#include "led.h"
 #include "wwan_led.h"
 #include "wwan_perst.h"
 #include "sim_switch.h"
@@ -11,6 +28,7 @@
 #include "card_pres.h"
 #include <osmocom/core/timer.h>
 #include "usb_buf.h"
+#include "i2c.h"
 
 static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
 static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
@@ -29,6 +47,7 @@ static int qmod_sam3_is_12(void)
 		return 0;
 }
 
+#if (ALLOW_PEER_ERASE > 0)
 const unsigned char __eeprom_bin[256] = {
 	USB_VENDOR_OPENMOKO & 0xff,
 	USB_VENDOR_OPENMOKO >> 8,
@@ -52,11 +71,8 @@ const unsigned char __eeprom_bin[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
 };
 
-#include "i2c.h"
 static int write_hub_eeprom(void)
 {
-	const unsigned int __eeprom_bin_len = 256;
-
 	int i;
 
 	/* wait */
@@ -64,22 +80,25 @@ 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);
+		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
 			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
 					i, __eeprom_bin[i], byte);
 	}
+	TRACE_INFO("EEPROM written\n\r");
 
 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -87,6 +106,29 @@ 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;
+		}
+	}
+	TRACE_INFO("EEPROM erased\n\r");
+
+	return 0;
+}
+#endif /* ALLOW_PEER_ERASE */
+
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -96,9 +138,14 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		return;
 
 	switch (ch) {
+#if (ALLOW_PEER_ERASE > 0)
 	case 'E':
 		write_hub_eeprom();
 		break;
+	case 'e':
+		erase_hub_eeprom();
+		break;
+#endif /* ALLOW_PEER_ERASE */
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -107,6 +154,7 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
+#if (ALLOW_PEER_ERASE > 0)
 	case 'H':
 		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
@@ -123,13 +171,14 @@ 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;
+#endif /* ALLOW_PEER_ERASE */
 	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);
@@ -140,12 +189,24 @@ static void board_exec_dbg_cmd_st12only(int ch)
 /* returns '1' in case we should break any endless loop */
 void board_exec_dbg_cmd(int ch)
 {
+#if (ALLOW_PEER_ERASE > 0)
+	/* this variable controls if it is allowed to assert/release the ERASE line.
+	   this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE.
+	 */
+	static bool allow_erase = false;
+#endif
+
 	switch (ch) {
 	case '?':
 		printf("\t?\thelp\n\r");
 		printf("\tR\treset SAM3\n\r");
+		printf("\tl\tswitch off LED 1\n\r");
+		printf("\tL\tswitch off LED 1\n\r");
+		printf("\tg\tswitch off LED 2\n\r");
+		printf("\tG\tswitch off LED 2\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");
@@ -155,8 +216,11 @@ void board_exec_dbg_cmd(int ch)
 		}
 		printf("\tX\tRelease peer SAM3 from reset\n\r");
 		printf("\tx\tAssert peer SAM3 reset\n\r");
+#if (ALLOW_PEER_ERASE > 0)
 		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
+		printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");
 		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
+#endif
 		printf("\tU\tProceed to USB Initialization\n\r");
 		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
 		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
@@ -166,6 +230,22 @@ void board_exec_dbg_cmd(int ch)
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
+	case 'l':
+		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
+		printf("LED 1 switched off\n\r");
+		break;
+	case 'L':
+		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+		printf("LED 1 switched on\n\r");
+		break;
+	case 'g':
+		led_blink(LED_RED, BLINK_ALWAYS_OFF);
+		printf("LED 2 switched off\n\r");
+		break;
+	case 'G':
+		led_blink(LED_RED, BLINK_ALWAYS_ON);
+		printf("LED 2 switched on\n\r");
+		break;
 	case 'X':
 		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
 		PIO_Clear(&pin_peer_rst);
@@ -174,14 +254,24 @@ void board_exec_dbg_cmd(int ch)
 		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
+#if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
 		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
-	case 'y':
+	case 'a':
-		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
+		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
-		PIO_Set(&pin_peer_erase);
+		allow_erase = true;
 		break;
+	case 'y':
+		if (allow_erase) {
+			printf("Setting SIMTRACExx_ERASE (active)\n\r");
+			PIO_Set(&pin_peer_erase);
+		} else {
+			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
+		}
+		break;
+#endif
 	case '1':
 		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
@@ -203,6 +293,13 @@ void board_exec_dbg_cmd(int ch)
 			board_exec_dbg_cmd_st12only(ch);
 		break;
 	}
+
+#if (ALLOW_PEER_ERASE > 0)
+	// set protection back so it can only run for one command
+	if ('a' != ch) {
+		allow_erase = false;
+	}
+#endif
 }
 
 void board_main_top(void)
@@ -261,20 +358,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/sam3p256/include/board.h

@@ -0,0 +1,163 @@
+/* Olimiex SAM3S-P256 board definition
+ *
+ * (C) 2019 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
+#pragma once
+#include "board_common.h"
+#include "simtrace_usb.h"
+
+/* Name of the board */
+#define BOARD_NAME "SAM3S-P256"
+/* Board definition */
+#define simtrace
+
+/** oscillator used as main clock source (in Hz) */
+#define BOARD_MAINOSC 12000000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58000000
+
+/** MCU pin connected to yellow LED2 */
+#define PIO_LED_RED     PIO_PA17
+/** MCU pin connected to green LED1 */
+#define PIO_LED_GREEN   PIO_PA18
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
+
+/** Pin configuration **/
+/* Button to force bootloader start (shorted to ground when pressed */
+#define PIN_BOOTLOADER_SW      {PIO_PA20, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+#if 0
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
+#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+/* Card presence pin */
+#define SW_SIM                  PIO_PA8
+/* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA4B_TCLK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
+
+/** Phone connection **/
+/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
+/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
+#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Phone CLK clock input (CLK_PHONE in schematic) */
+#define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Pin used for phone USIM slot 1 communication */
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
+/* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
+#define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
+#define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+
+/** Default pin configuration **/
+/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+
+/** Sniffer configuration **/
+/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
+/* Card RST reset signal input (use as input since the phone will drive it) */
+#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+/* Pins used to sniff phone-card communication */
+#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Use phone VCC to power card */
+#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
+
+/** CCID configuration */
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* ISO7816-communication related pins */
+#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
+
+/** External SPI flash interface   **/
+/* SPI MISO pin definition */
+#define PIN_SPI_MISO  {PIO_PA12A_MISO, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
+/* SPI MOSI pin definition */
+#define PIN_SPI_MOSI  {PIO_PA13A_MOSI, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI SCK pin definition */
+#define PIN_SPI_SCK   {PIO_PA14A_SPCK, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI pins definition. Contains MISO, MOSI & SCK */
+#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SCK
+/* SPI chip select 0 pin definition */
+#define PIN_SPI_NPCS0 {PIO_PA11A_NPCS0, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI flash write protect pin (active low, pulled low) */
+#define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#endif
+
+/** 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
+/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
+/* USB release number (bcdDevice, shown as 0.00) */
+#define BOARD_USB_RELEASE	0x000
+/* Indicate SIMtrace is bus power in USB attributes */
+#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
+
+/** Supported modes */
+/* SIMtrace board supports sniffer mode */
+#define HAVE_SNIFFER
+/* SIMtrace board supports CCID mode */
+//#define HAVE_CCID
+/* SIMtrace board supports card emulation mode */
+//#define HAVE_CARDEM
+/* SIMtrace board supports man-in-the-middle mode */
+//#define HAVE_MITM

firmware/libboard/sam3p256/source/board_sam3p256.c

@@ -0,0 +1,68 @@
+/* Olimex SAM3S-P256 specific application code
+ *
+ * (C) 2017,2019 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"
+#include "sim_switch.h"
+#include <osmocom/core/timer.h>
+#include "usb_buf.h"
+
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\n\r");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	default:
+		printf("Unknown command '%c'\n\r", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+
+	/* Initialize checking for card insert/remove events */
+	//card_present_init();
+#endif
+}
+
+int board_override_enter_dfu(void)
+{
+	const Pin bl_sw_pin = PIN_BOOTLOADER_SW;
+
+	PIO_Configure(&bl_sw_pin, 1);
+
+	/* Enter DFU bootloader in case the respective button is pressed */
+	if (PIO_Get(&bl_sw_pin) == 0) {
+		/* do not print to early since the console is not initialized yet */
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
+		return 1;
+	} else
+		return 0;
+}

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"
@@ -7,14 +26,31 @@
 /* Board definition */
 #define simtrace
 
-/* Board main oscillator frequency (in Hz) */
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
+
+/** MCU pin connected to red LED */
+#define PIO_LED_RED     PIO_PA17
+/** MCU pin connected to green LED */
+#define PIO_LED_GREEN   PIO_PA18
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
 
 /** Pin configuration **/
 /* Button to force bootloader start (shorted to ground when pressed */
 #define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
 /* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define SIM_PWEN_PIN           {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /* Enable powering the SIM card */
 #define PWR_PINS                SIM_PWEN_PIN
 /* Card presence pin */
@@ -72,9 +108,9 @@
 /* Pins used to sniff phone-card communication */
 #define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
 /* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define PIN_SIM_PWEN_SNIFF     {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
-#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PIN_VCC_FWD_SNIFF      {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /* Use phone VCC to power card */
 #define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
 
@@ -98,6 +134,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>
@@ -10,8 +29,18 @@ enum card_io {
 	CARD_IO_CLK,
 };
 
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan,
+/** initialise card slot
-				  uint8_t in_ep, uint8_t irq_ep);
+ *  @param[in] slot_num slot number (arbitrary number)
+ *  @param[in] tc_chan timer counter channel (to measure the ETU)
+ *  @param[in] uart_chan UART peripheral channel
+ *  @param[in] in_ep USB IN end point number
+ *  @param[in] irq_ep USB INTerrupt end point number
+ *  @param[in] vcc_active initial VCC signal state (true = on)
+ *  @param[in] in_reset initial RST signal state (true = reset asserted)
+ *  @param[in] clocked initial CLK signat state (true = active)
+ *  @return main card handle reference
+ */
+struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked);
 
 /* process a single byte received from the reader */
 void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte);
@@ -36,3 +65,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,22 @@
+/* SIMtrace 2 mode definitions
+ *
+ * Copyright (c) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * Copyright (c) 2018-2019, 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
+ */
 #ifndef SIMTRACE_H
 #define SIMTRACE_H
 
@@ -39,6 +58,7 @@ enum confNum {
 #ifdef HAVE_MITM
 	CFG_NUM_MITM,
 #endif
+	CFG_NUM_VERSION,
 	NUM_CONF
 };
 
@@ -68,7 +88,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,46 @@ enum iso7816_3_card_state {
 	ISO_S_IN_TPDU,		/* inside a TPDU */
 };
 
+const struct value_string iso7816_3_card_state_names[] = {
+	{
+		.value = ISO_S_WAIT_POWER,
+		.str = "WAIT_POWER",
+	},
+	{
+		.value = ISO_S_WAIT_CLK,
+		.str = "WAIT_CLK",
+	},
+	{
+		.value = ISO_S_WAIT_RST,
+		.str = "WAIT_RST",
+	},
+	{
+		.value = ISO_S_WAIT_ATR,
+		.str = "WAIT_ATR",
+	},
+	{
+		.value = ISO_S_IN_ATR,
+		.str = "IN_ATR",
+	},
+	{
+		.value = ISO_S_IN_PTS,
+		.str = "IN_PTS",
+	},
+	{
+		.value = ISO_S_WAIT_TPDU,
+		.str = "WAIT_TPDU",
+	},
+	{
+		.value = ISO_S_IN_TPDU,
+		.str = "IN_TPDU",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+
 /* detailed sub-states of ISO_S_IN_PTS */
 enum pts_state {
 	PTS_S_WAIT_REQ_PTSS,
@@ -72,6 +110,7 @@ enum pts_state {
 	PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10,
 };
 
+/* PTS field byte index */
 #define _PTSS	0
 #define _PTS0	1
 #define _PTS1	2
@@ -87,10 +126,50 @@ 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 */
 };
 
+const struct value_string tpdu_state_names[] = {
+	{
+		.value = TPDU_S_WAIT_CLA,
+		.str = "WAIT_CLA",
+	},
+	{
+		.value = TPDU_S_WAIT_INS,
+		.str = "WAIT_INS",
+	},
+	{
+		.value = TPDU_S_WAIT_P1,
+		.str = "WAIT_P1",
+	},
+	{
+		.value = TPDU_S_WAIT_P2,
+		.str = "WAIT_P2",
+	},
+	{
+		.value = TPDU_S_WAIT_P3,
+		.str = "WAIT_P3",
+	},
+	{
+		.value = TPDU_S_WAIT_PB,
+		.str = "WAIT_PB",
+	},
+	{
+		.value = TPDU_S_WAIT_RX,
+		.str = "WAIT_RX",
+	},
+	{
+		.value = TPDU_S_WAIT_TX,
+		.str = "WAIT_TX",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+/* TPDU field byte index */
 #define	_CLA	0
 #define	_INS	1
 #define	_P1	2
@@ -98,14 +177,14 @@ enum tpdu_state {
 #define	_P3	4
 
 struct card_handle {
-	uint32_t num;
+	unsigned int num;
 
 	enum iso7816_3_card_state state;
 
 	/* signal levels */
-	uint8_t vcc_active;	/* 1 = on, 0 = off */
+	bool vcc_active;	/*< if VCC is active (true = active/ON) */
-	uint8_t in_reset;	/* 1 = RST low, 0 = RST high */
+	bool in_reset;	/*< if card is in reset (true = RST low/asserted, false = RST high/ released) */
-	uint8_t clocked;	/* 1 = active, 0 = inactive */
+	bool clocked;	/*< if clock is active ( true = active, false = inactive) */
 
 	/* timing parameters, from PTS */
 	uint8_t fi;
@@ -175,12 +254,35 @@ void usb_buf_upd_len_and_submit(struct msgb *msg)
 /* Allocate USB buffer and push + initialize simtrace_msg_hdr */
 struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 {
-	struct msgb *msg;
+	struct msgb *msg = NULL;
 	struct simtrace_msg_hdr *sh;
 
-	msg = usb_buf_alloc(ep);
+	while (!msg) {
-	if (!msg)
+		msg = usb_buf_alloc(ep); // try to allocate some memory
+		if (!msg) { // allocation failed, we might be out of memory
+			struct llist_head *queue = usb_get_queue(ep);
+			if (!queue) {
+				TRACE_ERROR("ep %u: %s queue does not exist\n\r",
+				            ep, __func__);
 				return NULL;
+			}
+			if (llist_empty(queue)) {
+				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r",
+				            ep, __func__);
+				return NULL;
+			}
+			msg = msgb_dequeue(queue);
+			if (!msg) {
+				TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
+				            ep, __func__);
+				return NULL;
+			}
+			usb_buf_free(msg);
+			msg = NULL;
+			TRACE_DEBUG("ep %u: %s queue msg dropped\n\r",
+			            ep, __func__);
+		}
+	}
 
 	msg->l1h = msgb_put(msg, sizeof(*sh));
 	sh = (struct simtrace_msg_hdr *) msg->l1h;
@@ -192,7 +294,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 +307,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 +392,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 %s -> %s\r\n", ch->num,
-		    ch->state, new_state);
+		    get_value_string(iso7816_3_card_state_names, ch->state),
+		    get_value_string(iso7816_3_card_state_names, new_state));
 	ch->state = new_state;
 
 	switch (new_state) {
@@ -297,34 +403,48 @@ static void card_set_state(struct card_handle *ch,
 	case ISO_S_WAIT_RST:
 		/* disable Rx and Tx of UART */
 		card_emu_uart_enable(ch->uart_chan, 0);
+		/* check end activation state (only necessary if the reader to not respect the activation sequence) */
+		if (ch->vcc_active && ch->clocked && !ch->in_reset) {
+			/* 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);
+		}
 		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);
+		/* the ATR should only be sent 400 to 40k clock cycles after the RESET.
+		 * 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
-		 * receive TC2, and it will be programmed into hardware after
+		 * 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 +452,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",
@@ -558,9 +746,9 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
 	if (ch->tpdu.state == new_ts)
 		return;
 
-	TRACE_DEBUG("%u: 7816 TPDU state %u -> %u\r\n", ch->num,
+	TRACE_DEBUG("%u: 7816 TPDU state %s -> %s\r\n", ch->num,
-		    ch->tpdu.state, new_ts);
+		get_value_string(tpdu_state_names, ch->tpdu.state),
-
+		get_value_string(tpdu_state_names, new_ts));
 	ch->tpdu.state = new_ts;
 
 	switch (new_ts) {
@@ -718,7 +906,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 +953,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 +966,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 +984,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 +1079,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 +1101,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 +1140,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 */
@@ -967,8 +1156,7 @@ static const uint8_t default_atr[] = { 0x3B, 0x02, 0x14, 0x50 };
 
 static struct card_handle card_handles[NUM_SLOTS];
 
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan,
+struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked)
-				  uint8_t in_ep, uint8_t irq_ep)
 {
 	struct card_handle *ch;
 
@@ -981,14 +1169,13 @@ 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 */
 	ch->num = slot_num;
 	ch->irq_ep = irq_ep;
 	ch->in_ep = in_ep;
 	ch->state = ISO_S_WAIT_POWER;
-	ch->vcc_active = 0;
+	ch->vcc_active = vcc_active;
-	ch->in_reset = 1;
+	ch->in_reset = in_reset;
-	ch->clocked = 0;
+	ch->clocked = clocked;
 
 	ch->fi = 0;
 	ch->di = 1;

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,16 +99,12 @@ 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;
 	}
+}
 
 /***********************************************************************
  * Call-Backs from card_emu.c
@@ -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
  ***********************************************************************/
@@ -281,7 +309,7 @@ static int card_vcc_adc_init(void)
 }
 
 #define VCC_UV_THRESH_1V8	1500000
-#define VCC_UV_THRESH_3V	2800000
+#define VCC_UV_THRESH_3V	2500000
 
 static void process_vcc_adc(struct cardem_inst *ci)
 {
@@ -329,14 +357,14 @@ void ADC_IrqHandler(void)
 
 static void usim1_rst_irqhandler(const Pin *pPin)
 {
-	int active = PIO_Get(&pin_usim1_rst) ? 0 : 1;
+	bool active = PIO_Get(&pin_usim1_rst) ? false : true;
 	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_RST, active);
 }
 
 #ifndef DETECT_VCC_BY_ADC
 static void usim1_vcc_irqhandler(const Pin *pPin)
 {
-	int active = PIO_Get(&pin_usim1_vcc) ? 1 : 0;
+	bool active = PIO_Get(&pin_usim1_vcc) ? true : false;
 	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active);
 	/* FIXME do this for real */
 	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active);
@@ -346,14 +374,14 @@ static void usim1_vcc_irqhandler(const Pin *pPin)
 #ifdef CARDEMU_SECOND_UART
 static void usim2_rst_irqhandler(const Pin *pPin)
 {
-	int active = PIO_Get(&pin_usim2_rst) ? 0 : 1;
+	bool active = PIO_Get(&pin_usim2_rst) ? false : true;
 	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_RST, active);
 }
 
 #ifndef DETECT_VCC_BY_ADC
 static void usim2_vcc_irqhandler(const Pin *pPin)
 {
-	int active = PIO_Get(&pin_usim2_vcc) ? 1 : 0;
+	bool active = PIO_Get(&pin_usim2_vcc) ? true : false;
 	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active);
 	/* FIXME do this for real */
 	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active);
@@ -392,7 +420,7 @@ void mode_cardemu_init(void)
 	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler);
 	PIO_EnableIt(&pin_usim1_vcc);
 #endif /* DETECT_VCC_BY_ADC */
-	cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT);
+	cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT, PIO_Get(&pin_usim1_vcc) ? true : false, PIO_Get(&pin_usim1_rst) ? false : true, PIO_Get(&pin_usim1_vcc) ? true : false);
 	sim_switch_use_physical(0, 1);
 
 #ifdef CARDEMU_SECOND_UART
@@ -407,10 +435,9 @@ void mode_cardemu_init(void)
 	PIO_ConfigureIt(&pin_usim2_vcc, usim2_vcc_irqhandler);
 	PIO_EnableIt(&pin_usim2_vcc);
 #endif /* DETECT_VCC_BY_ADC */
-	cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT);
+	cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT, PIO_Get(&pin_usim2_vcc) ? true : false, PIO_Get(&pin_usim2_rst) ? false : true, PIO_Get(&pin_usim2_vcc) ? true : false);
 	sim_switch_use_physical(1, 1);
 #endif /* CARDEMU_SECOND_UART */
-
 }
 
 /* called if config is deactivated */
@@ -576,6 +603,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 +615,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,6 +197,68 @@ 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
  */
@@ -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,14 +299,97 @@ 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);
+}
+
+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("%s", flag_meanings[i].str);
+			flags &= ~flag_meanings[i].value;
+			if (flags) {
+				printf(", ");
+			}
+		}
+	}
+}
+
+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_2F_O);
+
+	/* Print message */
+	switch (type) {
+	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;
+	}
+	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 data over USB */
+	struct msgb *usb_msg = usb_msg_alloc_hdr(SIMTRACE_USB_EP_CARD_DATAIN, SIMTRACE_MSGC_SNIFF, type);
+	if (!usb_msg) {
+		return;
+	}
+	struct sniff_data *usb_sniff_data = (struct sniff_data *) msgb_put(usb_msg, sizeof(*usb_sniff_data));
+	usb_sniff_data->flags = flags;
+	usb_sniff_data->length = length;
+	uint8_t *sniff_data = msgb_put(usb_msg, usb_sniff_data->length);
+	memcpy(sniff_data, data, length);
+	usb_msg_upd_len_and_submit(usb_msg);
+
 }
 
 /*! Send current ATR over USB
- *  @param[in] complete if the ATR is complete
+ *  @param[in] flags SNIFF_DATA_FLAG_ data flags 
  *  @note Also print the ATR to debug console
  */
-static void usb_send_atr(bool complete)
+static void usb_send_atr(uint32_t flags)
 {
 	/* Check state */
 	if (ISO7816_S_IN_ATR != iso_state) {
@@ -248,36 +401,8 @@ static void usb_send_atr(bool complete)
 		return;
 	}
 
-	/* Show activity on LED */
-	led_blink(LED_GREEN, BLINK_2O_F);
-
-	/* Print ATR */
-	printf("ATR%s: ", complete ? "" : " (incomplete)");
-	for (uint8_t i=0; i<atr_i; i++) {
-		printf("%02x ", atr[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_ATR, atr, atr_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_ATR;
-	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;
-	usb_sniff_data_atr->length = atr_i;
-	uint8_t *data = msgb_put(usb_msg, usb_sniff_data_atr->length);
-	memcpy(data, atr, atr_i);
-	usb_msg_header->msg_len = msgb_length(usb_msg);
-	usb_buf_submit(usb_msg);
 }
 
 /*! Process ATR byte
@@ -287,6 +412,8 @@ 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) {
@@ -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,9 +441,13 @@ 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 */
@@ -325,6 +457,7 @@ static void process_byte_atr(uint8_t byte)
 			t_protocol_support |= (1<<(byte & 0x0f)); /* remember supported protocol to know if TCK will be present */
 		}
 		y = (byte & 0xf0); /* remember upcoming interface bytes */
+		i++; /* next interface byte sub-group is coming */
 		if (y & 0x10) {
 			atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */
 			break;
@@ -340,6 +473,14 @@ static void process_byte_atr(uint8_t byte)
 			break;
 		}
 	case ATR_S_WAIT_TC: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
+		/* 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;
@@ -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,10 +524,10 @@ 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) */
 
@@ -409,36 +563,8 @@ static void usb_send_pps(bool complete)
 		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,27 +573,19 @@ 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) {
@@ -482,11 +600,14 @@ 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;
@@ -528,8 +649,11 @@ static void process_byte_pps(uint8_t byte)
 			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 (0 == check) { /* checksum is valid */
 				change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */
@@ -547,7 +671,8 @@ static void process_byte_pps(uint8_t byte)
 					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,10 +690,10 @@ 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) {
@@ -576,36 +701,8 @@ static void usb_send_tpdu(bool complete)
 		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)
@@ -625,6 +722,8 @@ static void process_byte_tpdu(uint8_t byte)
 	case TPDU_S_CLA:
 		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;
 		}
@@ -635,6 +734,8 @@ static void process_byte_tpdu(uint8_t byte)
 	case TPDU_S_INS:
 		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;
 		}
@@ -673,13 +774,15 @@ static void process_byte_tpdu(uint8_t 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:
@@ -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;
+		}
 	}
 }
 
@@ -747,15 +871,11 @@ static void Sniffer_reset_isr(const Pin* pPin)
 		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);
-		}
 	}
 }
 
@@ -825,8 +945,8 @@ 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) */
@@ -844,7 +964,6 @@ void Sniffer_init(void)
 
 /*! 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)
 {
@@ -858,22 +977,13 @@ static void usb_send_change(uint32_t flags)
 	}
 
 	/* 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,7 +1023,7 @@ 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) {
 					change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
 				} else {
@@ -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_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;
 
 
 //------------------------------------------------------------------------------
@@ -347,7 +350,10 @@ signed int vsnprintf(char *pStr, size_t length, const char *pFormat, va_list ap)
 			}
 		
 			// Parse type
+			do {
+				num = 0;
 				switch (*pFormat) {
+				case 'l': num = -1; break; // ignore long qualifier since int == long (and long long is not supported)
 				case 'd':
 				case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break;
 				case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break;
@@ -358,8 +364,8 @@ signed int vsnprintf(char *pStr, size_t length, const char *pFormat, va_list ap)
 				default:
 					return EOF;
 				}
-
 				pFormat++;
+			} while (num < 0);
 			pStr += num;
 			size += num;
 		}
@@ -423,18 +429,54 @@ signed int vsprintf(char *pString, const char *pFormat, va_list ap)
 signed int vfprintf(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) {
+	int rc = vsprintf(pStr, pFormat, ap);
-
+	if (rc < 0) {
-        fputs(pError, stderr);
+		fputs("format string error in ", stderr);
+		fputs(pFormat, stderr);
+		return rc;
+	}
+	if (rc >= MAX_STRING_SIZE) {
+		fputs("stdio.c: increase MAX_STRING_SIZE\n\r", stderr);
+		return rc;
 	}
 
 	// Display string
 	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];
+
+	// Write formatted string in buffer
+	int rc = vsprintf(pStr, pFormat, ap);
+	if (rc < 0) {
+		fputs_sync("format string error in ", stderr);
+		fputs_sync(pFormat, stderr);
+		return rc;
+	}
+	if (rc >= MAX_STRING_SIZE) {
+		fputs_sync("stdio.c: increase MAX_STRING_SIZE\n\r", stderr);
+		return rc;
+	}
+
+	// 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 +488,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 +537,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-2019, 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>
@@ -44,7 +46,10 @@
  *       USB String descriptors 
  *------------------------------------------------------------------------------*/
 #include "usb_strings_generated.h"
+
+// the index of the strings (must match the order in usb_strings.txt)
 enum strDescNum {
+	// static strings from usb_strings
 	MANUF_STR = 1,
 	PRODUCT_STRING,
 	SNIFFER_CONF_STR,
@@ -53,9 +58,82 @@ enum strDescNum {
 	MITM_CONF_STR,
 	CARDEM_USIM1_INTF_STR,
 	CARDEM_USIM2_INTF_STR,
+	CARDEM_USIM3_INTF_STR,
+	CARDEM_USIM4_INTF_STR,
+	// runtime strings
+	SERIAL_STR,
+	VERSION_CONF_STR,
+	VERSION_STR,
+	// count
 	STRING_DESC_CNT
 };
 
+/** array of static (from usb_strings) and runtime (serial, version) USB strings
+ */
+static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 3];
+
+/* USB string for the serial (using 128-bit device ID) */
+static unsigned char usb_string_serial[] = {
+	USBStringDescriptor_LENGTH(32),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('f'),
+};
+
+/* USB string for the version */
+static const unsigned char usb_string_version_conf[] = {
+	USBStringDescriptor_LENGTH(16),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('m'),
+	USBStringDescriptor_UNICODE('w'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE(' '),
+	USBStringDescriptor_UNICODE('v'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('s'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('o'),
+	USBStringDescriptor_UNICODE('n'),
+};
+static const char git_version[] = GIT_VERSION;
+static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2];
+
 /*------------------------------------------------------------------------------
  *       USB Device descriptors 
  *------------------------------------------------------------------------------*/
@@ -521,6 +599,40 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 };
 #endif /* HAVE_CARDEM */
 
+/* USB descriptor just to show the version */
+typedef struct _SIMTraceDriverConfigurationDescriptorVersion {
+	/** Standard configuration descriptor. */
+	USBConfigurationDescriptor configuration;
+	USBInterfaceDescriptor version;
+} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion;
+
+static const SIMTraceDriverConfigurationDescriptorVersion
+				configurationDescriptorVersion = {
+	/* Standard configuration descriptor for the interface descriptor*/
+	.configuration = {
+		.bLength 		= sizeof(USBConfigurationDescriptor),
+		.bDescriptorType	= USBGenericDescriptor_CONFIGURATION,
+		.wTotalLength		= sizeof(SIMTraceDriverConfigurationDescriptorVersion),
+		.bNumInterfaces		= 1,
+		.bConfigurationValue	= CFG_NUM_VERSION,
+		.iConfiguration		= VERSION_CONF_STR,
+		.bmAttributes		= USBD_BMATTRIBUTES,
+		.bMaxPower		= USBConfigurationDescriptor_POWER(100),
+	},
+	/* Interface standard descriptor just holding the version information */
+	.version = {
+		.bLength = sizeof(USBInterfaceDescriptor),
+		.bDescriptorType 	= USBGenericDescriptor_INTERFACE,
+		.bInterfaceNumber	= 0,
+		.bAlternateSetting	= 0,
+		.bNumEndpoints		= 0,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
+		.bInterfaceSubClass	= 0xff,
+		.bInterfaceProtocol	= 0,
+		.iInterface		= VERSION_STR,
+	},
+};
+
 const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
 #ifdef HAVE_SNIFFER
 	&configurationDescriptorSniffer.configuration,
@@ -534,6 +646,7 @@ const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
 #ifdef HAVE_MITM
 	&configurationDescriptorMITM.configuration,
 #endif
+	&configurationDescriptorVersion.configuration,
 };
 
 /** Standard USB device descriptor for the CDC serial driver */
@@ -550,7 +663,7 @@ const USBDeviceDescriptor deviceDescriptor = {
 	.bcdDevice		= 2,	/* Release number */
 	.iManufacturer		= MANUF_STR,
 	.iProduct		= PRODUCT_STRING,
-	.iSerialNumber		= 0,
+	.iSerialNumber		= SERIAL_STR,
 	.bNumConfigurations	= ARRAY_SIZE(configurationDescriptorsArr),
 };
 
@@ -564,8 +677,8 @@ static const USBDDriverDescriptors driverDescriptors = {
 	0,			/* No high-speed configuration descriptor */
 	0,			/* No high-speed device qualifier descriptor */
 	0,			/* No high-speed other speed configuration descriptor */
-	usb_strings,
+	usb_strings_extended,
-	ARRAY_SIZE(usb_strings),/* cnt string descriptors in list */
+	ARRAY_SIZE(usb_strings_extended),/* cnt string descriptors in list */
 };
 
 /*----------------------------------------------------------------------------
@@ -574,17 +687,49 @@ static const USBDDriverDescriptors driverDescriptors = {
 
 void SIMtrace_USB_Initialize(void)
 {
-
+	unsigned int i;
 	/* 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();
 
+	// put device ID into USB serial number description
+	unsigned int device_id[4];
+	EEFC_ReadUniqueID(device_id);
+	char device_id_string[32 + 1];
+	snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x",
+		device_id[0], device_id[1], device_id[2], device_id[3]);
+	for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) {
+		usb_string_serial[2 + 2 * i] = device_id_string[i];
+	}
+
+	// put version into USB string
+	usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1);
+	usb_string_version[1] = USBGenericDescriptor_STRING;
+	for (i = 0; i < ARRAY_SIZE(git_version) - 1; i++) {
+		usb_string_version[2 + i * 2 + 0] = git_version[i];
+		usb_string_version[2 + i * 2 + 1] = 0;
+	}
+
+	// fill extended USB strings
+	for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) {
+		usb_strings_extended[i] = usb_strings[i];
+	}
+	usb_strings_extended[SERIAL_STR] = usb_string_serial;
+	usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf;
+	usb_strings_extended[VERSION_STR] = usb_string_version;
+
 	// Initialize standard USB driver
 	USBDDriver_Initialize(pUsbd, &driverDescriptors, 0);	// Multiple interface settings not supported
 	USBD_Init();

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/Makefile

@@ -11,12 +11,12 @@ CFLAGS=-g -Wall $(LIBOSMOCORE_CFLAGS) \
 	-I../libboard/common/include \
 	-I../libboard/simtrace/include \
 	-I.
-LDFLAGS=$(LIBOSMOCORE_LIBS)
+LIBS=$(LIBOSMOCORE_LIBS)
 
 VPATH=../src_simtrace ../libcommon/source
 
 card_emu_test:	card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 %.hobj: %.c
 	$(CC) $(CFLAGS) -o $@ -c $^

firmware/test/card_emu_tests.c

@@ -13,7 +13,9 @@
 #define PHONE_INT	2
 #define PHONE_DATAOUT	3
 
-/* stub functions required by card_emu.c */
+/***********************************************************************
+ * stub functions required by card_emu.c
+ ***********************************************************************/
 
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan)
 {
@@ -30,6 +32,7 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
 static uint8_t tx_debug_buf[1024];
 static unsigned int tx_debug_buf_idx;
 
+/* the card emulator wants to send some data to the host [reader] */
 int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 {
 	printf("UART_TX(%02x)\n", byte);
@@ -37,13 +40,6 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 	return 1;
 }
 
-static void reader_check_and_clear(const uint8_t *data, unsigned int len)
-{
-	assert(len == tx_debug_buf_idx);
-	assert(!memcmp(tx_debug_buf, data, len));
-	tx_debug_buf_idx = 0;
-}
-
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 {
 	char *rts;
@@ -65,6 +61,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);
@@ -90,7 +91,21 @@ void tc_etu_disable(uint8_t chan_nr)
 	printf("tc_etu_disable(tc_chan=%u)\n", chan_nr);
 }
 
-const uint8_t atr[] = { 0x3b, 0x02, 0x14, 0x50 };
+
+
+/***********************************************************************
+ * test helper functions
+ ***********************************************************************/
+
+
+static void reader_check_and_clear(const uint8_t *data, unsigned int len)
+{
+	assert(len == tx_debug_buf_idx);
+	assert(!memcmp(tx_debug_buf, data, len));
+	tx_debug_buf_idx = 0;
+}
+
+static const uint8_t atr[] = { 0x3b, 0x02, 0x14, 0x50 };
 
 static int verify_atr(struct card_handle *ch)
 {
@@ -120,9 +135,12 @@ 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);
 }
 
+/* emulate the host/reader sending some bytes to the [emulated] card */
 static void reader_send_bytes(struct card_handle *ch, const uint8_t *bytes, unsigned int len)
 {
 	unsigned int i;
@@ -390,7 +408,7 @@ int main(int argc, char **argv)
 	struct card_handle *ch;
 	unsigned int i;
 
-	ch = card_emu_init(0, 23, 42, PHONE_DATAIN, PHONE_INT);
+	ch = card_emu_init(0, 23, 42, PHONE_DATAIN, PHONE_INT, false, true, false);
 	assert(ch);
 
 	usb_buf_init();

hardware/board_gpio.gnumeric

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnm:Workbook xmlns:gnm="http://www.gnumeric.org/v10.dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gnumeric.org/v9.xsd">
-  <gnm:Version Epoch="1" Major="12" Minor="32" Full="1.12.32"/>
+  <gnm:Version Epoch="1" Major="12" Minor="44" Full="1.12.44"/>
   <gnm:Attributes>
     <gnm:Attribute>
       <gnm:name>WorkbookView::show_horizontal_scrollbar</gnm:name>
@@ -25,7 +25,7 @@
   </gnm:Attributes>
   <office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.2">
     <office:meta>
-      <dc:date>2017-05-05T14:31:27Z</dc:date>
+      <dc:date>2019-02-28T17:12:35Z</dc:date>
       <meta:creation-date>2017-03-05T18:42:38Z</meta:creation-date>
     </office:meta>
   </office:document-meta>
@@ -35,11 +35,11 @@
     <gnm:SheetName gnm:Cols="256" gnm:Rows="65536">Sheet2</gnm:SheetName>
     <gnm:SheetName gnm:Cols="256" gnm:Rows="65536">Sheet3</gnm:SheetName>
   </gnm:SheetNameIndex>
-  <gnm:Geometry Width="1304" Height="896"/>
+  <gnm:Geometry Width="1918" Height="2001"/>
   <gnm:Sheets>
     <gnm:Sheet DisplayFormulas="0" HideZero="0" HideGrid="0" HideColHeader="0" HideRowHeader="0" DisplayOutlines="1" OutlineSymbolsBelow="1" OutlineSymbolsRight="1" Visibility="GNM_SHEET_VISIBILITY_VISIBLE" GridColor="0:0:0">
       <gnm:Name>Sheet1</gnm:Name>
-      <gnm:MaxCol>7</gnm:MaxCol>
+      <gnm:MaxCol>9</gnm:MaxCol>
       <gnm:MaxRow>67</gnm:MaxRow>
       <gnm:Zoom>1</gnm:Zoom>
       <gnm:Names>
@@ -1057,127 +1057,452 @@
             </gnm:StyleBorder>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="0" endCol="255" endRow="5">
+        <gnm:StyleRegion startCol="7" startRow="0" endCol="7" endRow="5">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="6" endCol="255" endRow="9">
+        <gnm:StyleRegion startCol="7" startRow="6" endCol="7" endRow="9">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="10" endCol="255" endRow="11">
+        <gnm:StyleRegion startCol="7" startRow="10" endCol="7" endRow="11">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="12" endCol="255" endRow="14">
+        <gnm:StyleRegion startCol="7" startRow="12" endCol="7" endRow="14">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="15" endCol="255" endRow="15">
+        <gnm:StyleRegion startCol="7" startRow="15" endCol="7" endRow="15">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="16" endCol="255" endRow="19">
+        <gnm:StyleRegion startCol="7" startRow="16" endCol="7" endRow="19">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="20" endCol="255" endRow="21">
+        <gnm:StyleRegion startCol="7" startRow="20" endCol="7" endRow="21">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="22" endCol="255" endRow="26">
+        <gnm:StyleRegion startCol="7" startRow="22" endCol="7" endRow="26">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="27" endCol="255" endRow="27">
+        <gnm:StyleRegion startCol="7" startRow="27" endCol="7" endRow="27">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="28" endCol="255" endRow="35">
+        <gnm:StyleRegion startCol="7" startRow="28" endCol="7" endRow="35">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="36" endCol="255" endRow="36">
+        <gnm:StyleRegion startCol="7" startRow="36" endCol="7" endRow="36">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="37" endCol="255" endRow="41">
+        <gnm:StyleRegion startCol="7" startRow="37" endCol="7" endRow="41">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="42" endCol="255" endRow="43">
+        <gnm:StyleRegion startCol="7" startRow="42" endCol="7" endRow="43">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="44" endCol="255" endRow="47">
+        <gnm:StyleRegion startCol="7" startRow="44" endCol="7" endRow="47">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="48" endCol="255" endRow="49">
+        <gnm:StyleRegion startCol="7" startRow="48" endCol="7" endRow="49">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="50" endCol="255" endRow="51">
+        <gnm:StyleRegion startCol="7" startRow="50" endCol="7" endRow="51">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="52" endCol="255" endRow="54">
+        <gnm:StyleRegion startCol="7" startRow="52" endCol="7" endRow="54">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="55" endCol="255" endRow="55">
+        <gnm:StyleRegion startCol="7" startRow="55" endCol="7" endRow="55">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="56" endCol="255" endRow="57">
+        <gnm:StyleRegion startCol="7" startRow="56" endCol="7" endRow="57">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="58" endCol="255" endRow="58">
+        <gnm:StyleRegion startCol="7" startRow="58" endCol="7" endRow="58">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="59" endCol="255" endRow="61">
+        <gnm:StyleRegion startCol="7" startRow="59" endCol="7" endRow="61">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="62" endCol="255" endRow="62">
+        <gnm:StyleRegion startCol="7" startRow="62" endCol="7" endRow="62">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="63" endCol="255" endRow="63">
+        <gnm:StyleRegion startCol="7" startRow="63" endCol="7" endRow="63">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="64" endCol="255" endRow="66">
+        <gnm:StyleRegion startCol="7" startRow="64" endCol="7" endRow="66">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
         </gnm:StyleRegion>
-        <gnm:StyleRegion startCol="7" startRow="67" endCol="255" endRow="65535">
+        <gnm:StyleRegion startCol="7" startRow="67" endCol="7" endRow="65535">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="0" endCol="8" endRow="5">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="6" endCol="8" endRow="9">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="10" endCol="8" endRow="11">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="12" endCol="8" endRow="14">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="15" endCol="8" endRow="15">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="16" endCol="8" endRow="19">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="20" endCol="8" endRow="21">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="22" endCol="8" endRow="26">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="27" endCol="8" endRow="27">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="28" endCol="8" endRow="35">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="36" endCol="8" endRow="36">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="37" endCol="8" endRow="41">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="42" endCol="8" endRow="43">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="44" endCol="8" endRow="47">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="48" endCol="8" endRow="49">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="50" endCol="8" endRow="51">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="52" endCol="8" endRow="54">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="55" endCol="8" endRow="55">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="56" endCol="8" endRow="57">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="58" endCol="8" endRow="58">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="59" endCol="8" endRow="61">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="62" endCol="8" endRow="62">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="63" endCol="8" endRow="63">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="64" endCol="8" endRow="66">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="8" startRow="67" endCol="8" endRow="65535">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+            <gnm:StyleBorder>
+              <gnm:Left Style="1" Color="0:0:0"/>
+            </gnm:StyleBorder>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="0" endCol="255" endRow="5">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="6" endCol="255" endRow="9">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="10" endCol="255" endRow="11">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="12" endCol="255" endRow="14">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="15" endCol="255" endRow="15">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="16" endCol="255" endRow="19">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="20" endCol="255" endRow="21">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="22" endCol="255" endRow="26">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="27" endCol="255" endRow="27">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="28" endCol="255" endRow="35">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="36" endCol="255" endRow="36">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="37" endCol="255" endRow="41">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="42" endCol="255" endRow="43">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="44" endCol="255" endRow="47">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="48" endCol="255" endRow="49">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="50" endCol="255" endRow="51">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="52" endCol="255" endRow="54">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="55" endCol="255" endRow="55">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="56" endCol="255" endRow="57">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="58" endCol="255" endRow="58">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="59" endCol="255" endRow="61">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="62" endCol="255" endRow="62">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="63" endCol="255" endRow="63">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="64" endCol="255" endRow="66">
+          <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="1" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:BABA" PatternColor="0:0:0" Format="General">
+            <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
+          </gnm:Style>
+        </gnm:StyleRegion>
+        <gnm:StyleRegion startCol="9" startRow="67" endCol="255" endRow="65535">
           <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
             <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font>
           </gnm:Style>
@@ -1190,15 +1515,27 @@
         <gnm:ColInfo No="5" Unit="120" HardSize="1"/>
         <gnm:ColInfo No="7" Unit="161.2" HardSize="1"/>
       </gnm:Cols>
-      <gnm:Rows DefaultSizePts="12.75"/>
+      <gnm:Rows DefaultSizePts="12.75">
-      <gnm:Selections CursorCol="5" CursorRow="34">
+        <gnm:RowInfo No="2" Unit="13.5" Count="2"/>
-        <gnm:Selection startCol="5" startRow="34" endCol="5" endRow="34"/>
+        <gnm:RowInfo No="12" Unit="13.5" Count="3"/>
+        <gnm:RowInfo No="16" Unit="13.5" Count="2"/>
+        <gnm:RowInfo No="19" Unit="13.5"/>
+        <gnm:RowInfo No="22" Unit="13.5"/>
+        <gnm:RowInfo No="24" Unit="13.5" Count="2"/>
+        <gnm:RowInfo No="30" Unit="13.5" Count="5"/>
+        <gnm:RowInfo No="39" Unit="13.5"/>
+        <gnm:RowInfo No="46" Unit="13.5"/>
+        <gnm:RowInfo No="55" Unit="13.5"/>
+      </gnm:Rows>
+      <gnm:Selections CursorCol="3" CursorRow="0">
+        <gnm:Selection startCol="3" startRow="0" endCol="3" endRow="0"/>
       </gnm:Selections>
       <gnm:Cells>
         <gnm:Cell Row="0" Col="0" ValueType="60">Pins / Ios of SAM3 based devices</gnm:Cell>
         <gnm:Cell Row="2" Col="2" ValueType="60">SIMtrace v1.x</gnm:Cell>
         <gnm:Cell Row="2" Col="4" ValueType="60">Quad Modem</gnm:Cell>
         <gnm:Cell Row="2" Col="6" ValueType="60">OWHW</gnm:Cell>
+        <gnm:Cell Row="2" Col="8" ValueType="60">SAM3-P256</gnm:Cell>
         <gnm:Cell Row="3" Col="0" ValueType="60">Pin Number</gnm:Cell>
         <gnm:Cell Row="3" Col="1" ValueType="60">Pin Name</gnm:Cell>
         <gnm:Cell Row="3" Col="2" ValueType="60">Used Function</gnm:Cell>
@@ -1207,6 +1544,8 @@
         <gnm:Cell Row="3" Col="5" ValueType="60">Signal Name</gnm:Cell>
         <gnm:Cell Row="3" Col="6" ValueType="60">Used Function</gnm:Cell>
         <gnm:Cell Row="3" Col="7" ValueType="60">Signal Name</gnm:Cell>
+        <gnm:Cell Row="3" Col="8" ValueType="60">Used Function</gnm:Cell>
+        <gnm:Cell Row="3" Col="9" ValueType="60">Signal Name</gnm:Cell>
         <gnm:Cell Row="4" Col="0" ValueType="40">1</gnm:Cell>
         <gnm:Cell Row="4" Col="1" ValueType="60">ADVREF</gnm:Cell>
         <gnm:Cell Row="4" Col="4" ValueType="60">ADVREF</gnm:Cell>
@@ -1245,6 +1584,7 @@
         <gnm:Cell Row="12" Col="5" ValueType="60">LED_RED</gnm:Cell>
         <gnm:Cell Row="12" Col="6" ValueType="60">PA17</gnm:Cell>
         <gnm:Cell Row="12" Col="7" ValueType="60">LED_RED</gnm:Cell>
+        <gnm:Cell Row="12" Col="8" ValueType="60">LED2</gnm:Cell>
         <gnm:Cell Row="13" Col="0" ValueType="40">10</gnm:Cell>
         <gnm:Cell Row="13" Col="1" ValueType="60">PA18</gnm:Cell>
         <gnm:Cell Row="13" Col="2" ValueType="60">PA18</gnm:Cell>
@@ -1253,6 +1593,7 @@
         <gnm:Cell Row="13" Col="5" ValueType="60">LED_GREEN</gnm:Cell>
         <gnm:Cell Row="13" Col="6" ValueType="60">PA18</gnm:Cell>
         <gnm:Cell Row="13" Col="7" ValueType="60">LED_GREEN</gnm:Cell>
+        <gnm:Cell Row="13" Col="8" ValueType="60">LED1</gnm:Cell>
         <gnm:Cell Row="14" Col="0" ValueType="40">11</gnm:Cell>
         <gnm:Cell Row="14" Col="1" ValueType="60">PA21/RXD1/PCK1</gnm:Cell>
         <gnm:Cell Row="14" Col="2" ValueType="60">RXD1</gnm:Cell>
@@ -1261,6 +1602,7 @@
         <gnm:Cell Row="14" Col="5" ValueType="60">ST_USIM1_IO</gnm:Cell>
         <gnm:Cell Row="14" Col="6" ValueType="60">RXD1</gnm:Cell>
         <gnm:Cell Row="14" Col="7" ValueType="60">ST_USIM1_IO</gnm:Cell>
+        <gnm:Cell Row="14" Col="8" ValueType="60">RXD1</gnm:Cell>
         <gnm:Cell Row="15" Col="0" ValueType="40">12</gnm:Cell>
         <gnm:Cell Row="15" Col="1" ValueType="60">VDDCORE</gnm:Cell>
         <gnm:Cell Row="16" Col="0" ValueType="40">13</gnm:Cell>
@@ -1270,6 +1612,7 @@
         <gnm:Cell Row="16" Col="4" ValueType="60">AD2</gnm:Cell>
         <gnm:Cell Row="16" Col="5" ValueType="60">VERSION_DETECT12</gnm:Cell>
         <gnm:Cell Row="16" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="16" Col="8" ValueType="60">B1</gnm:Cell>
         <gnm:Cell Row="17" Col="0" ValueType="40">14</gnm:Cell>
         <gnm:Cell Row="17" Col="1" ValueType="60">PA22/TXD1/NPCS3</gnm:Cell>
         <gnm:Cell Row="17" Col="2" ValueType="60">TXD1</gnm:Cell>
@@ -1278,6 +1621,7 @@
         <gnm:Cell Row="17" Col="5" ValueType="60">ST_USIM1_IO</gnm:Cell>
         <gnm:Cell Row="17" Col="6" ValueType="60">TXD1</gnm:Cell>
         <gnm:Cell Row="17" Col="7" ValueType="60">ST_USIM1_IO</gnm:Cell>
+        <gnm:Cell Row="17" Col="8" ValueType="60">TXD1</gnm:Cell>
         <gnm:Cell Row="18" Col="0" ValueType="40">15</gnm:Cell>
         <gnm:Cell Row="18" Col="1" ValueType="60">PA23/SCK1/PWM0</gnm:Cell>
         <gnm:Cell Row="18" Col="2" ValueType="60">SCK1</gnm:Cell>
@@ -1293,6 +1637,7 @@
         <gnm:Cell Row="19" Col="4" ValueType="60">PA20</gnm:Cell>
         <gnm:Cell Row="19" Col="5" ValueType="60">!CONNECT_ST_USIM1</gnm:Cell>
         <gnm:Cell Row="19" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="19" Col="8" ValueType="60">B2</gnm:Cell>
         <gnm:Cell Row="20" Col="0" ValueType="40">17</gnm:Cell>
         <gnm:Cell Row="20" Col="1" ValueType="60">GND</gnm:Cell>
         <gnm:Cell Row="21" Col="0" ValueType="40">18</gnm:Cell>
@@ -1305,6 +1650,7 @@
         <gnm:Cell Row="22" Col="5" ValueType="60">WWAN2</gnm:Cell>
         <gnm:Cell Row="22" Col="6" ValueType="60">PA16</gnm:Cell>
         <gnm:Cell Row="22" Col="7" ValueType="60">UDP_PUP_CTL</gnm:Cell>
+        <gnm:Cell Row="22" Col="8" ValueType="60">DP_PUP</gnm:Cell>
         <gnm:Cell Row="23" Col="0" ValueType="40">20</gnm:Cell>
         <gnm:Cell Row="23" Col="1" ValueType="60">PA15/TF/TIOA1</gnm:Cell>
         <gnm:Cell Row="23" Col="2" ValueType="60">PA15</gnm:Cell>
@@ -1320,6 +1666,7 @@
         <gnm:Cell Row="24" Col="5" ValueType="60">ST12_ST34_SELECT</gnm:Cell>
         <gnm:Cell Row="24" Col="6" ValueType="60">PA14</gnm:Cell>
         <gnm:Cell Row="24" Col="7" ValueType="60">SET_USIM2_PRES</gnm:Cell>
+        <gnm:Cell Row="24" Col="8" ValueType="60">SPCK</gnm:Cell>
         <gnm:Cell Row="25" Col="0" ValueType="40">22</gnm:Cell>
         <gnm:Cell Row="25" Col="1" ValueType="60">PA13/MOSI/PWM2</gnm:Cell>
         <gnm:Cell Row="25" Col="2" ValueType="60">MOSI</gnm:Cell>
@@ -1327,6 +1674,7 @@
         <gnm:Cell Row="25" Col="4" ValueType="60">PA13</gnm:Cell>
         <gnm:Cell Row="25" Col="5" ValueType="60">HUB_RESET</gnm:Cell>
         <gnm:Cell Row="25" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="25" Col="8" ValueType="60">MOSI</gnm:Cell>
         <gnm:Cell Row="26" Col="0" ValueType="40">23</gnm:Cell>
         <gnm:Cell Row="26" Col="1" ValueType="60">PA24/RTS1/PWM1</gnm:Cell>
         <gnm:Cell Row="26" Col="2" ValueType="60">PA24</gnm:Cell>
@@ -1359,6 +1707,7 @@
         <gnm:Cell Row="30" Col="5" ValueType="60">SIMPRES1</gnm:Cell>
         <gnm:Cell Row="30" Col="6" ValueType="60">PA12</gnm:Cell>
         <gnm:Cell Row="30" Col="7" ValueType="60">SET_USIM1_PRES</gnm:Cell>
+        <gnm:Cell Row="30" Col="8" ValueType="60">MISO</gnm:Cell>
         <gnm:Cell Row="31" Col="0" ValueType="40">28</gnm:Cell>
         <gnm:Cell Row="31" Col="1" ValueType="60">PA11/NPCS0/PWM0</gnm:Cell>
         <gnm:Cell Row="31" Col="2" ValueType="60">NPCS0</gnm:Cell>
@@ -1366,6 +1715,7 @@
         <gnm:Cell Row="31" Col="4" ValueType="60">PA11</gnm:Cell>
         <gnm:Cell Row="31" Col="5" ValueType="60">_SIMTRACE34_ERASE</gnm:Cell>
         <gnm:Cell Row="31" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="31" Col="8" ValueType="60">NPCS0</gnm:Cell>
         <gnm:Cell Row="32" Col="0" ValueType="40">29</gnm:Cell>
         <gnm:Cell Row="32" Col="1" ValueType="60">PA10/DTXD/NCPS2</gnm:Cell>
         <gnm:Cell Row="32" Col="2" ValueType="60">DTXD</gnm:Cell>
@@ -1374,6 +1724,7 @@
         <gnm:Cell Row="32" Col="5" ValueType="60">SIMTRACE1_DTXD</gnm:Cell>
         <gnm:Cell Row="32" Col="6" ValueType="60">DTXD</gnm:Cell>
         <gnm:Cell Row="32" Col="7" ValueType="60">SIMTRACE_DTXD</gnm:Cell>
+        <gnm:Cell Row="32" Col="8" ValueType="60">DTXD</gnm:Cell>
         <gnm:Cell Row="33" Col="0" ValueType="40">30</gnm:Cell>
         <gnm:Cell Row="33" Col="1" ValueType="60">PA9/DRXDNPCS1</gnm:Cell>
         <gnm:Cell Row="33" Col="2" ValueType="60">DRXD</gnm:Cell>
@@ -1382,6 +1733,7 @@
         <gnm:Cell Row="33" Col="5" ValueType="60">SIMTRACE1_DRXD</gnm:Cell>
         <gnm:Cell Row="33" Col="6" ValueType="60">DRXD</gnm:Cell>
         <gnm:Cell Row="33" Col="7" ValueType="60">SIMTRACE_DRXD</gnm:Cell>
+        <gnm:Cell Row="33" Col="8" ValueType="60">DRXD</gnm:Cell>
         <gnm:Cell Row="34" Col="0" ValueType="40">31</gnm:Cell>
         <gnm:Cell Row="34" Col="1" ValueType="60">PA8/CTS0/ADTRG</gnm:Cell>
         <gnm:Cell Row="34" Col="2" ValueType="60">PA8</gnm:Cell>
@@ -1389,6 +1741,7 @@
         <gnm:Cell Row="34" Col="4" ValueType="60">PA8</gnm:Cell>
         <gnm:Cell Row="34" Col="5" ValueType="60">SIMPRES2 / ST12_PRTPWR-OVERRIDE</gnm:Cell>
         <gnm:Cell Row="34" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="34" Col="8" ValueType="60">DM_PUP</gnm:Cell>
         <gnm:Cell Row="35" Col="0" ValueType="40">32</gnm:Cell>
         <gnm:Cell Row="35" Col="1" ValueType="60">PA7/RTS0/PWM3</gnm:Cell>
         <gnm:Cell Row="35" Col="2" ValueType="60">PA7</gnm:Cell>
@@ -1424,6 +1777,7 @@
         <gnm:Cell Row="39" Col="5" ValueType="60">ST_USIM2_CLK</gnm:Cell>
         <gnm:Cell Row="39" Col="6" ValueType="60">TCLK0</gnm:Cell>
         <gnm:Cell Row="39" Col="7" ValueType="60">ST_USIM2_CLK</gnm:Cell>
+        <gnm:Cell Row="39" Col="8" ValueType="60">TWCK</gnm:Cell>
         <gnm:Cell Row="40" Col="0" ValueType="40">37</gnm:Cell>
         <gnm:Cell Row="40" Col="1" ValueType="60">PA27/DTR1/TIOB2</gnm:Cell>
         <gnm:Cell Row="40" Col="2" ValueType="60">NC</gnm:Cell>
@@ -1470,6 +1824,7 @@
         <gnm:Cell Row="46" Col="4" ValueType="60">NC</gnm:Cell>
         <gnm:Cell Row="46" Col="5" ValueType="60">NC</gnm:Cell>
         <gnm:Cell Row="46" Col="7" ValueType="60">NC</gnm:Cell>
+        <gnm:Cell Row="46" Col="8" ValueType="60">TWD</gnm:Cell>
         <gnm:Cell Row="47" Col="0" ValueType="40">44</gnm:Cell>
         <gnm:Cell Row="47" Col="1" ValueType="60">PA2/PWM2/SCK0</gnm:Cell>
         <gnm:Cell Row="47" Col="2" ValueType="60">SCK0</gnm:Cell>
@@ -1522,6 +1877,7 @@
         <gnm:Cell Row="55" Col="3" ValueType="60">BOTLOADER_SW</gnm:Cell>
         <gnm:Cell Row="55" Col="4" ValueType="60">PA31</gnm:Cell>
         <gnm:Cell Row="55" Col="5" ValueType="60">SCL</gnm:Cell>
+        <gnm:Cell Row="55" Col="8" ValueType="60">NPCS1</gnm:Cell>
         <gnm:Cell Row="56" Col="0" ValueType="40">53</gnm:Cell>
         <gnm:Cell Row="56" Col="1" ValueType="60">TCK</gnm:Cell>
         <gnm:Cell Row="56" Col="2" ValueType="60">TCK</gnm:Cell>
@@ -1565,7 +1921,7 @@
         <gnm:Cell Row="67" Col="0" ValueType="40">64</gnm:Cell>
         <gnm:Cell Row="67" Col="1" ValueType="60">VDDPLL</gnm:Cell>
       </gnm:Cells>
-      <gnm:SheetLayout TopLeft="A13"/>
+      <gnm:SheetLayout TopLeft="A1"/>
       <gnm:Solver ModelType="0" ProblemType="0" MaxTime="60" MaxIter="1000" NonNeg="1" Discr="0" AutoScale="0" ProgramR="0" SensitivityR="0"/>
     </gnm:Sheet>
     <gnm:Sheet DisplayFormulas="0" HideZero="0" HideGrid="0" HideColHeader="0" HideRowHeader="0" DisplayOutlines="1" OutlineSymbolsBelow="1" OutlineSymbolsRight="1" Visibility="GNM_SHEET_VISIBILITY_VISIBLE" GridColor="0:0:0">

host/.gitignore

@@ -0,0 +1,32 @@
+.o
+*.a
+*.lo
+*.la
+.deps
+Makefile
+Makefile.in
+
+#configure
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+configure.lineno
+depcomp
+install-sh
+missing
+stamp-h1
+
+#libtool
+ltmain.sh
+libtool
+.libs
+
+.tarball-version
+.version
+
+*.pc

host/Makefile.am

@@ -0,0 +1,14 @@
+AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
+
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+SUBDIRS = include lib src contrib #tests examples doc
+
+EXTRA_DIST = .version git-version-gen
+
+@RELMAKE@
+
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version

host/Makefile.old

@@ -1,10 +1,12 @@
-LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore
+LDFLAGS+=`pkg-config --libs libusb-1.0 libosmocore` -pthread
 CFLAGS=-Wall -g
 
-all: simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
+APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
 
-simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o
+all: $(APPS)
-	$(CC) -o $@ $^ $(LDFLAGS) -losmosim
+
+simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o simtrace2_api.o libusb_util.o
+	$(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite`
 
 simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o
 	$(CC) -o $@ $^ $(LDFLAGS)
@@ -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.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <osmocom/sim/sim.h>
-
-struct apdu_context {
-	struct osim_apdu_cmd_hdr hdr;
-	uint8_t dc[256];
-	uint8_t de[256];
-	uint8_t sw[2];
-	uint8_t apdu_case;
-	struct {
-		uint8_t tot;
-		uint8_t cur;
-	} lc;
-	struct {
-		uint8_t tot;
-		uint8_t cur;
-	} le;
-};
-
-enum apdu_action {
-	APDU_ACT_TX_CAPDU_TO_CARD		= 0x0001,
-	APDU_ACT_RX_MORE_CAPDU_FROM_READER	= 0x0002,
-};
-
-
-int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf,
-		    unsigned int apdu_len, bool new_apdu);

host/configure.ac

@@ -0,0 +1,102 @@
+AC_INIT([simtrace2],
+	m4_esyscmd([./git-version-gen .tarball-version]),
+	[simtrace@lists.osmocom.org])
+
+dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
+AC_CONFIG_AUX_DIR([.])
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects])
+AC_CONFIG_TESTDIR(tests)
+
+dnl kernel style compile messages
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl include release helper
+RELMAKE='-include osmo-release.mk'
+AC_SUBST([RELMAKE])
+
+dnl checks for programs
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_PROG_INSTALL
+LT_INIT([pic-only])
+
+dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
+AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
+if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
+        AC_MSG_WARN([You need to install pkg-config])
+fi
+PKG_PROG_PKG_CONFIG([0.20])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+CFLAGS="$CFLAGS -Wall"
+CPPFLAGS="$CPPFLAGS -Wall"
+
+AC_ARG_ENABLE(sanitize,
+	[AS_HELP_STRING(
+		[--enable-sanitize],
+		[Compile with address sanitizer enabled],
+	)],
+	[sanitize=$enableval], [sanitize="no"])
+if test x"$sanitize" = x"yes"
+then
+	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
+	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
+fi
+
+# The following test is taken from WebKit's webkit.m4
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fvisibility=hidden "
+AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
+      [ AC_MSG_RESULT([yes])
+        SYMBOL_VISIBILITY="-fvisibility=hidden"],
+        AC_MSG_RESULT([no]))
+CFLAGS="$saved_CFLAGS"
+AC_SUBST(SYMBOL_VISIBILITY)
+
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.0.0)
+PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
+
+AC_ARG_ENABLE(sanitize,
+	[AS_HELP_STRING(
+		[--enable-sanitize],
+		[Compile with address sanitizer enabled],
+	)],
+	[sanitize=$enableval], [sanitize="no"])
+if test x"$sanitize" = x"yes"
+then
+	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
+	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
+fi
+
+AC_ARG_ENABLE(werror,
+	[AS_HELP_STRING(
+		[--enable-werror],
+		[Turn all compiler warnings into errors, with exceptions:
+		 a) deprecation (allow upstream to mark deprecation without breaking builds);
+		 b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds)
+		]
+	)],
+	[werror=$enableval], [werror="no"])
+if test x"$werror" = x"yes"
+then
+	WERROR_FLAGS="-Werror"
+	WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations"
+	WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
+	CFLAGS="$CFLAGS $WERROR_FLAGS"
+	CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
+fi
+
+AC_MSG_RESULT([CFLAGS="$CFLAGS"])
+AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
+
+AC_OUTPUT(
+	libosmo-simtrace2.pc
+	include/Makefile
+	src/Makefile
+	lib/Makefile
+	contrib/Makefile
+	Makefile)

host/contrib/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = 99-simtrace2.rules

host/git-version-gen

@@ -0,0 +1,151 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2010-01-28.01
+
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+#   produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+#   presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+    1) ;;
+    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+    v=`cat $tarball_version_file` || exit 1
+    case $v in
+	*$nl*) v= ;; # reject multi-line output
+	[0-9]*) ;;
+	*) v= ;;
+    esac
+    test -z "$v" \
+	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+    : # use $v
+elif
+       v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+	  || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && case $v in
+	 [0-9]*) ;;
+	 v[0-9]*) ;;
+	 *) (exit 1) ;;
+       esac
+then
+    # Is this a new git that lists number of commits since the last
+    # tag or the previous older version that did not?
+    #   Newer: v6.10-77-g0f8faeb
+    #   Older: v6.10-g0f8faeb
+    case $v in
+	*-*-*) : git describe is okay three part flavor ;;
+	*-*)
+	    : git describe is older two part flavor
+	    # Recreate the number of commits and rewrite such that the
+	    # result is the same as if we were using the newer version
+	    # of git describe.
+	    vtag=`echo "$v" | sed 's/-.*//'`
+	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+	    ;;
+    esac
+
+    # Change the first '-' to a '.', so version-comparing tools work properly.
+    # Remove the "g" in git describe's output string, to save a byte.
+    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+else
+    v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+    '') ;;
+    *) # Append the suffix only if there isn't one already.
+	case $v in
+	  *-dirty) ;;
+	  *) v="$v-dirty" ;;
+	esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

host/include/Makefile.am

@@ -0,0 +1,7 @@
+nobase_include_HEADERS = \
+		osmocom/simtrace2/apdu_dispatch.h \
+		osmocom/simtrace2/libusb_util.h \
+		osmocom/simtrace2/simtrace2_api.h \
+		osmocom/simtrace2/simtrace_usb.h \
+		osmocom/simtrace2/simtrace_prot.h \
+		osmocom/simtrace2/gsmtap.h