tag debian release 0.5.1

Change-Id: Id6559b1019353815eea9f6653b6560e9a8aab23a

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

README.md

@@ -0,0 +1,39 @@
+SIMtrace v2.0
+=============
+
+This is the repository for the next-generation SIMtrace devices,
+providing abilities to trace the communication between (U)SIM card and
+phone, remote (U)SIM card forward, (U)SIM man-in-the-middle, and more.
+
+This is under heavy development, and right now it is not surprising if
+things still break on a daily basis.
+
+NOTE: Nothing in this repository applies to the SIMtrace v1.x hardware
+or its associated firmware.  SIMtrace v1.x is based on a different CPU /
+microcontroller architecture and uses a completely different software
+stack and host software.
+
+Supported Hardware
+------------------
+
+At this point, the primary development target is still the OWHW + sysmoQMOD
+device, but we expect to add support for a SAM3 based SIMtrace hardware
+board soon.
+
+The goal is to support the following devices:
+
+* Osmocom SIMtrace 1.x with SAM3 controller
+** this is open hardware and schematics / PCB design is published
+* sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
+** this is a proprietary device, publicly available from sysmocom
+* sysmocom OWHW (with 2 Modems and 1 SAM3 onboard)
+** this is not publicly available hardware, but still supported
+
+This Repository
+---------------
+
+This repository contains several directory
+
+* firmware - the firmware to run on the actual devices
+* hardware - some information related to the hardware
+* host - Programs to use on the USB host to interface with the hardware

contrib/jenkins.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+TOPDIR=`pwd`
+
+if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
+	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
+	exit 2
+fi
+
+set -e
+
+publish="$1"
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
+osmo-clean-workspace.sh
+
+mkdir "$deps" || true
+
+osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
+
+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+="qmod/dfu qmod/cardem "
+BUILDS+="owhw/dfu owhw/cardem "
+
+cd $TOPDIR/firmware
+for build in $BUILDS; do
+	board=`echo $build | cut -d "/" -f 1`
+	app=`echo $build | cut -d "/" -f 2`
+	echo
+	echo "=============== $board / $app START  =============="
+	make BOARD="$board" APP="$app"
+	echo "=============== $board / $app RES:$? =============="
+done
+
+echo
+echo "=============== FIRMWARE TESTS ==========="
+cd $TOPDIR/firmware/test
+make clean
+make
+./card_emu_test
+make clean
+
+echo
+echo "=============== HOST START  =============="
+cd $TOPDIR/host
+make clean
+make
+make clean
+
+if [ "x$publish" = "x--publish" ]; then
+	echo
+	echo "=============== UPLOAD BUILD  =============="
+
+	cat > "$WORKSPACE/known_hosts" <<EOF
+[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
+[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
+[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
+EOF
+	SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
+	rsync -avz --delete -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.bin binaries@rita.osmocom.org:web-files/simtrace2/firmware/
+fi
+
+echo
+echo "=============== FIRMWARE CLEAN  =============="
+cd $TOPDIR/firmware/
+for build in $BUILDS; do
+	board=`echo $build | cut -d "/" -f 1`
+	app=`echo $build | cut -d "/" -f 2`
+	make BOARD="$board" APP="$app" clean
+done
+
+osmo-clean-workspace.sh

debian/changelog

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

debian/rules

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

debian/simtrace2-firmware.install

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

debian/simtrace2-utils.install

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

firmware/Makefile

@@ -141,13 +141,12 @@ INCLUDES += -Ilibosmocore/include
 INCLUDES += -Isrc_simtrace -Iinclude
 INCLUDES += -Iapps/$(APP)
 
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
+CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
 CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
-CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef
+CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef
 CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-CFLAGS += -Wsign-compare -Waggregate-return
+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
@@ -192,7 +191,7 @@ $(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin
 	cat $^ > $@
 
 $(BIN) $(OBJ):
-	mkdir $@
+	mkdir -p $@
 
 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@
@@ -234,3 +233,7 @@ log:
 
 clean:
 	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`
+
+install:
+	mkdir -p $(DESTDIR)/usr/share/simtrace2
+	cp $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(DESTDIR)/usr/share/simtrace2

firmware/README.txt

@@ -1,70 +1,81 @@
+This is the source code for SIMtrace 2 firmwares.
 
-== BOARDS
+= Hardware
 
-A board defines a given circuit board, i.e. SIMtrace, OWHW, QMOD
+== Micro-Controller
 
-It defines the given hardware model for which the program is to be
+The firmware is for Microchip (formerly Atmel) ATSAM3S4B micro-controllers (MCU).
-compiled.
+Product page:  https://www.microchip.com/wwwproducts/en/ATSAM3S4B
+Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6500-32-bit-Cortex-M3-Microcontroller-SAM3S4-SAM3S2-SAM3S1_Datasheet.pdf
+
+Note: The SAM3S is now not recommended for new designs.
+It can be replaced by the pin-compatible SAM4S.
+The MCU can be specified using the environment variable `CHIP` (set to `sam3s4` per default) for future MCU support.
+
+== Boards
+
+The SIMtrace 2 firmware supports multiple boards.
+A board defines a given circuit board.
+While compiling the firmware, set the target board using the `BOARD` environment variable (set to `qmod` per default).
+The supported boards correspond to sub-folders under `libboard`.
 
 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
 
-== APPLICATIONS
+* `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
 
-An application is a specific piece of software with given
+= Firmware
-functionality.
 
-== ENVIRONMENTS
+== Library
+
+The firmware uses the manufacturer provided Software Package (SoftPack) micro-controller library.
+The original library is available at https://www.microchip.com/design-centers/32-bit/softpacks/legacy-softpacks .
+Version 2.1 from 2001 is used: http://ww1.microchip.com/downloads/en/DeviceDoc/SAM3S_softpack_2.1_for_CodeSourcery_2010q1.zip
+The SIMtrace 2 project uses the `libboard_sam3s-ek`, `libchip_sam3s`, and `usb` sub-libraries, saved in `atmel_softpack_libraries` (with local modifications).
+
+Note: SoftPack is the legacy micro-controller library.
+This library is now replaced by the Advanced Software Framework (ASF): https://www.microchip.com/avr-support/advanced-software-framework-(asf) .
+The SAM3S ASF documentation is available at http://asf.atmel.com/docs/latest/sam3s/html/index.html .
+
+== Applications
+
+An application is a specific piece of software with given functionality.
+While compiling the firmware, set the target application using the `APP` environment variable (set to `dfu` per default).
+The supported applications correspond to sub-folder under `apps`.
+
+Current applications supported are:
+
+* `dfu`: The USB DFU bootloader to flash further main appliction firmwares.
+* `ccid`: To use SIMtrace 2 as USB CCID smartcard reader.
+* `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.
+
+== Memories
+
+Firmwares can be run from several memory locations:
 
-An environment is a runtime environment, typically defined by a linker
-script.  The current runtime environments include
 * flash: Run natively from start of flash memory
-* dfu: Run after a DFU bootloader from an offset after the first 16k
+* dfu: Run after a DFU bootloader from an offset after the first 16k of flash (the first 16k are reserved for the bootloader)
-  of flash (the first 16k are reserved for the bootloader)
 * ram: Run from within the RAM of the chip, downloaded via JTAG/SWD
 
-
 == Building
 
-A given software build is made for a specific combination of an APP
+A given firmware build is made for a specific combination of an application `APP` running in a certain memory `MEM` on a given board `BOARD`.
-running in a certain ENVIRONMENT on a given BOARD.
+When building using `make`, set the target application using the `APP` environment variable and target board using the `BOARD`  environment variable, e.g.:
 
-A Makefile is provided. It will create output files in the format
-bin/$(BOARD)-$(APP)-$(ENV).{elf,bin}
-
-You can specify the APP and BOARD to build when calling make, like
-e.g.
 * make APP=cardem BOARD=qmod
 * make APP=dfu BOARD=qmod
 
+The Makefile will create output files in the format: `bin/$(BOARD)-$(APP)-$(MEM).{elf,bin}`
+
 The level of debug messages can be altered at compile time:
 ```
 $ make TRACE_LEVEL=4
 ```
 Accepted values: 0 (NO_TRACE) to 5 (DEBUG)
 
-== Flashing
+= Flashing
 
-For flashing the firmware, there are at least two options.
+To flash a firmware image follow the instructions provided in the [wiki](https://projects.osmocom.org/projects/simtrace2/wiki/).
-
-=== Using JTAG + OpenOCD to flash the DFU bootloader
-
-The first one is using openocd and a JTAG key.
-For this option, a JTAG connector has to be soldered onto the board, which is not attached per default.
-
-```
-$ openocd -f openocd/openocd.cfg -c "init" -c "halt" -c "flash write_bank 0 ./bin/$(BOARD)-dfu-flash.bin 0" -c "reset" -c "shutdown"
-```
-
-=== Using bossac to flash the DFU bootloader
-
-The second option is using rumba for flashing. No further hardware has to be provided for this option.
-
-FIXME
-
-=== Using DFU to flash application
-
-FIXME

firmware/TODO.txt

@@ -0,0 +1,22 @@
+
+== Important DFU topics / reliability ==
+x some kind of DFU fallback / boot cycle counter ?
+* CRC check of image before attempting to execute it ?
+x Keep WDT running while in DFU or app
+? USB control request for flash erase
+
+== QModem related ==
+x new vendor/product ID for hub and SAM3s
+* board-specfic string descriptors
+* re-mapping of USB ports in EEPROM
+
+== Lower Priority ==
+* unique serial number in iSerial?
+* printing of banner from generic function
+* board_main_top() automatically before calling main()
+x compile-time USB string generation
+* shared USB strings for DFU and runtime
+* version detection voltage ranges
+* locking of bootloader pages?
+* debug console command for switch-to-dfu
+* read CPU reset cause (and time?) via USB

firmware/apps/cardem/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c ccid.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
+C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

firmware/apps/cardem/main.c

@@ -1,4 +1,21 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -6,7 +23,7 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 
 unsigned int g_unique_id[4];
 
@@ -89,12 +106,14 @@ void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 
 void USART1_IrqHandler(void)
 {
-	config_func_ptrs[simtrace_config].usart1_irq();
+	if (config_func_ptrs[simtrace_config].usart1_irq)
+		config_func_ptrs[simtrace_config].usart1_irq();
 }
 
 void USART0_IrqHandler(void)
 {
-	config_func_ptrs[simtrace_config].usart0_irq();
+	if (config_func_ptrs[simtrace_config].usart0_irq)
+		config_func_ptrs[simtrace_config].usart0_irq();
 }
 
 /* returns '1' in case we should break any endless loop */
@@ -106,6 +125,8 @@ static void check_exec_dbg_cmd(void)
 		return;
 
 	ch = UART_GetChar();
+	/* We must echo the character to make python fdexpect happy, whcih we use in factory testing */
+	fputc(ch, stdout);
 
 	board_exec_dbg_cmd(ch);
 }
@@ -123,24 +144,38 @@ 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);
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-        printf("\n\r\n\r"
+		printf("\n\r\n\r"
 		"=============================================================================\n\r"
 		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
 		"=============================================================================\n\r");
 
-	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+	static const char* reset_causes[] = {
+		"general reset (first power-up reset)",
+		"backup reset (return from backup mode)",
+		"watchdog reset (watchdog fault occurred)",
+		"software reset (processor reset required by the software)",
+		"user reset (NRST pin detected low)",
+	};
+	if (reset_cause < ARRAY_SIZE(reset_causes)) {
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+	} else {
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	}
+#endif
 
 	board_main_top();
 

firmware/apps/dfu/main.c

@@ -1,8 +1,28 @@
+/* SIMtrace 2 firmware USB DFU bootloader
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 #include "board.h"
 #include "utils.h"
 #include "usb/device/dfu/dfu.h"
 #include "usb/common/dfu/usb_dfu.h"
 #include "manifest.h"
+#include "USBD_HAL.h"
 
 #include <osmocom/core/timer.h>
 
@@ -10,6 +30,14 @@
 #define ALTIF_FLASH 1
 
 unsigned int g_unique_id[4];
+/* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */
+static bool watchdog_configured = false;
+
+/* There is not enough space in the 16 KiB DFU bootloader to include led.h functions */
+#ifdef PINS_LEDS
+/** LED pin configurations */
+static const Pin pinsLeds[] = { PINS_LEDS } ;
+#endif
 
 /*----------------------------------------------------------------------------
  *       Callbacks
@@ -21,46 +49,81 @@ unsigned int g_unique_id[4];
 #define IFLASH_END	((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
 #define IRAM_END	((uint8_t *)IRAM_ADDR + IRAM_SIZE)
 
-/* incoming call-back: Host has transfered 'len' bytes (stored at
+/* incoming call-back: Host has transferred 'len' bytes (stored at
  * 'data'), which we shall write to 'offset' into the partition
- * associated with 'altif'.  Guaranted to be les than
+ * associated with 'altif'.  Guaranted to be less than
  * BOARD_DFU_PAGE_SIZE */
 int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 			 uint8_t *data, unsigned int len)
 {
 	uint32_t addr;
+	unsigned int i;
 	int rc;
+	/* address of the last allocated variable on the stack */
+	uint32_t stack_addr = (uint32_t)&rc;
+	/* kick the dog to have enough time to flash */
+	if (watchdog_configured) {
+		WDT_Restart(WDT);
+	}
 
 	printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
 
+#ifdef PINS_LEDS
+	PIO_Clear(&pinsLeds[LED_NUM_RED]);
+#endif
+
 	switch (altif) {
 	case ALTIF_RAM:
 		addr = RAM_ADDR(offset);
-		if (addr > IRAM_ADDR + IRAM_SIZE) {
+		if (addr < IRAM_ADDR || addr + len >= IRAM_ADDR + IRAM_SIZE || addr + len >= stack_addr) {
 			g_dfu->state = DFU_STATE_dfuERROR;
 			g_dfu->status = DFU_STATUS_errADDRESS;
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
 		}
 		memcpy((void *)addr, data, len);
-		return DFU_RET_ZLP;
+		rc = DFU_RET_ZLP;
+		break;
 	case ALTIF_FLASH:
 		addr = FLASH_ADDR(offset);
-		if (addr > IFLASH_ADDR + IFLASH_SIZE) {
+		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) {
 			g_dfu->state = DFU_STATE_dfuERROR;
 			g_dfu->status = DFU_STATUS_errADDRESS;
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
+		}
+		rc = FLASHD_Unlock(addr, addr + len, 0, 0);
+		if (rc != 0) {
+			TRACE_ERROR("DFU download flash unlock failed\n\r");
+			rc =  DFU_RET_STALL;
+			break;
 		}
 		rc = FLASHD_Write(addr, data, len);
 		if (rc != 0) {
-			/* FIXME: set error codes */
+			TRACE_ERROR("DFU download flash erase failed\n\r");
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
 		}
-		return DFU_RET_ZLP;
+		for (i = 0; i < len; i++) {
+			if (((uint8_t*)addr)[i]!=data[i]) {
+				TRACE_ERROR("DFU download flash data written not correct\n\r");
+				rc = DFU_RET_STALL;
+				break;
+			}
+		}
+		rc = DFU_RET_ZLP;
+		break;
 	default:
-		/* FIXME: set error codes */
 		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
-		return DFU_RET_STALL;
+		rc = DFU_RET_STALL;
+		break;
 	}
+
+#ifdef PINS_LEDS
+	PIO_Set(&pinsLeds[LED_NUM_RED]);
+#endif
+
+	return rc;
 }
 
 /* incoming call-back: Host has requested to read back 'req_len' bytes
@@ -105,31 +168,10 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
 	return req_len;
 }
 
-static int uart_has_loopback_jumper(void)
+/* can be overridden by board specific code, e.g. by pushbutton */
+WEAK int board_override_enter_dfu(void)
 {
-	unsigned int i;
+	return 0;
-	const Pin uart_loopback_pins[] = {
-		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
-		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-	};
-
-	/* Configure UART pins as I/O */
-	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
-
-	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]))
-			return 0;
-		/* Set TxD low, abort if RxD doesn't go low either */
-		PIO_Clear(&uart_loopback_pins[1]);
-		if (PIO_Get(&uart_loopback_pins[0]))
-			return 0;
-	}
-	/* 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 */
-	return 1;
 }
 
 /* using this function we can determine if we should enter DFU mode
@@ -137,22 +179,30 @@ static int uart_has_loopback_jumper(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 (uart_has_loopback_jumper())
+	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;
 }
@@ -180,21 +230,23 @@ extern int main(void)
 	unsigned int i = 0;
 	uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
 
-#if 0
+	/* Enable watchdog for 2000ms, with no window */
-	led_init();
-	led_blink(LED_GREEN, BLINK_3O_30F);
-	led_blink(LED_RED, BLINK_3O_30F);
-#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));
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+	watchdog_configured = true;
+
+#ifdef PINS_LEDS
+	/* Configure LED */
+	PIO_Configure(pinsLeds, sizeof(pinsLeds));
+	PIO_Set(&pinsLeds[LED_NUM_RED]);
+	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
+#endif
 
 	PIO_InitializeInterrupts(0);
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-        printf("\n\r\n\r"
+	printf("\n\r\n\r"
 		"=============================================================================\n\r"
 		"DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r"
 		"=============================================================================\n\r",
@@ -206,6 +258,35 @@ extern int main(void)
 		   g_unique_id[2], g_unique_id[3]);
 	TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);
 
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	/* Find out why we are in the DFU bootloader, and not the main application */
+	TRACE_INFO("DFU bootloader start reason: ");
+	switch (USBDFU_OverrideEnterDFU()) {
+	case 0:
+		/* 0 normally means that there is no override, but we are in the bootloader,
+		 * thus the first check in board_cstartup_gnu did return something else than 0.
+		 * this can only be g_dfu->magic which is erased when the segment are
+		 * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU.
+		 * no static variable can be used to store this case since this will also be overwritten
+		 */
+	case 1:
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
+		break;
+	case 2:
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
+		break;
+	case 3:
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
+		break;
+	case 4: // the is no reason
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
+		break;
+	default:
+		TRACE_INFO_WP("unknown\n\r");
+		break;
+	}
+#endif
+
 	/* clear g_dfu on power-up reset */
 	if (reset_cause == 0)
 		memset(g_dfu, 0, sizeof(*g_dfu));
@@ -213,6 +294,19 @@ extern int main(void)
 	board_main_top();
 
 	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);
+#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) {
@@ -229,7 +323,9 @@ extern int main(void)
 		i++;
 	}
 
+	/* Initialize the flash to be able to write it, using the IAP ROM code */
 	FLASHD_Initialize(BOARD_MCK, 1);
+
 	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);

firmware/apps/dfu/usb_strings.txt

@@ -1,5 +1,5 @@
 sysmocom - s.f.m.c. GmbH
 SIMtrace 2 compatible device
-DFU (Device Firmare Upgrade)
+DFU (Device Firmware Upgrade)
 RAM
 Flash (Application Partition)

firmware/apps/trace/Makefile

@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

firmware/apps/trace/main.c

@@ -0,0 +1,236 @@
+/* SIMtrace 2 firmware sniffer application
+ *
+ * (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.
+ */
+/*------------------------------------------------------------------------------
+ *          Headers
+ *------------------------------------------------------------------------------*/
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "osmocom/core/timer.h"
+
+unsigned int g_unique_id[4];
+
+/*------------------------------------------------------------------------------
+ *         Internal variables
+ *------------------------------------------------------------------------------*/
+typedef struct {
+	/* static initialization, called whether or not the usb config is active */
+	void (*configure) (void);
+	/* initialization function after the config was selected */
+	void (*init) (void);
+	/* de-initialization before selecting new config */
+	void (*exit) (void);
+	/* main loop content for given configuration */
+	void (*run) (void);
+	/* Interrupt handler for USART0 */
+	void (*usart0_irq) (void);
+	/* Interrupt handler for USART1 */
+	void (*usart1_irq) (void);
+} conf_func;
+
+static const conf_func config_func_ptrs[] = {
+	/* array slot 0 is empty, usb configs start at 1 */
+#ifdef HAVE_SNIFFER
+	[CFG_NUM_SNIFF] = {
+		.configure = Sniffer_configure,
+		.init = Sniffer_init,
+		.exit = Sniffer_exit,
+		.run = Sniffer_run,
+		.usart0_irq = Sniffer_usart0_irq,
+		.usart1_irq = Sniffer_usart1_irq,
+	},
+#endif
+#ifdef HAVE_CCID
+	[CFG_NUM_CCID] = {
+		.configure = CCID_configure,
+		.init = CCID_init,
+		.exit = CCID_exit,
+		.run = CCID_run,
+	},
+#endif
+#ifdef HAVE_CARDEM
+	[CFG_NUM_PHONE] = {
+		.configure = mode_cardemu_configure,
+		.init = mode_cardemu_init,
+		.exit = mode_cardemu_exit,
+		.run = mode_cardemu_run,
+		.usart0_irq = mode_cardemu_usart0_irq,
+		.usart1_irq = mode_cardemu_usart1_irq,
+	},
+#endif
+#ifdef HAVE_MITM
+	[CFG_NUM_MITM] = {
+		.configure = MITM_configure,
+		.init = MITM_init,
+		.exit = MITM_exit,
+		.run = MITM_run,
+	},
+#endif
+};
+
+/*------------------------------------------------------------------------------
+ *         Internal variables
+ *------------------------------------------------------------------------------*/
+#if defined(HAVE_SNIFFER)
+static volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+#elif defined(HAVE_CARDEM)
+static volatile enum confNum simtrace_config = CFG_NUM_PHONE;
+#elif defined(HAVE_CCID)
+static volatile enum confNum simtrace_config = CFG_NUM_CCID;
+#endif
+
+/*----------------------------------------------------------------------------
+ *       Callbacks
+ *----------------------------------------------------------------------------*/
+
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+	simtrace_config = cfgnum;
+}
+
+void USART1_IrqHandler(void)
+{
+	if (config_func_ptrs[simtrace_config].usart1_irq)
+		config_func_ptrs[simtrace_config].usart1_irq();
+}
+
+void USART0_IrqHandler(void)
+{
+	if (config_func_ptrs[simtrace_config].usart0_irq)
+		config_func_ptrs[simtrace_config].usart0_irq();
+}
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+	int ch;
+
+	if (!UART_IsRxReady())
+		return;
+
+	ch = UART_GetChar();
+
+	board_exec_dbg_cmd(ch);
+}
+
+/*------------------------------------------------------------------------------
+ *        Main
+ *------------------------------------------------------------------------------*/
+#define MAX_USB_ITER BOARD_MCK/72	// This should be around a second
+extern int main(void)
+{
+	uint8_t isUsbConnected = 0;
+	enum confNum last_simtrace_config = simtrace_config;
+	unsigned int i = 0;
+
+	/* 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_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);
+
+	EEFC_ReadUniqueID(g_unique_id);
+
+		printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
+		"=============================================================================\n\r");
+
+	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%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();
+
+	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+		WDT_Restart(WDT);
+		check_exec_dbg_cmd();
+#if 0
+		if (i >= MAX_USB_ITER * 3) {
+			TRACE_ERROR("Resetting board (USB could "
+				    "not be configured)\n\r");
+			USBD_Disconnect();
+			NVIC_SystemReset();
+		}
+#endif
+		i++;
+	}
+
+	TRACE_INFO("calling configure of all configurations...\n\r");
+	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
+		if (config_func_ptrs[i].configure)
+			config_func_ptrs[i].configure();
+	}
+
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	config_func_ptrs[simtrace_config].init();
+	last_simtrace_config = simtrace_config;
+
+	TRACE_INFO("entering main loop...\n\r");
+	while (1) {
+		WDT_Restart(WDT);
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+		const char rotor[] = { '-', '\\', '|', '/' };
+		putchar('\b');
+		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+		check_exec_dbg_cmd();
+		osmo_timers_prepare();
+		osmo_timers_update();
+
+		if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+			if (isUsbConnected) {
+				isUsbConnected = 0;
+			}
+		} else if (isUsbConnected == 0) {
+			TRACE_INFO("USB is now configured\n\r");
+
+			isUsbConnected = 1;
+		}
+		if (last_simtrace_config != simtrace_config) {
+			TRACE_INFO("USB config chg %u -> %u\n\r",
+				   last_simtrace_config, simtrace_config);
+			config_func_ptrs[last_simtrace_config].exit();
+			config_func_ptrs[simtrace_config].init();
+			last_simtrace_config = simtrace_config;
+		} else {
+			config_func_ptrs[simtrace_config].run();
+		}
+	}
+}

firmware/apps/trace/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/triple_play/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c ccid.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
+C_FILES += card_emu.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

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
  *------------------------------------------------------------------------------*/
@@ -7,7 +24,7 @@
 #include "simtrace.h"
 #include "utils.h"
 #include "req_ctx.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 
 unsigned int g_unique_id[4];
 
@@ -134,7 +151,7 @@ extern int main(void)
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-        printf("\r\n\r\n"
+		printf("\r\n\r\n"
 		"=============================================================================\r\n"
 		"SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
 		"=============================================================================\r\n");

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/core/USBD.c

@@ -47,6 +47,8 @@
 #include "USBD.h"
 #include "USBD_HAL.h"
 
+extern void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request);
+
 /*---------------------------------------------------------------------------
  *      Definitions
  *---------------------------------------------------------------------------*/
@@ -144,7 +146,11 @@ void USBD_RequestHandler(uint8_t bEndpoint,
                       bEndpoint);
     }
     else {
+#if defined(BOARD_USB_DFU) && !defined(APPLICATION_dfu)
+        USBDFU_Runtime_RequestHandler(pRequest);
+#else
         USBDCallbacks_RequestReceived(pRequest);
+#endif
     }
 }
 

firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2008, Atmel Corporation
+ * Copyright (c) 2018, Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -331,8 +332,13 @@ static void GetDescriptor(
             /* Check if descriptor exists */
 
             if (indexRDesc >= numStrings) {
-
+                /* Sometimes descriptor string 0xee is requested.
-                USBD_Stall(0);
+                 * This is a mechanism used by Microsoft Windows to further identify the USB device.
+                 * Instead of stalling, as is the original code, leading to an USB reset, we send an empty packet.
+                 * I am not sure if sending an empty string would be better, but an empty packet seems sufficient.
+                 */
+                //USBD_Stall(0);
+                USBD_Write(0, NULL, 0, 0, 0);
             }
             else {
 

firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h

@@ -78,8 +78,8 @@ extern const USBDDriverDescriptors dfu_descriptors;
 
 /* no DFU bootloader is being used */
 #define DFURT_NUM_IF	0
-#define DFURT_IF_DESCRIPTOR_STRUCT(a, b)
+#define DFURT_IF_DESCRIPTOR_STRUCT
-#define DFURT_IF_DESCRIPTOR
+#define DFURT_IF_DESCRIPTOR(a, b)
 
 #endif /* BOARD_USB_DFU */
 

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

@@ -28,7 +28,7 @@ static const USBDeviceDescriptor fsDevice = {
 	.bDeviceClass =		0,
 	.bDeviceSubClass = 	0,
 	.bDeviceProtocol = 	0,
-	.bMaxPacketSize0 =	BOARD_USB_ENDPOINTS_MAXPACKETSIZE(0),
+	.bMaxPacketSize0 = 	USBEndpointDescriptor_MAXCTRLSIZE_FS,
 	.idVendor =		BOARD_USB_VENDOR_ID,
 	.idProduct = 		BOARD_DFU_USB_PRODUCT_ID,
 	.bcdDevice = 		BOARD_USB_RELEASE,

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

@@ -217,7 +217,7 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request)
 	uint8_t req = USBGenericRequest_GetRequest(request);
 	uint16_t len = USBGenericRequest_GetLength(request);
 	uint16_t val = USBGenericRequest_GetValue(request);
-	int rc, ret;
+	int rc, ret = DFU_RET_NOTHING;
 
 	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),

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

@@ -107,7 +107,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	uint8_t req = USBGenericRequest_GetRequest(request);
 	uint16_t len = USBGenericRequest_GetLength(request);
 	uint16_t val = USBGenericRequest_GetValue(request);
-	int rc, ret;
+	int rc, ret = DFU_RET_NOTHING;
 
 	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
@@ -141,7 +141,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	if (USBGenericRequest_GetType(request) != USBGenericRequest_CLASS ||
 	    USBGenericRequest_GetRecipient(request) != USBGenericRequest_INTERFACE) {
 		TRACE_DEBUG("std_ho_usbd ");
-		USBDDriver_RequestHandler(usbdDriver, request);
+		USBDCallbacks_RequestReceived(request);
 		return;
 	}
 
@@ -216,9 +216,3 @@ void DFURT_SwitchToDFU(void)
 	 * ResetVector of the bootloader */
 	NVIC_SystemReset();
 }
-
-void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
-{
-	/* FIXME: integration with CCID control point reqeusts */
-	USBDFU_Runtime_RequestHandler(request);
-}

firmware/libboard/common/include/board_common.h

@@ -1,3 +1,19 @@
+/* SIMtrace 2 common board pin definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #ifndef _BOARD_
 #define _BOARD_
 
@@ -39,8 +55,8 @@
 
 #define BOARD_MCK     48000000
 
-#define PIO_LED_RED	PIO_PA17
+#define PIO_LED_RED     PIO_PA17
-#define PIO_LED_GREEN	PIO_PA17
+#define PIO_LED_GREEN   PIO_PA18
 
 #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}
@@ -65,10 +81,14 @@
 /** UART0 */
 /** Console baudrate always using 115200. */
 #define CONSOLE_BAUDRATE    115200
-/** Usart Hw interface used by the console (UART0). */
+/** UART peripheral used by the console (UART0). */
-#define CONSOLE_USART       UART0
+#define CONSOLE_UART       UART0
-/** Usart Hw ID used by the console (UART0). */
+/** UART peripheral ID used by the console (UART0). */
 #define CONSOLE_ID          ID_UART0
+/** UART ISR used by the console (UART0). */
+#define CONSOLE_ISR         UART0_IrqHandler
+/** UART IRQ used by the console (UART0). */
+#define CONSOLE_IRQ         UART0_IRQn
 /** Pins description corresponding to Rxd,Txd, (UART pins) */
 #define CONSOLE_PINS        {PINS_UART}
 
@@ -77,39 +97,25 @@
 #define BOARD_ISO7816_BASE_USART    USART0
 #define BOARD_ISO7816_ID_USART      ID_USART0
 
+/* USART peripherals for a phone and SIM card setup */
+/* USART peripheral connected to the SIM card */
 #define USART_SIM       USART0
+/* ID of USART peripheral connected to the SIM card */
 #define ID_USART_SIM    ID_USART0
-#define USART_PHONE       USART1
+/* Interrupt request ID of USART peripheral connected to the SIM card */
-#define ID_USART_PHONE    ID_USART1
+#define IRQ_USART_SIM   USART0_IRQn
+/* USART peripheral connected to the phone */
+#define USART_PHONE     USART1
+/* ID of USART peripheral connected to the phone */
+#define ID_USART_PHONE  ID_USART1
+/* 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
 
-
-//**     USB **/
-// USB pull-up control pin definition (PA16).
-// Default: 1 (USB Pullup deactivated) 
-#define PIN_USB_PULLUP  {1 << 16, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
 // Board has UDP controller
 #define BOARD_USB_UDP
-// D+ has external pull-up
-#define BOARD_USB_PULLUP_EXTERNAL
-
-#define BOARD_USB_NUMENDPOINTS      8
-
-// FIXME: in all other cases return 0?
-#define BOARD_USB_ENDPOINTS_MAXPACKETSIZE(i)    (((i == 4) || (i == 5))? 512 : 64)
-#define BOARD_USB_ENDPOINTS_BANKS(i)            (((i == 0) || (i == 3)) ? 1 : 2)
-
-#define USB_VENDOR_OPENMOKO		0x1d50
-#define USB_PRODUCT_OWHW_SAM3_DFU	0x4001	/* was 0x4000 */
-#define USB_PRODUCT_OWHW_SAM3		0x4001
-#define USB_PRODUCT_QMOD_HUB		0x4002
-#define USB_PRODUCT_QMOD_SAM3_DFU	0x4004	/* was 0x4003 */
-#define USB_PRODUCT_QMOD_SAM3		0x4004
-#define USB_PRODUCT_SIMTRACE2_DFU	0x60e3	/* was 0x60e2 */
-#define USB_PRODUCT_SIMTRACE2		0x60e3
 
 #define BOARD_USB_DFU
 #define BOARD_DFU_BOOT_SIZE	(16 * 1024)
@@ -119,4 +125,5 @@
 
 extern void board_exec_dbg_cmd(int ch);
 extern void board_main_top(void);
+extern int board_override_enter_dfu(void);
 #endif

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,3 +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
 
 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 {
@@ -13,9 +27,11 @@ enum led_pattern {
 	BLINK_3O_30F		= 3,
 	BLINK_3O_1F_3O_30F	= 4,
 	BLINK_3O_1F_3O_1F_3O_30F= 5,
-	BLINK_200O_F		= 6,
+	BLINK_2O_F		= 6,
-	BLINK_600O_F		= 7,
+	BLINK_200O_F		= 7,
-	BLINK_CUSTOM		= 8,
+	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,6 +2,8 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2010, Atmel Corporation
+ * 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.
  *
@@ -69,59 +71,59 @@ void ResetException( void ) ;
 __attribute__((section(".vectors")))
 IntFunc exception_table[] = {
 
-    /* Configure Initial Stack Pointer, using linker-generated symbols */
+	/* Configure Initial Stack Pointer, using linker-generated symbols */
-    (IntFunc)(&pdwStack[STACK_SIZE-1]),
+	(IntFunc)(&pdwStack[STACK_SIZE-1]),
-    ResetException,
+	ResetException,
 
-    NMI_Handler,
+	NMI_Handler,
-    HardFault_Handler,
+	HardFault_Handler,
-    MemManage_Handler,
+	MemManage_Handler,
-    BusFault_Handler,
+	BusFault_Handler,
-    UsageFault_Handler,
+	UsageFault_Handler,
-    0, 0, 0, 0,         /* Reserved */
+	0, 0, 0, 0,         /* Reserved */
-    SVC_Handler,
+	SVC_Handler,
-    DebugMon_Handler,
+	DebugMon_Handler,
-    0,                  /* Reserved  */
+	0,                  /* Reserved  */
-    PendSV_Handler,
+	PendSV_Handler,
-    SysTick_Handler,
+	SysTick_Handler,
 
-    /* Configurable interrupts  */
+	/* Configurable interrupts  */
-    SUPC_IrqHandler,    /* 0  Supply Controller */
+	SUPC_IrqHandler,    /* 0  Supply Controller */
-    RSTC_IrqHandler,    /* 1  Reset Controller */
+	RSTC_IrqHandler,    /* 1  Reset Controller */
-    RTC_IrqHandler,     /* 2  Real Time Clock */
+	RTC_IrqHandler,     /* 2  Real Time Clock */
-    RTT_IrqHandler,     /* 3  Real Time Timer */
+	RTT_IrqHandler,     /* 3  Real Time Timer */
-    WDT_IrqHandler,     /* 4  Watchdog Timer */
+	WDT_IrqHandler,     /* 4  Watchdog Timer */
-    PMC_IrqHandler,     /* 5  PMC */
+	PMC_IrqHandler,     /* 5  PMC */
-    EEFC_IrqHandler,    /* 6  EEFC */
+	EEFC_IrqHandler,    /* 6  EEFC */
-    IrqHandlerNotUsed,  /* 7  Reserved */
+	IrqHandlerNotUsed,  /* 7  Reserved */
-    UART0_IrqHandler,   /* 8  UART0 */
+	UART0_IrqHandler,   /* 8  UART0 */
-    UART1_IrqHandler,   /* 9  UART1 */
+	UART1_IrqHandler,   /* 9  UART1 */
-    SMC_IrqHandler,     /* 10 SMC */
+	SMC_IrqHandler,     /* 10 SMC */
-    PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
+	PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
-    PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
+	PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
-    PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
+	PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
-    USART0_IrqHandler,  /* 14 USART 0 */
+	USART0_IrqHandler,  /* 14 USART 0 */
-    USART1_IrqHandler,  /* 15 USART 1 */
+	USART1_IrqHandler,  /* 15 USART 1 */
-    IrqHandlerNotUsed,  /* 16 Reserved */
+	IrqHandlerNotUsed,  /* 16 Reserved */
-    IrqHandlerNotUsed,  /* 17 Reserved */
+	IrqHandlerNotUsed,  /* 17 Reserved */
-    MCI_IrqHandler,     /* 18 MCI */
+	MCI_IrqHandler,     /* 18 MCI */
-    TWI0_IrqHandler,    /* 19 TWI 0 */
+	TWI0_IrqHandler,    /* 19 TWI 0 */
-    TWI1_IrqHandler,    /* 20 TWI 1 */
+	TWI1_IrqHandler,    /* 20 TWI 1 */
-    SPI_IrqHandler,     /* 21 SPI */
+	SPI_IrqHandler,     /* 21 SPI */
-    SSC_IrqHandler,     /* 22 SSC */
+	SSC_IrqHandler,     /* 22 SSC */
-    TC0_IrqHandler,     /* 23 Timer Counter 0 */
+	TC0_IrqHandler,     /* 23 Timer Counter 0 */
-    TC1_IrqHandler,     /* 24 Timer Counter 1 */
+	TC1_IrqHandler,     /* 24 Timer Counter 1 */
-    TC2_IrqHandler,     /* 25 Timer Counter 2 */
+	TC2_IrqHandler,     /* 25 Timer Counter 2 */
-    TC3_IrqHandler,     /* 26 Timer Counter 3 */
+	TC3_IrqHandler,     /* 26 Timer Counter 3 */
-    TC4_IrqHandler,     /* 27 Timer Counter 4 */
+	TC4_IrqHandler,     /* 27 Timer Counter 4 */
-    TC5_IrqHandler,     /* 28 Timer Counter 5 */
+	TC5_IrqHandler,     /* 28 Timer Counter 5 */
-    ADC_IrqHandler,     /* 29 ADC controller */
+	ADC_IrqHandler,     /* 29 ADC controller */
-    DAC_IrqHandler,     /* 30 DAC controller */
+	DAC_IrqHandler,     /* 30 DAC controller */
-    PWM_IrqHandler,     /* 31 PWM */
+	PWM_IrqHandler,     /* 31 PWM */
-    CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
+	CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
-    ACC_IrqHandler,     /* 33 Analog Comparator */
+	ACC_IrqHandler,     /* 33 Analog Comparator */
-    USBD_IrqHandler,    /* 34 USB Device Port */
+	USBD_IrqHandler,    /* 34 USB Device Port */
-    IrqHandlerNotUsed   /* 35 not used */
+	IrqHandlerNotUsed   /* 35 not used */
 };
 
 #if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
@@ -132,8 +134,12 @@ 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) */
-	appReset = pSrc[1];
+	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;
 
@@ -147,57 +153,56 @@ static void BootIntoApp(void)
  */
 void ResetException( void )
 {
-    uint32_t *pSrc, *pDest ;
+	uint32_t *pSrc, *pDest ;
 
-    /* Low level Initialize */
+	/* Low level Initialize */
-    LowLevelInit() ;
+	LowLevelInit() ;
 
 
 #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()) {
+		BootIntoApp();
-        BootIntoApp();
+		/* Infinite loop */
-        /* Infinite loop */
+		while ( 1 ) ;
-        while ( 1 ) ;
+	}
-    }
 #endif
 
-    /* Initialize the relocate segment */
+	/* Initialize the relocate segment */
-    pSrc = &_etext ;
+	pSrc = &_etext ;
-    pDest = &_srelocate ;
+	pDest = &_srelocate ;
 
-    if ( pSrc != pDest )
+	if ( pSrc != pDest )
-    {
+	{
-        for ( ; pDest < &_erelocate ; )
+		for ( ; pDest < &_erelocate ; )
-        {
+		{
-            *pDest++ = *pSrc++ ;
+		    *pDest++ = *pSrc++ ;
-        }
+		}
-    }
+	}
 
-    /* Clear the zero segment */
+	/* Clear the zero segment */
-    for ( pDest = &_szero ; pDest < &_ezero ; )
+	for ( pDest = &_szero ; pDest < &_ezero ; )
-    {
+	{
-        *pDest++ = 0;
+		*pDest++ = 0;
-    }
+	}
 
-    /* Set the vector table base address */
+	/* Set the vector table base address */
-    pSrc = (uint32_t *)&_sfixed;
+	pSrc = (uint32_t *)&_sfixed;
-    SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
+	SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
 	
-    if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
+	if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
-    {
+	{
 	    SCB->VTOR |= 1 << SCB_VTOR_TBLBASE_Pos ;
-    }
+	}
 
-    /* App should have disabled interrupts during the transition */
+	/* App should have disabled interrupts during the transition */
-    __enable_irq();
+	__enable_irq();
 
-    /* Branch to main function */
+	/* Branch to main function */
-    main() ;
+	main() ;
 
-    /* Infinite loop */
+	/* Infinite loop */
-    while ( 1 ) ;
+	while ( 1 ) ;
 }
 

firmware/libboard/common/source/board_lowlevel.c

@@ -50,15 +50,15 @@
 #if (BOARD_MAINOSC == 18432000)
 /* Clock settings at 48MHz  for 18 MHz crystal */
 #define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(13-1) \
+					   | CKGR_PLLAR_MULA(13-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(5))
+					   | 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_MULA(8-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
+					   | CKGR_PLLAR_DIVA(2))
 #else
 #error "Please define PLLA config for your MAINOSC frequency"
 #endif /* MAINOSC */
@@ -66,19 +66,19 @@
 #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(7-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
+					   | CKGR_PLLAR_DIVA(2))
 #elif (BOARD_MAINOSC == 12000000)
 /* 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_MULA(10-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
+					   | CKGR_PLLAR_DIVA(2))
 #error "Please define PLLA config for your MAINOSC frequency"
 #endif /* MAINOSC */
 #else
-    #error "No PLL settings for current BOARD_MCK."
+	#error "No PLL settings for current BOARD_MCK."
 #endif
 
 #if (BOARD_MAINOSC == 12000000)
@@ -117,85 +117,85 @@ static void _ConfigureUsbClock(void)
  */
 extern WEAK void LowLevelInit( void )
 {
-    uint32_t timeout = 0;
+	uint32_t timeout = 0;
 
-    /* Configure the Supply Monitor to reset the CPU in case VDDIO is
+	/* Configure the Supply Monitor to reset the CPU in case VDDIO is
-     * lower than 3.0V.  As we run the board on 3.3V, any lower voltage
+	 * lower than 3.0V.  As we run the board on 3.3V, any lower voltage
-     * might be some kind of leakage that creeps in some way, but is not
+	 * might be some kind of leakage that creeps in some way, but is not
-     * the "official" power supply */
+	 * the "official" power supply */
-    SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
+	SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
 	    	      SUPC_SMMR_SMRSTEN_ENABLE;
 
-    /* enable both LED and green LED */
+	/* enable both LED and green LED */
-    PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
+	PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
-    PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
+	PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
-    PIOA->PIO_CODR |= PIO_LED_RED | PIO_LED_GREEN;
+	PIOA->PIO_CODR |= PIO_LED_RED | PIO_LED_GREEN;
 
-    /* Set 3 FWS for Embedded Flash Access */
+	/* Set 3 FWS for Embedded Flash Access */
-    EFC->EEFC_FMR = EEFC_FMR_FWS(3);
+	EFC->EEFC_FMR = EEFC_FMR_FWS(3);
 
-    /* Select external slow clock */
+	/* Select external slow clock */
 /*    if ((SUPC->SUPC_SR & SUPC_SR_OSCSEL) != SUPC_SR_OSCSEL_CRYST)
-    {
+	{
-        SUPC->SUPC_CR = (uint32_t)(SUPC_CR_XTALSEL_CRYSTAL_SEL | SUPC_CR_KEY(0xA5));
+		SUPC->SUPC_CR = (uint32_t)(SUPC_CR_XTALSEL_CRYSTAL_SEL | SUPC_CR_KEY(0xA5));
-        timeout = 0;
+		timeout = 0;
-        while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
+		while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
-    }
+	}
 */
 
 #ifndef qmod
-    /* Initialize main oscillator */
+	/* Initialize main oscillator */
-    if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
+	if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
-    {
+	{
-        PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
+		PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
-        timeout = 0;
+		timeout = 0;
-        while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
+		while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
-    }
+	}
 
-    /* Switch to 3-20MHz Xtal oscillator */
+	/* Switch to 3-20MHz Xtal oscillator */
-    PIOB->PIO_PDR = (1 << 8) | (1 << 9);
+	PIOB->PIO_PDR = (1 << 8) | (1 << 9);
-    PIOB->PIO_PUDR = (1 << 8) | (1 << 9);
+	PIOB->PIO_PUDR = (1 << 8) | (1 << 9);
-    PIOB->PIO_PPDDR = (1 << 8) | (1 << 9);
+	PIOB->PIO_PPDDR = (1 << 8) | (1 << 9);
-    PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN | CKGR_MOR_MOSCSEL;
+	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN | CKGR_MOR_MOSCSEL;
-    /* wait for Main XTAL oscillator stabilization */
+	/* wait for Main XTAL oscillator stabilization */
-    timeout = 0;
+	timeout = 0;
-    while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
+	while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
 #else
-    /* QMOD has external 12MHz clock source */
+	/* QMOD has external 12MHz clock source */
-    PIOB->PIO_PDR = (1 << 9);
+	PIOB->PIO_PDR = (1 << 9);
-    PIOB->PIO_PUDR = (1 << 9);
+	PIOB->PIO_PUDR = (1 << 9);
-    PIOB->PIO_PPDDR = (1 << 9);
+	PIOB->PIO_PPDDR = (1 << 9);
-    PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL;
+	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL;
 #endif
 
-    /* disable the red LED after main clock initialization */
+	/* disable the red LED after main clock initialization */
-    PIOA->PIO_SODR = PIO_LED_RED;
+	PIOA->PIO_SODR = PIO_LED_RED;
 
-    /* "switch" to main clock as master clock source (should already be the case */
+	/* "switch" to main clock as master clock source (should already be the case */
-    PMC->PMC_MCKR = (PMC->PMC_MCKR & ~(uint32_t)PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
+	PMC->PMC_MCKR = (PMC->PMC_MCKR & ~(uint32_t)PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
-    /* wait for master clock to be ready */
+	/* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
 
-    /* Initialize PLLA */
+	/* Initialize PLLA */
-    PMC->CKGR_PLLAR = BOARD_PLLAR;
+	PMC->CKGR_PLLAR = BOARD_PLLAR;
-    /* Wait for PLLA to lock */
+	/* Wait for PLLA to lock */
-    timeout = 0;
+	timeout = 0;
-    while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
+	while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
 
-    /* Switch to main clock (again ?!?) */
+	/* Switch to main clock (again ?!?) */
-    PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
+	PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
-    /* wait for master clock to be ready */
+	/* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
 
-    /* switch to PLLA as master clock source */
+	/* switch to PLLA as master clock source */
-    PMC->PMC_MCKR = BOARD_MCKR ;
+	PMC->PMC_MCKR = BOARD_MCKR ;
-    /* wait for master clock to be ready */
+	/* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
 
-    /* Configure SysTick for 1ms */
+	/* Configure SysTick for 1ms */
-    SysTick_Config(BOARD_MCK/1000);
+	SysTick_Config(BOARD_MCK/1000);
 
-    _ConfigureUsbClock();
+	_ConfigureUsbClock();
 }
 
 /* SysTick based delay function */

firmware/libboard/common/source/boardver_adc.c

@@ -1,9 +1,22 @@
+/* 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"
 
-/* FIXME: share this with mode_cardemu.c */
 #define UV_PER_LSB	((3300 * 1000) / 4096)
-static uint32_t adc2uv(uint16_t adc)
+uint32_t adc2uv(uint16_t adc)
 {
 	uint32_t uv = (uint32_t) adc * UV_PER_LSB;
 	return uv;
@@ -73,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>
@@ -16,9 +35,9 @@ static void led_set(enum led led, int on)
 	ASSERT(led < PIO_LISTSIZE(pinsLeds));
 
 	if (on)
-        	PIO_Set(&pinsLeds[led]);
+			PIO_Clear(&pinsLeds[led]);
 	else
-        	PIO_Clear(&pinsLeds[led]);
+			PIO_Set(&pinsLeds[led]);
 }
 
 /* LED blinking code */
@@ -27,7 +46,7 @@ static void led_set(enum led led, int on)
 struct blink_state {
 	/* duration of the state in ms */
 	uint16_t duration;
-	/* bringhtness of LED during the state */
+	/* brightness of LED during the state */
 	uint8_t on;
 } __attribute__((packed));
 
@@ -54,13 +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 {
@@ -94,6 +123,10 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_3on_1off_3on_1off_3on_30off,
 		.size = ARRAY_SIZE(bs_3on_1off_3on_1off_3on_30off),
 	},
+	[BLINK_2O_F] = {
+		.states = bs_2on_off,
+		.size = ARRAY_SIZE(bs_2on_off),
+	},
 	[BLINK_200O_F] = {
 		.states = bs_200on_off,
 		.size = ARRAY_SIZE(bs_200on_off),
@@ -102,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 {
@@ -158,16 +196,16 @@ static void blink_tmr_cb(void *data)
 }
 
 static struct led_state led_state[] = {
-	[LED_GREEN] = {
-		.led = LED_GREEN,
-		.timer.cb = blink_tmr_cb,
-		.timer.data = &led_state[LED_GREEN],
-	},
 	[LED_RED] = {
 		.led = LED_RED,
 		.timer.cb = blink_tmr_cb,
 		.timer.data = &led_state[LED_RED],
 	},
+	[LED_GREEN] = {
+		.led = LED_GREEN,
+		.timer.cb = blink_tmr_cb,
+		.timer.data = &led_state[LED_GREEN],
+	},
 };
 #endif /* PINS_LEDS */
 

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,7 +1,24 @@
-/* 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"
 #include "sim_switch.h"
 
 #ifdef PIN_SIM_SWITCH1
@@ -16,6 +33,7 @@ static int initialized = 0;
 int sim_switch_use_physical(unsigned int nr, int physical)
 {
 	const Pin *pin;
+	enum led led;
 
 	if (!initialized) {
 		TRACE_ERROR("Somebody forgot to call sim_switch_init()\r\n");
@@ -29,11 +47,13 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 #ifdef PIN_SIM_SWITCH1
 	case 0:
 		pin = &pin_conn_usim1;
+		led = LED_USIM1;
 		break;
 #endif
 #ifdef PIN_SIM_SWITCH2
 	case 1:
 		pin = &pin_conn_usim2;
+		led = LED_USIM2;
 		break;
 #endif
 	default:
@@ -44,9 +64,11 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 	if (physical) {
 		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
 		PIO_Clear(pin);
+		led_blink(led, BLINK_ALWAYS_ON);
 	} else {
 		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
 		PIO_Set(pin);
+		led_blink(led, BLINK_ALWAYS_OFF);
 	}
 
 	return 0;
@@ -63,5 +85,6 @@ int sim_switch_init(void)
 	PIO_Configure(&pin_conn_usim2, 1);
 	num_switch++;
 #endif
+	initialized = 1;
 	return num_switch;
 }

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.
  *
@@ -43,6 +44,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
+#include "ringbuffer.h"
+
 /*----------------------------------------------------------------------------
  *        Definitions
  *----------------------------------------------------------------------------*/
@@ -52,7 +55,9 @@
  *----------------------------------------------------------------------------*/
 
 /** Is Console Initialized. */
-static uint8_t _ucIsConsoleInitialized=0 ;
+static uint8_t _ucIsConsoleInitialized=0;
+/** Ring buffer to queue data to be sent */
+static ringbuf uart_tx_buffer;
 
 /**
  * \brief Configures an USART peripheral with the specified parameters.
@@ -62,56 +67,117 @@ static uint8_t _ucIsConsoleInitialized=0 ;
  */
 extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
 {
-    const Pin pPins[] = CONSOLE_PINS;
+	const Pin pPins[] = CONSOLE_PINS;
-    Uart *pUart = CONSOLE_USART;
+	Uart *pUart = CONSOLE_UART;
 
-    /* Configure PIO */
+	/* Configure PIO */
-    PIO_Configure(pPins, PIO_LISTSIZE(pPins));
+	PIO_Configure(pPins, PIO_LISTSIZE(pPins));
 
-    /* Configure PMC */
+	/* Configure PMC */
-    PMC->PMC_PCER0 = 1 << CONSOLE_ID;
+	PMC->PMC_PCER0 = 1 << CONSOLE_ID;
 
-    /* Reset and disable receiver & transmitter */
+	/* Reset and disable receiver & transmitter */
-    pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
+	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
-                   | UART_CR_RXDIS | UART_CR_TXDIS;
+				   | UART_CR_RXDIS | UART_CR_TXDIS;
 
-    /* Configure mode */
+	/* Configure mode */
-    pUart->UART_MR =  UART_MR_PAR_NO;
+	pUart->UART_MR =  UART_MR_PAR_NO;
 
-    /* Configure baudrate */
+	/* Configure baudrate */
-    /* Asynchronous, no oversampling */
+	/* Asynchronous, no oversampling */
-    pUart->UART_BRGR = (masterClock / baudrate) / 16;
+	pUart->UART_BRGR = (masterClock / baudrate) / 16;
 
-    /* Disable PDC channel */
+	/* Disable PDC channel */
-    pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
+	pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
 
-    /* Enable receiver and transmitter */
+	/* Reset transmit ring buffer */
-    pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
+	rbuf_reset(&uart_tx_buffer);
 
-    _ucIsConsoleInitialized=1 ;
+	/* Enable TX interrupts */
+	pUart->UART_IER = UART_IER_TXRDY;
+	NVIC_EnableIRQ(CONSOLE_IRQ);
+	
+	/* Enable receiver and transmitter */
+	pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
+
+	/* Remember the configuration is complete */
+	_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_THR = rbuf_read(&uart_tx_buffer);
+		} else {
+			uart->UART_IDR = UART_IER_TXRDY;
+		}
+	}
 }
 
 /**
  * \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_USART ;
+	Uart *pUart = CONSOLE_UART ;
 
-    if ( !_ucIsConsoleInitialized )
+	/* Initialize console is not already done */
-    {
+	if ( !_ucIsConsoleInitialized )
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	{
-    }
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	}
 
-    /* Wait for the transmitter to be ready */
+	if (!rbuf_is_full(&uart_tx_buffer)) {
-    while ( (pUart->UART_SR & UART_SR_TXEMPTY) == 0 ) ;
+		rbuf_write(&uart_tx_buffer, uc);
+		if (!(pUart->UART_IMR & UART_IMR_TXRDY)) {
+			pUart->UART_IER = UART_IER_TXRDY;
+			CONSOLE_ISR();
+		}
+	}
+}
 
-    /* Send character */
+/**
-    pUart->UART_THR=c ;
+ * \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) */
 }
 
 /**
@@ -122,16 +188,17 @@ extern void UART_PutChar( uint8_t c )
  */
 extern uint32_t UART_GetChar( void )
 {
-    Uart *pUart=CONSOLE_USART ;
+	Uart *pUart = CONSOLE_UART ;
 
-    if ( !_ucIsConsoleInitialized )
+	if ( !_ucIsConsoleInitialized )
-    {
+	{
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-    }
+	}
 
-    while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 ) ;
+	while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 )
+		WDT_Restart(WDT);
 
-    return pUart->UART_RHR ;
+	return pUart->UART_RHR ;
 }
 
 /**
@@ -141,14 +208,14 @@ extern uint32_t UART_GetChar( void )
  */
 extern uint32_t UART_IsRxReady( void )
 {
-    Uart *pUart=CONSOLE_USART ;
+	Uart *pUart = CONSOLE_UART;
 
-    if ( !_ucIsConsoleInitialized )
+	if ( !_ucIsConsoleInitialized )
-    {
+	{
-        UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
+		UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
-    }
+	}
 
-    return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
+	return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
 }
 
 /**
@@ -159,14 +226,14 @@ extern uint32_t UART_IsRxReady( void )
  */
 extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
 {
-    uint32_t dw ;
+	uint32_t dw ;
 
-    for ( dw=0 ; dw < dwSize ; dw++ )
+	for ( dw=0 ; dw < dwSize ; dw++ )
-    {
+	{
-        printf( "%02X ", pucFrame[dw] ) ;
+		printf( "%02X ", pucFrame[dw] ) ;
-    }
+	}
 
-    printf( "\n\r" ) ;
+	printf( "\n\r" ) ;
 }
 
 /**
@@ -178,62 +245,62 @@ extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
  */
 extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
 {
-    uint32_t i ;
+	uint32_t i ;
-    uint32_t j ;
+	uint32_t j ;
-    uint32_t dwLastLineStart ;
+	uint32_t dwLastLineStart ;
-    uint8_t* pucTmp ;
+	uint8_t* pucTmp ;
 
-    for ( i=0 ; i < (dwSize / 16) ; i++ )
+	for ( i=0 ; i < (dwSize / 16) ; i++ )
-    {
+	{
-        printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
+		printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
-        pucTmp = (uint8_t*)&pucBuffer[i*16] ;
+		pucTmp = (uint8_t*)&pucBuffer[i*16] ;
 
-        for ( j=0 ; j < 4 ; j++ )
+		for ( j=0 ; j < 4 ; j++ )
-        {
+		{
-            printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
+			printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
-            pucTmp += 4 ;
+			pucTmp += 4 ;
-        }
+		}
 
-        pucTmp=(uint8_t*)&pucBuffer[i*16] ;
+		pucTmp=(uint8_t*)&pucBuffer[i*16] ;
 
-        for ( j=0 ; j < 16 ; j++ )
+		for ( j=0 ; j < 16 ; j++ )
-        {
+		{
-            UART_PutChar( *pucTmp++ ) ;
+			UART_PutChar( *pucTmp++ ) ;
-        }
+		}
 
-        printf( "\n\r" ) ;
+		printf( "\n\r" ) ;
-    }
+	}
 
-    if ( (dwSize%16) != 0 )
+	if ( (dwSize%16) != 0 )
-    {
+	{
-        dwLastLineStart=dwSize - (dwSize%16) ;
+		dwLastLineStart=dwSize - (dwSize%16) ;
 
-        printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
+		printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
-        for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
+		for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
-        {
+		{
-            if ( (j!=dwLastLineStart) && (j%4 == 0) )
+			if ( (j!=dwLastLineStart) && (j%4 == 0) )
-            {
+			{
-                printf( " " ) ;
+				printf( " " ) ;
-            }
+			}
 
-            if ( j < dwSize )
+			if ( j < dwSize )
-            {
+			{
-                printf( "%02X", pucBuffer[j] ) ;
+				printf( "%02X", pucBuffer[j] ) ;
-            }
+			}
-            else
+			else
-            {
+			{
-                printf("  ") ;
+				printf("  ") ;
-            }
+			}
-        }
+		}
 
-        printf( " " ) ;
+		printf( " " ) ;
-        for ( j=dwLastLineStart ; j < dwSize ; j++ )
+		for ( j=dwLastLineStart ; j < dwSize ; j++ )
-        {
+		{
-            UART_PutChar( pucBuffer[j] ) ;
+			UART_PutChar( pucBuffer[j] ) ;
-        }
+		}
 
-        printf( "\n\r" ) ;
+		printf( "\n\r" ) ;
-    }
+	}
 }
 
 /**
@@ -243,45 +310,46 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
  */
 extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 {
-    uint8_t ucKey ;
+	uint8_t ucKey ;
-    uint8_t ucNbNb=0 ;
+	uint8_t ucNbNb=0 ;
-    uint32_t dwValue=0 ;
+	uint32_t dwValue=0 ;
 
-    while ( 1 )
+	while ( 1 )
-    {
+	{
-        ucKey=UART_GetChar() ;
+		ucKey=UART_GetChar() ;
-        UART_PutChar( ucKey ) ;
+		UART_PutChar( ucKey ) ;
 
-        if ( ucKey >= '0' &&  ucKey <= '9' )
+		if ( ucKey >= '0' &&  ucKey <= '9' )
-        {
+		{
-            dwValue = (dwValue * 10) + (ucKey - '0');
+			dwValue = (dwValue * 10) + (ucKey - '0');
-            ucNbNb++ ;
+			ucNbNb++ ;
-        }
+		}
-        else
+		else
-        {
+		{
-            if ( ucKey == 0x0D || ucKey == ' ' )
+			if ( ucKey == 0x0D || ucKey == ' ' )
-            {
+			{
-                if ( ucNbNb == 0 )
+				if ( ucNbNb == 0 )
-                {
+				{
-                    printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
+					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
-                    return 0 ;
+					return 0 ;
-                }
+				}
-                else
+				else
-                {
+				{
-                    printf( "\n\r" ) ;
+					printf( "\n\r" ) ;
-                    *pdwValue=dwValue ;
+					*pdwValue=dwValue ;
 
-                    return 1 ;
+					return 1 ;
-                }
+				}
-            }
+			}
-            else
+			else
-            {
+			{
-                printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
+				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
 
-                return 0 ;
+				return 0 ;
-            }
+			}
-        }
+		}
-    }
+		WDT_Restart(WDT);
+	}
 }
 
 /**
@@ -293,25 +361,25 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
  */
 extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
 {
-    uint32_t dwValue=0 ;
+	uint32_t dwValue=0 ;
 
-    if ( UART_GetInteger( &dwValue ) == 0 )
+	if ( UART_GetInteger( &dwValue ) == 0 )
-    {
+	{
-        return 0 ;
+		return 0 ;
-    }
+	}
 
-    if ( dwValue < dwMin || dwValue > dwMax )
+	if ( dwValue < dwMin || dwValue > dwMax )
  {
-        printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
+		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
 
-        return 0 ;
+		return 0 ;
-    }
+	}
 
-    printf( "\n\r" ) ;
+	printf( "\n\r" ) ;
 
-    *pdwValue = dwValue ;
+	*pdwValue = dwValue ;
 
-    return 1 ;
+	return 1 ;
 }
 
 /**
@@ -321,45 +389,45 @@ extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint3
  */
 extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 {
-    uint8_t ucKey ;
+	uint8_t ucKey ;
-    uint32_t dw = 0 ;
+	uint32_t dw = 0 ;
-    uint32_t dwValue = 0 ;
+	uint32_t dwValue = 0 ;
 
-    for ( dw=0 ; dw < 8 ; dw++ )
+	for ( dw=0 ; dw < 8 ; dw++ )
-    {
+	{
-        ucKey = UART_GetChar() ;
+		ucKey = UART_GetChar() ;
-        UART_PutChar( ucKey ) ;
+		UART_PutChar( ucKey ) ;
 
-        if ( ucKey >= '0' &&  ucKey <= '9' )
+		if ( ucKey >= '0' &&  ucKey <= '9' )
-        {
+		{
-            dwValue = (dwValue * 16) + (ucKey - '0') ;
+			dwValue = (dwValue * 16) + (ucKey - '0') ;
-        }
+		}
-        else
+		else
-        {
+		{
-            if ( ucKey >= 'A' &&  ucKey <= 'F' )
+			if ( ucKey >= 'A' &&  ucKey <= 'F' )
-            {
+			{
-                dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
+				dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
-            }
+			}
-            else
+			else
-            {
+			{
-                if ( ucKey >= 'a' &&  ucKey <= 'f' )
+				if ( ucKey >= 'a' &&  ucKey <= 'f' )
-                {
+				{
-                    dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
+					dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
-                }
+				}
-                else
+				else
-                {
+				{
-                    printf( "\n\rIt is not a hexa character!\n\r" ) ;
+					printf( "\n\rIt is not a hexa character!\n\r" ) ;
 
-                    return 0 ;
+					return 0 ;
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 
-    printf("\n\r" ) ;
+	printf("\n\r" ) ;
-    *pdwValue = dwValue ;
+	*pdwValue = dwValue ;
 
-    return 1 ;
+	return 1 ;
 }
 
 #if defined __ICCARM__ /* IAR Ewarm 5.41+ */
@@ -372,9 +440,9 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
  */
 extern WEAK signed int putchar( signed int c )
 {
-    UART_PutChar( c ) ;
+	UART_PutChar( c ) ;
 
-    return c ;
+	return c ;
 }
 #endif // defined __ICCARM__
 

firmware/libboard/owhw/include/board.h

@@ -1,5 +1,24 @@
+/* OWHW board definition
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 #include "board_common.h"
+#include "simtrace_usb.h"
 
 /** Name of the board */
 #define BOARD_NAME "OWHW"

firmware/libboard/owhw/source/owhw.c

@@ -1,20 +1,20 @@
-/* Card simulator specific functions */
+/* Card simulator specific functions
-/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  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 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,
+ * This program is free software; you can redistribute it and/or modify
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * it under the terms of the GNU General Public License as published by
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * the Free Software Foundation; either version 2 of the License, or
- *  GNU General Public License for more details.
+ * (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
+ * This program is distributed in the hope that it will be useful,
- *  along with this program; if not, write to the Free Software
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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 "chip.h"
@@ -36,5 +36,5 @@ void cardsim_set_simpres(uint8_t slot, int present)
 
 void cardsim_gpio_init(void)
 {
-	PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim));
+	PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));
 }

firmware/libboard/qmod/include/board.h

@@ -1,5 +1,27 @@
+/* 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"

firmware/libboard/qmod/include/card_pres.h

@@ -1,3 +1,21 @@
+/* card presence utilities
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 int is_card_present(int port);

firmware/libboard/qmod/include/i2c.h

@@ -1,3 +1,19 @@
+/* I2C EEPROM memory read and write utilities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 void i2c_pin_init(void);

firmware/libboard/qmod/include/wwan_led.h

@@ -1,3 +1,19 @@
+/* Code to read/track the status of the WWAN LEDs of attached modems
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 int wwan_led_active(int wwan);

firmware/libboard/qmod/include/wwan_perst.h

@@ -1,3 +1,19 @@
+/* Code to control the PERST lines of attached modems
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 int wwan_perst_set(int modem_nr, int active);

firmware/libboard/qmod/source/board_qmod.c

@@ -1,6 +1,21 @@
-/* Quad-modem speciic application code */
+/* sysmocom quad-modem sysmoQMOD application code
-/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
+ *
-
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
@@ -9,7 +24,7 @@
 #include "sim_switch.h"
 #include "boardver_adc.h"
 #include "card_pres.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 #include "usb_buf.h"
 
 static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
@@ -55,8 +70,6 @@ const unsigned char __eeprom_bin[256] = {
 #include "i2c.h"
 static int write_hub_eeprom(void)
 {
-	const unsigned int __eeprom_bin_len = 256;
-
 	int i;
 
 	/* wait */
@@ -64,16 +77,18 @@ static int write_hub_eeprom(void)
 
 	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		/* if the result was negative, repeat that write */
+		if (rc < 0) {
-		if (rc < 0)
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
-			i--;
+				i, __eeprom_bin[i]);
+			return 1;
+		}
 	}
 
 	/* then pursue re-reading it again and again */
 	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
 		TRACE_INFO("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
@@ -87,6 +102,28 @@ static int write_hub_eeprom(void)
 	return 0;
 }
 
+static int erase_hub_eeprom(void)
+{
+	int i;
+
+	/* wait */
+	mdelay(100);
+
+	TRACE_INFO("Erasing EEPROM...\n\r");
+	/* write the EEPROM once */
+	for (i = 0; i < 256; i++) {
+		int rc = eeprom_write_byte(0x50, i, 0xff);
+		if (rc < 0) {
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
+				i, __eeprom_bin[i]);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -99,6 +136,9 @@ static void board_exec_dbg_cmd_st12only(int ch)
 	case 'E':
 		write_hub_eeprom();
 		break;
+	case 'e':
+		erase_hub_eeprom();
+		break;
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -123,13 +163,13 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		UART_GetIntegerMinMax(&addr, 0, 255);
 		printf("Please enter EEPROM value:\n\r");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
 	case 'r':
 		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
@@ -146,6 +186,7 @@ void board_exec_dbg_cmd(int ch)
 		printf("\tR\treset SAM3\n\r");
 		if (qmod_sam3_is_12()) {
 			printf("\tE\tprogram EEPROM\n\r");
+			printf("\te\tErase EEPROM\n\r");
 			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
 			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
 			printf("\tH\tRelease HUB RESET (high)\n\r");
@@ -249,3 +290,51 @@ void board_main_top(void)
 	card_present_init();
 #endif
 }
+
+static int uart_has_loopback_jumper(void)
+{
+	unsigned int i;
+	const Pin uart_loopback_pins[] = {
+		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
+		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+	};
+
+	/* 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])) {
+			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])) {
+			has_loopback_jumper = 0;
+			break;
+		}
+	}
+
+	/* Put pins back to UART mode */
+	const Pin uart_pins[] = {PINS_UART};
+	PIO_Configure(uart_pins, PIO_LISTSIZE(uart_pins));
+
+	return has_loopback_jumper;
+}
+
+int board_override_enter_dfu(void)
+{
+	/* If the loopback jumper is set, we enter DFU mode */
+	if (uart_has_loopback_jumper())
+		return 1;
+
+	return 0;
+}

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"
@@ -17,9 +35,9 @@ int is_card_present(int port)
 	const Pin *pin;
 	int present;
 
-	if (port < 1 || port > NUM_CARDPRES)
+	if (port < 0 || port >= NUM_CARDPRES)
 		return -1;
-	pin = &pin_cardpres[port-1];
+	pin = &pin_cardpres[port];
 
 	/* Card present signals are low-active, as we have a switch
 	 * against GND and an internal-pull-up in the SAM3 */
@@ -32,12 +50,12 @@ static void cardpres_tmr_cb(void *data)
 {
 	unsigned int i;
 
-	for (i = 1; i <= ARRAY_SIZE(pin_cardpres); i++) {
+	for (i = 0; i < ARRAY_SIZE(pin_cardpres); i++) {
 		int state = is_card_present(i);
-		if (state != last_state[i-1]) {
+		if (state != last_state[i]) {
-			TRACE_INFO("Card Detect %d Status %d -> %d\r\n", i, last_state[i], state);
+			TRACE_INFO("%u: Card Detect Status %d -> %d\r\n", i, last_state[i], state);
 			/* FIXME: report to USB host */
-			last_state[i-1] = state;
+			last_state[i] = state;
 		}
 	}
 

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"
 
@@ -14,9 +27,9 @@ static const Pin pin_wwan1 = PIN_WWAN1;
 
 static void wwan1_irqhandler(const Pin *pPin)
 {
-	int active = wwan_led_active(1);
+	int active = wwan_led_active(0);
 
-	TRACE_INFO("WWAN1 LED %u\r\n", active);
+	TRACE_INFO("0: WWAN LED %u\r\n", active);
 
 	/* TODO: notify host via USB */
 }
@@ -27,8 +40,8 @@ static const Pin pin_wwan2 = PIN_WWAN2;
 
 static void wwan2_irqhandler(const Pin *pPin)
 {
-	int active = wwan_led_active(2);
+	int active = wwan_led_active(1);
-	TRACE_INFO("WWAN2 LED %u\r\n", active);
+	TRACE_INFO("1: WWAN LED %u\r\n", active);
 
 	/* TODO: notify host via USB */
 }
@@ -42,12 +55,12 @@ int wwan_led_active(int wwan)
 
 	switch (wwan) {
 #ifdef PIN_WWAN1
-	case 1:
+	case 0:
 		pin = &pin_wwan1;
 		break;
 #endif
 #ifdef PIN_WWAN2
-	case 2:
+	case 1:
 		pin = &pin_wwan2;
 		break;
 #endif

firmware/libboard/qmod/source/wwan_perst.c

@@ -1,29 +1,45 @@
 /* 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"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 
 struct wwan_perst {
+	uint8_t idx;
 	const Pin pin;
 	struct osmo_timer_list timer;
 };
 
 #ifdef PIN_PERST1
 static struct wwan_perst perst1 = {
+	.idx = 0,
 	.pin = PIN_PERST1,
 };
 #endif
 
 #ifdef PIN_PERST2
 static struct wwan_perst perst2 = {
+	.idx = 1,
 	.pin = PIN_PERST2,
 };
 #endif
@@ -34,7 +50,7 @@ static void perst_tmr_cb(void *data)
 {
 	struct wwan_perst *perst = data;
 	/* release the (low-active) reset */
-	TRACE_INFO("De-asserting modem reset\r\n");
+	TRACE_INFO("%u: De-asserting modem reset\r\n", perst->idx);
 	PIO_Clear(&perst->pin);
 }
 
@@ -106,5 +122,6 @@ int wwan_perst_init(void)
 	perst2.timer.data = (void *) &perst2;
 	num_perst++;
 #endif
+	initialized = 1;
 	return num_perst;
 }

firmware/libboard/simtrace/include/board.h

@@ -1,87 +1,145 @@
+/* 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"
 
-/** Name of the board */
+/* Name of the board */
 #define BOARD_NAME "SAM3S-SIMTRACE"
-/** Board definition */
+/* Board definition */
 #define simtrace
 
+/* Board main oscillator frequency (in Hz) */
 #define BOARD_MAINOSC 18432000
 
-/** Phone (SIM card emulator)/CCID Reader/MITM configuration    **/
+/** Pin configuration **/
-/*  Normally the communication lines between phone and SIM card are disconnected    */
+/* Button to force bootloader start (shorted to ground when pressed */
-// Disconnect SIM card I/O, VPP line from the phone lines
+#define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-// FIXME: Per default pins are input, therefore high-impedance, therefore they don not activate the bus switch, right?
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define PIN_SC_SW_DEFAULT               {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-// Disconnect SIM card RST, CLK line from the phone lines
+/* Enable powering the SIM card */
-#define PIN_IO_SW_DEFAULT               {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PWR_PINS                SIM_PWEN_PIN
-#define PINS_BUS_DEFAULT                PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+/* 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 from smartcard to the phone
+/* 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
 
-#define PINS_SIM_SNIFF_SIM      PIN_PHONE_IO,  PIN_PHONE_CLK
+/** 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
 
-#define SIM_PWEN_PIN            {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** 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}
 
-#define PWR_PINS                                                         \
+/** Pin configuration to control USB pull-up on D+
-    /* Enable power converter 4.5-6V to 3.3V; low: off */               \
+ *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
-    {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT},               \
+ */
-    /* Enable second power converter: VCC_PHONE to VCC_SIM; high: on */ \
+#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-    {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-#define SW_SIM      PIO_PA8
-#define SMARTCARD_CONNECT_PIN {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
-//#define SMARTCARD_CONNECT_PIN {SW_SIM, PIOB, ID_PIOB, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_IT_EDGE}
-
-/// PIN used for resetting the smartcard
-// FIXME: Card is resetted with pin set to 0 --> PIO_OUTPUT_1 as default is right?
-#define PIN_ISO7816_RSTMC       {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-/// Pins used for connect the smartcard
-#define PIN_SIM_IO_INPUT    {PIO_PA1, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_SIM_IO          {PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PIN_SIM_CLK         {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_SIM_CLK_INPUT   {PIO_PA4, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-//#define PINS_ISO7816            PIN_USART1_TXD, PIN_USART1_SCK, PIN_ISO7816_RSTMC
-#define PINS_ISO7816        PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
-
-#define PINS_TC             PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
-
-#define VCC_PHONE                   {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_ISO7816_RST_PHONE       {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
-#define PIN_PHONE_IO_INPUT          {PIO_PA21, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_PHONE_IO                {PIO_PA22, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PIN_PHONE_CLK               {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}     // External Clock Input on PA28
-//#define PIN_PHONE_CLK               {PIO_PA23A_SCK1, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}     // External Clock Input on PA28
-#define PIN_PHONE_CLK_INPUT         {PIO_PA29, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PINS_ISO7816_PHONE          PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, VCC_PHONE, PIN_PHONE_IO_INPUT, PIN_ISO7816_RST_PHONE
-//, VCC_PHONE
-
-
-//**     SPI interface   **/
-/// SPI MISO pin definition (PA12).
-#define PIN_SPI_MISO   {1 << 12, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
-/// SPI MOSI pin definition (PA13).
-#define PIN_SPI_MOSI   {1 << 13, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/// SPI SPCK pin definition (PA14).
-#define PIN_SPI_SPCK   {1 << 14, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/// SPI pins definition. Contains MISO, MOSI & SPCK (PA12, PA13 & PA14).
-#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SPCK
-/// SPI chip select 0 pin definition (PA11).
-#define PIN_SPI_NPCS0  {1 << 11, PIOA, PIOA, PIO_PERIPH_A, 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
 
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
+/** Supported modes */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* SIMtrace board supports sniffer mode */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
-#define BOARD_USB_RELEASE	0x000
-
 #define HAVE_SNIFFER
-#define HAVE_CCID
+/* SIMtrace board supports CCID mode */
-#define HAVE_CARDEM
+//#define HAVE_CCID
-#define HAVE_MITM
+/* SIMtrace board supports card emulation mode */
+//#define HAVE_CARDEM
+/* SIMtrace board supports man-in-the-middle mode */
+//#define HAVE_MITM

firmware/libboard/simtrace/source/board_simtrace.c

@@ -0,0 +1,68 @@
+/* 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"
+
+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/libcommon/include/assert.h

@@ -65,41 +65,41 @@
 //         Definitions
 //------------------------------------------------------------------------------
 #if defined(NOASSERT)
-    #define ASSERT(...)
+	#define ASSERT(...)
-    #define SANITY_CHECK(...)
+	#define SANITY_CHECK(...)
 #else
 
-    #if (TRACE_LEVEL == 0)
+	#if (TRACE_LEVEL == 0)
-        /// Checks that the given condition is true, 
+		/// Checks that the given condition is true, 
-        /// otherwise stops the program execution.
+		/// otherwise stops the program execution.
-        /// \param condition  Condition to verify.
+		/// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
+		#define ASSERT(condition)  { \
-            if (!(condition)) { \
+			if (!(condition)) { \
-                while (1); \
+				while (1); \
-            } \
+			} \
-        }
+		}
 
-        /// Performs the same duty as the ASSERT() macro
+		/// Performs the same duty as the ASSERT() macro
-        /// \param condition  Condition to verify.
+		/// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, ...)
+		#define SANITY_CHECK(condition) ASSERT(condition, ...)
 
-    #else
+	#else
-        /// Checks that the given condition is true, otherwise displays an error
+		/// Checks that the given condition is true, otherwise displays an error
-        /// message and stops the program execution.
+		/// message and stops the program execution.
-        /// \param condition  Condition to verify.
+		/// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
+		#define ASSERT(condition)  { \
-            if (!(condition)) { \
+			if (!(condition)) { \
-                printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
+				printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
-                while (1); \
+				while (1); \
-            } \
+			} \
-        }
+		}
-        #define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
+		#define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
 	
-        /// Performs the same duty as the ASSERT() macro, except a default error
+		/// Performs the same duty as the ASSERT() macro, except a default error
-        /// message is output if the condition is false.
+		/// message is output if the condition is false.
-        /// \param condition  Condition to verify.
+		/// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, SANITY_ERROR, __FILE__, __LINE__)
+		#define SANITY_CHECK(condition) ASSERT(condition, SANITY_ERROR, __FILE__, __LINE__)
-    #endif
+	#endif
 #endif
 
 

firmware/libcommon/include/card_emu.h

@@ -1,3 +1,22 @@
+/* ISO7816-3 state machine for the card side
+ *
+ * (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 #include <stdint.h>
@@ -36,3 +55,4 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
 int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte);
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan);
+void card_emu_uart_interrupt(uint8_t uart_chan);

firmware/libcommon/include/cciddriver.h

@@ -145,129 +145,129 @@ typedef struct
 /// 6.1.11.2 PIN Verification Data Structure
 typedef struct
 {
-    /// Number of seconds.
+	/// Number of seconds.
-    unsigned char bTimerOut;
+	unsigned char bTimerOut;
-    /// Several parameters for the PIN format options
+	/// Several parameters for the PIN format options
-    unsigned char bmFormatString;
+	unsigned char bmFormatString;
-    /// Define the length of the PIN to present in the APDU command
+	/// Define the length of the PIN to present in the APDU command
-    unsigned char bmPINBlockString;
+	unsigned char bmPINBlockString;
-    /// Allows the length PIN insertion in the APDU command
+	/// Allows the length PIN insertion in the APDU command
-    unsigned char bmPINLengthFormat;
+	unsigned char bmPINLengthFormat;
-    /// Minimum PIN size in digit and Maximum PIN size in digit
+	/// Minimum PIN size in digit and Maximum PIN size in digit
-    unsigned char wPINMaxExtraDigit;
+	unsigned char wPINMaxExtraDigit;
-    /// The value is a bit wise OR operation.
+	/// The value is a bit wise OR operation.
-    unsigned char bEntryValidationCondition;
+	unsigned char bEntryValidationCondition;
-    /// Number of messages to display for the PIN modify command
+	/// Number of messages to display for the PIN modify command
-    unsigned char bNumberMessage;
+	unsigned char bNumberMessage;
-    /// Language used to display the messages.
+	/// Language used to display the messages.
-    unsigned char wLangId;
+	unsigned char wLangId;
-    /// Message index in the Reader message table
+	/// Message index in the Reader message table
-    unsigned char bMsgIndex;
+	unsigned char bMsgIndex;
-    /// T=1 I-block prologue field to use
+	/// T=1 I-block prologue field to use
-    unsigned char bTeoPrologue[3];
+	unsigned char bTeoPrologue[3];
-    /// APDU to send to the ICC
+	/// APDU to send to the ICC
-    unsigned char abPINApdu[255];
+	unsigned char abPINApdu[255];
 }__attribute__ ((packed)) S_ccid_PIN_Verification;
 
 
 /// 6.1.11.7 PIN Modification Data Structure
 typedef struct
 {
-    /// Number of seconds. If 00h then CCID default value is used.
+	/// Number of seconds. If 00h then CCID default value is used.
-    unsigned char bTimeOut;
+	unsigned char bTimeOut;
-    /// Several parameters for the PIN format options (defined in § 6.1.11.4)
+	/// Several parameters for the PIN format options (defined in § 6.1.11.4)
-    unsigned char bmFormatString4;
+	unsigned char bmFormatString4;
-    /// Define the length of the PIN to present in the APDU command
+	/// Define the length of the PIN to present in the APDU command
-    unsigned char bmPINBlockString;
+	unsigned char bmPINBlockString;
-    /// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
+	/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
-    unsigned char bmPinLengthFormat;
+	unsigned char bmPinLengthFormat;
-    /// Insertion position offset in byte for the current PIN
+	/// Insertion position offset in byte for the current PIN
-    unsigned char bInsertionOffsetOld;
+	unsigned char bInsertionOffsetOld;
-    /// Insertion position offset in byte for the new PIN
+	/// Insertion position offset in byte for the new PIN
-    unsigned char bInsertionOffsetNew;
+	unsigned char bInsertionOffsetNew;
-    /// XXYYh
+	/// XXYYh
-    /// XX: Minimum PIN size in digit
+	/// XX: Minimum PIN size in digit
-    /// YY: Maximum PIN size in digit
+	/// YY: Maximum PIN size in digit
-    unsigned char wPINMaxExtraDigit;
+	unsigned char wPINMaxExtraDigit;
-    /// 00h,01h,02h,03h
+	/// 00h,01h,02h,03h
-    /// Indicates if a confirmation is requested before acceptance of a new PIN (meaning that the user has to enter this new PIN twice before it is accepted)
+	/// Indicates if a confirmation is requested before acceptance of a new PIN (meaning that the user has to enter this new PIN twice before it is accepted)
-    /// Indicates if the current PIN must be entered and set in the same APDU field of not.
+	/// Indicates if the current PIN must be entered and set in the same APDU field of not.
-    unsigned char bConfirmPIN;
+	unsigned char bConfirmPIN;
-    /// The value is a bit wise OR operation.
+	/// The value is a bit wise OR operation.
-    /// 01h Max size reached
+	/// 01h Max size reached
-    /// 02h Validation key pressed
+	/// 02h Validation key pressed
-    /// 04h Timeout occurred
+	/// 04h Timeout occurred
-    unsigned char bEntryValidationCondition;
+	unsigned char bEntryValidationCondition;
-    /// 00h,01h,02h,03h,or FFh
+	/// 00h,01h,02h,03h,or FFh
-    /// Number of messages to display for the PIN modify command.
+	/// Number of messages to display for the PIN modify command.
-    unsigned char bNumberMessage;
+	unsigned char bNumberMessage;
-    /// Language used to display the messages. The 16 bit
+	/// Language used to display the messages. The 16 bit
-    unsigned char wLangId;
+	unsigned char wLangId;
-    /// Message index in the Reader message table (should be 00h or 01h).
+	/// Message index in the Reader message table (should be 00h or 01h).
-    unsigned char bMsgIndex1;
+	unsigned char bMsgIndex1;
-    /// Message index in the Reader message table (should be 01h or 02h).
+	/// Message index in the Reader message table (should be 01h or 02h).
-    unsigned char bMsgIndex2;
+	unsigned char bMsgIndex2;
-    /// Message index in the Reader message table (should be 02h).
+	/// Message index in the Reader message table (should be 02h).
-    unsigned char bMsgIndex3;
+	unsigned char bMsgIndex3;
-    /// T=1 I-block prologue field to use. Significant only if protocol in use is T=1.
+	/// T=1 I-block prologue field to use. Significant only if protocol in use is T=1.
-    unsigned char bTeoPrologue[3];
+	unsigned char bTeoPrologue[3];
-    /// Byte array APDU to send to the ICC
+	/// Byte array APDU to send to the ICC
-    unsigned char abPINApdu[255];
+	unsigned char abPINApdu[255];
 }__attribute__ ((packed)) S_ccid_PIN_Modification;
 
 /// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
 typedef struct
 {
-    /// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
-    /// clock rate conversion factor
+	/// clock rate conversion factor
-    /// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
-    /// baud rate conversion factor
+	/// baud rate conversion factor
-    unsigned char bmFindexDindex;
+	unsigned char bmFindexDindex;
-    /// For T=0 ,B0 – 0b, B7-2 – 000000b
+	/// For T=0 ,B0 – 0b, B7-2 – 000000b
-    /// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
-    unsigned char bmTCCKST0;         // 0 to 2
+	unsigned char bmTCCKST0;         // 0 to 2
-    /// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
+	/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
-    /// guardtime of 12etu. FFh is the same as 00h.
+	/// guardtime of 12etu. FFh is the same as 00h.
-    unsigned char bGuardTimeT0;      // 0 to FF
+	unsigned char bGuardTimeT0;      // 0 to FF
-    /// WI for T=0 used to define WWT
+	/// WI for T=0 used to define WWT
-    unsigned char bWaitingIntegerT0; // 0 to FF
+	unsigned char bWaitingIntegerT0; // 0 to FF
-    /// ICC Clock Stop Support
+	/// ICC Clock Stop Support
-    /// 00 = Stopping the Clock is not allowed
+	/// 00 = Stopping the Clock is not allowed
-    /// 01 = Stop with Clock signal Low
+	/// 01 = Stop with Clock signal Low
-    /// 02 = Stop with Clock signal High
+	/// 02 = Stop with Clock signal High
-    /// 03 = Stop with Clock either High or Low
+	/// 03 = Stop with Clock either High or Low
-    unsigned char bClockStop;        // 0 to 3
+	unsigned char bClockStop;        // 0 to 3
 } __attribute__ ((packed)) S_ccid_protocol_t0;
 
 
 /// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
 typedef struct
 {
-    /// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
-    /// clock rate conversion factor
+	/// clock rate conversion factor
-    /// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
-    /// baud rate conversion factor
+	/// baud rate conversion factor
-    unsigned char bmFindexDindex;
+	unsigned char bmFindexDindex;
-    /// For T=1, B7-2 – 000100b
+	/// For T=1, B7-2 – 000100b
-    /// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
+	/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
-    /// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
-    unsigned char bmTCCKST1;           // 10h, 11h, 12h, 13h
+	unsigned char bmTCCKST1;           // 10h, 11h, 12h, 13h
-    /// Extra Guardtime (0 to 254 etu between two characters). 
+	/// Extra Guardtime (0 to 254 etu between two characters). 
-    /// If value is FFh, then guardtime is reduced by 1.
+	/// If value is FFh, then guardtime is reduced by 1.
-    unsigned char bGuardTimeT1;        // 0 to FF
+	unsigned char bGuardTimeT1;        // 0 to FF
-    /// B7-4 = BWI
+	/// B7-4 = BWI
-    /// B3-0 = CWI
+	/// B3-0 = CWI
-    unsigned char bmWaitingIntegersT1; // 0 to 9
+	unsigned char bmWaitingIntegersT1; // 0 to 9
-    /// ICC Clock Stop Support
+	/// ICC Clock Stop Support
-    /// 00 = Stopping the Clock is not allowed
+	/// 00 = Stopping the Clock is not allowed
-    /// 01 = Stop with Clock signal Low
+	/// 01 = Stop with Clock signal Low
-    /// 02 = Stop with Clock signal High
+	/// 02 = Stop with Clock signal High
-    /// 03 = Stop with Clock either High or Low
+	/// 03 = Stop with Clock either High or Low
-    unsigned char bClockStop;          // 0 to 3
+	unsigned char bClockStop;          // 0 to 3
-    /// Size of negotiated IFSC
+	/// Size of negotiated IFSC
-    unsigned char bIFSC;               // 0 to FE
+	unsigned char bIFSC;               // 0 to FE
-    /// Nad value used by CCID
+	/// Nad value used by CCID
-    unsigned char bNadValue;           // 0 to FF
+	unsigned char bNadValue;           // 0 to FF
 } __attribute__ ((packed)) S_ccid_protocol_t1;
 
 
@@ -357,8 +357,8 @@ typedef struct
 //------------------------------------------------------------------------------
 
 extern unsigned char RDRtoPCHardwareError( unsigned char bSlot, 
-                                           unsigned char bSeq, 
+					                       unsigned char bSeq, 
-                                           unsigned char bHardwareErrorCode );
+					                       unsigned char bHardwareErrorCode );
 
 /*
 #if !defined(NOAUTOCALLBACK)
@@ -368,13 +368,13 @@ extern void USBDCallbacks_RequestReceived(const USBGenericRequest *request);
 extern void CCID_SmartCardRequest( void );
 extern void CCIDDriver_Initialize( void );
 extern unsigned char CCID_Read(void *pBuffer,
-                               unsigned int dLength,
+					           unsigned int dLength,
-                               TransferCallback fCallback,
+					           TransferCallback fCallback,
-                               void *pArgument);
+					           void *pArgument);
 extern unsigned char CCID_Write(void *pBuffer,
-                                unsigned int dLength,
+					            unsigned int dLength,
-                                TransferCallback fCallback,
+					            TransferCallback fCallback,
-                                void *pArgument);
+					            void *pArgument);
 extern unsigned char CCID_Insertion( void );
 extern unsigned char CCID_Removal( void );
 

firmware/libcommon/include/iso7816_4.h

@@ -76,9 +76,9 @@ extern uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart);
 
 extern void ISO7816_IccPowerOff(void);
 extern uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
-                                        uint8_t *pMessage,
+					                    uint8_t *pMessage,
-                                        uint16_t wLength,
+					                    uint16_t wLength,
-                                        uint16_t *retlen);
+					                    uint16_t *retlen);
 extern void ISO7816_Escape( void );
 extern void ISO7816_RestartClock(void);
 extern void ISO7816_StopClock( void );

firmware/libcommon/include/iso7816_fidi.h

@@ -1,6 +1,30 @@
+/* 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>
 
+/* Table 7 of ISO 7816-3:2006 */
+extern const uint16_t fi_table[];
+
+/* Table 8 from ISO 7816-3:2006 */
+extern const uint8_t di_table[];
+
 /* compute the F/D ratio based on Fi and Di values */
 int compute_fidi_ratio(uint8_t fi, uint8_t di);

firmware/libcommon/include/llist_irqsafe.h

@@ -1,19 +1,42 @@
+/* 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"
+#include <osmocom/core/linuxlist.h>
+#include "utils.h"
 
 static inline void llist_add_irqsafe(struct llist_head *_new,
 					  struct llist_head *head)
 {
-	__disable_irq();
+	unsigned long x;
+
+	local_irq_save(x);
 	llist_add(_new, head);
-	__enable_irq();
+	local_irq_restore(x);
 }
 
 static inline void llist_add_tail_irqsafe(struct llist_head *_new,
 					  struct llist_head *head)
 {
-	__disable_irq();
+	unsigned long x;
+
+	local_irq_save(x);
 	llist_add_tail(_new, head);
 	__enable_irq();
 }
@@ -21,15 +44,16 @@ static inline void llist_add_tail_irqsafe(struct llist_head *_new,
 static inline struct llist_head *llist_head_dequeue_irqsafe(struct llist_head *head)
 {
 	struct llist_head *lh;
+	unsigned long x;
 
-	__disable_irq();
+	local_irq_save(x);
 	if (llist_empty(head)) {
 		lh = NULL;
 	} else {
 		lh = head->next;
 		llist_del(lh);
 	}
-	__enable_irq();
+	local_irq_restore(x);
 
 	return lh;
 }

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
 
@@ -5,7 +21,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#define RING_BUFLEN 128
+#define RING_BUFLEN 512
 
 typedef struct ringbuf {
 	uint8_t buf[RING_BUFLEN];
@@ -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,24 +1,30 @@
+/* SIMtrace 2 mode definitions
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #ifndef SIMTRACE_H
 #define SIMTRACE_H
 
 #include "ringbuffer.h"
 #include "board.h"
-
+#include <usb/device/dfu/dfu.h>
-/* Endpoint numbers */
-#define DATAOUT     1
-#define DATAIN      2
-#define INT         3
 
 #define BUFLEN  512
 
-#define PHONE_DATAOUT     4
-#define PHONE_DATAIN      5
-#define PHONE_INT         6
-
-#define CARDEM_USIM2_DATAOUT	DATAOUT
-#define CARDEM_USIM2_DATAIN	DATAIN
-#define CARDEM_USIM2_INT	INT
-
 #define CLK_MASTER      true
 #define CLK_SLAVE       false
 
@@ -59,24 +65,28 @@ enum confNum {
 /// device using the CCID driver.
 typedef struct {
 
-    /// Configuration descriptor
+	/// Configuration descriptor
-    USBConfigurationDescriptor configuration;
+	USBConfigurationDescriptor configuration;
-    /// Interface descriptor
+	/// Interface descriptor
-    USBInterfaceDescriptor     interface;
+	USBInterfaceDescriptor     interface;
-    /// CCID descriptor
+	/// CCID descriptor
-    CCIDDescriptor             ccid;
+	CCIDDescriptor             ccid;
-    /// Bulk OUT endpoint descriptor
+	/// Bulk OUT endpoint descriptor
-    USBEndpointDescriptor      bulkOut;
+	USBEndpointDescriptor      bulkOut;
-    /// Bulk IN endpoint descriptor
+	/// Bulk IN endpoint descriptor
-    USBEndpointDescriptor      bulkIn;
+	USBEndpointDescriptor      bulkIn;
-    /// Interrupt OUT endpoint descriptor
+	/// Interrupt OUT endpoint descriptor
-    USBEndpointDescriptor      interruptIn;
+	USBEndpointDescriptor      interruptIn;
+	DFURT_IF_DESCRIPTOR_STRUCT
 } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
 
 extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
 
-int check_data_from_phone();
+/*! Update USART baud rate to Fi/Di ratio
-void update_fidi(uint8_t fidi);
+ *  @param[io] usart USART peripheral base address
+ *  @param[in] fidi FiDi value as provided in TA interface byte
+ */
+void update_fidi(Usart_info *usart, uint8_t fidi);
 
 void ISR_PhoneRST( const Pin *pPin);
 
@@ -106,6 +116,9 @@ extern void CCID_run( void );
 extern void mode_cardemu_run(void);
 extern void MITM_run( void );
 
+/*  IRQ functions   */
+extern void Sniffer_usart0_irq(void);
+extern void Sniffer_usart1_irq(void);
 extern void mode_cardemu_usart0_irq(void);
 extern void mode_cardemu_usart1_irq(void);
 

firmware/libcommon/include/simtrace_prot.h

@@ -1,26 +1,26 @@
+/* SIMtrace2 USB protocol
+ *
+ * (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
+ */
 #pragma once
 
 #include <stdint.h>
-
+#include <stdbool.h>
-/* SIMtrace2 USB protocol */
-
-/* (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
- *
- */
 
 /***********************************************************************
  * COMMON HEADER
@@ -30,10 +30,10 @@ enum simtrace_msg_class {
 	SIMTRACE_MSGC_GENERIC = 0,
 	/* Card Emulation / Forwarding */
 	SIMTRACE_MSGC_CARDEM,
-	/* Modem Control (if modem is attached next to device */
+	/* Modem Control (if modem is attached next to device) */
 	SIMTRACE_MSGC_MODEM,
-	/* SIM protocol tracing */
+	/* Reader/phone-car/SIM communication sniff */
-	SIMTRACE_MSGC_TRACE,
+	SIMTRACE_MSGC_SNIFF,
 
 	/* first vendor-specific request */
 	_SIMTRACE_MGSC_VENDOR_FIRST = 127,
@@ -74,10 +74,18 @@ enum simtrace_msg_type_modem {
 	SIMTRACE_MSGT_BD_MODEM_STATUS,
 };
 
-/* SIMTRACE_MSGC_TRACE */
+/* SIMTRACE_MSGC_SNIFF */
-enum simtrace_msg_type_trace {
+enum simtrace_msg_type_sniff {
-	/* FIXME */
+	/* Status change (card inserted, reset, ...) */
-	_dummy,
+	SIMTRACE_MSGT_SNIFF_CHANGE = 0,
+	/* Fi/Di baudrate change */
+	SIMTRACE_MSGT_SNIFF_FIDI,
+	/* ATR data */
+	SIMTRACE_MSGT_SNIFF_ATR,
+	/* PPS (request or response) data */
+	SIMTRACE_MSGT_SNIFF_PPS,
+	/* TPDU data */
+	SIMTRACE_MSGT_SNIFF_TPDU,
 };
 
 /* common message header */
@@ -92,7 +100,7 @@ struct simtrace_msg_hdr {
 } __attribute__ ((packed));
 
 /***********************************************************************
- * CARD EMULATOR / FORWARDER
+ * Capabilities
  ***********************************************************************/
 
 /* generic capabilities */
@@ -107,7 +115,7 @@ enum simtrace_capability_generic {
 	SIMTRACE_CAP_LED_1,
 	/* Has LED2 */
 	SIMTRACE_CAP_LED_2,
-	/* Has Single-Pole Dual-Throw (local/remote SIM */
+	/* Has Single-Pole Dual-Throw (local/remote SIM) */
 	SIMTRACE_CAP_SPDT,
 	/* Has Bus-Switch (trace / MITM) */
 	SIMTRACE_CAP_BUS_SWITCH,
@@ -127,7 +135,7 @@ enum simtrace_capability_generic {
 	SIMTRACE_CAP_ASSERT_MODEM_RST,
 };
 
-/* vendor-specific capabilities of sysmoocm devices */
+/* vendor-specific capabilities of sysmocom devices */
 enum simtrace_capability_vendor {
 	/* Can erase a peer SAM3 controller */
 	SIMTRACE_CAP_SYSMO_QMOD_ERASE_PEER,
@@ -137,7 +145,6 @@ enum simtrace_capability_vendor {
 	SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB,
 };
 
-
 /* SIMTRACE_CMD_BD_BOARD_INFO */
 struct simtrace_board_info {
 	struct {
@@ -253,7 +260,7 @@ struct cardemu_usb_msg_error {
 
 /* SIMTRACE_MSGT_DT_MODEM_RESET */
 struct st_modem_reset {
-	/* 0: de-assert reset, 1: assert reset, 2: poulse reset */
+	/* 0: de-assert reset, 1: assert reset, 2: pulse reset */
 	uint8_t asserted;
 	/* if above is '2', duration of pulse in ms */
 	uint16_t pulse_duration_msec;
@@ -276,3 +283,40 @@ struct st_modem_status {
 	/* bit-field of changed status bits */
 	uint8_t changed_mask;
 } __attribute__((packed));
+
+/***********************************************************************
+ * SNIFF
+ ***********************************************************************/
+
+/* 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_ASSERT (1<<2)
+#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 {
+	/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
+	uint32_t flags;
+} __attribute__ ((packed));
+
+/* SIMTRACE_MSGT_SNIFF_FIDI */
+struct sniff_fidi {
+	/* Fi/Di values as encoded in TA1 */
+	uint8_t fidi;
+} __attribute__ ((packed));
+
+/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */
+struct sniff_data {
+	/* data flags */
+	uint32_t flags;
+	/* data length */
+	uint16_t length;
+	/* data */
+	uint8_t data[0];
+} __attribute__ ((packed));

firmware/libcommon/include/simtrace_usb.h

@@ -0,0 +1,67 @@
+/* SIMtrace 2 USB definitions
+ *
+ * (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
+ */
+/* SIMtrace USB IDs */
+#define USB_VENDOR_OPENMOKO			0x1d50
+#define USB_PRODUCT_OWHW_SAM3_DFU	0x4001	/* was 0x4000 */
+#define USB_PRODUCT_OWHW_SAM3		0x4001
+#define USB_PRODUCT_QMOD_HUB		0x4002
+#define USB_PRODUCT_QMOD_SAM3_DFU	0x4004	/* was 0x4003 */
+#define USB_PRODUCT_QMOD_SAM3		0x4004
+#define USB_PRODUCT_SIMTRACE2_DFU	0x60e3	/* was 0x60e2 */
+#define USB_PRODUCT_SIMTRACE2		0x60e3
+
+/* USB proprietary class */
+#define USB_CLASS_PROPRIETARY			0xff
+
+/* SIMtrace USB sub-classes */
+/*! Sniffer USB sub-class */
+#define SIMTRACE_SNIFFER_USB_SUBCLASS	1
+/*! Card-emulation USB sub-class */
+#define SIMTRACE_CARDEM_USB_SUBCLASS	2
+
+/* Generic USB endpoint numbers */
+/*! Card-side USB data out (host to device) endpoint number */
+#define SIMTRACE_USB_EP_CARD_DATAOUT	1
+/*! Card-side USB data in (device to host) endpoint number */
+#define SIMTRACE_USB_EP_CARD_DATAIN		2
+/*! Card-side USB interrupt endpoint number */
+#define SIMTRACE_USB_EP_CARD_INT		3
+/*! Phone-side USB data out (host to device) endpoint number */
+#define SIMTRACE_USB_EP_PHONE_DATAOUT	4
+/*! Phone-side USB data in (device to host) endpoint number */
+#define SIMTRACE_USB_EP_PHONE_DATAIN	5
+/*! Phone-side USB interrupt endpoint number */
+#define SIMTRACE_USB_EP_PHONE_INT		6
+
+/* Card-emulation USB endpoint numbers */
+/*! USIM1 USB data out (host to device) endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT	4
+/*! USIM1 USB data in (device to host) endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN		5
+/*! USIM1 USB interrupt endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM1_INT		6
+/*! USIM2 USB data out (host to device) endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT	1
+/*! USIM2 USB data in (device to host) endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN		2
+/*! USIM2 USB interrupt endpoint number */
+#define SIMTRACE_CARDEM_USB_EP_USIM2_INT		3
+
+/*! Maximum number of endpoints */
+#define BOARD_USB_NUMENDPOINTS		6

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,7 +1,23 @@
+/* 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"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/msgb.h"
+#include <osmocom/core/msgb.h>
 
 /* buffered USB endpoint (with queue of msgb) */
 struct usb_buffered_ep {

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

firmware/libcommon/source/fputs.c

@@ -1,3 +1,19 @@
+/* UART print output
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include <stdio.h>
 #include "uart_console.h"
 
@@ -10,6 +26,19 @@ int fputc(int c, FILE *stream)
 int fputs(const char *s, FILE *stream)
 {
 	while (*s != '\0')
-		UART_PutChar(*s++);
+		fputc(*s++, stream);
+	return 0;
+}
+
+int fputc_sync(int c, FILE *stream)
+{
+	UART_PutChar_Sync(c);
+	return c;
+}
+
+int fputs_sync(const char *s, FILE *stream)
+{
+	while (*s != '\0')
+		fputc_sync(*s++, stream);
 	return 0;
 }

firmware/libcommon/source/host_communication.c

@@ -1,9 +1,26 @@
+/* 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"
+#include "utils.h"
 
-#include "osmocom/core/linuxlist.h"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/msgb.h"
+#include <osmocom/core/msgb.h>
 #include <errno.h>
 
 /***********************************************************************
@@ -16,12 +33,13 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 {
 	struct msgb *msg = (struct msgb *) arg;
 	struct usb_buffered_ep *bep = msg->dst;
+	unsigned long x;
 
 	TRACE_DEBUG("%s (EP=0x%02x)\r\n", __func__, bep->ep);
 
-	__disable_irq();
+	local_irq_save(x);
 	bep->in_progress--;
-	__enable_irq();
+	local_irq_restore(x);
 	TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress);
 
 	if (status != USBD_STATUS_SUCCESS)
@@ -34,6 +52,7 @@ int usb_refill_to_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
+	unsigned long x;
 	int rc;
 
 #if 0
@@ -43,14 +62,14 @@ int usb_refill_to_host(uint8_t ep)
 	}
 #endif
 
-	__disable_irq();
+	local_irq_save(x);
 	if (bep->in_progress) {
-		__enable_irq();
+		local_irq_restore(x);
 		return 0;
 	}
 
 	if (llist_empty(&bep->queue)) {
-		__enable_irq();
+		local_irq_restore(x);
 		return 0;
 	}
 
@@ -58,7 +77,7 @@ int usb_refill_to_host(uint8_t ep)
 
 	msg = msgb_dequeue(&bep->queue);
 
-	__enable_irq();
+	local_irq_restore(x);
 
 	TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress);
 
@@ -70,9 +89,9 @@ int usb_refill_to_host(uint8_t ep)
 		TRACE_ERROR("%s error %x\n", __func__, rc);
 		/* re-insert to head of queue */
 		llist_add_irqsafe(&msg->list, &bep->queue);
-		__disable_irq();
+		local_irq_save(x);
 		bep->in_progress--;
-		__enable_irq();
+		local_irq_restore(x);
 		TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress);
 		return 0;
 	}
@@ -105,6 +124,7 @@ int usb_refill_from_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
+	unsigned long x;
 	int rc;
 
 #if 0
@@ -130,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;
 	}
@@ -142,16 +162,17 @@ int usb_drain_queue(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
+	unsigned long x;
 	int ret = 0;
 
 	/* wait until no transfers are in progress anymore and block
 	 * further interrupts */
 	while (1) {
-		__disable_irq();
+		local_irq_save(x);
 		if (!bep->in_progress) {
 			break;
 		}
-		__enable_irq();
+		local_irq_restore(x);
 		/* retry */
 	}
 
@@ -162,7 +183,7 @@ int usb_drain_queue(uint8_t ep)
 	}
 
 	/* re-enable interrupts and return number of free'd msgbs */
-	__enable_irq();
+	local_irq_restore(x);
 
 	return ret;
 }

firmware/libcommon/source/iso7816_4.c

@@ -76,44 +76,45 @@ struct Usart_info usart_sim = {.base = USART_SIM, .id = ID_USART_SIM, .state = U
  */
 uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
 {
-    uint32_t status;
+	uint32_t status;
-    uint32_t timeout=0;
+	uint32_t timeout=0;
 
-    Usart *us_base = usart->base;
+	Usart *us_base = usart->base;
-    uint32_t us_id = usart->id;
+	uint32_t us_id = usart->id;
 
-    if( usart->state == USART_SEND ) {
+	if( usart->state == USART_SEND ) {
-        while((us_base->US_CSR & US_CSR_TXEMPTY) == 0) {}
+		while((us_base->US_CSR & US_CSR_TXEMPTY) == 0) {}
-        us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+		us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-        usart->state = USART_RCV;
+		usart->state = USART_RCV;
-    }
+	}
 
-    /* Wait USART ready for reception */
+	/* Wait USART ready for reception */
-    while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
+	while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
-        if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
+	WDT_Restart(WDT);
-            TRACE_WARNING("TimeOut\n\r");
+		if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
-            return( 0 );
+			TRACE_WARNING("TimeOut\n\r");
-        }
+			return( 0 );
-    }
+		}
+	}
 
-    /* At least one complete character has been received and US_RHR has not yet been read. */
+	/* At least one complete character has been received and US_RHR has not yet been read. */
 
-    /* Get a char */
+	/* Get a char */
-    *pCharToReceive = ((us_base->US_RHR) & 0xFF);
+	*pCharToReceive = ((us_base->US_RHR) & 0xFF);
 
-    status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
+	status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
-                                      US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
+					                  US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
-                                      (1<<10)));
+					                  (1<<10)));
 
-    if (status != 0 ) {
+	if (status != 0 ) {
-        TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
-        TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
-        TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
+		TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
-        us_base->US_CR = US_CR_RSTSTA;
+		us_base->US_CR = US_CR_RSTSTA;
-    }
+	}
 
-    /* Return status */
+	/* Return status */
-    return( status );
+	return( status );
 }
 
 
@@ -124,50 +125,50 @@ uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
  */
 uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart )
 {
-    uint32_t status;
+	uint32_t status;
 
-    Usart *us_base = usart->base;
+	Usart *us_base = usart->base;
-    uint32_t us_id = usart->id;
+	uint32_t us_id = usart->id;
 
-    if( usart->state == USART_RCV ) {
+	if( usart->state == USART_RCV ) {
-        us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+		us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-        usart->state = USART_SEND;
+		usart->state = USART_SEND;
-    }
+	}
 
-    /* Wait USART ready for transmit */
+	/* Wait USART ready for transmit */
-    int i = 0;
+	int i = 0;
-    while((us_base->US_CSR & (US_CSR_TXRDY)) == 0)  {
+	while((us_base->US_CSR & (US_CSR_TXRDY)) == 0)  {
-        i++;
+		i++;
-        if (!(i%1000000)) {
+		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_RSTTX;
-            us_base->US_CR = US_CR_RSTRX;
+			us_base->US_CR = US_CR_RSTRX;
-      }
+	  }
-    }
+	}
-    /* There is no character in the US_THR */
+	/* There is no character in the US_THR */
 
-    /* Transmit a char */
+	/* Transmit a char */
-    us_base->US_THR = CharToSend;
+	us_base->US_THR = CharToSend;
 
-    TRACE_ERROR("Sx%02X\r\n", CharToSend);
+	TRACE_ERROR("Sx%02X\r\n", CharToSend);
 
-    status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
+	status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
-                                      US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
+					                  US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
-                                      (1<<10)));
+					                  (1<<10)));
 
-    if (status != 0 ) {
+	if (status != 0 ) {
-        TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
+		TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
-                    ", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
+					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
-                    status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
+					status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
-                    ((status & US_CSR_TIMEOUT) >> 8), ((status & (1 << 10)) >> 10));
+					((status & US_CSR_TIMEOUT) >> 8), ((status & (1 << 10)) >> 10));
-        TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\n\r", us_base->US_CSR);
+		TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\n\r", us_base->US_CSR);
-        TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
+		TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
-        us_base->US_CR = US_CR_RSTSTA;
+		us_base->US_CR = US_CR_RSTSTA;
-    }
+	}
 
-    /* Return status */
+	/* Return status */
-    return( status );
+	return( status );
 }
 
 
@@ -176,10 +177,10 @@ uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart )
  */
 static void ISO7816_IccPowerOn( void )
 {
-    /* Set RESET Master Card */
+	/* Set RESET Master Card */
-    if (st_pinIso7816RstMC) {
+	if (st_pinIso7816RstMC) {
-        PIO_Set(st_pinIso7816RstMC);
+		PIO_Set(st_pinIso7816RstMC);
-    }
+	}
 }
 
 /*----------------------------------------------------------------------------
@@ -191,10 +192,10 @@ static void ISO7816_IccPowerOn( void )
  */
 void ISO7816_IccPowerOff( void )
 {
-    /* Clear RESET Master Card */
+	/* Clear RESET Master Card */
-    if (st_pinIso7816RstMC) {
+	if (st_pinIso7816RstMC) {
-        PIO_Clear(st_pinIso7816RstMC);
+		PIO_Clear(st_pinIso7816RstMC);
-    }
+	}
 }
 
 /**
@@ -206,159 +207,159 @@ void ISO7816_IccPowerOff( void )
  * \return              0 on success, content of US_CSR otherwise
  */
 uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
-                                        uint8_t *pMessage,
+					                    uint8_t *pMessage,
-                                        uint16_t wLength,
+					                    uint16_t wLength,
-                                        uint16_t *retlen )
+					                    uint16_t *retlen )
 {
-    uint16_t NeNc;
+	uint16_t NeNc;
-    uint16_t indexApdu = 4;
+	uint16_t indexApdu = 4;
-    uint16_t indexMsg = 0;
+	uint16_t indexMsg = 0;
-    uint8_t SW1 = 0;
+	uint8_t SW1 = 0;
-    uint8_t procByte;
+	uint8_t procByte;
-    uint8_t cmdCase;
+	uint8_t cmdCase;
-    uint32_t status = 0;
+	uint32_t status = 0;
 
-    TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
+	TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
-    TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
+	TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
-    TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
+	TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
-    TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
+	TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
-    TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
+	TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
-    TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
+	TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
-    TRACE_INFO("wlength=%d\n\r",wLength);
+	TRACE_INFO("wlength=%d\n\r",wLength);
 
-    ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
+	ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
-    ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
+	ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
-    ISO7816_SendChar( pAPDU[2], &usart_sim ); /* P1 */
+	ISO7816_SendChar( pAPDU[2], &usart_sim ); /* P1 */
-    ISO7816_SendChar( pAPDU[3], &usart_sim ); /* P2 */
+	ISO7816_SendChar( pAPDU[3], &usart_sim ); /* P2 */
-    ISO7816_SendChar( pAPDU[4], &usart_sim ); /* P3 */
+	ISO7816_SendChar( pAPDU[4], &usart_sim ); /* P3 */
 
-    /* Handle the four structures of command APDU */
+	/* Handle the four structures of command APDU */
-    indexApdu = 5;
+	indexApdu = 5;
 
-    if( wLength == 4 ) {
+	if( wLength == 4 ) {
-        cmdCase = CASE1;
+		cmdCase = CASE1;
-        NeNc = 0;
+		NeNc = 0;
-    }
+	}
-    else if( wLength == 5) {
+	else if( wLength == 5) {
-        cmdCase = CASE2;
+		cmdCase = CASE2;
-        NeNc = pAPDU[4]; /* C5 */
+		NeNc = pAPDU[4]; /* C5 */
-        if (NeNc == 0) {
+		if (NeNc == 0) {
-            NeNc = 256;
+			NeNc = 256;
-        }
+		}
-    }
+	}
-    else if( wLength == 6) {
+	else if( wLength == 6) {
-        NeNc = pAPDU[4]; /* C5 */
+		NeNc = pAPDU[4]; /* C5 */
-        cmdCase = CASE3;
+		cmdCase = CASE3;
-    }
+	}
-    else if( wLength == 7) {
+	else if( wLength == 7) {
-        NeNc = pAPDU[4]; /* C5 */
+		NeNc = pAPDU[4]; /* C5 */
-        if( NeNc == 0 ) {
+		if( NeNc == 0 ) {
-            cmdCase = CASE2;
+			cmdCase = CASE2;
-            NeNc = (pAPDU[5]<<8)+pAPDU[6];
+			NeNc = (pAPDU[5]<<8)+pAPDU[6];
-        }
+		}
-        else {
+		else {
-            cmdCase = CASE3;
+			cmdCase = CASE3;
-        }
+		}
-    }
+	}
-    else {
+	else {
-        NeNc = pAPDU[4]; /* C5 */
+		NeNc = pAPDU[4]; /* C5 */
-        if( NeNc == 0 ) {
+		if( NeNc == 0 ) {
-            cmdCase = CASE3;
+			cmdCase = CASE3;
-            NeNc = (pAPDU[5]<<8)+pAPDU[6];
+			NeNc = (pAPDU[5]<<8)+pAPDU[6];
-        }
+		}
-        else {
+		else {
-            cmdCase = CASE3;
+			cmdCase = CASE3;
-        }
+		}
-    }
+	}
 
-    TRACE_DEBUG("CASE=0x%X NeNc=0x%X\n\r", cmdCase, NeNc);
+	TRACE_DEBUG("CASE=0x%X NeNc=0x%X\n\r", cmdCase, NeNc);
 
-    /* Handle Procedure Bytes */
+	/* Handle Procedure Bytes */
-    do {
+	do {
-        status = ISO7816_GetChar(&procByte, &usart_sim);
+		status = ISO7816_GetChar(&procByte, &usart_sim);
-        if (status != 0) {
+		if (status != 0) {
-            return status;
+			return status;
-        }
+		}
-        TRACE_INFO("procByte: 0x%X\n\r", procByte);
+		TRACE_INFO("procByte: 0x%X\n\r", procByte);
-        /* Handle NULL */
+		/* Handle NULL */
-        if ( procByte == ISO_NULL_VAL ) {
+		if ( procByte == ISO_NULL_VAL ) {
-            TRACE_INFO("INS\n\r");
+			TRACE_INFO("INS\n\r");
-            continue;
+			continue;
-        }
+		}
-        /* Handle SW1 */
+		/* Handle SW1 */
-        else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
+		else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
-            TRACE_INFO("SW1\n\r");
+			TRACE_INFO("SW1\n\r");
-            SW1 = 1;
+			SW1 = 1;
-        }
+		}
-        /* Handle INS */
+		/* Handle INS */
-        else if ( pAPDU[1] == procByte) {
+		else if ( pAPDU[1] == procByte) {
-            TRACE_INFO("HdlINS\n\r");
+			TRACE_INFO("HdlINS\n\r");
-            if (cmdCase == CASE2) {
+			if (cmdCase == CASE2) {
-                /* receive data from card */
+				/* receive data from card */
-                do {
+				do {
-                    status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
+					status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
-                } while(( 0 != --NeNc) && (status == 0) );
+				} while(( 0 != --NeNc) && (status == 0) );
-                if (status != 0) {
+				if (status != 0) {
-                    return status;
+					return status;
-                }
+				}
-            }
+			}
-            else {
+			else {
-                 /* Send data */
+				 /* Send data */
-                do {
+				do {
-                    TRACE_INFO("Send %X", pAPDU[indexApdu]);
+					TRACE_INFO("Send %X", pAPDU[indexApdu]);
-                    ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
+					ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
-                } while( 0 != --NeNc );
+				} while( 0 != --NeNc );
-            }
+			}
-        }
+		}
-        /* Handle INS ^ 0xff */
+		/* Handle INS ^ 0xff */
-        else
+		else
-        #pragma GCC diagnostic push
+		#pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wsign-compare"
+		#pragma GCC diagnostic ignored "-Wsign-compare"
-        if ( pAPDU[1] == (procByte ^ 0xff)) {
+		if ( pAPDU[1] == (procByte ^ 0xff)) {
-        #pragma GCC diagnostic pop
+		#pragma GCC diagnostic pop
-            TRACE_INFO("HdlINS+\n\r");
+			TRACE_INFO("HdlINS+\n\r");
-            if (cmdCase == CASE2) {
+			if (cmdCase == CASE2) {
-                /* receive data from card */
+				/* receive data from card */
-                status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
+				status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
-                if (status != 0) {
+				if (status != 0) {
-                    return status;
+					return status;
-                }
+				}
-                TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
+				TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
-            }
+			}
-            else {
+			else {
-                status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
+				status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
-                if (status != 0) {
+				if (status != 0) {
-                    return status;
+					return status;
-                }
+				}
-            }
+			}
-            NeNc--;
+			NeNc--;
-        }
+		}
-        else {
+		else {
-            /* ?? */
+			/* ?? */
-            TRACE_INFO("procByte=0x%X\n\r", procByte);
+			TRACE_INFO("procByte=0x%X\n\r", procByte);
-            break;
+			break;
-        }
+		}
-    } while (NeNc != 0);
+	} while (NeNc != 0);
 
-    /* Status Bytes */
+	/* Status Bytes */
-    if (SW1 == 0) {
+	if (SW1 == 0) {
-        status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW1 */
+		status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW1 */
-        if (status != 0) {
+		if (status != 0) {
-            return status;
+			return status;
-        }
+		}
-    }
+	}
-    else {
+	else {
-        pMessage[indexMsg++] = procByte;
+		pMessage[indexMsg++] = procByte;
-    }
+	}
-    status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW2 */
+	status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW2 */
-    if (status != 0) {
+	if (status != 0) {
-        return status;
+		return status;
-    }
+	}
 
-    TRACE_WARNING("SW1=0x%X, SW2=0x%X\n\r", pMessage[indexMsg-2], pMessage[indexMsg-1]);
+	TRACE_WARNING("SW1=0x%X, SW2=0x%X\n\r", pMessage[indexMsg-2], pMessage[indexMsg-1]);
 
-    *retlen = indexMsg;
+	*retlen = indexMsg;
-    return status;
+	return status;
 
 }
 
@@ -367,7 +368,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
  */
 void ISO7816_Escape( void )
 {
-    TRACE_DEBUG("For user, if needed\n\r");
+	TRACE_DEBUG("For user, if needed\n\r");
 }
 
 /**
@@ -375,8 +376,8 @@ void ISO7816_Escape( void )
  */
 void ISO7816_RestartClock( void )
 {
-    TRACE_DEBUG("ISO7816_RestartClock\n\r");
+	TRACE_DEBUG("ISO7816_RestartClock\n\r");
-    USART_SIM->US_BRGR = 13;
+	USART_SIM->US_BRGR = 13;
 }
 
 /**
@@ -384,8 +385,8 @@ void ISO7816_RestartClock( void )
  */
 void ISO7816_StopClock( void )
 {
-    TRACE_DEBUG("ISO7816_StopClock\n\r");
+	TRACE_DEBUG("ISO7816_StopClock\n\r");
-    USART_SIM->US_BRGR = 0;
+	USART_SIM->US_BRGR = 0;
 }
 
 /**
@@ -393,8 +394,8 @@ void ISO7816_StopClock( void )
  */
 void ISO7816_toAPDU( void )
 {
-    TRACE_DEBUG("ISO7816_toAPDU\n\r");
+	TRACE_DEBUG("ISO7816_toAPDU\n\r");
-    TRACE_DEBUG("Not supported at this time\n\r");
+	TRACE_DEBUG("Not supported at this time\n\r");
 }
 
 /**
@@ -405,64 +406,64 @@ void ISO7816_toAPDU( void )
  */
 uint32_t ISO7816_Datablock_ATR( uint8_t* pAtr, uint8_t* pLength )
 {
-    uint32_t i;
+	uint32_t i;
-    uint32_t j;
+	uint32_t j;
-    uint32_t y;
+	uint32_t y;
-    uint32_t status = 0; 
+	uint32_t status = 0; 
 
-    *pLength = 0;
+	*pLength = 0;
 
-    /* Read ATR TS */
+	/* Read ATR TS */
-    // FIXME: There should always be a check for the GetChar return value..0 means timeout
+	// FIXME: There should always be a check for the GetChar return value..0 means timeout
-    status = ISO7816_GetChar(&pAtr[0], &usart_sim);
+	status = ISO7816_GetChar(&pAtr[0], &usart_sim);
-    if (status != 0) {
+	if (status != 0) {
-        return status;
+		return status;
-    }
+	}
 
-    /* Read ATR T0 */
+	/* Read ATR T0 */
-    status = ISO7816_GetChar(&pAtr[1], &usart_sim);
+	status = ISO7816_GetChar(&pAtr[1], &usart_sim);
-    if (status != 0) {
+	if (status != 0) {
-        return status;
+		return status;
-    }
+	}
-    y = pAtr[1] & 0xF0;
+	y = pAtr[1] & 0xF0;
-    i = 2;
+	i = 2;
 
-    /* Read ATR Ti */
+	/* Read ATR Ti */
-    while (y && (status == 0)) {
+	while (y && (status == 0)) {
 
-        if (y & 0x10) {  /* TA[i] */
+		if (y & 0x10) {  /* TA[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
+		}
-        if (y & 0x20) {  /* TB[i] */
+		if (y & 0x20) {  /* TB[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
+		}
-        if (y & 0x40) {  /* TC[i] */
+		if (y & 0x40) {  /* TC[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
+		}
-        if (y & 0x80) {  /* TD[i] */
+		if (y & 0x80) {  /* TD[i] */
-            status = ISO7816_GetChar(&pAtr[i], &usart_sim);
+			status = ISO7816_GetChar(&pAtr[i], &usart_sim);
-            y =  pAtr[i++] & 0xF0;
+			y =  pAtr[i++] & 0xF0;
-        }
+		}
-        else {
+		else {
-            y = 0;
+			y = 0;
-        }
+		}
-    }
+	}
-    if (status != 0) {
+	if (status != 0) {
-        return status;
+		return status;
-    }
+	}
 
-    /* Historical Bytes */
+	/* Historical Bytes */
-    y = pAtr[1] & 0x0F;
+	y = pAtr[1] & 0x0F;
-    for( j=0; (j < y) && (status == 0); j++ ) {
+	for( j=0; (j < y) && (status == 0); j++ ) {
-        status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+		status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-    }
+	}
 
-    if (status != 0) {
+	if (status != 0) {
-        return status;
+		return status;
-    }
+	}
 
-    *pLength = i;
+	*pLength = i;
-    return status;
+	return status;
 }
 
 /**
@@ -472,18 +473,18 @@ uint32_t ISO7816_Datablock_ATR( uint8_t* pAtr, uint8_t* pLength )
  */
 void ISO7816_SetDataRateandClockFrequency( uint32_t dwClockFrequency, uint32_t dwDataRate )
 {
-    uint8_t ClockFrequency;
+	uint8_t ClockFrequency;
 
-    /* Define the baud rate divisor register */
+	/* Define the baud rate divisor register */
-    /* CD  = MCK / SCK */
+	/* CD  = MCK / SCK */
-    /* SCK = FIDI x BAUD = 372 x 9600 */
+	/* SCK = FIDI x BAUD = 372 x 9600 */
-    /* BOARD_MCK */
+	/* BOARD_MCK */
-    /* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
+	/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
-    USART_SIM->US_BRGR = BOARD_MCK / (dwClockFrequency*1000);
+	USART_SIM->US_BRGR = BOARD_MCK / (dwClockFrequency*1000);
 
-    ClockFrequency = BOARD_MCK / USART_SIM->US_BRGR;
+	ClockFrequency = BOARD_MCK / USART_SIM->US_BRGR;
 
-    USART_SIM->US_FIDI = (ClockFrequency)/dwDataRate;
+	USART_SIM->US_FIDI = (ClockFrequency)/dwDataRate;
 
 }
 
@@ -493,10 +494,10 @@ void ISO7816_SetDataRateandClockFrequency( uint32_t dwClockFrequency, uint32_t d
  */
 uint8_t ISO7816_StatusReset( void )
 {
-    if (st_pinIso7816RstMC) {
+	if (st_pinIso7816RstMC) {
-        return PIO_Get(st_pinIso7816RstMC);
+		return PIO_Get(st_pinIso7816RstMC);
-    }
+	}
-    return 0;
+	return 0;
 }
 
 /**
@@ -504,16 +505,16 @@ uint8_t ISO7816_StatusReset( void )
  */
 void ISO7816_cold_reset( void )
 {
-    volatile uint32_t i;
+	volatile uint32_t i;
 
-    /* tb: wait ??? cycles*/
+	/* tb: wait ??? cycles*/
-    for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
+	for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
-    }
+	}
 
-    USART_SIM->US_RHR;
+	USART_SIM->US_RHR;
-    USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+	USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
 
-    ISO7816_IccPowerOn();
+	ISO7816_IccPowerOn();
 }
 
 /**
@@ -521,20 +522,20 @@ void ISO7816_cold_reset( void )
  */
 void ISO7816_warm_reset( void )
 {
-    volatile uint32_t i;
+	volatile uint32_t i;
 
 // Clears Reset
-    ISO7816_IccPowerOff();
+	ISO7816_IccPowerOff();
 
-    /* tb: wait ??? cycles */
+	/* tb: wait ??? cycles */
-    for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
+	for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
-    }
+	}
 
-    USART_SIM->US_RHR;
+	USART_SIM->US_RHR;
-    USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+	USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
 
 // Sets Reset
-    ISO7816_IccPowerOn();
+	ISO7816_IccPowerOn();
 }
 
 /**
@@ -543,99 +544,99 @@ void ISO7816_warm_reset( void )
  */
 void ISO7816_Decode_ATR( uint8_t* pAtr )
 {
-    uint32_t i;
+	uint32_t i;
-    uint32_t j;
+	uint32_t j;
-    uint32_t y;
+	uint32_t y;
-    uint8_t offset;
+	uint8_t offset;
 
-    printf("\n\r");
+	printf("\n\r");
-    printf("ATR: Answer To Reset:\n\r");
+	printf("ATR: Answer To Reset:\n\r");
-    printf("TS = 0x%X Initial character ",pAtr[0]);
+	printf("TS = 0x%X Initial character ",pAtr[0]);
-    if( pAtr[0] == 0x3B ) {
+	if( pAtr[0] == 0x3B ) {
 
-        printf("Direct Convention\n\r");
+		printf("Direct Convention\n\r");
-    }
+	}
-    else {
+	else {
-        if( pAtr[0] == 0x3F ) {
+		if( pAtr[0] == 0x3F ) {
 
-            printf("Inverse Convention\n\r");
+			printf("Inverse Convention\n\r");
-        }
+		}
-        else {
+		else {
-            printf("BAD Convention\n\r");
+			printf("BAD Convention\n\r");
-        }
+		}
-    }
+	}
 
-    printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
+	printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
-    printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
+	printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
-    printf("    Presence further interface byte:\n\r");
+	printf("    Presence further interface byte:\n\r");
-    if( pAtr[1]&0x80 ) {
+	if( pAtr[1]&0x80 ) {
-        printf("TA ");
+		printf("TA ");
-    }
+	}
-    if( pAtr[1]&0x40 ) {
+	if( pAtr[1]&0x40 ) {
-        printf("TB ");
+		printf("TB ");
-    }
+	}
-    if( pAtr[1]&0x20 ) {
+	if( pAtr[1]&0x20 ) {
-        printf("TC ");
+		printf("TC ");
-    }
+	}
-    if( pAtr[1]&0x10 ) {
+	if( pAtr[1]&0x10 ) {
-        printf("TD ");
+		printf("TD ");
-    }
+	}
-    if( pAtr[1] != 0 ) {
+	if( pAtr[1] != 0 ) {
-        printf(" present\n\r");
+		printf(" present\n\r");
-    }
+	}
 
-    i = 2;
+	i = 2;
-    y = pAtr[1] & 0xF0;
+	y = pAtr[1] & 0xF0;
 
-    /* Read ATR Ti */
+	/* Read ATR Ti */
-    offset = 1;
+	offset = 1;
-    while (y) {
+	while (y) {
 
-        if (y & 0x10) {  /* TA[i] */
+		if (y & 0x10) {  /* TA[i] */
-            printf("TA[%d] = 0x%X ", offset, pAtr[i]);
+			printf("TA[%d] = 0x%X ", offset, pAtr[i]);
-            if( offset == 1 ) {
+			if( offset == 1 ) {
-                printf("FI = %d ", (pAtr[i]>>8));
+				printf("FI = %d ", (pAtr[i]>>8));
-                printf("DI = %d", (pAtr[i]&0x0F));
+				printf("DI = %d", (pAtr[i]&0x0F));
-            }
+			}
-            printf("\n\r");
+			printf("\n\r");
-            i++;
+			i++;
-        }
+		}
-        if (y & 0x20) {  /* TB[i] */
+		if (y & 0x20) {  /* TB[i] */
-            printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
+			printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
-            i++;
+			i++;
-        }
+		}
-        if (y & 0x40) {  /* TC[i] */
+		if (y & 0x40) {  /* TC[i] */
-            printf("TC[%d] = 0x%X ", offset, pAtr[i]);
+			printf("TC[%d] = 0x%X ", offset, pAtr[i]);
-            if( offset == 1 ) {
+			if( offset == 1 ) {
-                printf("Extra Guard Time: N = %d", pAtr[i]);
+				printf("Extra Guard Time: N = %d", pAtr[i]);
-            }
+			}
-            printf("\n\r");
+			printf("\n\r");
-            i++;
+			i++;
-        }
+		}
-        if (y & 0x80) {  /* TD[i] */
+		if (y & 0x80) {  /* TD[i] */
-            printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
+			printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
-            y =  pAtr[i++] & 0xF0;
+			y =  pAtr[i++] & 0xF0;
-        }
+		}
-        else {
+		else {
-            y = 0;
+			y = 0;
-        }
+		}
-        offset++;
+		offset++;
-    }
+	}
 
-    /* Historical Bytes */
+	/* Historical Bytes */
-    printf("Historical bytes:\n\r");
+	printf("Historical bytes:\n\r");
-    y = pAtr[1] & 0x0F;
+	y = pAtr[1] & 0x0F;
-    for( j=0; j < y; j++ ) {
+	for( j=0; j < y; j++ ) {
-        printf(" 0x%X", pAtr[i]);
+		printf(" 0x%X", pAtr[i]);
-        i++;
+		i++;
-    }
+	}
-    printf("\n\r\n\r");
+	printf("\n\r\n\r");
 
 }
 
 void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC) {
-    /* Pin ISO7816 initialize */
+	/* Pin ISO7816 initialize */
-    st_pinIso7816RstMC  = (Pin *)pPinIso7816RstMC;
+	st_pinIso7816RstMC  = (Pin *)pPinIso7816RstMC;
 }
 
 /** Initializes a ISO driver
@@ -643,46 +644,46 @@ void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC) {
  */
 void ISO7816_Init( Usart_info *usart, bool master_clock )
 {
-    uint32_t clk;
+	uint32_t clk;
-    TRACE_DEBUG("ISO_Init\n\r");
+	TRACE_DEBUG("ISO_Init\n\r");
 
-    Usart *us_base = usart->base;
+	Usart *us_base = usart->base;
-    uint32_t us_id = usart->id;
+	uint32_t us_id = usart->id;
 
-    if (master_clock == true) {
+	if (master_clock == true) {
-        clk = US_MR_USCLKS_MCK;
+		clk = US_MR_USCLKS_MCK;
-    } else {
+	} else {
-        clk = US_MR_USCLKS_SCK;
+		clk = US_MR_USCLKS_SCK;
-    }
+	}
 
-    USART_Configure( us_base,
+	USART_Configure( us_base,
-                     US_MR_USART_MODE_IS07816_T_0
+					 US_MR_USART_MODE_IS07816_T_0
-                     | clk
+					 | clk
-                     | US_MR_NBSTOP_1_BIT
+					 | US_MR_NBSTOP_1_BIT
-                     | US_MR_PAR_EVEN
+					 | US_MR_PAR_EVEN
-                     | US_MR_CHRL_8_BIT
+					 | US_MR_CHRL_8_BIT
-                     | US_MR_CLKO
+					 | US_MR_CLKO
-                     | US_MR_INACK  /* Inhibit errors */
+					 | US_MR_INACK  /* Inhibit errors */
-                     | (3<<24), /* MAX_ITERATION */
+					 | (3<<24), /* MAX_ITERATION */
-                     1,
+					 1,
-                     0);
+					 0);
 
-    /* Disable interrupts */
+	/* Disable interrupts */
-    us_base->US_IDR = (uint32_t) -1;
+	us_base->US_IDR = (uint32_t) -1;
 
-    /* Configure USART */
+	/* Configure USART */
-    PMC_EnablePeripheral(us_id);
+	PMC_EnablePeripheral(us_id);
 
-    us_base->US_FIDI = 372;  /* by default */
+	us_base->US_FIDI = 372;  /* by default */
-    /* Define the baud rate divisor register */
+	/* Define the baud rate divisor register */
-    /* CD  = MCK / SCK */
+	/* CD  = MCK / SCK */
-    /* SCK = FIDI x BAUD = 372 x 9600 */
+	/* SCK = FIDI x BAUD = 372 x 9600 */
-    /* BOARD_MCK */
+	/* BOARD_MCK */
-    /* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
+	/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
-    if (master_clock == true) {
+	if (master_clock == true) {
-        us_base->US_BRGR = BOARD_MCK / (372*9600);
+		us_base->US_BRGR = BOARD_MCK / (372*9600);
-    } else {
+	} else {
-        us_base->US_BRGR = US_BRGR_CD(1);
+		us_base->US_BRGR = US_BRGR_CD(1);
-    }
+	}
 }
 

firmware/libcommon/source/iso7816_fidi.c

@@ -1,22 +1,21 @@
-/* ISO7816-3 Fi/Di tables + computation */
+/* ISO7816-3 Fi/Di tables + computation
-/* (C) 2010-2015 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * (C) 2010-2015 by Harald Welte <laforge@gnumonks.org>
- *  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,
+ * This program is free software; you can redistribute it and/or modify
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * it under the terms of the GNU General Public License as published by
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * the Free Software Foundation; either version 2 of the License, or
- *  GNU General Public License for more details.
+ * (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
+ * This program is distributed in the hope that it will be useful,
- *  along with this program; if not, write to the Free Software
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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 <errno.h>
 
@@ -24,13 +23,13 @@
 #include "iso7816_fidi.h"
 
 /* Table 7 of ISO 7816-3:2006 */
-static const uint16_t fi_table[] = {
+const uint16_t fi_table[] = {
 	372, 372, 558, 744, 1116, 1488, 1860, 0,
 	0, 512, 768, 1024, 1536, 2048, 0, 0
 };
 
 /* Table 8 from ISO 7816-3:2006 */
-static const uint8_t di_table[] = {
+const uint8_t di_table[] = {
 	0, 1, 2, 4, 8, 16, 32, 64,
 	12, 20, 2, 4, 8, 16, 32, 64,
 };

firmware/libcommon/source/mode_cardemu.c

@@ -1,17 +1,35 @@
-//#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"
 #include "ringbuffer.h"
 #include "card_emu.h"
 #include "iso7816_fidi.h"
 #include "utils.h"
-#include "osmocom/core/linuxlist.h"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/msgb.h"
+#include <osmocom/core/msgb.h>
 #include "llist_irqsafe.h"
 #include "usb_buf.h"
+#include "simtrace_usb.h"
 #include "simtrace_prot.h"
-#include "wwan_perst.h"
 #include "sim_switch.h"
 
 #define TRACE_ENTRY()	TRACE_DEBUG("%s entering\r\n", __func__)
@@ -32,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;
@@ -54,9 +72,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART1,
 			.state = USART_RCV
 		},
-		.ep_out = PHONE_DATAOUT,
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
-		.ep_in = PHONE_DATAIN,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
-		.ep_int = PHONE_INT,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
 #ifdef PIN_SET_USIM1_PRES
 		.pin_insert = PIN_SET_USIM1_PRES,
 #endif
@@ -69,9 +87,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART0,
 			.state = USART_RCV
 		},
-		.ep_out = CARDEM_USIM2_DATAOUT,
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
-		.ep_in = CARDEM_USIM2_DATAIN,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
-		.ep_int = CARDEM_USIM2_INT,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
 #ifdef PIN_SET_USIM2_PRES
 		.pin_insert = PIN_SET_USIM2_PRES,
 #endif
@@ -81,15 +99,11 @@ struct cardem_inst cardem_inst[] = {
 
 static Usart *get_usart_by_chan(uint8_t uart_chan)
 {
-	switch (uart_chan) {
+	if (uart_chan < ARRAY_SIZE(cardem_inst)) {
-	case 0:
+		return cardem_inst[uart_chan].usart_info.base;
-		return USART1;
+	} else {
-#ifdef CARDEMU_SECOND_UART
+		return NULL;
-	case 1:
-		return USART0;
-#endif
 	}
-	return NULL;
 }
 
 /***********************************************************************
@@ -103,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++;
 	}
@@ -160,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;
@@ -186,8 +200,9 @@ static void usart_irq_rx(uint8_t inst_num)
 	csr = usart->US_CSR & usart->US_IMR;
 
 	if (csr & US_CSR_RXRDY) {
-        	byte = (usart->US_RHR) & 0xFF;
+		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) {
@@ -198,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);
 	}
 }
 
@@ -226,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
  ***********************************************************************/
@@ -279,7 +308,6 @@ static int card_vcc_adc_init(void)
 	return 0;
 }
 
-#define UV_PER_LSB	((3300 * 1000) / 4096)
 #define VCC_UV_THRESH_1V8	1500000
 #define VCC_UV_THRESH_3V	2800000
 
@@ -299,12 +327,6 @@ static void process_vcc_adc(struct cardem_inst *ci)
 	ci->vcc_uv_last = ci->vcc_uv;
 }
 
-static uint32_t adc2uv(uint16_t adc)
-{
-	uint32_t uv = (uint32_t) adc * UV_PER_LSB;
-	return uv;
-}
-
 void ADC_IrqHandler(void)
 {
 #ifdef CARDEMU_SECOND_UART
@@ -330,7 +352,7 @@ void ADC_IrqHandler(void)
 #endif /* DETECT_VCC_BY_ADC */
 
 /***********************************************************************
- * Core USB  / mainloop integration
+ * Core USB  / main loop integration
  ***********************************************************************/
 
 static void usim1_rst_irqhandler(const Pin *pPin)
@@ -398,7 +420,8 @@ 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, PHONE_DATAIN, PHONE_INT);
+	cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT);
+	sim_switch_use_physical(0, 1);
 
 #ifdef CARDEMU_SECOND_UART
 	INIT_LLIST_HEAD(&cardem_inst[1].usb_out_queue);
@@ -412,8 +435,10 @@ 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, CARDEM_USIM2_DATAIN, CARDEM_USIM2_INT);
+	cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT);
+	sim_switch_use_physical(1, 1);
 #endif /* CARDEMU_SECOND_UART */
+
 }
 
 /* called if config is deactivated */
@@ -478,6 +503,11 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 		break;
 	case SIMTRACE_MSGT_DT_CEMU_CARDINSERT:
 		cardins = (struct cardemu_usb_msg_cardinsert *) msg->l2h;
+		if (!ci->pin_insert.pio) {
+			TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
+				   ci->num, cardins->card_insert ? "INSERTED" : "REMOVED");
+			break;
+		}
 		TRACE_INFO("%u: set card_insert to %s\r\n", ci->num,
 			   cardins->card_insert ? "INSERTED" : "REMOVED");
 		if (cardins->card_insert)
@@ -498,6 +528,10 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 	}
 }
 
+#ifdef PINS_PERST
+#include "wwan_perst.h"
+#endif
+
 static int usb_command_modem_reset(struct msgb *msg, struct cardem_inst *ci)
 {
 	struct st_modem_reset *mr = (struct st_modem_reset *) msg->l2h;
@@ -506,6 +540,7 @@ static int usb_command_modem_reset(struct msgb *msg, struct cardem_inst *ci)
 		return -1;
 
 	switch (mr->asserted) {
+#ifdef PINS_PERST
 	case 0:
 		wwan_perst_set(ci->num, 0);
 		break;
@@ -515,6 +550,7 @@ static int usb_command_modem_reset(struct msgb *msg, struct cardem_inst *ci)
 	case 2:
 		wwan_perst_do_reset_pulse(ci->num, mr->pulse_duration_msec);
 		break;
+#endif
 	default:
 		return -1;
 	}
@@ -568,6 +604,7 @@ static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 		usb_buf_free(msg);
 		return;
 	}
+	msg->l2h = msg->l1h + sizeof(*sh);
 
 	switch (sh->msg_class) {
 	case SIMTRACE_MSGC_GENERIC:
@@ -579,7 +616,6 @@ static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 	case SIMTRACE_MSGC_MODEM:
 		/* FIXME: Find out why this fails if used for !=
 		 * MSGC_MODEM ?!? */
-		msg->l2h = msg->l1h + sizeof(*sh);
 		dispatch_usb_command_modem(msg, ci);
 		break;
 	default:

firmware/libcommon/source/mode_ccid.c

@@ -27,14 +27,15 @@
  * ----------------------------------------------------------------------------
  */
 
+#include "board.h"
+#include "simtrace.h"
+
 #ifdef HAVE_CCID
 
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
 
-#include "board.h"
-
 #include <string.h>
 
 /*------------------------------------------------------------------------------
@@ -83,11 +84,11 @@ static const Pin pinSmartCard = SMARTCARD_CONNECT_PIN;
 static void ISR_PioSmartCard(const Pin * pPin)
 {
 /* FIXME: why is pinSmartCard.pio->PIO_ISR the wrong number?
-    printf("+++++ Trying to check for pending interrupts (PIO ISR: 0x%X)\n\r", pinSmartCard.pio->PIO_ISR);
+	printf("+++++ Trying to check for pending interrupts (PIO ISR: 0x%X)\n\r", pinSmartCard.pio->PIO_ISR);
-    printf("+++++ Mask: 0x%X\n\r", pinSmartCard.mask);
+	printf("+++++ Mask: 0x%X\n\r", pinSmartCard.mask);
 Output:
-    +++++ Trying to check for pending interrupts (PIO ISR: 0x400)) = 1<<10
+	+++++ Trying to check for pending interrupts (PIO ISR: 0x400)) = 1<<10
-    +++++ Mask: 0x100 = 1<<8
+	+++++ Mask: 0x100 = 1<<8
 */
 	// PA10 is DTXD, which is the debug uart transmit pin
 
@@ -125,6 +126,7 @@ static void ConfigureCardDetection(void)
  *-----------------------------------------------------------------------------*/
 extern CCIDDriverConfigurationDescriptors configurationDescriptorCCID;
 
+/* Called during USB enumeration after device is enumerated by host */
 void CCID_configure(void)
 {
 	CCIDDriver_Initialize();
@@ -132,6 +134,7 @@ void CCID_configure(void)
 	PIO_ConfigureIt(&pinSmartCard, ISR_PioSmartCard);
 }
 
+/* called when *different* configuration is set by host */
 void CCID_exit(void)
 {
 	PIO_DisableIt(&pinSmartCard);
@@ -139,6 +142,7 @@ void CCID_exit(void)
 	USART_SetReceiverEnabled(usart_info.base, 0);
 }
 
+/* called when *CCID* configuration is set by host */
 void CCID_init(void)
 {
 	uint8_t pAtr[MAX_ATR_SIZE];
@@ -178,6 +182,7 @@ void CCID_init(void)
 	}
 }
 
+/* main (idle/busy) loop of this USB configuration */
 void CCID_run(void)
 {
 

firmware/libcommon/source/phone.c

@@ -1,196 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, 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.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *          Headers
- *------------------------------------------------------------------------------*/
-
-#include "board.h"
-
-#include <string.h>
-
-/*------------------------------------------------------------------------------
- *         Internal definitions
- *------------------------------------------------------------------------------*/
-
-/** Maximum ucSize in bytes of the smartcard answer to a command.*/
-#define MAX_ANSWER_SIZE         10
-
-/** Maximum ATR ucSize in bytes.*/
-#define MAX_ATR_SIZE            55
-
-/** USB states */
-/// Use for power management
-#define STATE_IDLE    0
-/// The USB device is in suspend state
-#define STATE_SUSPEND 4
-/// The USB device is in resume state
-#define STATE_RESUME  5
-
-extern volatile uint8_t timeout_occured;
-
-/*------------------------------------------------------------------------------
- *         Internal variables
- *------------------------------------------------------------------------------*/
-/** USB state: suspend, resume, idle */
-unsigned char USBState = STATE_IDLE;
-
-/** ISO7816 pins */
-static const Pin pinsISO7816_PHONE[] = { PINS_ISO7816_PHONE };
-
-/** Bus switch pins */
-
-#if DEBUG_PHONE_SNIFF
-#warning "Debug phone sniff via logic analyzer is enabled"
-// Logic analyzer probes are easier to attach to the SIM card slot
-static const Pin pins_bus[] = { PINS_BUS_SNIFF };
-#else
-static const Pin pins_bus[] = { PINS_BUS_DEFAULT };
-#endif
-
-/** ISO7816 RST pin */
-static uint8_t sim_inserted = 0;
-
-static const Pin pPwr[] = {
-	/* Enable power converter 4.5-6V to 3.3V; low: off */
-	{SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT},
-
-	/* Enable second power converter: VCC_PHONE to VCC_SIM; high: off */
-	{VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-};
-
-const Pin pinPhoneRST = PIN_ISO7816_RST_PHONE;
-
-static struct Usart_info usart_info = {
-	.base = USART_PHONE,
-	.id = ID_USART_PHONE,
-	.state = USART_RCV,
-};
-
-/* ===================================================*/
-/*                      Taken from iso7816_4.c        */
-/* ===================================================*/
-/** Flip flop for send and receive char */
-#define USART_SEND 0
-#define USART_RCV  1
-
-/*-----------------------------------------------------------------------------
- *          Internal variables
- *-----------------------------------------------------------------------------*/
-static uint8_t host_to_sim_buf[BUFLEN];
-static bool change_fidi = false;
-
-static void receive_from_host(void);
-static void sendResponse_to_phone(uint8_t * pArg, uint8_t status,
-				  uint32_t transferred, uint32_t remaining)
-{
-	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USB err status: %d (%s)\n", __FUNCTION__, status);
-		return;
-	}
-	TRACE_DEBUG("sendResp, stat: %X, trnsf: %x, rem: %x\n\r", status,
-		    transferred, remaining);
-	TRACE_DEBUG("Resp: %x %x %x .. %x\n", host_to_sim_buf[0],
-		    host_to_sim_buf[1], host_to_sim_buf[2],
-		    host_to_sim_buf[transferred - 1]);
-
-	USART_SetReceiverEnabled(USART_PHONE, 0);
-	USART_SetTransmitterEnabled(USART_PHONE, 1);
-	uint32_t i = 0;
-	if (host_to_sim_buf[0] == 0xff) {
-		printf("Change FIDI detected\n");
-		// PTS command, change FIDI after command
-		i = 2;
-		change_fidi = true;
-	}
-	for (; i < transferred; i++) {
-		ISO7816_SendChar(host_to_sim_buf[i], &usart_info);
-	}
-	USART_SetTransmitterEnabled(USART_PHONE, 0);
-	USART_SetReceiverEnabled(USART_PHONE, 1);
-
-	if (change_fidi == true) {
-		printf("Change FIDI: %x\n", host_to_sim_buf[2]);
-		update_fidi(host_to_sim_buf[2]);
-		change_fidi = false;
-	}
-
-	receive_from_host();
-}
-
-static void receive_from_host()
-{
-	int ret;
-	if ((ret = USBD_Read(PHONE_DATAOUT, &host_to_sim_buf,
-			     sizeof(host_to_sim_buf),
-			     (TransferCallback) &sendResponse_to_phone,
-			     0)) == USBD_STATUS_SUCCESS) {
-	} else {
-		TRACE_ERROR("USB Err: %X\n", ret);
-	}
-}
-
-void Phone_configure(void)
-{
-	PIO_ConfigureIt(&pinPhoneRST, ISR_PhoneRST);
-	NVIC_EnableIRQ(PIOA_IRQn);
-}
-
-void Phone_exit(void)
-{
-	PIO_DisableIt(&pinPhoneRST);
-	NVIC_DisableIRQ(USART1_IRQn);
-	USART_DisableIt(USART_PHONE, US_IER_RXRDY);
-	USART_SetTransmitterEnabled(USART_PHONE, 0);
-	USART_SetReceiverEnabled(USART_PHONE, 0);
-}
-
-void Phone_init(void)
-{
-	PIO_Configure(pinsISO7816_PHONE, PIO_LISTSIZE(pinsISO7816_PHONE));
-	PIO_Configure(pins_bus, PIO_LISTSIZE(pins_bus));
-
-	PIO_Configure(&pinPhoneRST, 1);
-
-	PIO_EnableIt(&pinPhoneRST);
-	ISO7816_Init(&usart_info, CLK_SLAVE);
-
-	USART_SetTransmitterEnabled(USART_PHONE, 0);
-	USART_SetReceiverEnabled(USART_PHONE, 1);
-
-	USART_EnableIt(USART_PHONE, US_IER_RXRDY);
-	NVIC_EnableIRQ(USART1_IRQn);
-
-	receive_from_host();
-}
-
-void Phone_run(void)
-{
-	check_data_from_phone();
-}

firmware/libcommon/source/pseudo_talloc.c

@@ -1,8 +1,25 @@
+/* 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"
 #include "trace.h"
-#include "osmocom/core/utils.h"
+#include "utils.h"
+#include <osmocom/core/utils.h>
 
 #define NUM_RCTX_SMALL 10
 #define RCTX_SIZE_SMALL 348
@@ -13,8 +30,11 @@ static uint8_t msgb_inuse[NUM_RCTX_SMALL];
 void *_talloc_zero(const void *ctx, size_t size, const char *name)
 {
 	unsigned int i;
+	unsigned long x;
 
+	local_irq_save(x);
 	if (size > RCTX_SIZE_SMALL) {
+		local_irq_restore(x);
 		TRACE_ERROR("%s() request too large(%d > %d)\r\n", __func__, size, RCTX_SIZE_SMALL);
 		return NULL;
 	}
@@ -24,9 +44,11 @@ void *_talloc_zero(const void *ctx, size_t size, const char *name)
 			uint8_t *out = msgb_data[i];
 			msgb_inuse[i] = 1;
 			memset(out, 0, size);
+			local_irq_restore(x);
 			return out;
 		}
 	}
+	local_irq_restore(x);
 	TRACE_ERROR("%s() out of memory!\r\n", __func__);
 	return NULL;
 }
@@ -34,17 +56,22 @@ void *_talloc_zero(const void *ctx, size_t size, const char *name)
 int _talloc_free(void *ptr, const char *location)
 {
 	unsigned int i;
+	unsigned long x;
+
+	local_irq_save(x);
 	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;
 			}
+			local_irq_restore(x);
 			return 0;
 		}
 	}
 
+	local_irq_restore(x);
 	TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location);
 	return -1;
 }

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

@@ -33,6 +33,7 @@
 
 #include "board.h"
 #include "simtrace.h"
+#include "simtrace_usb.h"
 #include "ringbuffer.h"
 #include "iso7816_fidi.h"
 
@@ -57,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 ");
@@ -67,7 +68,7 @@ void ISR_PhoneRST(const Pin * pPin)
 	}
 
 	if ((ret =
-	     USBD_Write(PHONE_INT, "R", 1,
+	     USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1,
 			(TransferCallback) & Callback_PhoneRST_ISR,
 			0)) != USBD_STATUS_SUCCESS) {
 		TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
@@ -116,20 +117,27 @@ void mode_trace_usart1_irq(void)
 }
 
 /*  FIDI update functions   */
-void update_fidi(uint8_t fidi)
+void update_fidi(Usart_info *usart, uint8_t fidi)
 {
-	int rc;
+	if (NULL==usart) {
+		return;
+	}
 
 	uint8_t fi = fidi >> 4;
 	uint8_t di = fidi & 0xf;
+	int ratio = compute_fidi_ratio(fi, di);
 
-	rc = compute_fidi_ratio(fi, di);
+	if (ratio > 0 && ratio < 0x8000) {
-	if (rc > 0 && rc < 0x400) {
+		/* make sure USART uses new F/D ratio */
-		TRACE_INFO("computed Fi(%u) Di(%u) ratio: %d", fi, di, rc);
+		usart->base->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
-		/* make sure UART uses new F/D ratio */
+		/* disable write protection */
-		USART_PHONE->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
+		if (usart->base->US_WPMR) {
-		USART_PHONE->US_FIDI = rc & 0x3ff;
+			usart->base->US_WPMR = US_WPMR_WPKEY(0x555341);
-		USART_PHONE->US_CR |= US_CR_RXEN | US_CR_STTTO;
+		}
-	} else
+		usart->base->US_FIDI = (ratio & 0x7ff);
-		TRACE_INFO("computed FiDi ratio %d unsupported", rc);
+		usart->base->US_CR |= US_CR_RXEN | US_CR_STTTO;
+		//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/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;
 
 
 //------------------------------------------------------------------------------
@@ -76,8 +79,8 @@ FILE* const stderr = NULL;
 //------------------------------------------------------------------------------
 signed int PutChar(char *pStr, char c)
 {
-    *pStr = c;
+	*pStr = c;
-    return 1;
+	return 1;
 }
 
 //------------------------------------------------------------------------------
@@ -89,15 +92,15 @@ signed int PutChar(char *pStr, char c)
 //------------------------------------------------------------------------------
 signed int PutString(char *pStr, const char *pSource)
 {
-    signed int num = 0;
+	signed int num = 0;
 
-    while (*pSource != 0) {
+	while (*pSource != 0) {
 
-        *pStr++ = *pSource++;
+		*pStr++ = *pSource++;
-        num++;
+		num++;
-    }
+	}
 
-    return num;
+	return num;
 }
 
 //------------------------------------------------------------------------------
@@ -110,38 +113,38 @@ signed int PutString(char *pStr, const char *pSource)
 // \param value  Integer value.
 //------------------------------------------------------------------------------
 signed int PutUnsignedInt(
-    char *pStr,
+	char *pStr,
-    char fill,
+	char fill,
-    signed int width,
+	signed int width,
-    unsigned int value)
+	unsigned int value)
 {
-    signed int num = 0;
+	signed int num = 0;
 
-    // Take current digit into account when calculating width
+	// Take current digit into account when calculating width
-    width--;
+	width--;
 
-    // Recursively write upper digits
+	// Recursively write upper digits
-    if ((value / 10) > 0) {
+	if ((value / 10) > 0) {
 
-        num = PutUnsignedInt(pStr, fill, width, value / 10);
+		num = PutUnsignedInt(pStr, fill, width, value / 10);
-        pStr += num;
+		pStr += num;
-    }
+	}
-    // Write filler characters
+	// Write filler characters
-    else {
+	else {
 
-        while (width > 0) {
+		while (width > 0) {
 
-            PutChar(pStr, fill);
+			PutChar(pStr, fill);
-            pStr++;
+			pStr++;
-            num++;
+			num++;
-            width--;
+			width--;
-        }
+		}
-    }
+	}
 
-    // Write lower digit
+	// Write lower digit
-    num += PutChar(pStr, (value % 10) + '0');
+	num += PutChar(pStr, (value % 10) + '0');
 
-    return num;
+	return num;
 }
 
 //------------------------------------------------------------------------------
@@ -154,69 +157,69 @@ signed int PutUnsignedInt(
 // \param value  Signed integer value.
 //------------------------------------------------------------------------------
 signed int PutSignedInt(
-    char *pStr,
+	char *pStr,
-    char fill,
+	char fill,
-    signed int width,
+	signed int width,
-    signed int value)
+	signed int value)
 {
-    signed int num = 0;
+	signed int num = 0;
-    unsigned int absolute;
+	unsigned int absolute;
 
-    // Compute absolute value
+	// Compute absolute value
-    if (value < 0) {
+	if (value < 0) {
 
-        absolute = -value;
+		absolute = -value;
-    }
+	}
-    else {
+	else {
 
-        absolute = value;
+		absolute = value;
-    }
+	}
 
-    // Take current digit into account when calculating width
+	// Take current digit into account when calculating width
-    width--;
+	width--;
 
-    // Recursively write upper digits
+	// Recursively write upper digits
-    if ((absolute / 10) > 0) {
+	if ((absolute / 10) > 0) {
 
-        if (value < 0) {
+		if (value < 0) {
 		
-            num = PutSignedInt(pStr, fill, width, -(absolute / 10));
+			num = PutSignedInt(pStr, fill, width, -(absolute / 10));
-        }
+		}
-        else {
+		else {
 
-            num = PutSignedInt(pStr, fill, width, absolute / 10);
+			num = PutSignedInt(pStr, fill, width, absolute / 10);
-        }
+		}
-        pStr += num;
+		pStr += num;
-    }
+	}
-    else {
+	else {
 
-        // Reserve space for sign
+		// Reserve space for sign
-        if (value < 0) {
+		if (value < 0) {
 
-            width--;
+			width--;
-        }
+		}
 
-        // Write filler characters
+		// Write filler characters
-        while (width > 0) {
+		while (width > 0) {
 
-            PutChar(pStr, fill);
+			PutChar(pStr, fill);
-            pStr++;
+			pStr++;
-            num++;
+			num++;
-            width--;
+			width--;
-        }
+		}
 
-        // Write sign
+		// Write sign
-        if (value < 0) {
+		if (value < 0) {
 
-            num += PutChar(pStr, '-');
+			num += PutChar(pStr, '-');
-            pStr++;
+			pStr++;
-        }
+		}
-    }
+	}
 
-    // Write lower digit
+	// Write lower digit
-    num += PutChar(pStr, (absolute % 10) + '0');
+	num += PutChar(pStr, (absolute % 10) + '0');
 
-    return num;
+	return num;
 }
 
 //------------------------------------------------------------------------------
@@ -230,51 +233,51 @@ signed int PutSignedInt(
 // \param value  Hexadecimal value.
 //------------------------------------------------------------------------------
 signed int PutHexa(
-    char *pStr,
+	char *pStr,
-    char fill,
+	char fill,
-    signed int width,
+	signed int width,
-    unsigned char maj,
+	unsigned char maj,
-    unsigned int value)
+	unsigned int value)
 {
-    signed int num = 0;
+	signed int num = 0;
 
-    // Decrement width
+	// Decrement width
-    width--;
+	width--;
 
-    // Recursively output upper digits
+	// Recursively output upper digits
-    if ((value >> 4) > 0) {
+	if ((value >> 4) > 0) {
 
-        num += PutHexa(pStr, fill, width, maj, value >> 4);
+		num += PutHexa(pStr, fill, width, maj, value >> 4);
-        pStr += num;
+		pStr += num;
-    }
+	}
-    // Write filler chars
+	// Write filler chars
-    else {
+	else {
 
-        while (width > 0) {
+		while (width > 0) {
 
-            PutChar(pStr, fill);
+			PutChar(pStr, fill);
-            pStr++;
+			pStr++;
-            num++;
+			num++;
-            width--;
+			width--;
-        }
+		}
-    }
+	}
 
-    // Write current digit
+	// Write current digit
-    if ((value & 0xF) < 10) {
+	if ((value & 0xF) < 10) {
 
-        PutChar(pStr, (value & 0xF) + '0');
+		PutChar(pStr, (value & 0xF) + '0');
-    }
+	}
-    else if (maj) {
+	else if (maj) {
 
-        PutChar(pStr, (value & 0xF) - 10 + 'A');
+		PutChar(pStr, (value & 0xF) - 10 + 'A');
-    }
+	}
-    else {
+	else {
 
-        PutChar(pStr, (value & 0xF) - 10 + 'a');
+		PutChar(pStr, (value & 0xF) - 10 + 'a');
-    }
+	}
-    num++;
+	num++;
 
-    return num;
+	return num;
 }
 
 //------------------------------------------------------------------------------
@@ -292,91 +295,91 @@ signed int PutHexa(
 //------------------------------------------------------------------------------
 signed int vsnprintf(char *pStr, size_t length, const char *pFormat, va_list ap)
 {
-    char          fill;
+	char          fill;
-    unsigned char width;
+	unsigned char width;
-    signed int    num = 0;
+	signed int    num = 0;
-    size_t        size = 0;
+	size_t        size = 0;
 
-    // Clear the string
+	// Clear the string
-    if (pStr) {
+	if (pStr) {
 
-        *pStr = 0;
+		*pStr = 0;
-    }
+	}
 
-    // Phase string
+	// Phase string
-    while (*pFormat != 0 && size < length) {
+	while (*pFormat != 0 && size < length) {
 
-        // Normal character
+		// Normal character
-        if (*pFormat != '%') {
+		if (*pFormat != '%') {
 
-            *pStr++ = *pFormat++;
+			*pStr++ = *pFormat++;
-            size++;
+			size++;
-        }
+		}
-        // Escaped '%'
+		// Escaped '%'
-        else if (*(pFormat+1) == '%') {
+		else if (*(pFormat+1) == '%') {
 
-            *pStr++ = '%';
+			*pStr++ = '%';
-            pFormat += 2;
+			pFormat += 2;
-            size++;
+			size++;
-        }
+		}
-        // Token delimiter
+		// Token delimiter
-        else {
+		else {
 
-            fill = ' ';
+			fill = ' ';
-            width = 0;
+			width = 0;
-            pFormat++;
+			pFormat++;
 
-            // Parse filler
+			// Parse filler
-            if (*pFormat == '0') {
+			if (*pFormat == '0') {
 
-                fill = '0';
+				fill = '0';
-                pFormat++;
+				pFormat++;
-            }
+			}
 
-            // Parse width
+			// Parse width
-            while ((*pFormat >= '0') && (*pFormat <= '9')) {
+			while ((*pFormat >= '0') && (*pFormat <= '9')) {
 		
-                width = (width*10) + *pFormat-'0';
+				width = (width*10) + *pFormat-'0';
-                pFormat++;
+				pFormat++;
-            }
+			}
 
-            // Check if there is enough space
+			// Check if there is enough space
-            if (size + width > length) {
+			if (size + width > length) {
 
-                width = length - size;
+				width = length - size;
-            }
+			}
 		
-            // Parse type
+			// Parse type
-            switch (*pFormat) {
+			switch (*pFormat) {
-            case 'd': 
+			case 'd': 
-            case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break;
+			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;
+			case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break;
-            case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break;
+			case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break;
-            case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break;
+			case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break;
-            case 's': num = PutString(pStr, va_arg(ap, char *)); break;
+			case 's': num = PutString(pStr, va_arg(ap, char *)); break;
-            case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break;
+			case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break;
-            default:
+			default:
-                return EOF;
+				return EOF;
-            }
+			}
 
-            pFormat++;
+			pFormat++;
-            pStr += num;
+			pStr += num;
-            size += num;
+			size += num;
-        }
+		}
-    }
+	}
 
-    // NULL-terminated (final \0 is not counted)
+	// NULL-terminated (final \0 is not counted)
-    if (size < length) {
+	if (size < length) {
 
-        *pStr = 0;
+		*pStr = 0;
-    }
+	}
-    else {
+	else {
 
-        *(--pStr) = 0;
+		*(--pStr) = 0;
-        size--;
+		size--;
-    }
+	}
 
-    return size;
+	return size;
 }
 
 //------------------------------------------------------------------------------
@@ -390,14 +393,14 @@ signed int vsnprintf(char *pStr, size_t length, const char *pFormat, va_list ap)
 //------------------------------------------------------------------------------
 signed int snprintf(char *pString, size_t length, const char *pFormat, ...)
 {
-    va_list    ap;
+	va_list    ap;
-    signed int rc;
+	signed int rc;
 
-    va_start(ap, pFormat);
+	va_start(ap, pFormat);
-    rc = vsnprintf(pString, length, pFormat, ap);
+	rc = vsnprintf(pString, length, pFormat, ap);
-    va_end(ap);
+	va_end(ap);
 
-    return rc;
+	return rc;
 }
 
 //------------------------------------------------------------------------------
@@ -410,7 +413,7 @@ signed int snprintf(char *pString, size_t length, const char *pFormat, ...)
 //------------------------------------------------------------------------------
 signed int vsprintf(char *pString, const char *pFormat, va_list ap)
 {
-    return vsnprintf(pString, MAX_STRING_SIZE, pFormat, ap);
+	return vsnprintf(pString, MAX_STRING_SIZE, pFormat, ap);
 }
 
 //------------------------------------------------------------------------------
@@ -422,19 +425,45 @@ 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 pStr[MAX_STRING_SIZE];
-    char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r";
+	char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r";
 
-    // Write formatted string in buffer
+	// Write formatted string in buffer
-    if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) {
+	if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) {
 
-        fputs(pError, stderr);
+		fputs(pError, stderr);
-    }
+	}
 
-    // Display string
+	// Display string
-    return fputs(pStr, pStream);
+	return fputs(pStr, pStream);
 }
 
+//------------------------------------------------------------------------------
+/// Outputs a formatted string on the given stream. Format arguments are given
+/// in a va_list instance.
+/// \note This function is synchronous (i.e. blocks until the print completes)
+/// \param pStream  Output stream.
+/// \param pFormat  Format string
+/// \param ap  Argument list.
+//------------------------------------------------------------------------------
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
+signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap)
+{
+	char pStr[MAX_STRING_SIZE];
+	char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r";
+
+	// Write formatted string in buffer
+	if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) {
+
+		fputs_sync(pError, stderr);
+	}
+
+	// Display string
+	return fputs_sync(pStr, pStream);
+}
+#pragma GCC diagnostic pop
+
 //------------------------------------------------------------------------------
 /// Outputs a formatted string on the DBGU stream. Format arguments are given
 /// in a va_list instance.
@@ -443,7 +472,19 @@ signed int vfprintf(FILE *pStream, const char *pFormat, va_list ap)
 //------------------------------------------------------------------------------
 signed int vprintf(const char *pFormat, va_list ap)
 {
-    return vfprintf(stdout, pFormat, 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);
 }
 
 //------------------------------------------------------------------------------
@@ -454,15 +495,15 @@ signed int vprintf(const char *pFormat, va_list ap)
 //------------------------------------------------------------------------------
 signed int fprintf(FILE *pStream, const char *pFormat, ...)
 {
-    va_list ap;
+	va_list ap;
-    signed int result;
+	signed int result;
 
-    // Forward call to vfprintf
+	// Forward call to vfprintf
-    va_start(ap, pFormat);
+	va_start(ap, pFormat);
-    result = vfprintf(pStream, pFormat, ap);
+	result = vfprintf(pStream, pFormat, ap);
-    va_end(ap);
+	va_end(ap);
 
-    return result;
+	return result;
 }
 
 //------------------------------------------------------------------------------
@@ -472,15 +513,34 @@ signed int fprintf(FILE *pStream, const char *pFormat, ...)
 //------------------------------------------------------------------------------
 signed int printf(const char *pFormat, ...)
 {
-    va_list ap;
+	va_list ap;
-    signed int result;
+	signed int result;
 
-    // Forward call to vprintf
+	// Forward call to vprintf
-    va_start(ap, pFormat);
+	va_start(ap, pFormat);
-    result = vprintf(pFormat, ap);
+	result = vprintf(pFormat, ap);
-    va_end(ap);
+	va_end(ap);
 
-    return result;
+	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;
 }
 
 //------------------------------------------------------------------------------
@@ -490,15 +550,15 @@ signed int printf(const char *pFormat, ...)
 //------------------------------------------------------------------------------
 signed int sprintf(char *pStr, const char *pFormat, ...)
 {
-    va_list ap;
+	va_list ap;
-    signed int result;
+	signed int result;
 
-    // Forward call to vsprintf
+	// Forward call to vsprintf
-    va_start(ap, pFormat);
+	va_start(ap, pFormat);
-    result = vsprintf(pStr, pFormat, ap);
+	result = vsprintf(pStr, pFormat, ap);
-    va_end(ap);
+	va_end(ap);
 
-    return result;
+	return result;
 }
 
 //------------------------------------------------------------------------------
@@ -507,6 +567,6 @@ signed int sprintf(char *pStr, const char *pFormat, ...)
 //------------------------------------------------------------------------------
 signed int puts(const char *pStr)
 {
-    return fputs(pStr, stdout);
+	return fputs(pStr, stdout);
 }
 

firmware/libcommon/source/string.c

@@ -61,33 +61,33 @@
 //------------------------------------------------------------------------------
 void * memcpy(void *pDestination, const void *pSource, size_t num)
 {
-    unsigned char *pByteDestination;
+	unsigned char *pByteDestination;
-    unsigned char *pByteSource;
+	unsigned char *pByteSource;
-    unsigned int *pAlignedSource = (unsigned int *) pSource;
+	unsigned int *pAlignedSource = (unsigned int *) pSource;
-    unsigned int *pAlignedDestination = (unsigned int *) pDestination;
+	unsigned int *pAlignedDestination = (unsigned int *) pDestination;
 
-    // If num is more than 4 bytes, and both dest. and source are aligned,
+	// If num is more than 4 bytes, and both dest. and source are aligned,
-    // then copy dwords
+	// then copy dwords
-    if ((((unsigned int) pAlignedDestination & 0x3) == 0)
+	if ((((unsigned int) pAlignedDestination & 0x3) == 0)
-        && (((unsigned int) pAlignedSource & 0x3) == 0)
+		&& (((unsigned int) pAlignedSource & 0x3) == 0)
-        && (num >= 4)) {
+		&& (num >= 4)) {
 
-        while (num >= 4) {
+		while (num >= 4) {
 
-            *pAlignedDestination++ = *pAlignedSource++;
+			*pAlignedDestination++ = *pAlignedSource++;
-            num -= 4;
+			num -= 4;
-        }
+		}
-    }
+	}
 
-    // Copy remaining bytes
+	// Copy remaining bytes
-    pByteDestination = (unsigned char *) pAlignedDestination;
+	pByteDestination = (unsigned char *) pAlignedDestination;
-    pByteSource = (unsigned char *) pAlignedSource;
+	pByteSource = (unsigned char *) pAlignedSource;
-    while (num--) {
+	while (num--) {
 
-        *pByteDestination++ = *pByteSource++;
+		*pByteDestination++ = *pByteSource++;
-    }
+	}
 
-    return pDestination;
+	return pDestination;
 }
 
 //------------------------------------------------------------------------------
@@ -99,23 +99,23 @@ void * memcpy(void *pDestination, const void *pSource, size_t num)
 //------------------------------------------------------------------------------
 void * memset(void *pBuffer, int value, size_t num)
 {
-    unsigned char *pByteDestination;
+	unsigned char *pByteDestination;
-    unsigned int  *pAlignedDestination = (unsigned int *) pBuffer;
+	unsigned int  *pAlignedDestination = (unsigned int *) pBuffer;
-    unsigned int  alignedValue = (value << 24) | (value << 16) | (value << 8) | value;
+	unsigned int  alignedValue = (value << 24) | (value << 16) | (value << 8) | value;
 
-    // Set words if possible
+	// Set words if possible
-    if ((((unsigned int) pAlignedDestination & 0x3) == 0) && (num >= 4)) {
+	if ((((unsigned int) pAlignedDestination & 0x3) == 0) && (num >= 4)) {
-        while (num >= 4) {
+		while (num >= 4) {
-            *pAlignedDestination++ = alignedValue;
+			*pAlignedDestination++ = alignedValue;
-            num -= 4;
+			num -= 4;
-        }
+		}
-    }
+	}
-    // Set remaining bytes
+	// Set remaining bytes
-    pByteDestination = (unsigned char *) pAlignedDestination;
+	pByteDestination = (unsigned char *) pAlignedDestination;
-    while (num--) {
+	while (num--) {
-        *pByteDestination++ = value;
+		*pByteDestination++ = value;
-    }
+	}
-    return pBuffer;
+	return pBuffer;
 }
 
 //-----------------------------------------------------------------------------
@@ -126,16 +126,16 @@ void * memset(void *pBuffer, int value, size_t num)
 //-----------------------------------------------------------------------------
 char * strchr(const char *pString, int character)
 {
-    char * p = (char *)pString;
+	char * p = (char *)pString;
-    char   c = character & 0xFF;
+	char   c = character & 0xFF;
 
-    while(*p != c) {
+	while(*p != c) {
-        if (*p == 0) {
+		if (*p == 0) {
-            return 0;
+			return 0;
-        }
+		}
-        p++;
+		p++;
-    }
+	}
-    return p;
+	return p;
 }
 
 //-----------------------------------------------------------------------------
@@ -144,12 +144,12 @@ char * strchr(const char *pString, int character)
 //-----------------------------------------------------------------------------
 size_t strlen(const char *pString)
 {
-    unsigned int length = 0;
+	unsigned int length = 0;
 
-    while(*pString++ != 0) {
+	while(*pString++ != 0) {
-        length++;
+		length++;
-    }
+	}
-    return length;
+	return length;
 }
 
 
@@ -161,14 +161,14 @@ size_t strlen(const char *pString)
 //-----------------------------------------------------------------------------
 char * strrchr(const char *pString, int character)
 {
-    char *p = 0;
+	char *p = 0;
 
-    while(*pString != 0) {
+	while(*pString != 0) {
-        if (*pString++ == character) {
+		if (*pString++ == character) {
-            p = (char*)pString;
+			p = (char*)pString;
-        }
+		}
-    }
+	}
-    return p;
+	return p;
 }
 
 //-----------------------------------------------------------------------------
@@ -179,10 +179,10 @@ char * strrchr(const char *pString, int character)
 //-----------------------------------------------------------------------------
 char * strcpy(char *pDestination, const char *pSource)
 {
-    char *pSaveDest = pDestination;
+	char *pSaveDest = pDestination;
 
-    for(; (*pDestination = *pSource) != 0; ++pSource, ++pDestination);
+	for(; (*pDestination = *pSource) != 0; ++pSource, ++pDestination);
-    return pSaveDest;
+	return pSaveDest;
 }
 
 //-----------------------------------------------------------------------------
@@ -196,22 +196,22 @@ char * strcpy(char *pDestination, const char *pSource)
 //-----------------------------------------------------------------------------
 int strncmp(const char *pString1, const char *pString2, size_t count)
 {
-    int r;
+	int r;
 
-    while(count) {
+	while(count) {
-        r = *pString1 - *pString2;
+		r = *pString1 - *pString2;
-        if (r == 0) {
+		if (r == 0) {
-            if (*pString1 == 0) {
+			if (*pString1 == 0) {
-                break;
+				break;
-            }
+			}
-            pString1++;
+			pString1++;
-            pString2++;
+			pString2++;
-            count--;
+			count--;
-            continue;
+			continue;
-        }
+		}
-        return r;
+		return r;
-    }
+	}
-    return 0;
+	return 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -223,17 +223,17 @@ int strncmp(const char *pString1, const char *pString2, size_t count)
 //-----------------------------------------------------------------------------
 char * strncpy(char *pDestination, const char *pSource, size_t count)
 {
-    char *pSaveDest = pDestination;
+	char *pSaveDest = pDestination;
 
-    while (count) {
+	while (count) {
-        *pDestination = *pSource;
+		*pDestination = *pSource;
-        if (*pSource == 0) {
+		if (*pSource == 0) {
-            break;
+			break;
-        }
+		}
-        pDestination++;
+		pDestination++;
-        pSource++;
+		pSource++;
-        count--;
+		count--;
-    }
+	}
-    return pSaveDest;
+	return pSaveDest;
 }
 

firmware/libcommon/source/tc_etu.c

@@ -1,23 +1,21 @@
-/* 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>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * (C) 2006-2016 by Harald Welte <laforge@gnumonks.org>
- *  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,
+ * This program is free software; you can redistribute it and/or modify
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * it under the terms of the GNU General Public License as published by
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * the Free Software Foundation; either version 2 of the License, or
- *  GNU General Public License for more details.
+ * (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
+ * This program is distributed in the hope that it will be useful,
- *  along with this program; if not, write to the Free Software
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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 "utils.h"

firmware/libcommon/source/usb.c

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -33,22 +34,21 @@
 
 #include "board.h"
 #include "simtrace.h"
+#include "simtrace_usb.h"
 #include "utils.h"
+#include "USBD_HAL.h"
 
 #include <cciddriverdescriptors.h>
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-#define SIMTRACE_SUBCLASS_SNIFFER	1
-#define SIMTRACE_SUBCLASS_CARDEM	2
-
 /*------------------------------------------------------------------------------
  *       USB String descriptors 
  *------------------------------------------------------------------------------*/
 #include "usb_strings_generated.h"
 enum strDescNum {
-	PRODUCT_STRING = 1,
+	MANUF_STR = 1,
-	MANUF_STR,
+	PRODUCT_STRING,
 	SNIFFER_CONF_STR,
 	CCID_CONF_STR,
 	PHONE_CONF_STR,
@@ -94,8 +94,8 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
 		.bInterfaceNumber	= 0,
 		.bAlternateSetting	= 0,
 		.bNumEndpoints		= 3,
-		.bInterfaceClass	= 0xff,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
-		.bInterfaceSubClass	= SIMTRACE_SUBCLASS_SNIFFER,
+		.bInterfaceSubClass	= SIMTRACE_SNIFFER_USB_SUBCLASS,
 		.bInterfaceProtocol	= 0,
 		.iInterface		= SNIFFER_CONF_STR,
 	},
@@ -105,11 +105,9 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_OUT,
-						PHONE_DATAOUT),
+						SIMTRACE_USB_EP_CARD_DATAOUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXBULKSIZE_FS,
-							PHONE_DATAOUT),
-				      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0,
 	},
 	/* Bulk-IN endpoint descriptor */
@@ -118,11 +116,9 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_DATAIN),
+						SIMTRACE_USB_EP_CARD_DATAIN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize = MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize = USBEndpointDescriptor_MAXBULKSIZE_FS,
-								PHONE_DATAIN),
-				      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0,
 	},
 	// Notification endpoint descriptor
@@ -131,11 +127,9 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_INT),
+						SIMTRACE_USB_EP_CARD_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-								PHONE_INT),
-				      USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval = 0x10,
 	},
 	DFURT_IF_DESCRIPTOR(1, 0),
@@ -205,9 +199,7 @@ static const CCIDDriverConfigurationDescriptors configurationDescriptorCCID = {
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT,
 				      		      CCID_EPT_DATA_OUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					CCID_EPT_DATA_OUT),
-		    			USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0x00,
 	},
 	// Bulk-IN endpoint descriptor
@@ -218,9 +210,7 @@ static const CCIDDriverConfigurationDescriptors configurationDescriptorCCID = {
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
 						      CCID_EPT_DATA_IN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXBULKSIZE_FS),
-					CCID_EPT_DATA_IN),
-		    			USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0x00,
 	},
 	// Notification endpoint descriptor
@@ -231,9 +221,7 @@ static const CCIDDriverConfigurationDescriptors configurationDescriptorCCID = {
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
 						      CCID_EPT_NOTIFICATION),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize = MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-					CCID_EPT_NOTIFICATION),
-					USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval = 0x10,
 	},
 	DFURT_IF_DESCRIPTOR(1, 0),
@@ -268,7 +256,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 #ifdef CARDEMU_SECOND_UART
 		.bNumInterfaces		= 2+DFURT_NUM_IF,
 #else
-		.bNumInterefaces	= 1+DFURT_NUM_IF,
+		.bNumInterfaces		= 1+DFURT_NUM_IF,
 #endif
 		.bConfigurationValue	= CFG_NUM_PHONE,
 		.iConfiguration		= PHONE_CONF_STR,
@@ -282,8 +270,8 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bInterfaceNumber	= 0,
 		.bAlternateSetting	= 0,
 		.bNumEndpoints		= 3,
-		.bInterfaceClass	= 0xff,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
-		.bInterfaceSubClass	= SIMTRACE_SUBCLASS_CARDEM,
+		.bInterfaceSubClass	= SIMTRACE_CARDEM_USB_SUBCLASS,
 		.bInterfaceProtocol	= 0,
 		.iInterface		= CARDEM_USIM1_INTF_STR,
 	},
@@ -293,10 +281,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_OUT,
-						PHONE_DATAOUT),
+						SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAOUT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0	/* Must be 0 for full-speed bulk endpoints */
 	},
 	/* Bulk-IN endpoint descriptor */
@@ -305,10 +292,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_DATAIN),
+						SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAIN),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0	/* Must be 0 for full-speed bulk endpoints */
 	},
 	/* Notification endpoint descriptor */
@@ -317,10 +303,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_INT),
+						SIMTRACE_CARDEM_USB_EP_USIM1_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_INT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-					      USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval		= 0x10
 	},
 #ifdef CARDEMU_SECOND_UART
@@ -331,8 +316,8 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bInterfaceNumber	= 1,
 		.bAlternateSetting	= 0,
 		.bNumEndpoints		= 3,
-		.bInterfaceClass	= 0xff,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
-		.bInterfaceSubClass	= SIMTRACE_SUBCLASS_CARDEM,
+		.bInterfaceSubClass	= SIMTRACE_CARDEM_USB_SUBCLASS,
 		.bInterfaceProtocol	= 0,
 		.iInterface		= CARDEM_USIM2_INTF_STR,
 	},
@@ -342,10 +327,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_OUT,
-						CARDEM_USIM2_DATAOUT),
+						SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(CARDEM_USIM2_DATAOUT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0	/* Must be 0 for full-speed bulk endpoints */
 	}
 	,
@@ -355,10 +339,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						CARDEM_USIM2_DATAIN),
+						SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(CARDEM_USIM2_DATAIN),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0	/* Must be 0 for full-speed bulk endpoints */
 	},
 	/* Notification endpoint descriptor */
@@ -367,10 +350,9 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						CARDEM_USIM2_INT),
+						SIMTRACE_CARDEM_USB_EP_USIM2_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(CARDEM_USIM2_INT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-					      USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval		= 0x10,
 	},
 	DFURT_IF_DESCRIPTOR(2, 0),
@@ -466,9 +448,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT,
 				      		      CCID_EPT_DATA_OUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					CCID_EPT_DATA_OUT),
-		    			USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0x00,
 	},
 	// Bulk-IN endpoint descriptor
@@ -479,9 +459,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
 						      CCID_EPT_DATA_IN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize	= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize	= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					CCID_EPT_DATA_IN),
-		    			USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0x00,
 	},
 	// Notification endpoint descriptor
@@ -492,9 +470,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 			USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
 						      CCID_EPT_NOTIFICATION),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize = MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(
+		.wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-					CCID_EPT_NOTIFICATION),
-					USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval = 0x10,
 	},
 
@@ -506,7 +482,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 		.bAlternateSetting	= 0,
 		.bNumEndpoints		= 3,
 		.bInterfaceClass	= 0xff,
-		.bInterfaceSubClass	= SIMTRAC_SUBCLASS_CARDEM,
+		.bInterfaceSubClass	= SIMTRACE_SUBCLASS_CARDEM,
 		.bInterfaceProtocol	= 0,
 		.iInterface		= PHONE_CONF_STR,
 	},
@@ -516,10 +492,9 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_OUT,
-						PHONE_DATAOUT),
+						SIMTRACE_USB_EP_PHONE_DATAOUT),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAOUT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0, /* Must be 0 for full-speed bulk endpoints */
 	},
 	/* Bulk-IN endpoint descriptor */
@@ -528,10 +503,9 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_DATAIN),
+						SIMTRACE_USB_EP_PHONE_DATAIN),
 		.bmAttributes		= USBEndpointDescriptor_BULK,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAIN),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXBULKSIZE_FS,
-					      USBEndpointDescriptor_MAXBULKSIZE_FS),
 		.bInterval		= 0, /* Must be 0 for full-speed bulk endpoints */
 	},
 	/* Notification endpoint descriptor */
@@ -540,10 +514,9 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 		.bDescriptorType	= USBGenericDescriptor_ENDPOINT,
 		.bEndpointAddress	= USBEndpointDescriptor_ADDRESS(
 						USBEndpointDescriptor_IN,
-						PHONE_INT),
+						SIMTRACE_USB_EP_PHONE_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
-		.wMaxPacketSize		= MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_INT),
+		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-					      USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
 		.bInterval		= 0x10
 	},
 	DFURT_IF_DESCRIPTOR(2, 0),
@@ -573,7 +546,7 @@ const USBDeviceDescriptor deviceDescriptor = {
 	.bDeviceClass		= 0,
 	.bDeviceSubClass	= 0,
 	.bDeviceProtocol	= 0,
-	.bMaxPacketSize0	= BOARD_USB_ENDPOINTS_MAXPACKETSIZE(0),
+	.bMaxPacketSize0	= 64,
 	.idVendor		= BOARD_USB_VENDOR_ID,
 	.idProduct		= BOARD_USB_PRODUCT_ID,
 	.bcdDevice		= 2,	/* Release number */
@@ -603,11 +576,23 @@ static const USBDDriverDescriptors driverDescriptors = {
 
 void SIMtrace_USB_Initialize(void)
 {
+
+	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+#ifdef PIN_USB_PULLUP
+	const Pin usb_dp_pullup = PIN_USB_PULLUP;
+	PIO_Configure(&usb_dp_pullup, 1);
+	PIO_Set(&usb_dp_pullup);
+#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();
 
-	TRACE_DEBUG(".");
-
 	// Initialize standard USB driver
 	USBDDriver_Initialize(pUsbd, &driverDescriptors, 0);	// Multiple interface settings not supported
 	USBD_Init();

firmware/libcommon/source/usb_buf.c

@@ -1,9 +1,26 @@
+/* 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"
+#include "simtrace_usb.h"
 
-#include "osmocom/core/linuxlist.h"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/msgb.h"
+#include <osmocom/core/msgb.h>
 #include <errno.h>
 
 #define USB_ALLOC_SIZE	280

firmware/libosmocore/include/osmocom/core/timer.h

@@ -60,8 +60,8 @@ struct timezone;
 
 #include <stdbool.h>
 
-#include "osmocom/core/linuxlist.h"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/linuxrbtree.h"
+#include <osmocom/core/linuxrbtree.h>
 
 /**
  * Timer management:

firmware/libosmocore/source/panic.c

@@ -43,6 +43,7 @@ static osmo_panic_handler_t osmo_panic_handler = (void*)0;
 #include <stdio.h>
 #include <stdlib.h>
 
+__attribute__ ((format (printf, 1, 0)))
 static void osmo_panic_default(const char *fmt, va_list args)
 {
 	vfprintf(stderr, fmt, args);
@@ -73,6 +74,7 @@ static void osmo_panic_default(const char *fmt, va_list args)
  * The default function on most systems will generate a backtrace and
  * then abort() the process.
  */
+__attribute__ ((format (printf, 1, 0)))
 void osmo_panic(const char *fmt, ...)
 {
 	va_list args;

firmware/libosmocore/source/timer.c

@@ -33,8 +33,8 @@
 
 #include <assert.h>
 #include <limits.h>
-#include "osmocom/core/linuxlist.h"
+#include <osmocom/core/linuxlist.h>
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 
 /* These store the amount of time that we wait until next timer expires. */
 static struct osmo_timeval nearest;

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

@@ -1,5 +1,17 @@
-CFLAGS=-g -Wall -I../src_simtrace -I../libcommon/include -I.
+LIBOSMOCORE_CFLAGS=`pkg-config --cflags libosmocore`
-LDFLAGS=-losmocore
+LIBOSMOCORE_LIBS=`pkg-config --libs libosmocore`
+
+CFLAGS=-g -Wall $(LIBOSMOCORE_CFLAGS) \
+	-I../src_simtrace \
+	-I../atmel_softpack_libraries/libchip_sam3s \
+	-I../atmel_softpack_libraries/libchip_sam3s/cmsis \
+	-I../atmel_softpack_libraries/libchip_sam3s/include \
+	-I../atmel_softpack_libraries/usb/include \
+	-I../libcommon/include \
+	-I../libboard/common/include \
+	-I../libboard/simtrace/include \
+	-I.
+LDFLAGS=$(LIBOSMOCORE_LIBS)
 
 VPATH=../src_simtrace ../libcommon/source
 

firmware/test/card_emu_tests.c

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

host/Makefile

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

host/apdu_dispatch.c

@@ -2,20 +2,20 @@
  *
  * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or
- *  it under the terms of the GNU General Public License version 2 
+ * modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ * along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

host/apdu_dispatch.h

@@ -1,3 +1,21 @@
+/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU
+ *
+ * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 #pragma once
 
 #include <stdint.h>

host/libusb_util.c

@@ -1,3 +1,21 @@
+/* libisb utilities
+ * 
+ * (C) 2010-2016 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -130,11 +148,11 @@ int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, i
 			for (k = 0; k < intf->num_altsetting; k++) {
 				const struct libusb_interface_descriptor *if_desc;
 				if_desc = &intf->altsetting[k];
-				if (class > 0 && if_desc->bInterfaceClass != class)
+				if (class >= 0 && if_desc->bInterfaceClass != class)
 					continue;
-				if (sub_class > 0 && if_desc->bInterfaceSubClass != sub_class)
+				if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class)
 					continue;
-				if (protocol > 0 && if_desc->bInterfaceProtocol != protocol)
+				if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol)
 					continue;
 				/* MATCH! */
 				out[out_idx].usb_dev = dev;
@@ -197,7 +215,7 @@ int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids,
 			dev_desc.idVendor, dev_desc.idProduct, addr);
 #endif
 
-		rc = dev_find_matching_interfaces(*dev, 255, 2, -1, out_cur, out_len_remain);
+		rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain);
 		if (rc < 0)
 			continue;
 		out_cur += rc;
@@ -232,34 +250,39 @@ libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
 		    (strlen(ifm->path) && !strcmp(path, ifm->path))) {
 			rc = libusb_open(*dev, &usb_devh);
 			if (rc < 0) {
-				perror("Cannot open device");
+				fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc));
+				usb_devh = NULL;
 				break;
 			}
 			rc = libusb_get_configuration(usb_devh, &config);
 			if (rc < 0) {
-				perror("Cannot get current configuration");
+				fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc));
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 			if (config != ifm->configuration) {
 				rc = libusb_set_configuration(usb_devh, ifm->configuration);
 				if (rc < 0) {
-					perror("Cannot set configuration");
+					fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc));
 					libusb_close(usb_devh);
+					usb_devh = NULL;
 					break;
 				}
 			}
 			rc = libusb_claim_interface(usb_devh, ifm->interface);
 			if (rc < 0) {
-				perror("Cannot claim interface");
+				fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc));
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 			rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting);
 			if (rc < 0) {
-				perror("Cannot set interface altsetting");
+				fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc));
 				libusb_release_interface(usb_devh, ifm->interface);
 				libusb_close(usb_devh);
+				usb_devh = NULL;
 				break;
 			}
 		}

host/libusb_util.h

@@ -1,3 +1,21 @@
+/* libisb utilities
+ * 
+ * (C) 2010-2016 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 #pragma once
 
 #include <libusb.h>

host/simtrace2-discovery.c

@@ -1,3 +1,22 @@
+/* simtrace2-discovery - host PC library to scan for matching USB
+ * devices
+ *
+ * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 #include <stdint.h>
 
 #include <libusb.h>