cardem: ignore set ATR

the PPS procedure with baud rate change has not been tested.
by keeping the default ATR instead of applying the ATR sent by
the host software, no other baud rate choice is offered.

Change-Id: Ibf7c6b83d2cf68172c7aa25116d838e24a95d5fe

.gitignore

@@ -21,3 +21,4 @@ host/simtrace2-list
 host/simtrace2-remsim
 host/simtrace2-remsim-usb2udp
 usb_strings_generated.h
+firmware/usbstring/usbstring

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

debian/rules

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

debian/simtrace2-firmware.install

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

debian/simtrace2-utils.install

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

firmware/Makefile

@@ -100,7 +100,7 @@ C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c
 C_LIBCOMMON  = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c
 
 C_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))
-C_BOARD	    += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
+C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
 
 C_APPLEVEL = $(notdir $(wildcard apps/$(APP)/*.c))
 
@@ -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 += -Wformat=0
+CFLAGS += -Waggregate-return #-Wsign-compare
 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 $@
@@ -229,8 +228,12 @@ program:
 
 SERIAL ?= /dev/ttyUSB0
 log:
-	stty -F $(SERIAL) 115200
+	stty -F $(SERIAL) 921600
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )
 
 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
-compiled.
+The firmware is for Microchip (formerly Atmel) ATSAM3S4B micro-controllers (MCU).
+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
-functionality.
+= Firmware
 
-== 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
-  of flash (the first 16k are reserved for the bootloader)
+* dfu: Run after a DFU bootloader from an offset after the first 16k 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
-running in a certain ENVIRONMENT on a given BOARD.
+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`.
+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.
-
-=== 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
+To flash a firmware image follow the instructions provided in the [wiki](https://projects.osmocom.org/projects/simtrace2/wiki/).

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 iso7816_3.c iso7816_4.c mode_cardemu.c simtrace_iso7816.c usb.c

firmware/apps/cardem/main.c

@@ -1,4 +1,22 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -6,7 +24,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];
 
@@ -84,17 +102,23 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
-	simtrace_config = cfgnum;
+	if (cfgnum < ARRAY_SIZE(config_func_ptrs)) {
+		simtrace_config = cfgnum;
+	} else {
+		TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum);
+	}
 }
 
 void USART1_IrqHandler(void)
 {
-	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,7 +130,8 @@ static void check_exec_dbg_cmd(void)
 		return;
 
 	ch = UART_GetChar();
-
+	/* We must echo the character to make python fdexpect happy, which we use in factory testing */
+	fputc(ch, stdout);
 	board_exec_dbg_cmd(ch);
 }
 
@@ -121,26 +146,42 @@ extern int main(void)
 	unsigned int i = 0;
 
 	led_init();
-	led_blink(LED_RED, BLINK_3O_5F);
+	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
 
-	/* 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"
+		"SIMtrace2 firmware " GIT_VERSION "\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\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();
 
@@ -169,7 +210,9 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	config_func_ptrs[simtrace_config].init();
+	if (config_func_ptrs[simtrace_config].init) {
+		config_func_ptrs[simtrace_config].init();
+	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -197,11 +240,17 @@ extern int main(void)
 		if (last_simtrace_config != simtrace_config) {
 			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
-			config_func_ptrs[last_simtrace_config].exit();
-			config_func_ptrs[simtrace_config].init();
+			if (config_func_ptrs[last_simtrace_config].exit) {
+				config_func_ptrs[last_simtrace_config].exit();
+			}
+			if (config_func_ptrs[simtrace_config].init) {
+				config_func_ptrs[simtrace_config].init();
+			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			config_func_ptrs[simtrace_config].run();
+			if (config_func_ptrs[simtrace_config].run) {
+				config_func_ptrs[simtrace_config].run();
+			}
 		}
 	}
 }

firmware/apps/dfu/main.c

@@ -1,8 +1,28 @@
+/* SIMtrace 2 firmware USB DFU bootloader
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018-2019 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,85 @@ 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);
+#if TRACE_LEVEL >= TRACE_LEVEL_INFO
+	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
+#else
+	printf("DL off=%u\n\r", offset);
+#endif
+
+#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 */
-			return DFU_RET_STALL;
+			TRACE_ERROR("DFU download flash erase failed\n\r");
+			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 +172,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;
-	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;
+	return 0;
 }
 
 /* using this function we can determine if we should enter DFU mode
@@ -137,22 +183,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())
-		return 1;
+	if (board_override_enter_dfu()) {
+		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) ||
-	    ((uint8_t *)app_part[0] > IRAM_END))
-		return 1;
+	if ((app_part[0] < IRAM_ADDR) || ((uint8_t *)app_part[0] > IRAM_END)) {
+		return 3;
+	}
 
 	/* 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))
-		return 1;
+	    ((uint8_t *)app_part[1] > IFLASH_END)) {
+		return 4;
+	}
 
 	return 0;
 }
@@ -180,23 +234,26 @@ 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
-	led_init();
-	led_blink(LED_GREEN, BLINK_3O_30F);
-	led_blink(LED_RED, BLINK_3O_30F);
-#endif
-
-	/* 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));
+	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"
+		"DFU bootloader %s for board %s\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
 		"=============================================================================\n\r",
 		manifest_revision, manifest_board);
 
@@ -204,7 +261,36 @@ extern int main(void)
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);
+	TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause);
+
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	/* Find out why we are in the DFU bootloader, and not the main application */
+	TRACE_INFO("DFU bootloader start reason: ");
+	switch (USBDFU_OverrideEnterDFU()) {
+	case 0:
+		/* 0 normally means that there is no override, but we are in the bootloader,
+		 * thus the first check in board_cstartup_gnu did return something else than 0.
+		 * this can only be g_dfu->magic which is erased when the segment are
+		 * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU.
+		 * no static variable can be used to store this case since this will also be overwritten
+		 */
+	case 1:
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
+		break;
+	case 2:
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
+		break;
+	case 3:
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
+		break;
+	case 4: // the is no reason
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
+		break;
+	default:
+		TRACE_INFO_WP("unknown\n\r");
+		break;
+	}
+#endif
 
 	/* clear g_dfu on power-up reset */
 	if (reset_cause == 0)
@@ -213,6 +299,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 +328,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 += iso7816_4.c iso7816_fidi.c simtrace_iso7816.c sniffer.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/include/efc.h

@@ -1,113 +1,113 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * \section Purpose
- *
- * Interface for configuration the Enhanced Embedded Flash Controller (EEFC) peripheral.
- *
- * \section Usage
- *
- * -# Enable/disable %flash ready interrupt sources using EFC_EnableFrdyIt()
- *    and EFC_DisableFrdyIt().
- * -# Translates the given address into which EEFC, page and offset values
- *    for difference density %flash memory using EFC_TranslateAddress().
- * -# Computes the address of a %flash access given the EFC, page and offset
- *    for difference density %flash memory using EFC_ComputeAddress().
- * -# Start the executing command with EFC_StartCommand()
- * -# Retrieve the current status of the EFC using EFC_GetStatus().
- * -# Retrieve the result of the last executed command with EFC_GetResult().
- */
-
-#ifndef _EEFC_
-#define _EEFC_
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-#include "chip.h"
-
-#include <stdint.h>
-
-/*----------------------------------------------------------------------------
- *        Definitions
- *----------------------------------------------------------------------------*/
-/* EFC command */
-#define EFC_FCMD_GETD    0x00
-#define EFC_FCMD_WP      0x01
-#define EFC_FCMD_WPL     0x02
-#define EFC_FCMD_EWP     0x03
-#define EFC_FCMD_EWPL    0x04
-#define EFC_FCMD_EA      0x05
-#define EFC_FCMD_SLB     0x08
-#define EFC_FCMD_CLB     0x09
-#define EFC_FCMD_GLB     0x0A
-#define EFC_FCMD_SFB     0x0B
-#define EFC_FCMD_CFB     0x0C
-#define EFC_FCMD_GFB     0x0D
-#define EFC_FCMD_STUI    0x0E /* Start unique ID */
-#define EFC_FCMD_SPUI    0x0F /* Stop unique ID */
-
-/* The IAP function entry addreass */
-#define CHIP_FLASH_IAP_ADDRESS  (0x00800008)
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-extern void EFC_EnableFrdyIt( Efc* efc ) ;
-
-extern void EFC_DisableFrdyIt( Efc* efc ) ;
-
-extern void EFC_SetWaitState( Efc* efc, uint8_t cycles ) ;
-
-extern void EFC_TranslateAddress( Efc** pEfc, uint32_t dwAddress, uint16_t *pwPage, uint16_t *pwOffset ) ;
-
-extern void EFC_ComputeAddress( Efc* efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress ) ;
-
-extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument ) ;
-
-extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP ) ;
-
-extern uint32_t EFC_GetStatus( Efc* efc ) ;
-
-extern uint32_t EFC_GetResult( Efc* efc ) ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef _EEFC_ */
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ * \section Purpose
+ *
+ * Interface for configuration the Enhanced Embedded Flash Controller (EEFC) peripheral.
+ *
+ * \section Usage
+ *
+ * -# Enable/disable %flash ready interrupt sources using EFC_EnableFrdyIt()
+ *    and EFC_DisableFrdyIt().
+ * -# Translates the given address into which EEFC, page and offset values
+ *    for difference density %flash memory using EFC_TranslateAddress().
+ * -# Computes the address of a %flash access given the EFC, page and offset
+ *    for difference density %flash memory using EFC_ComputeAddress().
+ * -# Start the executing command with EFC_StartCommand()
+ * -# Retrieve the current status of the EFC using EFC_GetStatus().
+ * -# Retrieve the result of the last executed command with EFC_GetResult().
+ */
+
+#ifndef _EEFC_
+#define _EEFC_
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+#include "chip.h"
+
+#include <stdint.h>
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+/* EFC command */
+#define EFC_FCMD_GETD    0x00
+#define EFC_FCMD_WP      0x01
+#define EFC_FCMD_WPL     0x02
+#define EFC_FCMD_EWP     0x03
+#define EFC_FCMD_EWPL    0x04
+#define EFC_FCMD_EA      0x05
+#define EFC_FCMD_SLB     0x08
+#define EFC_FCMD_CLB     0x09
+#define EFC_FCMD_GLB     0x0A
+#define EFC_FCMD_SFB     0x0B
+#define EFC_FCMD_CFB     0x0C
+#define EFC_FCMD_GFB     0x0D
+#define EFC_FCMD_STUI    0x0E /* Start unique ID */
+#define EFC_FCMD_SPUI    0x0F /* Stop unique ID */
+
+/* The IAP function entry addreass */
+#define CHIP_FLASH_IAP_ADDRESS  (0x00800008)
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+extern void EFC_EnableFrdyIt( Efc* efc ) ;
+
+extern void EFC_DisableFrdyIt( Efc* efc ) ;
+
+extern void EFC_SetWaitState( Efc* efc, uint8_t cycles ) ;
+
+extern void EFC_TranslateAddress( Efc** pEfc, uint32_t dwAddress, uint16_t *pwPage, uint16_t *pwOffset ) ;
+
+extern void EFC_ComputeAddress( Efc* efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress ) ;
+
+extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument ) ;
+
+extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP ) ;
+
+extern uint32_t EFC_GetStatus( Efc* efc ) ;
+
+extern uint32_t EFC_GetResult( Efc* efc ) ;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef _EEFC_ */
+

firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h

@@ -1,79 +1,79 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
-*/
-
-/**
- * \file
- *
- * The flash driver provides the unified interface for flash program operations.
- *
- */
-
-#ifndef _FLASHD_
-#define _FLASHD_
-
-#include <stdint.h>
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP ) ;
-
-extern uint32_t FLASHD_Erase( uint32_t dwAddress ) ;
-
-extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize ) ;
-
-extern uint32_t FLASHD_Lock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
-extern uint32_t FLASHD_Unlock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
-extern uint32_t FLASHD_IsLocked( uint32_t dwStart, uint32_t dwEnd ) ;
-
-extern uint32_t FLASHD_SetGPNVM( uint8_t gpnvm ) ;
-
-extern uint32_t FLASHD_ClearGPNVM( uint8_t gpnvm ) ;
-
-extern uint32_t FLASHD_IsGPNVMSet( uint8_t gpnvm ) ;
-
-#define FLASHD_IsSecurityBitSet() FLASHD_IsGPNVMSet( 0 )
-
-#define FLASHD_SetSecurityBit()   FLASHD_SetGPNVM( 0 )
-
-extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID ) ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef _FLASHD_ */
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+*/
+
+/**
+ * \file
+ *
+ * The flash driver provides the unified interface for flash program operations.
+ *
+ */
+
+#ifndef _FLASHD_
+#define _FLASHD_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP ) ;
+
+extern uint32_t FLASHD_Erase( uint32_t dwAddress ) ;
+
+extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize ) ;
+
+extern uint32_t FLASHD_Lock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
+
+extern uint32_t FLASHD_Unlock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
+
+extern uint32_t FLASHD_IsLocked( uint32_t dwStart, uint32_t dwEnd ) ;
+
+extern uint32_t FLASHD_SetGPNVM( uint8_t gpnvm ) ;
+
+extern uint32_t FLASHD_ClearGPNVM( uint8_t gpnvm ) ;
+
+extern uint32_t FLASHD_IsGPNVMSet( uint8_t gpnvm ) ;
+
+#define FLASHD_IsSecurityBitSet() FLASHD_IsGPNVMSet( 0 )
+
+#define FLASHD_SetSecurityBit()   FLASHD_SetGPNVM( 0 )
+
+extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID ) ;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef _FLASHD_ */
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

@@ -1,290 +1,290 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/** \addtogroup efc_module Working with EEFC
- * The EEFC driver provides the interface to configure and use the EEFC
- * peripheral.
- *
- * The user needs to set the number of wait states depending on the frequency used.\n
- * Configure number of cycles for flash read/write operations in the FWS field of EEFC_FMR.
- *
- * It offers a function to send flash command to EEFC and waits for the
- * flash to be ready.
- *
- * To send flash command, the user could do in either of following way:
- * <ul>
- * <li>Write a correct key, command and argument in EEFC_FCR. </li>
- * <li>Or, Use IAP (In Application Programming) function which is executed from
- * ROM directly, this allows flash programming to be done by code running in flash.</li>
- * <li>Once the command is achieved, it can be detected even by polling EEFC_FSR or interrupt.
- * </ul>
- *
- * The command argument could be a page number,GPNVM number or nothing, it depends on
- * the command itself. Some useful functions in this driver could help user tranlate physical
- * flash address into a page number and vice verse.
- *
- * For more accurate information, please look at the EEFC section of the
- * Datasheet.
- *
- * Related files :\n
- * \ref efc.c\n
- * \ref efc.h.\n
-*/
-/*@{*/
-/*@}*/
-
-
-/**
- * \file
- *
- * Implementation of Enhanced Embedded Flash Controller (EEFC).
- *
- */
-
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-#include "chip.h"
-#include "efc.h"
-
-#include <assert.h>
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Enables the flash ready interrupt source on the EEFC peripheral.
- *
- * \param efc  Pointer to a Efc instance
- */
-extern void EFC_EnableFrdyIt( Efc* efc )
-{
-    efc->EEFC_FMR |= EEFC_FMR_FRDY ;
-}
-
-/**
- * \brief Disables the flash ready interrupt source on the EEFC peripheral.
- *
- * \param efc  Pointer to a Efc instance
- */
-
-extern void EFC_DisableFrdyIt( Efc* efc )
-{
-    efc->EEFC_FMR &= ~((uint32_t)EEFC_FMR_FRDY) ;
-}
-
-
-/**
- * \brief Set read/write wait state on the EEFC perpherial.
- *
- * \param efc  Pointer to a Efc instance
- * \param cycles  the number of wait states in cycle.
- */
-
-extern void EFC_SetWaitState( Efc* efc, uint8_t ucCycles )
-{
-    uint32_t dwValue ;
-
-    dwValue = efc->EEFC_FMR ;
-    dwValue &= ~((uint32_t)EEFC_FMR_FWS_Msk) ;
-    dwValue |= EEFC_FMR_FWS(ucCycles);
-    efc->EEFC_FMR = dwValue ;
-}
-
-/**
- * \brief Returns the current status of the EEFC.
- *
- * \note Keep in mind that this function clears the value of some status bits (LOCKE, PROGE).
- *
- * \param efc  Pointer to a Efc instance
- */
-extern uint32_t EFC_GetStatus( Efc* efc )
-{
-    return efc->EEFC_FSR ;
-}
-
-/**
- * \brief Returns the result of the last executed command.
- *
- * \param efc  Pointer to a Efc instance
- */
-extern uint32_t EFC_GetResult( Efc* efc )
-{
-    return efc->EEFC_FRR ;
-}
-
-/**
- * \brief Translates the given address page and offset values.
- * \note The resulting values are stored in the provided variables if they are not null.
- *
- * \param efc  Pointer to a Efc instance
- * \param address  Address to translate.
- * \param pPage  First page accessed.
- * \param pOffset  Byte offset in first page.
- */
-extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwPage, uint16_t* pwOffset )
-{
-    Efc *pEfc ;
-    uint16_t wPage ;
-    uint16_t wOffset ;
-
-    assert( dwAddress >= IFLASH_ADDR ) ;
-    assert( dwAddress <= (IFLASH_ADDR + IFLASH_SIZE) ) ;
-
-    pEfc = EFC ;
-    wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
-    wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
-
-    TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
-    /* Store values */
-    if ( pEfc )
-    {
-        *ppEfc = pEfc ;
-    }
-
-    if ( pwPage )
-    {
-        *pwPage = wPage ;
-    }
-
-    if ( pwOffset )
-    {
-        *pwOffset = wOffset ;
-    }
-}
-
-/**
- * \brief Computes the address of a flash access given the page and offset.
- *
- * \param efc  Pointer to a Efc instance
- * \param page  Page number.
- * \param offset  Byte offset inside page.
- * \param pAddress  Computed address (optional).
- */
-extern void EFC_ComputeAddress( Efc *efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress )
-{
-    uint32_t dwAddress ;
-	
-    assert( efc ) ;
-    assert( wPage <= IFLASH_NB_OF_PAGES ) ;
-    assert( wOffset < IFLASH_PAGE_SIZE ) ;
-	
-    /* Compute address */
-    dwAddress = IFLASH_ADDR + wPage * IFLASH_PAGE_SIZE + wOffset ;
-	
-    /* Store result */
-    if ( pdwAddress != NULL )
-	{
-        *pdwAddress = dwAddress ;
-    }
-}
-
-/**
- * \brief Starts the executing the given command on the EEFC and returns as soon as the command is started.
- *
- * \note It does NOT set the FMCN field automatically.
- * \param efc  Pointer to a Efc instance
- * \param command  Command to execute.
- * \param argument  Command argument (should be 0 if not used).
- */
-extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument )
-{
-    /* Check command & argument */
-    switch ( dwCommand )
-    {
-        case EFC_FCMD_WP:
-        case EFC_FCMD_WPL:
-        case EFC_FCMD_EWP:
-        case EFC_FCMD_EWPL:
-        case EFC_FCMD_SLB:
-        case EFC_FCMD_CLB:
-            assert( dwArgument < IFLASH_NB_OF_PAGES ) ;
-        break ;
-
-        case EFC_FCMD_SFB:
-        case EFC_FCMD_CFB:
-            assert( dwArgument < 2 ) ;
-        break;
-
-        case EFC_FCMD_GETD:
-        case EFC_FCMD_EA:
-        case EFC_FCMD_GLB:
-        case EFC_FCMD_GFB:
-        case EFC_FCMD_STUI:
-            assert( dwArgument == 0 ) ;
-        break;
-
-        default: assert( 0 ) ;
-    }
-
-    /* Start command Embedded flash */
-    assert( (efc->EEFC_FSR & EEFC_FMR_FRDY) == EEFC_FMR_FRDY ) ;
-    efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
-}
-
-/**
- * \brief Performs the given command and wait until its completion (or an error).
- *
- * \param efc  Pointer to a Efc instance
- * \param command  Command to perform.
- * \param argument  Optional command argument.
- *
- * \return 0 if successful, otherwise returns an error code.
- */
-
-extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP )
-{
-    if ( dwUseIAP != 0 )
-    {
-        /* Pointer on IAP function in ROM */
-        static uint32_t (*IAP_PerformCommand)( uint32_t, uint32_t ) ;
-
-        IAP_PerformCommand = (uint32_t (*)( uint32_t, uint32_t )) *((uint32_t*)CHIP_FLASH_IAP_ADDRESS ) ;
-        IAP_PerformCommand( 0, EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ) ;
-
-        return (efc->EEFC_FSR & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE)) ;
-    }
-    else
-    {
-        uint32_t dwStatus ;
-
-        efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
-        do
-        {
-            dwStatus = efc->EEFC_FSR ;
-        }
-        while ( (dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ;
-
-        return ( dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE) ) ;
-    }
-}
-
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/** \addtogroup efc_module Working with EEFC
+ * The EEFC driver provides the interface to configure and use the EEFC
+ * peripheral.
+ *
+ * The user needs to set the number of wait states depending on the frequency used.\n
+ * Configure number of cycles for flash read/write operations in the FWS field of EEFC_FMR.
+ *
+ * It offers a function to send flash command to EEFC and waits for the
+ * flash to be ready.
+ *
+ * To send flash command, the user could do in either of following way:
+ * <ul>
+ * <li>Write a correct key, command and argument in EEFC_FCR. </li>
+ * <li>Or, Use IAP (In Application Programming) function which is executed from
+ * ROM directly, this allows flash programming to be done by code running in flash.</li>
+ * <li>Once the command is achieved, it can be detected even by polling EEFC_FSR or interrupt.
+ * </ul>
+ *
+ * The command argument could be a page number,GPNVM number or nothing, it depends on
+ * the command itself. Some useful functions in this driver could help user tranlate physical
+ * flash address into a page number and vice verse.
+ *
+ * For more accurate information, please look at the EEFC section of the
+ * Datasheet.
+ *
+ * Related files :\n
+ * \ref efc.c\n
+ * \ref efc.h.\n
+*/
+/*@{*/
+/*@}*/
+
+
+/**
+ * \file
+ *
+ * Implementation of Enhanced Embedded Flash Controller (EEFC).
+ *
+ */
+
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+#include "chip.h"
+#include "efc.h"
+
+#include <assert.h>
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Enables the flash ready interrupt source on the EEFC peripheral.
+ *
+ * \param efc  Pointer to a Efc instance
+ */
+extern void EFC_EnableFrdyIt( Efc* efc )
+{
+    efc->EEFC_FMR |= EEFC_FMR_FRDY ;
+}
+
+/**
+ * \brief Disables the flash ready interrupt source on the EEFC peripheral.
+ *
+ * \param efc  Pointer to a Efc instance
+ */
+
+extern void EFC_DisableFrdyIt( Efc* efc )
+{
+    efc->EEFC_FMR &= ~((uint32_t)EEFC_FMR_FRDY) ;
+}
+
+
+/**
+ * \brief Set read/write wait state on the EEFC perpherial.
+ *
+ * \param efc  Pointer to a Efc instance
+ * \param cycles  the number of wait states in cycle.
+ */
+
+extern void EFC_SetWaitState( Efc* efc, uint8_t ucCycles )
+{
+    uint32_t dwValue ;
+
+    dwValue = efc->EEFC_FMR ;
+    dwValue &= ~((uint32_t)EEFC_FMR_FWS_Msk) ;
+    dwValue |= EEFC_FMR_FWS(ucCycles);
+    efc->EEFC_FMR = dwValue ;
+}
+
+/**
+ * \brief Returns the current status of the EEFC.
+ *
+ * \note Keep in mind that this function clears the value of some status bits (LOCKE, PROGE).
+ *
+ * \param efc  Pointer to a Efc instance
+ */
+extern uint32_t EFC_GetStatus( Efc* efc )
+{
+    return efc->EEFC_FSR ;
+}
+
+/**
+ * \brief Returns the result of the last executed command.
+ *
+ * \param efc  Pointer to a Efc instance
+ */
+extern uint32_t EFC_GetResult( Efc* efc )
+{
+    return efc->EEFC_FRR ;
+}
+
+/**
+ * \brief Translates the given address page and offset values.
+ * \note The resulting values are stored in the provided variables if they are not null.
+ *
+ * \param efc  Pointer to a Efc instance
+ * \param address  Address to translate.
+ * \param pPage  First page accessed.
+ * \param pOffset  Byte offset in first page.
+ */
+extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwPage, uint16_t* pwOffset )
+{
+    Efc *pEfc ;
+    uint16_t wPage ;
+    uint16_t wOffset ;
+
+    assert( dwAddress >= IFLASH_ADDR ) ;
+    assert( dwAddress <= (IFLASH_ADDR + IFLASH_SIZE) ) ;
+
+    pEfc = EFC ;
+    wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
+    wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
+
+    TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
+    /* Store values */
+    if ( pEfc )
+    {
+        *ppEfc = pEfc ;
+    }
+
+    if ( pwPage )
+    {
+        *pwPage = wPage ;
+    }
+
+    if ( pwOffset )
+    {
+        *pwOffset = wOffset ;
+    }
+}
+
+/**
+ * \brief Computes the address of a flash access given the page and offset.
+ *
+ * \param efc  Pointer to a Efc instance
+ * \param page  Page number.
+ * \param offset  Byte offset inside page.
+ * \param pAddress  Computed address (optional).
+ */
+extern void EFC_ComputeAddress( Efc *efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress )
+{
+    uint32_t dwAddress ;
+	
+    assert( efc ) ;
+    assert( wPage <= IFLASH_NB_OF_PAGES ) ;
+    assert( wOffset < IFLASH_PAGE_SIZE ) ;
+	
+    /* Compute address */
+    dwAddress = IFLASH_ADDR + wPage * IFLASH_PAGE_SIZE + wOffset ;
+	
+    /* Store result */
+    if ( pdwAddress != NULL )
+	{
+        *pdwAddress = dwAddress ;
+    }
+}
+
+/**
+ * \brief Starts the executing the given command on the EEFC and returns as soon as the command is started.
+ *
+ * \note It does NOT set the FMCN field automatically.
+ * \param efc  Pointer to a Efc instance
+ * \param command  Command to execute.
+ * \param argument  Command argument (should be 0 if not used).
+ */
+extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument )
+{
+    /* Check command & argument */
+    switch ( dwCommand )
+    {
+        case EFC_FCMD_WP:
+        case EFC_FCMD_WPL:
+        case EFC_FCMD_EWP:
+        case EFC_FCMD_EWPL:
+        case EFC_FCMD_SLB:
+        case EFC_FCMD_CLB:
+            assert( dwArgument < IFLASH_NB_OF_PAGES ) ;
+        break ;
+
+        case EFC_FCMD_SFB:
+        case EFC_FCMD_CFB:
+            assert( dwArgument < 2 ) ;
+        break;
+
+        case EFC_FCMD_GETD:
+        case EFC_FCMD_EA:
+        case EFC_FCMD_GLB:
+        case EFC_FCMD_GFB:
+        case EFC_FCMD_STUI:
+            assert( dwArgument == 0 ) ;
+        break;
+
+        default: assert( 0 ) ;
+    }
+
+    /* Start command Embedded flash */
+    assert( (efc->EEFC_FSR & EEFC_FMR_FRDY) == EEFC_FMR_FRDY ) ;
+    efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
+}
+
+/**
+ * \brief Performs the given command and wait until its completion (or an error).
+ *
+ * \param efc  Pointer to a Efc instance
+ * \param command  Command to perform.
+ * \param argument  Optional command argument.
+ *
+ * \return 0 if successful, otherwise returns an error code.
+ */
+
+extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP )
+{
+    if ( dwUseIAP != 0 )
+    {
+        /* Pointer on IAP function in ROM */
+        static uint32_t (*IAP_PerformCommand)( uint32_t, uint32_t ) ;
+
+        IAP_PerformCommand = (uint32_t (*)( uint32_t, uint32_t )) *((uint32_t*)CHIP_FLASH_IAP_ADDRESS ) ;
+        IAP_PerformCommand( 0, EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ) ;
+
+        return (efc->EEFC_FSR & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE)) ;
+    }
+    else
+    {
+        uint32_t dwStatus ;
+
+        efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
+        do
+        {
+            dwStatus = efc->EEFC_FSR ;
+        }
+        while ( (dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ;
+
+        return ( dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE) ) ;
+    }
+}
+
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio.c

@@ -1,453 +1,453 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2010, 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.
- * ----------------------------------------------------------------------------
- */
-
-/** \file */
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-#include "chip.h"
-#include "pio.h"
-#include "pmc.h"
-
-/*----------------------------------------------------------------------------
- *        Local functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral A. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
- */
-static void PIO_SetPeripheralA(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char enablePullUp)
-{
-    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
-
-    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
-        pio->PIO_PUER = mask;
-    }
-    else {
-
-        pio->PIO_PUDR = mask;
-    }
-
-    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
-    pio->PIO_PDR = mask;
-}
-
-/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral B. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
- */
-static void PIO_SetPeripheralB(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char enablePullUp)
-{
-    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
-
-    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
-
-        pio->PIO_PUER = mask;
-    }
-    else {
-
-        pio->PIO_PUDR = mask;
-    }
-
-    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] = (mask | abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
-
-    pio->PIO_PDR = mask;
-}
-
-/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral C. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
- */
-static void PIO_SetPeripheralC(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char enablePullUp)
-{
-    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
-
-    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
-
-        pio->PIO_PUER = mask;
-    }
-    else {
-
-        pio->PIO_PUDR = mask;
-    }
-
-    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] = (mask | abcdsr);
-
-    pio->PIO_PDR = mask;
-}
-
-/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral D. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
- */
-static void PIO_SetPeripheralD(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char enablePullUp)
-{
-    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
-
-    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
-
-        pio->PIO_PUER = mask;
-    }
-    else {
-
-        pio->PIO_PUDR = mask;
-    }
-
-    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] = (mask | abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] = (mask | abcdsr);
-
-    pio->PIO_PDR = mask;
-}
-
-/**
- * \brief Configures one or more pin(s) or a PIO controller as inputs. Optionally,
- * the corresponding internal pull-up(s) and glitch filter(s) can be enabled.
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask indicating which pin(s) to configure as input(s).
- * \param enablePullUp  Indicates if the internal pull-up(s) must be enabled.
- * \param enableFilter  Indicates if the glitch filter(s) must be enabled.
- */
-static void PIO_SetInput(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char attribute)
-{
-    /* Disable interrupts */
-    pio->PIO_IDR = mask;
-
-    /* Enable pull-up(s) if necessary */
-    if (attribute & PIO_PULLUP)
-        pio->PIO_PUER = mask;
-    else
-        pio->PIO_PUDR = mask;
-
-    /* Enable Input Filter if necessary */
-    if (attribute & (PIO_DEGLITCH | PIO_DEBOUNCE))
-        pio->PIO_IFER = mask;
-    else
-        pio->PIO_IFDR = mask;
-
-    /* Enable de-glitch or de-bounce if necessary */
-    if (attribute & PIO_DEGLITCH)
-    {
-        pio->PIO_IFSCDR = mask;
-    }
-    else
-    {
-        if (attribute & PIO_DEBOUNCE)
-        {
-            pio->PIO_IFSCER = mask;
-        }
-    }
-
-    /* Configure pin as input */
-    pio->PIO_ODR = mask;
-    pio->PIO_PER = mask;
-}
-
-/**
- * \brief Configures one or more pin(s) of a PIO controller as outputs, with the
- * given default value. Optionally, the multi-drive feature can be enabled
- * on the pin(s).
- *
- * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask indicating which pin(s) to configure.
- * \param defaultValue  Default level on the pin(s).
- * \param enableMultiDrive  Indicates if the pin(s) shall be configured as
- *                          open-drain.
- * \param enablePullUp  Indicates if the pin shall have its pull-up activated.
- */
-static void PIO_SetOutput(
-    Pio *pio,
-    unsigned int mask,
-    unsigned char defaultValue,
-    unsigned char enableMultiDrive,
-    unsigned char enablePullUp)
-{
-    /* Disable interrupts */
-    pio->PIO_IDR = mask;
-
-    /* Enable pull-up(s) if necessary */
-    if (enablePullUp) {
-
-        pio->PIO_PUER = mask;
-    }
-    else {
-
-        pio->PIO_PUDR = mask;
-    }
-
-    /* Enable multi-drive if necessary */
-    if (enableMultiDrive) {
-
-        pio->PIO_MDER = mask;
-    }
-    else {
-
-        pio->PIO_MDDR = mask;
-    }
-
-    /* Set default value */
-    if (defaultValue) {
-
-        pio->PIO_SODR = mask;
-    }
-    else {
-
-        pio->PIO_CODR = mask;
-    }
-
-    /* Configure pin(s) as output(s) */
-    pio->PIO_OER = mask;
-    pio->PIO_PER = mask;
-}
-
-/*----------------------------------------------------------------------------
- *         Global functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Configures a list of Pin instances, each of which can either hold a single
- * pin or a group of pins, depending on the mask value; all pins are configured
- * by this function. The size of the array must also be provided and is easily
- * computed using PIO_LISTSIZE whenever its length is not known in advance.
- *
- * \param list  Pointer to a list of Pin instances.
- * \param size  Size of the Pin list (calculated using PIO_LISTSIZE).
- *
- * \return 1 if the pins have been configured properly; otherwise 0.
- */
-uint8_t PIO_Configure( const Pin *list, uint32_t size )
-{
-    /* Configure pins */
-    while ( size > 0 )
-    {
-        switch ( list->type )
-        {
-
-            case PIO_PERIPH_A:
-                PIO_SetPeripheralA(list->pio,
-                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
-
-            case PIO_PERIPH_B:
-                PIO_SetPeripheralB(list->pio,
-                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
-
-            case PIO_PERIPH_C:
-                PIO_SetPeripheralC(list->pio,
-                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
-
-            case PIO_PERIPH_D:
-                PIO_SetPeripheralD(list->pio,
-                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
-            case PIO_INPUT:
-                PMC_EnablePeripheral(list->id);
-                PIO_SetInput(list->pio,
-                             list->mask,
-                             list->attribute);
-                break;
-
-            case PIO_OUTPUT_0:
-            case PIO_OUTPUT_1:
-                PIO_SetOutput(list->pio,
-                              list->mask,
-                              (list->type == PIO_OUTPUT_1),
-                              (list->attribute & PIO_OPENDRAIN) ? 1 : 0,
-                              (list->attribute & PIO_PULLUP) ? 1 : 0);
-                break;
-
-            default: return 0;
-        }
-
-        list++;
-        size--;
-    }
-
-    return 1;
-}
-
-/**
- * \brief Sets a high output level on all the PIOs defined in the given Pin instance.
- * This has no immediate effects on PIOs that are not output, but the PIO
- * controller will memorize the value they are changed to outputs.
- *
- * \param pin  Pointer to a Pin instance describing one or more pins.
- */
-void PIO_Set(const Pin *pin)
-{
-    pin->pio->PIO_SODR = pin->mask;
-}
-
-/**
- * \brief Sets a low output level on all the PIOs defined in the given Pin instance.
- * This has no immediate effects on PIOs that are not output, but the PIO
- * controller will memorize the value they are changed to outputs.
- *
- * \param pin  Pointer to a Pin instance describing one or more pins.
- */
-void PIO_Clear(const Pin *pin)
-{
-    pin->pio->PIO_CODR = pin->mask;
-}
-
-/**
- * \brief Returns 1 if one or more PIO of the given Pin instance currently have
- * a high level; otherwise returns 0. This method returns the actual value that
- * is being read on the pin. To return the supposed output value of a pin, use
- * PIO_GetOutputDataStatus() instead.
- *
- * \param pin  Pointer to a Pin instance describing one or more pins.
- *
- * \return 1 if the Pin instance contains at least one PIO that currently has
- * a high level; otherwise 0.
- */
-unsigned char PIO_Get( const Pin *pin )
-{
-    unsigned int reg ;
-
-    if ( (pin->type == PIO_OUTPUT_0) || (pin->type == PIO_OUTPUT_1) )
-    {
-        reg = pin->pio->PIO_ODSR ;
-    }
-    else
-    {
-        reg = pin->pio->PIO_PDSR ;
-    }
-
-    if ( (reg & pin->mask) == 0 )
-    {
-        return 0 ;
-    }
-    else
-    {
-        return 1 ;
-    }
-}
-
-/**
- * \brief Returns 1 if one or more PIO of the given Pin are configured to output a
- * high level (even if they are not output).
- * To get the actual value of the pin, use PIO_Get() instead.
- *
- * \param pin  Pointer to a Pin instance describing one or more pins.
- *
- * \return 1 if the Pin instance contains at least one PIO that is configured
- * to output a high level; otherwise 0.
- */
-unsigned char PIO_GetOutputDataStatus(const Pin *pin)
-{
-    if ((pin->pio->PIO_ODSR & pin->mask) == 0) {
-
-        return 0;
-    }
-    else {
-
-        return 1;
-    }
-}
-
-/*
- * \brief Configures Glitch or Debouncing filter for input.
- *
- * \param pin  Pointer to a Pin instance describing one or more pins.
- * \param cuttoff  Cutt off frequency for debounce filter.
- */
-void PIO_SetDebounceFilter( const Pin *pin, uint32_t cuttoff )
-{
-    Pio *pio = pin->pio;
-
-    pio->PIO_IFSCER = pin->mask; /* set Debouncing, 0 bit field no effect */
-    pio->PIO_SCDR = ((32678/(2*(cuttoff))) - 1) & 0x3FFF; /* the lowest 14 bits work */
-}
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2010, 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.
+ * ----------------------------------------------------------------------------
+ */
+
+/** \file */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+#include "chip.h"
+#include "pio.h"
+#include "pmc.h"
+
+/*----------------------------------------------------------------------------
+ *        Local functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * peripheral A. Optionally, the corresponding internal pull-up(s) can be enabled.
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ *                      configured.
+ */
+static void PIO_SetPeripheralA(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char enablePullUp)
+{
+    unsigned int abcdsr;
+    /* Disable interrupts on the pin(s) */
+    pio->PIO_IDR = mask;
+
+    /* Enable the pull-up(s) if necessary */
+    if (enablePullUp) {
+        pio->PIO_PUER = mask;
+    }
+    else {
+
+        pio->PIO_PUDR = mask;
+    }
+
+    abcdsr = pio->PIO_ABCDSR[0];
+    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
+    abcdsr = pio->PIO_ABCDSR[1];
+    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
+    pio->PIO_PDR = mask;
+}
+
+/**
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * peripheral B. Optionally, the corresponding internal pull-up(s) can be enabled.
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ *                      configured.
+ */
+static void PIO_SetPeripheralB(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char enablePullUp)
+{
+    unsigned int abcdsr;
+    /* Disable interrupts on the pin(s) */
+    pio->PIO_IDR = mask;
+
+    /* Enable the pull-up(s) if necessary */
+    if (enablePullUp) {
+
+        pio->PIO_PUER = mask;
+    }
+    else {
+
+        pio->PIO_PUDR = mask;
+    }
+
+    abcdsr = pio->PIO_ABCDSR[0];
+    pio->PIO_ABCDSR[0] = (mask | abcdsr);
+    abcdsr = pio->PIO_ABCDSR[1];
+    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
+
+    pio->PIO_PDR = mask;
+}
+
+/**
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * peripheral C. Optionally, the corresponding internal pull-up(s) can be enabled.
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ *                      configured.
+ */
+static void PIO_SetPeripheralC(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char enablePullUp)
+{
+    unsigned int abcdsr;
+    /* Disable interrupts on the pin(s) */
+    pio->PIO_IDR = mask;
+
+    /* Enable the pull-up(s) if necessary */
+    if (enablePullUp) {
+
+        pio->PIO_PUER = mask;
+    }
+    else {
+
+        pio->PIO_PUDR = mask;
+    }
+
+    abcdsr = pio->PIO_ABCDSR[0];
+    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
+    abcdsr = pio->PIO_ABCDSR[1];
+    pio->PIO_ABCDSR[1] = (mask | abcdsr);
+
+    pio->PIO_PDR = mask;
+}
+
+/**
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * peripheral D. Optionally, the corresponding internal pull-up(s) can be enabled.
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ *                      configured.
+ */
+static void PIO_SetPeripheralD(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char enablePullUp)
+{
+    unsigned int abcdsr;
+    /* Disable interrupts on the pin(s) */
+    pio->PIO_IDR = mask;
+
+    /* Enable the pull-up(s) if necessary */
+    if (enablePullUp) {
+
+        pio->PIO_PUER = mask;
+    }
+    else {
+
+        pio->PIO_PUDR = mask;
+    }
+
+    abcdsr = pio->PIO_ABCDSR[0];
+    pio->PIO_ABCDSR[0] = (mask | abcdsr);
+    abcdsr = pio->PIO_ABCDSR[1];
+    pio->PIO_ABCDSR[1] = (mask | abcdsr);
+
+    pio->PIO_PDR = mask;
+}
+
+/**
+ * \brief Configures one or more pin(s) or a PIO controller as inputs. Optionally,
+ * the corresponding internal pull-up(s) and glitch filter(s) can be enabled.
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask indicating which pin(s) to configure as input(s).
+ * \param enablePullUp  Indicates if the internal pull-up(s) must be enabled.
+ * \param enableFilter  Indicates if the glitch filter(s) must be enabled.
+ */
+static void PIO_SetInput(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char attribute)
+{
+    /* Disable interrupts */
+    pio->PIO_IDR = mask;
+
+    /* Enable pull-up(s) if necessary */
+    if (attribute & PIO_PULLUP)
+        pio->PIO_PUER = mask;
+    else
+        pio->PIO_PUDR = mask;
+
+    /* Enable Input Filter if necessary */
+    if (attribute & (PIO_DEGLITCH | PIO_DEBOUNCE))
+        pio->PIO_IFER = mask;
+    else
+        pio->PIO_IFDR = mask;
+
+    /* Enable de-glitch or de-bounce if necessary */
+    if (attribute & PIO_DEGLITCH)
+    {
+        pio->PIO_IFSCDR = mask;
+    }
+    else
+    {
+        if (attribute & PIO_DEBOUNCE)
+        {
+            pio->PIO_IFSCER = mask;
+        }
+    }
+
+    /* Configure pin as input */
+    pio->PIO_ODR = mask;
+    pio->PIO_PER = mask;
+}
+
+/**
+ * \brief Configures one or more pin(s) of a PIO controller as outputs, with the
+ * given default value. Optionally, the multi-drive feature can be enabled
+ * on the pin(s).
+ *
+ * \param pio  Pointer to a PIO controller.
+ * \param mask  Bitmask indicating which pin(s) to configure.
+ * \param defaultValue  Default level on the pin(s).
+ * \param enableMultiDrive  Indicates if the pin(s) shall be configured as
+ *                          open-drain.
+ * \param enablePullUp  Indicates if the pin shall have its pull-up activated.
+ */
+static void PIO_SetOutput(
+    Pio *pio,
+    unsigned int mask,
+    unsigned char defaultValue,
+    unsigned char enableMultiDrive,
+    unsigned char enablePullUp)
+{
+    /* Disable interrupts */
+    pio->PIO_IDR = mask;
+
+    /* Enable pull-up(s) if necessary */
+    if (enablePullUp) {
+
+        pio->PIO_PUER = mask;
+    }
+    else {
+
+        pio->PIO_PUDR = mask;
+    }
+
+    /* Enable multi-drive if necessary */
+    if (enableMultiDrive) {
+
+        pio->PIO_MDER = mask;
+    }
+    else {
+
+        pio->PIO_MDDR = mask;
+    }
+
+    /* Set default value */
+    if (defaultValue) {
+
+        pio->PIO_SODR = mask;
+    }
+    else {
+
+        pio->PIO_CODR = mask;
+    }
+
+    /* Configure pin(s) as output(s) */
+    pio->PIO_OER = mask;
+    pio->PIO_PER = mask;
+}
+
+/*----------------------------------------------------------------------------
+ *         Global functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Configures a list of Pin instances, each of which can either hold a single
+ * pin or a group of pins, depending on the mask value; all pins are configured
+ * by this function. The size of the array must also be provided and is easily
+ * computed using PIO_LISTSIZE whenever its length is not known in advance.
+ *
+ * \param list  Pointer to a list of Pin instances.
+ * \param size  Size of the Pin list (calculated using PIO_LISTSIZE).
+ *
+ * \return 1 if the pins have been configured properly; otherwise 0.
+ */
+uint8_t PIO_Configure( const Pin *list, uint32_t size )
+{
+    /* Configure pins */
+    while ( size > 0 )
+    {
+        switch ( list->type )
+        {
+
+            case PIO_PERIPH_A:
+                PIO_SetPeripheralA(list->pio,
+                                   list->mask,
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+            break;
+
+            case PIO_PERIPH_B:
+                PIO_SetPeripheralB(list->pio,
+                                   list->mask,
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+            break;
+
+            case PIO_PERIPH_C:
+                PIO_SetPeripheralC(list->pio,
+                                   list->mask,
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+            break;
+
+            case PIO_PERIPH_D:
+                PIO_SetPeripheralD(list->pio,
+                                   list->mask,
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+            break;
+            case PIO_INPUT:
+                PMC_EnablePeripheral(list->id);
+                PIO_SetInput(list->pio,
+                             list->mask,
+                             list->attribute);
+                break;
+
+            case PIO_OUTPUT_0:
+            case PIO_OUTPUT_1:
+                PIO_SetOutput(list->pio,
+                              list->mask,
+                              (list->type == PIO_OUTPUT_1),
+                              (list->attribute & PIO_OPENDRAIN) ? 1 : 0,
+                              (list->attribute & PIO_PULLUP) ? 1 : 0);
+                break;
+
+            default: return 0;
+        }
+
+        list++;
+        size--;
+    }
+
+    return 1;
+}
+
+/**
+ * \brief Sets a high output level on all the PIOs defined in the given Pin instance.
+ * This has no immediate effects on PIOs that are not output, but the PIO
+ * controller will memorize the value they are changed to outputs.
+ *
+ * \param pin  Pointer to a Pin instance describing one or more pins.
+ */
+void PIO_Set(const Pin *pin)
+{
+    pin->pio->PIO_SODR = pin->mask;
+}
+
+/**
+ * \brief Sets a low output level on all the PIOs defined in the given Pin instance.
+ * This has no immediate effects on PIOs that are not output, but the PIO
+ * controller will memorize the value they are changed to outputs.
+ *
+ * \param pin  Pointer to a Pin instance describing one or more pins.
+ */
+void PIO_Clear(const Pin *pin)
+{
+    pin->pio->PIO_CODR = pin->mask;
+}
+
+/**
+ * \brief Returns 1 if one or more PIO of the given Pin instance currently have
+ * a high level; otherwise returns 0. This method returns the actual value that
+ * is being read on the pin. To return the supposed output value of a pin, use
+ * PIO_GetOutputDataStatus() instead.
+ *
+ * \param pin  Pointer to a Pin instance describing one or more pins.
+ *
+ * \return 1 if the Pin instance contains at least one PIO that currently has
+ * a high level; otherwise 0.
+ */
+unsigned char PIO_Get( const Pin *pin )
+{
+    unsigned int reg ;
+
+    if ( (pin->type == PIO_OUTPUT_0) || (pin->type == PIO_OUTPUT_1) )
+    {
+        reg = pin->pio->PIO_ODSR ;
+    }
+    else
+    {
+        reg = pin->pio->PIO_PDSR ;
+    }
+
+    if ( (reg & pin->mask) == 0 )
+    {
+        return 0 ;
+    }
+    else
+    {
+        return 1 ;
+    }
+}
+
+/**
+ * \brief Returns 1 if one or more PIO of the given Pin are configured to output a
+ * high level (even if they are not output).
+ * To get the actual value of the pin, use PIO_Get() instead.
+ *
+ * \param pin  Pointer to a Pin instance describing one or more pins.
+ *
+ * \return 1 if the Pin instance contains at least one PIO that is configured
+ * to output a high level; otherwise 0.
+ */
+unsigned char PIO_GetOutputDataStatus(const Pin *pin)
+{
+    if ((pin->pio->PIO_ODSR & pin->mask) == 0) {
+
+        return 0;
+    }
+    else {
+
+        return 1;
+    }
+}
+
+/*
+ * \brief Configures Glitch or Debouncing filter for input.
+ *
+ * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param cuttoff  Cutt off frequency for debounce filter.
+ */
+void PIO_SetDebounceFilter( const Pin *pin, uint32_t cuttoff )
+{
+    Pio *pio = pin->pio;
+
+    pio->PIO_IFSCER = pin->mask; /* set Debouncing, 0 bit field no effect */
+    pio->PIO_SCDR = ((32678/(2*(cuttoff))) - 1) & 0x3FFF; /* the lowest 14 bits work */
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c

@@ -1,315 +1,315 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/*
- * \file
- */
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "chip.h"
-
-#include <assert.h>
-
-/*----------------------------------------------------------------------------
- *        Local definitions
- *----------------------------------------------------------------------------*/
-
-/* Maximum number of interrupt sources that can be defined. This
- * constant can be increased, but the current value is the smallest possible
- * that will be compatible with all existing projects. */
-#define MAX_INTERRUPT_SOURCES       7
-
-/*----------------------------------------------------------------------------
- *        Local types
- *----------------------------------------------------------------------------*/
-
-/**
- * Describes a PIO interrupt source, including the PIO instance triggering the
- * interrupt and the associated interrupt handler.
- */
-typedef struct _InterruptSource
-{
-    /* Pointer to the source pin instance. */
-    const Pin *pPin;
-
-    /* Interrupt handler. */
-    void (*handler)( const Pin* ) ;
-} InterruptSource ;
-
-/*----------------------------------------------------------------------------
- *        Local variables
- *----------------------------------------------------------------------------*/
-
-/* List of interrupt sources. */
-static InterruptSource _aIntSources[MAX_INTERRUPT_SOURCES] ;
-
-/* Number of currently defined interrupt sources. */
-static uint32_t _dwNumSources = 0;
-
-/*----------------------------------------------------------------------------
- *        Local Functions
- *----------------------------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
-/**
- * \brief Stub, to handling all PIO Capture interrupts, if not defined.
- */
-/*----------------------------------------------------------------------------*/
-extern WEAK void PIO_CaptureHandler( void )
-{
-}
-
-/**
- * \brief Handles all interrupts on the given PIO controller.
- * \param id  PIO controller ID.
- * \param pPio  PIO controller base address.
- */
-extern void PioInterruptHandler( uint32_t id, Pio *pPio )
-{
-    uint32_t status;
-    uint32_t i;
-
-    /* Read PIO controller status */
-    status = pPio->PIO_ISR;
-    status &= pPio->PIO_IMR;
-
-    /* Check pending events */
-    if ( status != 0 )
-    {
-        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
-
-        /* Find triggering source */
-        i = 0;
-        while ( status != 0 )
-        {
-            /* There cannot be an unconfigured source enabled. */
-            assert(i < _dwNumSources);
-
-            /* Source is configured on the same controller */
-            if (_aIntSources[i].pPin->id == id)
-            {
-                /* Source has PIOs whose statuses have changed */
-                if ( (status & _aIntSources[i].pPin->mask) != 0 )
-                {
-                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
-
-                    _aIntSources[i].handler(_aIntSources[i].pPin);
-                    status &= ~(_aIntSources[i].pPin->mask);
-                }
-            }
-            i++;
-        }
-    }
-}
-
-/*----------------------------------------------------------------------------
- *        Global Functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Parallel IO Controller A interrupt handler
- * \Redefined PIOA interrupt handler for NVIC interrupt table.
- */
-extern void PIOA_IrqHandler( void )
-{
-    if ( PIOA->PIO_PCISR != 0 )
-    {
-        PIO_CaptureHandler() ;
-    }
-
-    PioInterruptHandler( ID_PIOA, PIOA ) ;
-}
-
-/**
- * \brief Parallel IO Controller B interrupt handler
- * \Redefined PIOB interrupt handler for NVIC interrupt table.
- */
-extern void PIOB_IrqHandler( void )
-{
-    PioInterruptHandler( ID_PIOB, PIOB ) ;
-}
-
-/**
- * \brief Parallel IO Controller C interrupt handler
- * \Redefined PIOC interrupt handler for NVIC interrupt table.
- */
-extern void PIOC_IrqHandler( void )
-{
-    PioInterruptHandler( ID_PIOC, PIOC ) ;
-}
-
-/**
- * \brief Initializes the PIO interrupt management logic
- *
- * The desired priority of PIO interrupts must be provided.
- * Calling this function multiple times result in the reset of currently
- * configured interrupts.
- *
- * \param priority  PIO controller interrupts priority.
- */
-extern void PIO_InitializeInterrupts( uint32_t dwPriority )
-{
-    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
-
-    /* Reset sources */
-    _dwNumSources = 0 ;
-
-    /* Configure PIO interrupt sources */
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOA ) ;
-    PIOA->PIO_ISR ;
-    PIOA->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOA_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOA_IRQn ) ;
-    NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOA_IRQn ) ;
-
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOB ) ;
-    PIOB->PIO_ISR ;
-    PIOB->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOB_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOB_IRQn ) ;
-    NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOB_IRQn ) ;
-
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOC ) ;
-    PIOC->PIO_ISR ;
-    PIOC->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOC_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOC_IRQn ) ;
-    NVIC_SetPriority( PIOC_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOC_IRQn ) ;
-}
-
-/**
- * Configures a PIO or a group of PIO to generate an interrupt on status
- * change. The provided interrupt handler will be called with the triggering
- * pin as its parameter (enabling different pin instances to share the same
- * handler).
- * \param pPin  Pointer to a Pin instance.
- * \param handler  Interrupt handler function pointer.
- */
-extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
-{
-    Pio* pio ;
-    InterruptSource* pSource ;
-
-    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
-
-    assert( pPin ) ;
-    pio = pPin->pio ;
-    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
-
-    /* Define new source */
-    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
-
-    pSource = &(_aIntSources[_dwNumSources]) ;
-    pSource->pPin = pPin ;
-    pSource->handler = handler ;
-    _dwNumSources++ ;
-
-    /* PIO3 with additional interrupt support
-     * Configure additional interrupt mode registers */
-    if ( pPin->attribute & PIO_IT_AIME )
-    {
-        // enable additional interrupt mode
-        pio->PIO_AIMER       = pPin->mask ;
-
-        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
-        if ( pPin->attribute & PIO_IT_RE_OR_HL )
-        {
-            pio->PIO_REHLSR    = pPin->mask ;
-        }
-        else
-        {
-            pio->PIO_FELLSR     = pPin->mask;
-        }
-
-        /* if bit field of selected pin is 1, set as edge detection source */
-        if (pPin->attribute & PIO_IT_EDGE)
-            pio->PIO_ESR     = pPin->mask;
-        else
-            pio->PIO_LSR     = pPin->mask;
-    }
-    else
-    {
-        /* disable additional interrupt mode */
-        pio->PIO_AIMDR       = pPin->mask;
-    }
-}
-
-/**
- * Enables the given interrupt source if it has been configured. The status
- * register of the corresponding PIO controller is cleared prior to enabling
- * the interrupt.
- * \param pPin  Interrupt source to enable.
- */
-extern void PIO_EnableIt( const Pin *pPin )
-{
-    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
-
-    assert( pPin != NULL ) ;
-
-#ifndef NOASSERT
-    uint32_t i = 0;
-    uint32_t dwFound = 0;
-
-    while ( (i < _dwNumSources) && !dwFound )
-    {
-        if ( _aIntSources[i].pPin == pPin )
-        {
-            dwFound = 1 ;
-        }
-        i++ ;
-    }
-    assert( dwFound != 0 ) ;
-#endif
-
-    pPin->pio->PIO_ISR;
-    pPin->pio->PIO_IER = pPin->mask ;
-}
-
-/**
- * Disables a given interrupt source, with no added side effects.
- *
- * \param pPin  Interrupt source to disable.
- */
-extern void PIO_DisableIt( const Pin *pPin )
-{
-    assert( pPin != NULL ) ;
-
-    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
-
-    pPin->pio->PIO_IDR = pPin->mask;
-}
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/*
+ * \file
+ */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "chip.h"
+
+#include <assert.h>
+
+/*----------------------------------------------------------------------------
+ *        Local definitions
+ *----------------------------------------------------------------------------*/
+
+/* Maximum number of interrupt sources that can be defined. This
+ * constant can be increased, but the current value is the smallest possible
+ * that will be compatible with all existing projects. */
+#define MAX_INTERRUPT_SOURCES       7
+
+/*----------------------------------------------------------------------------
+ *        Local types
+ *----------------------------------------------------------------------------*/
+
+/**
+ * Describes a PIO interrupt source, including the PIO instance triggering the
+ * interrupt and the associated interrupt handler.
+ */
+typedef struct _InterruptSource
+{
+    /* Pointer to the source pin instance. */
+    const Pin *pPin;
+
+    /* Interrupt handler. */
+    void (*handler)( const Pin* ) ;
+} InterruptSource ;
+
+/*----------------------------------------------------------------------------
+ *        Local variables
+ *----------------------------------------------------------------------------*/
+
+/* List of interrupt sources. */
+static InterruptSource _aIntSources[MAX_INTERRUPT_SOURCES] ;
+
+/* Number of currently defined interrupt sources. */
+static uint32_t _dwNumSources = 0;
+
+/*----------------------------------------------------------------------------
+ *        Local Functions
+ *----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
+/**
+ * \brief Stub, to handling all PIO Capture interrupts, if not defined.
+ */
+/*----------------------------------------------------------------------------*/
+extern WEAK void PIO_CaptureHandler( void )
+{
+}
+
+/**
+ * \brief Handles all interrupts on the given PIO controller.
+ * \param id  PIO controller ID.
+ * \param pPio  PIO controller base address.
+ */
+extern void PioInterruptHandler( uint32_t id, Pio *pPio )
+{
+    uint32_t status;
+    uint32_t i;
+
+    /* Read PIO controller status */
+    status = pPio->PIO_ISR;
+    status &= pPio->PIO_IMR;
+
+    /* Check pending events */
+    if ( status != 0 )
+    {
+        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
+
+        /* Find triggering source */
+        i = 0;
+        while ( status != 0 )
+        {
+            /* There cannot be an unconfigured source enabled. */
+            assert(i < _dwNumSources);
+
+            /* Source is configured on the same controller */
+            if (_aIntSources[i].pPin->id == id)
+            {
+                /* Source has PIOs whose statuses have changed */
+                if ( (status & _aIntSources[i].pPin->mask) != 0 )
+                {
+                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
+
+                    _aIntSources[i].handler(_aIntSources[i].pPin);
+                    status &= ~(_aIntSources[i].pPin->mask);
+                }
+            }
+            i++;
+        }
+    }
+}
+
+/*----------------------------------------------------------------------------
+ *        Global Functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Parallel IO Controller A interrupt handler
+ * \Redefined PIOA interrupt handler for NVIC interrupt table.
+ */
+extern void PIOA_IrqHandler( void )
+{
+    if ( PIOA->PIO_PCISR != 0 )
+    {
+        PIO_CaptureHandler() ;
+    }
+
+    PioInterruptHandler( ID_PIOA, PIOA ) ;
+}
+
+/**
+ * \brief Parallel IO Controller B interrupt handler
+ * \Redefined PIOB interrupt handler for NVIC interrupt table.
+ */
+extern void PIOB_IrqHandler( void )
+{
+    PioInterruptHandler( ID_PIOB, PIOB ) ;
+}
+
+/**
+ * \brief Parallel IO Controller C interrupt handler
+ * \Redefined PIOC interrupt handler for NVIC interrupt table.
+ */
+extern void PIOC_IrqHandler( void )
+{
+    PioInterruptHandler( ID_PIOC, PIOC ) ;
+}
+
+/**
+ * \brief Initializes the PIO interrupt management logic
+ *
+ * The desired priority of PIO interrupts must be provided.
+ * Calling this function multiple times result in the reset of currently
+ * configured interrupts.
+ *
+ * \param priority  PIO controller interrupts priority.
+ */
+extern void PIO_InitializeInterrupts( uint32_t dwPriority )
+{
+    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
+
+    /* Reset sources */
+    _dwNumSources = 0 ;
+
+    /* Configure PIO interrupt sources */
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
+    PMC_EnablePeripheral( ID_PIOA ) ;
+    PIOA->PIO_ISR ;
+    PIOA->PIO_IDR = 0xFFFFFFFF ;
+    NVIC_DisableIRQ( PIOA_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOA_IRQn ) ;
+    NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
+    NVIC_EnableIRQ( PIOA_IRQn ) ;
+
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
+    PMC_EnablePeripheral( ID_PIOB ) ;
+    PIOB->PIO_ISR ;
+    PIOB->PIO_IDR = 0xFFFFFFFF ;
+    NVIC_DisableIRQ( PIOB_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOB_IRQn ) ;
+    NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
+    NVIC_EnableIRQ( PIOB_IRQn ) ;
+
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
+    PMC_EnablePeripheral( ID_PIOC ) ;
+    PIOC->PIO_ISR ;
+    PIOC->PIO_IDR = 0xFFFFFFFF ;
+    NVIC_DisableIRQ( PIOC_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOC_IRQn ) ;
+    NVIC_SetPriority( PIOC_IRQn, dwPriority ) ;
+    NVIC_EnableIRQ( PIOC_IRQn ) ;
+}
+
+/**
+ * Configures a PIO or a group of PIO to generate an interrupt on status
+ * change. The provided interrupt handler will be called with the triggering
+ * pin as its parameter (enabling different pin instances to share the same
+ * handler).
+ * \param pPin  Pointer to a Pin instance.
+ * \param handler  Interrupt handler function pointer.
+ */
+extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
+{
+    Pio* pio ;
+    InterruptSource* pSource ;
+
+    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
+
+    assert( pPin ) ;
+    pio = pPin->pio ;
+    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
+
+    /* Define new source */
+    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+
+    pSource = &(_aIntSources[_dwNumSources]) ;
+    pSource->pPin = pPin ;
+    pSource->handler = handler ;
+    _dwNumSources++ ;
+
+    /* PIO3 with additional interrupt support
+     * Configure additional interrupt mode registers */
+    if ( pPin->attribute & PIO_IT_AIME )
+    {
+        // enable additional interrupt mode
+        pio->PIO_AIMER       = pPin->mask ;
+
+        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
+        if ( pPin->attribute & PIO_IT_RE_OR_HL )
+        {
+            pio->PIO_REHLSR    = pPin->mask ;
+        }
+        else
+        {
+            pio->PIO_FELLSR     = pPin->mask;
+        }
+
+        /* if bit field of selected pin is 1, set as edge detection source */
+        if (pPin->attribute & PIO_IT_EDGE)
+            pio->PIO_ESR     = pPin->mask;
+        else
+            pio->PIO_LSR     = pPin->mask;
+    }
+    else
+    {
+        /* disable additional interrupt mode */
+        pio->PIO_AIMDR       = pPin->mask;
+    }
+}
+
+/**
+ * Enables the given interrupt source if it has been configured. The status
+ * register of the corresponding PIO controller is cleared prior to enabling
+ * the interrupt.
+ * \param pPin  Interrupt source to enable.
+ */
+extern void PIO_EnableIt( const Pin *pPin )
+{
+    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
+
+    assert( pPin != NULL ) ;
+
+#ifndef NOASSERT
+    uint32_t i = 0;
+    uint32_t dwFound = 0;
+
+    while ( (i < _dwNumSources) && !dwFound )
+    {
+        if ( _aIntSources[i].pPin == pPin )
+        {
+            dwFound = 1 ;
+        }
+        i++ ;
+    }
+    assert( dwFound != 0 ) ;
+#endif
+
+    pPin->pio->PIO_ISR;
+    pPin->pio->PIO_IER = pPin->mask ;
+}
+
+/**
+ * Disables a given interrupt source, with no added side effects.
+ *
+ * \param pPin  Interrupt source to disable.
+ */
+extern void PIO_DisableIt( const Pin *pPin )
+{
+    assert( pPin != NULL ) ;
+
+    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
+
+    pPin->pio->PIO_IDR = pPin->mask;
+}
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c

@@ -1,168 +1,168 @@
-/* ----------------------------------------------------------------------------
- *         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 "chip.h"
-#include "trace.h"
-
-#include <assert.h>
-
-/*----------------------------------------------------------------------------
- *        Local definitions
- *----------------------------------------------------------------------------*/
-
-#define MASK_STATUS0 0xFFFFFFFC
-#define MASK_STATUS1 0xFFFFFFFF
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Enables the clock of a peripheral. The peripheral ID is used
- * to identify which peripheral is targetted.
- *
- * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
- *
- * \param id  Peripheral ID (ID_xxx).
- */
-extern void PMC_EnablePeripheral( uint32_t dwId )
-{
-    assert( dwId < 35 ) ;
-
-    if ( dwId < 32 )
-    {
-        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
-        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
-        }
-        else
-        {
-            PMC->PMC_PCER0 = 1 << dwId ;
-        }
-    }
-    else
-    {
-        dwId -= 32;
-        if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
-        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
-        }
-        else
-        {
-            PMC->PMC_PCER1 = 1 << dwId ;
-        }
-    }
-}
-
-/**
- * \brief Disables the clock of a peripheral. The peripheral ID is used
- * to identify which peripheral is targetted.
- *
- * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
- *
- * \param id  Peripheral ID (ID_xxx).
- */
-extern void PMC_DisablePeripheral( uint32_t dwId )
-{
-    assert( dwId < 35 ) ;
-
-    if ( dwId < 32 )
-    {
-        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
-        {
-            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
-        }
-        else
-        {
-            PMC->PMC_PCDR0 = 1 << dwId ;
-        }
-    }
-    else
-    {
-        dwId -= 32 ;
-        if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
-        {
-            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
-        }
-        else
-        {
-            PMC->PMC_PCDR1 = 1 << dwId ;
-        }
-    }
-}
-
-/**
- * \brief Enable all the periph clock via PMC.
- */
-extern void PMC_EnableAllPeripherals( void )
-{
-    PMC->PMC_PCER0 = MASK_STATUS0 ;
-    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != MASK_STATUS0 ) ;
-
-    PMC->PMC_PCER1 = MASK_STATUS1 ;
-    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
-
-    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
-}
-
-/**
- * \brief Disable all the periph clock via PMC.
- */
-extern void PMC_DisableAllPeripherals( void )
-{
-    PMC->PMC_PCDR0 = MASK_STATUS0 ;
-    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != 0 ) ;
-
-    PMC->PMC_PCDR1 = MASK_STATUS1 ;
-    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
-
-    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
-}
-
-/**
- * \brief Get Periph Status for the given peripheral ID.
- *
- * \param id  Peripheral ID (ID_xxx).
- */
-extern uint32_t PMC_IsPeriphEnabled( uint32_t dwId )
-{
-    assert( dwId < 35 ) ;
-
-    if ( dwId < 32 )
-    {
-        return ( PMC->PMC_PCSR0 & (1 << dwId) ) ;
-    }
-    else {
-        return ( PMC->PMC_PCSR1 & (1 << (dwId - 32)) ) ;
-    }
-}
+/* ----------------------------------------------------------------------------
+ *         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 "chip.h"
+#include "trace.h"
+
+#include <assert.h>
+
+/*----------------------------------------------------------------------------
+ *        Local definitions
+ *----------------------------------------------------------------------------*/
+
+#define MASK_STATUS0 0xFFFFFFFC
+#define MASK_STATUS1 0xFFFFFFFF
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Enables the clock of a peripheral. The peripheral ID is used
+ * to identify which peripheral is targetted.
+ *
+ * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
+ *
+ * \param id  Peripheral ID (ID_xxx).
+ */
+extern void PMC_EnablePeripheral( uint32_t dwId )
+{
+    assert( dwId < 35 ) ;
+
+    if ( dwId < 32 )
+    {
+        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
+        {
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
+        }
+        else
+        {
+            PMC->PMC_PCER0 = 1 << dwId ;
+        }
+    }
+    else
+    {
+        dwId -= 32;
+        if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
+        {
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
+        }
+        else
+        {
+            PMC->PMC_PCER1 = 1 << dwId ;
+        }
+    }
+}
+
+/**
+ * \brief Disables the clock of a peripheral. The peripheral ID is used
+ * to identify which peripheral is targetted.
+ *
+ * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
+ *
+ * \param id  Peripheral ID (ID_xxx).
+ */
+extern void PMC_DisablePeripheral( uint32_t dwId )
+{
+    assert( dwId < 35 ) ;
+
+    if ( dwId < 32 )
+    {
+        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
+        {
+            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
+        }
+        else
+        {
+            PMC->PMC_PCDR0 = 1 << dwId ;
+        }
+    }
+    else
+    {
+        dwId -= 32 ;
+        if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
+        {
+            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
+        }
+        else
+        {
+            PMC->PMC_PCDR1 = 1 << dwId ;
+        }
+    }
+}
+
+/**
+ * \brief Enable all the periph clock via PMC.
+ */
+extern void PMC_EnableAllPeripherals( void )
+{
+    PMC->PMC_PCER0 = MASK_STATUS0 ;
+    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != MASK_STATUS0 ) ;
+
+    PMC->PMC_PCER1 = MASK_STATUS1 ;
+    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
+
+    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
+}
+
+/**
+ * \brief Disable all the periph clock via PMC.
+ */
+extern void PMC_DisableAllPeripherals( void )
+{
+    PMC->PMC_PCDR0 = MASK_STATUS0 ;
+    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != 0 ) ;
+
+    PMC->PMC_PCDR1 = MASK_STATUS1 ;
+    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
+
+    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
+}
+
+/**
+ * \brief Get Periph Status for the given peripheral ID.
+ *
+ * \param id  Peripheral ID (ID_xxx).
+ */
+extern uint32_t PMC_IsPeriphEnabled( uint32_t dwId )
+{
+    assert( dwId < 35 ) ;
+
+    if ( dwId < 32 )
+    {
+        return ( PMC->PMC_PCSR0 & (1 << dwId) ) ;
+    }
+    else {
+        return ( PMC->PMC_PCSR1 & (1 << (dwId - 32)) ) ;
+    }
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/spi.c

@@ -1,352 +1,352 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/** \addtogroup spi_module Working with SPI
- * The SPI driver provides the interface to configure and use the SPI
- * peripheral.
- *
- * The Serial Peripheral Interface (SPI) circuit is a synchronous serial
- * data link that provides communication with external devices in Master
- * or Slave Mode.
- *
- * To use the SPI, the user has to follow these few steps:
- * -# Enable the SPI pins required by the application (see pio.h).
- * -# Configure the SPI using the \ref SPI_Configure(). This enables the
- *    peripheral clock. The mode register is loaded with the given value.
- * -# Configure all the necessary chip selects with \ref SPI_ConfigureNPCS().
- * -# Enable the SPI by calling \ref SPI_Enable().
- * -# Send/receive data using \ref SPI_Write() and \ref SPI_Read(). Note that \ref SPI_Read()
- *    must be called after \ref SPI_Write() to retrieve the last value read.
- * -# Send/receive data using the PDC with the \ref SPI_WriteBuffer() and
- *    \ref SPI_ReadBuffer() functions.
- * -# Disable the SPI by calling \ref SPI_Disable().
- *
- * For more accurate information, please look at the SPI section of the
- * Datasheet.
- *
- * Related files :\n
- * \ref spi.c\n
- * \ref spi.h.\n
-*/
-/*@{*/
-/*@}*/
-
-/**
- * \file
- *
- * Implementation of Serial Peripheral Interface (SPI) controller.
- *
- */
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "chip.h"
-#include "pmc.h"
-#include "spi.h"
-
-#include <stdint.h>
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Enables a SPI peripheral.
- *
- * \param spi  Pointer to an Spi instance.
- */
-extern void SPI_Enable( Spi* spi )
-{
-    spi->SPI_CR = SPI_CR_SPIEN ;
-}
-
-/**
- * \brief Disables a SPI peripheral.
- *
- * \param spi  Pointer to an Spi instance.
- */
-extern void SPI_Disable( Spi* spi )
-{
-    spi->SPI_CR = SPI_CR_SPIDIS ;
-}
-
-/**
- * \brief Enables one or more interrupt sources of a SPI peripheral.
- *
- * \param spi  Pointer to an Spi instance.
- * \param sources Bitwise OR of selected interrupt sources.
- */
-extern void SPI_EnableIt( Spi* spi, uint32_t dwSources )
-{
-    spi->SPI_IER = dwSources ;
-}
-
-/**
- * \brief Disables one or more interrupt sources of a SPI peripheral.
- *
- * \param spi  Pointer to an Spi instance.
- * \param sources Bitwise OR of selected interrupt sources.
- */
-extern void SPI_DisableIt( Spi* spi, uint32_t dwSources )
-{
-    spi->SPI_IDR = dwSources ;
-}
-
-/**
- * \brief Configures a SPI peripheral as specified. The configuration can be computed
- * using several macros (see \ref spi_configuration_macros).
- *
- * \param spi  Pointer to an Spi instance.
- * \param id   Peripheral ID of the SPI.
- * \param configuration  Value of the SPI configuration register.
- */
-extern void SPI_Configure( Spi* spi, uint32_t dwId, uint32_t dwConfiguration )
-{
-    PMC_EnablePeripheral( dwId ) ;
-    spi->SPI_CR = SPI_CR_SPIDIS ;
-
-    /* Execute a software reset of the SPI twice */
-    spi->SPI_CR = SPI_CR_SWRST ;
-    spi->SPI_CR = SPI_CR_SWRST ;
-    spi->SPI_MR = dwConfiguration ;
-}
-
-
-/**
- * \brief Configures a chip select of a SPI peripheral. The chip select configuration
- * is computed using several macros (see \ref spi_configuration_macros).
- *
- * \param spi   Pointer to an Spi instance.
- * \param npcs  Chip select to configure (0, 1, 2 or 3).
- * \param configuration  Desired chip select configuration.
- */
-void SPI_ConfigureNPCS( Spi* spi, uint32_t dwNpcs, uint32_t dwConfiguration )
-{
-    spi->SPI_CSR[dwNpcs] = dwConfiguration ;
-}
-
-/**
- * \brief Get the current status register of the given SPI peripheral.
- * \note This resets the internal value of the status register, so further
- * read may yield different values.
- * \param spi   Pointer to a Spi instance.
- * \return  SPI status register.
- */
-extern uint32_t SPI_GetStatus( Spi* spi )
-{
-    return spi->SPI_SR ;
-}
-
-/**
- * \brief Reads and returns the last word of data received by a SPI peripheral. This
- * method must be called after a successful SPI_Write call.
- *
- * \param spi  Pointer to an Spi instance.
- *
- * \return readed data.
- */
-extern uint32_t SPI_Read( Spi* spi )
-{
-    while ( (spi->SPI_SR & SPI_SR_RDRF) == 0 ) ;
-
-    return spi->SPI_RDR & 0xFFFF ;
-}
-
-/**
- * \brief Sends data through a SPI peripheral. If the SPI is configured to use a fixed
- * peripheral select, the npcs value is meaningless. Otherwise, it identifies
- * the component which shall be addressed.
- *
- * \param spi   Pointer to an Spi instance.
- * \param npcs  Chip select of the component to address (0, 1, 2 or 3).
- * \param data  Word of data to send.
- */
-extern void SPI_Write( Spi* spi, uint32_t dwNpcs, uint16_t wData )
-{
-    /* Send data */
-    while ( (spi->SPI_SR & SPI_SR_TXEMPTY) == 0 ) ;
-    spi->SPI_TDR = wData | SPI_PCS( dwNpcs ) ;
-    while ( (spi->SPI_SR & SPI_SR_TDRE) == 0 ) ;
-}
-
-/**
- * \brief Check if SPI transfer finish.
- *
- * \param spi  Pointer to an Spi instance.
- *
- * \return Returns 1 if there is no pending write operation on the SPI; otherwise
- * returns 0.
- */
-extern uint32_t SPI_IsFinished( Spi* spi )
-{
-    return ((spi->SPI_SR & SPI_SR_TXEMPTY) != 0) ;
-}
-
-/**
- * \brief Enable Spi PDC transmit
- * \param spi  Pointer to an Spi instance.
-*/
-extern void SPI_PdcEnableTx( Spi* spi )
-{
-    spi->SPI_PTCR = SPI_PTCR_TXTEN ;
-}
-
-/**
- * \brief Disable Spi PDC transmit
- * \param spi  Pointer to an Spi instance.
-*/
-extern void SPI_PdcDisableTx( Spi* spi )
-{
-    spi->SPI_PTCR = SPI_PTCR_TXTDIS ;
-}
-
-/**
- * \brief Enable Spi PDC receive
- * \param spi  Pointer to an Spi instance.
-*/
-extern void SPI_PdcEnableRx( Spi* spi )
-{
-    spi->SPI_PTCR = SPI_PTCR_RXTEN ;
-}
-
-/**
- * \brief Disable Spi PDC receive
- * \param spi  Pointer to an Spi instance.
-*/
-extern void SPI_PdcDisableRx( Spi* spi )
-{
-    spi->SPI_PTCR = SPI_PTCR_RXTDIS ;
-}
-
-/**
- * \brief Set PDC transmit and next transmit buffer address and size.
- *
- * \param spi    Pointer to an Spi instance.
- * \param txBuf  PDC transmit buffer address.
- * \param txCount  Length in bytes of the transmit buffer.
- * \param txNextBuf  PDC next transmit buffer address.
- * \param txNextCount  Length in bytes of the next transmit buffer.
- */
-extern void SPI_PdcSetTx( Spi* spi, void* pvTxBuf, uint32_t dwTxCount, void* pvTxNextBuf, uint32_t dwTxNextCount )
-{
-    spi->SPI_TPR = (uint32_t)pvTxBuf ;
-    spi->SPI_TCR = dwTxCount ;
-    spi->SPI_TNPR = (uint32_t)pvTxNextBuf ;
-    spi->SPI_TNCR = dwTxNextCount ;
-}
-
-/**
- * \brief Set PDC receive and next receive buffer address and size.
- *
- * \param spi    Pointer to an Spi instance.
- * \param rxBuf  PDC receive buffer address.
- * \param rxCount  Length in bytes of the receive buffer.
- * \param rxNextBuf  PDC next receive buffer address.
- * \param rxNextCount  Length in bytes of the next receive buffer.
- */
-extern void SPI_PdcSetRx( Spi* spi, void* pvRxBuf, uint32_t dwRxCount, void* pvRxNextBuf, uint32_t dwRxNextCount )
-{
-    spi->SPI_RPR = (uint32_t)pvRxBuf ;
-    spi->SPI_RCR = dwRxCount ;
-    spi->SPI_RNPR = (uint32_t)pvRxNextBuf ;
-    spi->SPI_RNCR = dwRxNextCount ;
-}
-
-/**
- * \brief Sends the contents of buffer through a SPI peripheral, using the PDC to
- * take care of the transfer.
- *
- * \param spi     Pointer to an Spi instance.
- * \param buffer  Data buffer to send.
- * \param length  Length of the data buffer.
- */
-extern uint32_t SPI_WriteBuffer( Spi* spi, void* pvBuffer, uint32_t dwLength )
-{
-    /* Check if first bank is free */
-    if ( spi->SPI_TCR == 0 )
-    {
-        spi->SPI_TPR = (uint32_t)pvBuffer ;
-        spi->SPI_TCR = dwLength ;
-        spi->SPI_PTCR = PERIPH_PTCR_TXTEN ;
-
-        return 1 ;
-    }
-    /* Check if second bank is free */
-    else
-    {
-        if ( spi->SPI_TNCR == 0 )
-        {
-            spi->SPI_TNPR = (uint32_t)pvBuffer ;
-            spi->SPI_TNCR = dwLength ;
-
-            return 1 ;
-        }
-    }
-
-    /* No free banks */
-    return 0 ;
-}
-
-/**
- * \brief Reads data from a SPI peripheral until the provided buffer is filled. This
- * method does NOT need to be called after SPI_Write or SPI_WriteBuffer.
- *
- * \param spi     Pointer to an Spi instance.
- * \param buffer  Data buffer to store incoming bytes.
- * \param length  Length in bytes of the data buffer.
- */
-extern uint32_t SPI_ReadBuffer( Spi* spi, void *pvBuffer, uint32_t dwLength )
-{
-    /* Check if the first bank is free */
-    if ( spi->SPI_RCR == 0 )
-    {
-        spi->SPI_RPR = (uint32_t)pvBuffer ;
-        spi->SPI_RCR = dwLength ;
-        spi->SPI_PTCR = PERIPH_PTCR_RXTEN ;
-
-        return 1 ;
-    }
-    /* Check if second bank is free */
-    else
-    {
-        if ( spi->SPI_RNCR == 0 )
-        {
-            spi->SPI_RNPR = (uint32_t)pvBuffer ;
-            spi->SPI_RNCR = dwLength ;
-            return 1 ;
-        }
-    }
-
-    /* No free bank */
-    return 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.
+ * ----------------------------------------------------------------------------
+ */
+
+/** \addtogroup spi_module Working with SPI
+ * The SPI driver provides the interface to configure and use the SPI
+ * peripheral.
+ *
+ * The Serial Peripheral Interface (SPI) circuit is a synchronous serial
+ * data link that provides communication with external devices in Master
+ * or Slave Mode.
+ *
+ * To use the SPI, the user has to follow these few steps:
+ * -# Enable the SPI pins required by the application (see pio.h).
+ * -# Configure the SPI using the \ref SPI_Configure(). This enables the
+ *    peripheral clock. The mode register is loaded with the given value.
+ * -# Configure all the necessary chip selects with \ref SPI_ConfigureNPCS().
+ * -# Enable the SPI by calling \ref SPI_Enable().
+ * -# Send/receive data using \ref SPI_Write() and \ref SPI_Read(). Note that \ref SPI_Read()
+ *    must be called after \ref SPI_Write() to retrieve the last value read.
+ * -# Send/receive data using the PDC with the \ref SPI_WriteBuffer() and
+ *    \ref SPI_ReadBuffer() functions.
+ * -# Disable the SPI by calling \ref SPI_Disable().
+ *
+ * For more accurate information, please look at the SPI section of the
+ * Datasheet.
+ *
+ * Related files :\n
+ * \ref spi.c\n
+ * \ref spi.h.\n
+*/
+/*@{*/
+/*@}*/
+
+/**
+ * \file
+ *
+ * Implementation of Serial Peripheral Interface (SPI) controller.
+ *
+ */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "chip.h"
+#include "pmc.h"
+#include "spi.h"
+
+#include <stdint.h>
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Enables a SPI peripheral.
+ *
+ * \param spi  Pointer to an Spi instance.
+ */
+extern void SPI_Enable( Spi* spi )
+{
+    spi->SPI_CR = SPI_CR_SPIEN ;
+}
+
+/**
+ * \brief Disables a SPI peripheral.
+ *
+ * \param spi  Pointer to an Spi instance.
+ */
+extern void SPI_Disable( Spi* spi )
+{
+    spi->SPI_CR = SPI_CR_SPIDIS ;
+}
+
+/**
+ * \brief Enables one or more interrupt sources of a SPI peripheral.
+ *
+ * \param spi  Pointer to an Spi instance.
+ * \param sources Bitwise OR of selected interrupt sources.
+ */
+extern void SPI_EnableIt( Spi* spi, uint32_t dwSources )
+{
+    spi->SPI_IER = dwSources ;
+}
+
+/**
+ * \brief Disables one or more interrupt sources of a SPI peripheral.
+ *
+ * \param spi  Pointer to an Spi instance.
+ * \param sources Bitwise OR of selected interrupt sources.
+ */
+extern void SPI_DisableIt( Spi* spi, uint32_t dwSources )
+{
+    spi->SPI_IDR = dwSources ;
+}
+
+/**
+ * \brief Configures a SPI peripheral as specified. The configuration can be computed
+ * using several macros (see \ref spi_configuration_macros).
+ *
+ * \param spi  Pointer to an Spi instance.
+ * \param id   Peripheral ID of the SPI.
+ * \param configuration  Value of the SPI configuration register.
+ */
+extern void SPI_Configure( Spi* spi, uint32_t dwId, uint32_t dwConfiguration )
+{
+    PMC_EnablePeripheral( dwId ) ;
+    spi->SPI_CR = SPI_CR_SPIDIS ;
+
+    /* Execute a software reset of the SPI twice */
+    spi->SPI_CR = SPI_CR_SWRST ;
+    spi->SPI_CR = SPI_CR_SWRST ;
+    spi->SPI_MR = dwConfiguration ;
+}
+
+
+/**
+ * \brief Configures a chip select of a SPI peripheral. The chip select configuration
+ * is computed using several macros (see \ref spi_configuration_macros).
+ *
+ * \param spi   Pointer to an Spi instance.
+ * \param npcs  Chip select to configure (0, 1, 2 or 3).
+ * \param configuration  Desired chip select configuration.
+ */
+void SPI_ConfigureNPCS( Spi* spi, uint32_t dwNpcs, uint32_t dwConfiguration )
+{
+    spi->SPI_CSR[dwNpcs] = dwConfiguration ;
+}
+
+/**
+ * \brief Get the current status register of the given SPI peripheral.
+ * \note This resets the internal value of the status register, so further
+ * read may yield different values.
+ * \param spi   Pointer to a Spi instance.
+ * \return  SPI status register.
+ */
+extern uint32_t SPI_GetStatus( Spi* spi )
+{
+    return spi->SPI_SR ;
+}
+
+/**
+ * \brief Reads and returns the last word of data received by a SPI peripheral. This
+ * method must be called after a successful SPI_Write call.
+ *
+ * \param spi  Pointer to an Spi instance.
+ *
+ * \return readed data.
+ */
+extern uint32_t SPI_Read( Spi* spi )
+{
+    while ( (spi->SPI_SR & SPI_SR_RDRF) == 0 ) ;
+
+    return spi->SPI_RDR & 0xFFFF ;
+}
+
+/**
+ * \brief Sends data through a SPI peripheral. If the SPI is configured to use a fixed
+ * peripheral select, the npcs value is meaningless. Otherwise, it identifies
+ * the component which shall be addressed.
+ *
+ * \param spi   Pointer to an Spi instance.
+ * \param npcs  Chip select of the component to address (0, 1, 2 or 3).
+ * \param data  Word of data to send.
+ */
+extern void SPI_Write( Spi* spi, uint32_t dwNpcs, uint16_t wData )
+{
+    /* Send data */
+    while ( (spi->SPI_SR & SPI_SR_TXEMPTY) == 0 ) ;
+    spi->SPI_TDR = wData | SPI_PCS( dwNpcs ) ;
+    while ( (spi->SPI_SR & SPI_SR_TDRE) == 0 ) ;
+}
+
+/**
+ * \brief Check if SPI transfer finish.
+ *
+ * \param spi  Pointer to an Spi instance.
+ *
+ * \return Returns 1 if there is no pending write operation on the SPI; otherwise
+ * returns 0.
+ */
+extern uint32_t SPI_IsFinished( Spi* spi )
+{
+    return ((spi->SPI_SR & SPI_SR_TXEMPTY) != 0) ;
+}
+
+/**
+ * \brief Enable Spi PDC transmit
+ * \param spi  Pointer to an Spi instance.
+*/
+extern void SPI_PdcEnableTx( Spi* spi )
+{
+    spi->SPI_PTCR = SPI_PTCR_TXTEN ;
+}
+
+/**
+ * \brief Disable Spi PDC transmit
+ * \param spi  Pointer to an Spi instance.
+*/
+extern void SPI_PdcDisableTx( Spi* spi )
+{
+    spi->SPI_PTCR = SPI_PTCR_TXTDIS ;
+}
+
+/**
+ * \brief Enable Spi PDC receive
+ * \param spi  Pointer to an Spi instance.
+*/
+extern void SPI_PdcEnableRx( Spi* spi )
+{
+    spi->SPI_PTCR = SPI_PTCR_RXTEN ;
+}
+
+/**
+ * \brief Disable Spi PDC receive
+ * \param spi  Pointer to an Spi instance.
+*/
+extern void SPI_PdcDisableRx( Spi* spi )
+{
+    spi->SPI_PTCR = SPI_PTCR_RXTDIS ;
+}
+
+/**
+ * \brief Set PDC transmit and next transmit buffer address and size.
+ *
+ * \param spi    Pointer to an Spi instance.
+ * \param txBuf  PDC transmit buffer address.
+ * \param txCount  Length in bytes of the transmit buffer.
+ * \param txNextBuf  PDC next transmit buffer address.
+ * \param txNextCount  Length in bytes of the next transmit buffer.
+ */
+extern void SPI_PdcSetTx( Spi* spi, void* pvTxBuf, uint32_t dwTxCount, void* pvTxNextBuf, uint32_t dwTxNextCount )
+{
+    spi->SPI_TPR = (uint32_t)pvTxBuf ;
+    spi->SPI_TCR = dwTxCount ;
+    spi->SPI_TNPR = (uint32_t)pvTxNextBuf ;
+    spi->SPI_TNCR = dwTxNextCount ;
+}
+
+/**
+ * \brief Set PDC receive and next receive buffer address and size.
+ *
+ * \param spi    Pointer to an Spi instance.
+ * \param rxBuf  PDC receive buffer address.
+ * \param rxCount  Length in bytes of the receive buffer.
+ * \param rxNextBuf  PDC next receive buffer address.
+ * \param rxNextCount  Length in bytes of the next receive buffer.
+ */
+extern void SPI_PdcSetRx( Spi* spi, void* pvRxBuf, uint32_t dwRxCount, void* pvRxNextBuf, uint32_t dwRxNextCount )
+{
+    spi->SPI_RPR = (uint32_t)pvRxBuf ;
+    spi->SPI_RCR = dwRxCount ;
+    spi->SPI_RNPR = (uint32_t)pvRxNextBuf ;
+    spi->SPI_RNCR = dwRxNextCount ;
+}
+
+/**
+ * \brief Sends the contents of buffer through a SPI peripheral, using the PDC to
+ * take care of the transfer.
+ *
+ * \param spi     Pointer to an Spi instance.
+ * \param buffer  Data buffer to send.
+ * \param length  Length of the data buffer.
+ */
+extern uint32_t SPI_WriteBuffer( Spi* spi, void* pvBuffer, uint32_t dwLength )
+{
+    /* Check if first bank is free */
+    if ( spi->SPI_TCR == 0 )
+    {
+        spi->SPI_TPR = (uint32_t)pvBuffer ;
+        spi->SPI_TCR = dwLength ;
+        spi->SPI_PTCR = PERIPH_PTCR_TXTEN ;
+
+        return 1 ;
+    }
+    /* Check if second bank is free */
+    else
+    {
+        if ( spi->SPI_TNCR == 0 )
+        {
+            spi->SPI_TNPR = (uint32_t)pvBuffer ;
+            spi->SPI_TNCR = dwLength ;
+
+            return 1 ;
+        }
+    }
+
+    /* No free banks */
+    return 0 ;
+}
+
+/**
+ * \brief Reads data from a SPI peripheral until the provided buffer is filled. This
+ * method does NOT need to be called after SPI_Write or SPI_WriteBuffer.
+ *
+ * \param spi     Pointer to an Spi instance.
+ * \param buffer  Data buffer to store incoming bytes.
+ * \param length  Length in bytes of the data buffer.
+ */
+extern uint32_t SPI_ReadBuffer( Spi* spi, void *pvBuffer, uint32_t dwLength )
+{
+    /* Check if the first bank is free */
+    if ( spi->SPI_RCR == 0 )
+    {
+        spi->SPI_RPR = (uint32_t)pvBuffer ;
+        spi->SPI_RCR = dwLength ;
+        spi->SPI_PTCR = PERIPH_PTCR_RXTEN ;
+
+        return 1 ;
+    }
+    /* Check if second bank is free */
+    else
+    {
+        if ( spi->SPI_RNCR == 0 )
+        {
+            spi->SPI_RNPR = (uint32_t)pvBuffer ;
+            spi->SPI_RNCR = dwLength ;
+            return 1 ;
+        }
+    }
+
+    /* No free bank */
+    return 0 ;
+}
+
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/tc.c

@@ -1,175 +1,175 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Implementation of Timer Counter (TC).
- *
- */
-
-/*------------------------------------------------------------------------------
- *         Headers
- *------------------------------------------------------------------------------*/
-
-#include "chip.h"
-
-#include <assert.h>
-
-/*------------------------------------------------------------------------------
- *         Global functions
- *------------------------------------------------------------------------------*/
-
-/**
- * \brief Configures a Timer Counter Channel
- *
- * Configures a Timer Counter to operate in the given mode. Timer is stopped
- * after configuration and must be restarted with TC_Start(). All the
- * interrupts of the timer are also disabled.
- *
- * \param pTc  Pointer to a Tc instance.
- * \param channel Channel number.
- * \param mode  Operating mode (TC_CMR value).
- */
-extern void TC_Configure( Tc *pTc, uint32_t dwChannel, uint32_t dwMode )
-{
-    TcChannel* pTcCh ;
-
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-
-    /*  Disable TC clock */
-    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
-
-    /*  Disable interrupts */
-    pTcCh->TC_IDR = 0xFFFFFFFF ;
-
-    /*  Clear status register */
-    pTcCh->TC_SR ;
-
-    /*  Set mode */
-    pTcCh->TC_CMR = dwMode ;
-}
-
-/**
- * \brief Reset and Start the TC Channel
- *
- * Enables the timer clock and performs a software reset to start the counting.
- *
- * \param pTc  Pointer to a Tc instance.
- * \param dwChannel Channel number.
- */
-extern void TC_Start( Tc *pTc, uint32_t dwChannel )
-{
-    TcChannel* pTcCh ;
-
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-    pTcCh->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG ;
-}
-
-/**
- * \brief Stop TC Channel
- *
- * Disables the timer clock, stopping the counting.
- *
- * \param pTc     Pointer to a Tc instance.
- * \param dwChannel Channel number.
- */
-extern void TC_Stop(Tc *pTc, uint32_t dwChannel )
-{
-    TcChannel* pTcCh ;
-
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
-}
-
-/**
- * \brief Find best MCK divisor
- *
- * Finds the best MCK divisor given the timer frequency and MCK. The result
- * is guaranteed to satisfy the following equation:
- * \code
- *   (MCK / (DIV * 65536)) <= freq <= (MCK / DIV)
- * \endcode
- * with DIV being the highest possible value.
- *
- * \param dwFreq  Desired timer frequency.
- * \param dwMCk  Master clock frequency.
- * \param dwDiv  Divisor value.
- * \param dwTcClks  TCCLKS field value for divisor.
- * \param dwBoardMCK  Board clock frequency.
- *
- * \return 1 if a proper divisor has been found, otherwise 0.
- */
-extern uint32_t TC_FindMckDivisor( uint32_t dwFreq, uint32_t dwMCk, uint32_t *dwDiv, uint32_t *dwTcClks, uint32_t dwBoardMCK )
-{
-    const uint32_t adwDivisors[5] = { 2, 8, 32, 128, dwBoardMCK / 32768 } ;
-
-    uint32_t dwIndex = 0 ;
-
-    /*  Satisfy lower bound */
-    while ( dwFreq < ((dwMCk / adwDivisors[dwIndex]) / 65536) )
-    {
-        dwIndex++ ;
-
-        /*  If no divisor can be found, return 0 */
-        if ( dwIndex == (sizeof( adwDivisors )/sizeof( adwDivisors[0] ))  )
-        {
-            return 0 ;
-        }
-    }
-
-    /*  Try to maximize DIV while satisfying upper bound */
-    while ( dwIndex < 4 )
-    {
-
-        if ( dwFreq > (dwMCk / adwDivisors[dwIndex + 1]) )
-        {
-            break ;
-        }
-        dwIndex++ ;
-    }
-
-    /*  Store results */
-    if ( dwDiv )
-    {
-        *dwDiv = adwDivisors[dwIndex] ;
-    }
-    if ( dwTcClks )
-    {
-        *dwTcClks = dwIndex ;
-    }
-
-    return 1 ;
-}
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ * Implementation of Timer Counter (TC).
+ *
+ */
+
+/*------------------------------------------------------------------------------
+ *         Headers
+ *------------------------------------------------------------------------------*/
+
+#include "chip.h"
+
+#include <assert.h>
+
+/*------------------------------------------------------------------------------
+ *         Global functions
+ *------------------------------------------------------------------------------*/
+
+/**
+ * \brief Configures a Timer Counter Channel
+ *
+ * Configures a Timer Counter to operate in the given mode. Timer is stopped
+ * after configuration and must be restarted with TC_Start(). All the
+ * interrupts of the timer are also disabled.
+ *
+ * \param pTc  Pointer to a Tc instance.
+ * \param channel Channel number.
+ * \param mode  Operating mode (TC_CMR value).
+ */
+extern void TC_Configure( Tc *pTc, uint32_t dwChannel, uint32_t dwMode )
+{
+    TcChannel* pTcCh ;
+
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+
+    /*  Disable TC clock */
+    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
+
+    /*  Disable interrupts */
+    pTcCh->TC_IDR = 0xFFFFFFFF ;
+
+    /*  Clear status register */
+    pTcCh->TC_SR ;
+
+    /*  Set mode */
+    pTcCh->TC_CMR = dwMode ;
+}
+
+/**
+ * \brief Reset and Start the TC Channel
+ *
+ * Enables the timer clock and performs a software reset to start the counting.
+ *
+ * \param pTc  Pointer to a Tc instance.
+ * \param dwChannel Channel number.
+ */
+extern void TC_Start( Tc *pTc, uint32_t dwChannel )
+{
+    TcChannel* pTcCh ;
+
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+    pTcCh->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG ;
+}
+
+/**
+ * \brief Stop TC Channel
+ *
+ * Disables the timer clock, stopping the counting.
+ *
+ * \param pTc     Pointer to a Tc instance.
+ * \param dwChannel Channel number.
+ */
+extern void TC_Stop(Tc *pTc, uint32_t dwChannel )
+{
+    TcChannel* pTcCh ;
+
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
+}
+
+/**
+ * \brief Find best MCK divisor
+ *
+ * Finds the best MCK divisor given the timer frequency and MCK. The result
+ * is guaranteed to satisfy the following equation:
+ * \code
+ *   (MCK / (DIV * 65536)) <= freq <= (MCK / DIV)
+ * \endcode
+ * with DIV being the highest possible value.
+ *
+ * \param dwFreq  Desired timer frequency.
+ * \param dwMCk  Master clock frequency.
+ * \param dwDiv  Divisor value.
+ * \param dwTcClks  TCCLKS field value for divisor.
+ * \param dwBoardMCK  Board clock frequency.
+ *
+ * \return 1 if a proper divisor has been found, otherwise 0.
+ */
+extern uint32_t TC_FindMckDivisor( uint32_t dwFreq, uint32_t dwMCk, uint32_t *dwDiv, uint32_t *dwTcClks, uint32_t dwBoardMCK )
+{
+    const uint32_t adwDivisors[5] = { 2, 8, 32, 128, dwBoardMCK / 32768 } ;
+
+    uint32_t dwIndex = 0 ;
+
+    /*  Satisfy lower bound */
+    while ( dwFreq < ((dwMCk / adwDivisors[dwIndex]) / 65536) )
+    {
+        dwIndex++ ;
+
+        /*  If no divisor can be found, return 0 */
+        if ( dwIndex == (sizeof( adwDivisors )/sizeof( adwDivisors[0] ))  )
+        {
+            return 0 ;
+        }
+    }
+
+    /*  Try to maximize DIV while satisfying upper bound */
+    while ( dwIndex < 4 )
+    {
+
+        if ( dwFreq > (dwMCk / adwDivisors[dwIndex + 1]) )
+        {
+            break ;
+        }
+        dwIndex++ ;
+    }
+
+    /*  Store results */
+    if ( dwDiv )
+    {
+        *dwDiv = adwDivisors[dwIndex] ;
+    }
+    if ( dwTcClks )
+    {
+        *dwTcClks = dwIndex ;
+    }
+
+    return 1 ;
+}
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c

@@ -1,410 +1,410 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/** \addtogroup usart_module Working with USART
- * The USART driver provides the interface to configure and use the USART peripheral.\n
- *
- * The USART supports several kinds of comminication modes such as full-duplex asynchronous/
- * synchronous serial commnunication,RS485 with driver control signal,ISO7816,SPI and Test modes.
- *
- * To start a USART transfer with \ref AT91SAM3S_PDC "PDC" support, the user could follow these steps:
- * <ul>
- * <li> Configure USART with expected mode and baudrate(see \ref USART_Configure), which could be done by:
- * -# Resetting and disabling transmitter and receiver by setting US_CR(Control Register). </li>
- * -# Conifguring the USART in a specific mode by setting USART_MODE bits in US_MR(Mode Register) </li>
- * -# Setting baudrate which is different from mode to mode.
-   </li>
- * <li> Enable transmitter or receiver respectively by set US_CR_TXEN or US_CR_RXEN in US_CR.</li>
- * <li> Read from or write to the peripheral with  \ref USART_ReadBuffer or \ref USART_WriteBuffer.
-        These operations could be done by polling or interruption. </li>
- * <li> For polling, check the status bit US_CSR_ENDRX/US_CSR_RXBUFF (READ) or US_CSR_ENDTX/
-        US_CSR_TXBUFE (WRITE).  </li>
- * <li> For interruption,"enable" the status bit through US_IER and
-        realize the hanler with USARTx_IrqHandler according to IRQ vector
-        table which is defined in board_cstartup_<toolchain>.c
-        To enable the interruption of USART,it should be configured with priority and enabled first through
-        NVIC .</li>
- * </ul>
- *
- * For more accurate information, please look at the USART section of the
- * Datasheet.
- *
- * Related files :\n
- * \ref usart.c\n
- * \ref usart.h\n
-*/
-
-
-
-/**
- * \file
- *
- * Implementation of USART (Universal Synchronous Asynchronous Receiver Transmitter)
- * controller.
- *
- */
-/*------------------------------------------------------------------------------
- *         Headers
- *------------------------------------------------------------------------------*/
-#include "chip.h"
-#include "trace.h"
-
-#include <assert.h>
-#include <string.h>
-
-/*----------------------------------------------------------------------------
- *        Local definitions
- *----------------------------------------------------------------------------*/
-
-
-/*------------------------------------------------------------------------------
- *         Exported functions
- *------------------------------------------------------------------------------*/
-
-/**
- * \brief Configures an USART peripheral with the specified parameters.
- *
- *
- *  \param usart  Pointer to the USART peripheral to configure.
- *  \param mode  Desired value for the USART mode register (see the datasheet).
- *  \param baudrate  Baudrate at which the USART should operate (in Hz).
- *  \param masterClock  Frequency of the system master clock (in Hz).
- */
-void USART_Configure(Usart *usart,
-                            uint32_t mode,
-                            uint32_t baudrate,
-                            uint32_t masterClock)
-{
-    /* Reset and disable receiver & transmitter*/
-    usart->US_CR = US_CR_RSTRX | US_CR_RSTTX
-                   | US_CR_RXDIS | US_CR_TXDIS;
-
-    /* Configure mode*/
-    usart->US_MR = mode;
-
-    /* Configure baudrate*/
-    /* Asynchronous, no oversampling*/
-    if ( ((mode & US_MR_SYNC) == 0) && ((mode & US_MR_OVER) == 0) )
-    {
-        usart->US_BRGR = (masterClock / baudrate) / 16;
-    }
-
-    if( ((mode & US_MR_USART_MODE_SPI_MASTER) == US_MR_USART_MODE_SPI_MASTER)
-     || ((mode & US_MR_SYNC) == US_MR_SYNC))
-    {
-        if( (mode & US_MR_USCLKS_Msk) == US_MR_USCLKS_MCK)
-        {
-            usart->US_BRGR = masterClock / baudrate;
-        }
-        else
-        {
-            if ( (mode & US_MR_USCLKS_DIV) == US_MR_USCLKS_DIV)
-            {
-                usart->US_BRGR = masterClock / baudrate / 8;
-            }
-        }
-    }
-    /* TODO other modes*/
-}
-/**
- * \brief Enables or disables the transmitter of an USART peripheral.
- *
- *
- * \param usart  Pointer to an USART peripheral
- * \param enabled  If true, the transmitter is enabled; otherwise it is
- *                disabled.
- */
-void USART_SetTransmitterEnabled(Usart *usart, uint8_t enabled)
-{
-    if (enabled) {
-
-        usart->US_CR = US_CR_TXEN;
-    }
-    else {
-
-        usart->US_CR = US_CR_TXDIS;
-    }
-}
-
-/**
- * \brief Enables or disables the receiver of an USART peripheral
- *
- *
- * \param usart  Pointer to an USART peripheral
- * \param enabled  If true, the receiver is enabled; otherwise it is disabled.
- */
-void USART_SetReceiverEnabled(Usart *usart,
-                                     uint8_t enabled)
-{
-    if (enabled) {
-
-        usart->US_CR = US_CR_RXEN;
-    }
-    else {
-
-        usart->US_CR = US_CR_RXDIS;
-    }
-}
-
-/**
- * \brief Sends one packet of data through the specified USART peripheral. This
- * function operates synchronously, so it only returns when the data has been
- * actually sent.
- *
- *
- * \param usart  Pointer to an USART peripheral.
- * \param data  Data to send including 9nth bit and sync field if necessary (in
- *        the same format as the US_THR register in the datasheet).
- * \param timeOut  Time out value (0 = no timeout).
- */
-void USART_Write(
-    Usart *usart,
-    uint16_t data,
-    volatile uint32_t timeOut)
-{
-    if (timeOut == 0) {
-
-        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-    }
-    else {
-
-        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0) {
-
-            if (timeOut == 0) {
-
-                TRACE_ERROR("USART_Write: Timed out.\n\r");
-                return;
-            }
-            timeOut--;
-        }
-    }
-
-    usart->US_THR = data;
-}
-
-/**
- * \brief Sends the contents of a data buffer through the specified USART peripheral.
- * This function returns immediately (1 if the buffer has been queued, 0
- * otherwise); poll the ENDTX and TXBUFE bits of the USART status register
- * to check for the transfer completion.
- *
- * \param usart  Pointer to an USART peripheral.
- * \param buffer  Pointer to the data buffer to send.
- * \param size  Size of the data buffer (in bytes).
- */
-uint8_t USART_WriteBuffer(
-    Usart *usart,
-    void *buffer,
-    uint32_t size)
-{
-    /* Check if the first PDC bank is free*/
-    if ((usart->US_TCR == 0) && (usart->US_TNCR == 0)) {
-
-        usart->US_TPR = (uint32_t) buffer;
-        usart->US_TCR = size;
-        usart->US_PTCR = US_PTCR_TXTEN;
-
-        return 1;
-    }
-    /* Check if the second PDC bank is free*/
-    else if (usart->US_TNCR == 0) {
-
-        usart->US_TNPR = (uint32_t) buffer;
-        usart->US_TNCR = size;
-
-        return 1;
-    }
-    else {
-
-        return 0;
-    }
-}
-
-
-/**
- * \brief  Reads and return a packet of data on the specified USART peripheral. This
- * function operates asynchronously, so it waits until some data has been
- * received.
- *
- * \param usart  Pointer to an USART peripheral.
- * \param timeOut  Time out value (0 -> no timeout).
- */
-uint16_t USART_Read(
-    Usart *usart,
-    volatile uint32_t timeOut)
-{
-    if (timeOut == 0) {
-
-        while ((usart->US_CSR & US_CSR_RXRDY) == 0);
-    }
-    else {
-
-        while ((usart->US_CSR & US_CSR_RXRDY) == 0) {
-
-            if (timeOut == 0) {
-
-                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
-                return 0;
-            }
-            timeOut--;
-        }
-    }
-
-    return usart->US_RHR;
-}
-
-/**
- * \brief  Reads data from an USART peripheral, filling the provided buffer until it
- * becomes full. This function returns immediately with 1 if the buffer has
- * been queued for transmission; otherwise 0.
- *
- * \param usart  Pointer to an USART peripheral.
- * \param buffer  Pointer to the buffer where the received data will be stored.
- * \param size  Size of the data buffer (in bytes).
- */
-uint8_t USART_ReadBuffer(Usart *usart,
-                                      void *buffer,
-                                      uint32_t size)
-{
-    /* Check if the first PDC bank is free*/
-    if ((usart->US_RCR == 0) && (usart->US_RNCR == 0)) {
-
-        usart->US_RPR = (uint32_t) buffer;
-        usart->US_RCR = size;
-        usart->US_PTCR = US_PTCR_RXTEN;
-
-        return 1;
-    }
-    /* Check if the second PDC bank is free*/
-    else if (usart->US_RNCR == 0) {
-
-        usart->US_RNPR = (uint32_t) buffer;
-        usart->US_RNCR = size;
-
-        return 1;
-    }
-    else {
-
-        return 0;
-    }
-}
-
-/**
- * \brief  Returns 1 if some data has been received and can be read from an USART;
- * otherwise returns 0.
- *
- * \param usart  Pointer to an Usart instance.
- */
-uint8_t USART_IsDataAvailable(Usart *usart)
-{
-    if ((usart->US_CSR & US_CSR_RXRDY) != 0) {
-
-        return 1;
-    }
-    else {
-
-        return 0;
-    }
-}
-
-/**
- * \brief  Sets the filter value for the IRDA demodulator.
- *
- * \param pUsart  Pointer to an Usart instance.
- * \param filter  Filter value.
- */
-void USART_SetIrdaFilter(Usart *pUsart, uint8_t filter)
-{
-    assert( pUsart != NULL ) ;
-
-    pUsart->US_IF = filter;
-}
-
-/**
- * \brief  Sends one packet of data through the specified USART peripheral. This
- * function operates synchronously, so it only returns when the data has been
- * actually sent.
- *
- * \param usart  Pointer to an USART peripheral.
- * \param c  Character to send
- */
-void USART_PutChar(
-    Usart *usart,
-    uint8_t c)
-{
-    /* Wait for the transmitter to be ready*/
-    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-
-    /* Send character*/
-    usart->US_THR = c;
-
-    /* Wait for the transfer to complete*/
-    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-}
-
-/**
- * \brief   Return 1 if a character can be read in USART
- */
-uint32_t USART_IsRxReady(Usart *usart)
-{
-    return (usart->US_CSR & US_CSR_RXRDY);
-}
-/**
- * \brief   Get present status
- */
-uint32_t USART_GetStatus(Usart *usart)
-{
-    return usart->US_CSR;
-}
-/**
- * \brief   Enable interrupt
- */
-void USART_EnableIt(Usart *usart,uint32_t mode)
-{
-    usart->US_IER = mode;
-}
-/**
- * \brief   Disable interrupt
- */
-void USART_DisableIt(Usart *usart,uint32_t mode)
-{
-    usart->US_IDR = mode;
-}
-/**
- * \brief  Reads and returns a character from the USART.
- *
- * \note This function is synchronous (i.e. uses polling).
- * \param usart  Pointer to an USART peripheral.
- * \return Character received.
- */
-uint8_t USART_GetChar(Usart *usart)
-{
-    while ((usart->US_CSR & US_CSR_RXRDY) == 0);
-    return usart->US_RHR;
-}
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/** \addtogroup usart_module Working with USART
+ * The USART driver provides the interface to configure and use the USART peripheral.\n
+ *
+ * The USART supports several kinds of comminication modes such as full-duplex asynchronous/
+ * synchronous serial commnunication,RS485 with driver control signal,ISO7816,SPI and Test modes.
+ *
+ * To start a USART transfer with \ref AT91SAM3S_PDC "PDC" support, the user could follow these steps:
+ * <ul>
+ * <li> Configure USART with expected mode and baudrate(see \ref USART_Configure), which could be done by:
+ * -# Resetting and disabling transmitter and receiver by setting US_CR(Control Register). </li>
+ * -# Conifguring the USART in a specific mode by setting USART_MODE bits in US_MR(Mode Register) </li>
+ * -# Setting baudrate which is different from mode to mode.
+   </li>
+ * <li> Enable transmitter or receiver respectively by set US_CR_TXEN or US_CR_RXEN in US_CR.</li>
+ * <li> Read from or write to the peripheral with  \ref USART_ReadBuffer or \ref USART_WriteBuffer.
+        These operations could be done by polling or interruption. </li>
+ * <li> For polling, check the status bit US_CSR_ENDRX/US_CSR_RXBUFF (READ) or US_CSR_ENDTX/
+        US_CSR_TXBUFE (WRITE).  </li>
+ * <li> For interruption,"enable" the status bit through US_IER and
+        realize the hanler with USARTx_IrqHandler according to IRQ vector
+        table which is defined in board_cstartup_<toolchain>.c
+        To enable the interruption of USART,it should be configured with priority and enabled first through
+        NVIC .</li>
+ * </ul>
+ *
+ * For more accurate information, please look at the USART section of the
+ * Datasheet.
+ *
+ * Related files :\n
+ * \ref usart.c\n
+ * \ref usart.h\n
+*/
+
+
+
+/**
+ * \file
+ *
+ * Implementation of USART (Universal Synchronous Asynchronous Receiver Transmitter)
+ * controller.
+ *
+ */
+/*------------------------------------------------------------------------------
+ *         Headers
+ *------------------------------------------------------------------------------*/
+#include "chip.h"
+#include "trace.h"
+
+#include <assert.h>
+#include <string.h>
+
+/*----------------------------------------------------------------------------
+ *        Local definitions
+ *----------------------------------------------------------------------------*/
+
+
+/*------------------------------------------------------------------------------
+ *         Exported functions
+ *------------------------------------------------------------------------------*/
+
+/**
+ * \brief Configures an USART peripheral with the specified parameters.
+ *
+ *
+ *  \param usart  Pointer to the USART peripheral to configure.
+ *  \param mode  Desired value for the USART mode register (see the datasheet).
+ *  \param baudrate  Baudrate at which the USART should operate (in Hz).
+ *  \param masterClock  Frequency of the system master clock (in Hz).
+ */
+void USART_Configure(Usart *usart,
+                            uint32_t mode,
+                            uint32_t baudrate,
+                            uint32_t masterClock)
+{
+    /* Reset and disable receiver & transmitter*/
+    usart->US_CR = US_CR_RSTRX | US_CR_RSTTX
+                   | US_CR_RXDIS | US_CR_TXDIS;
+
+    /* Configure mode*/
+    usart->US_MR = mode;
+
+    /* Configure baudrate*/
+    /* Asynchronous, no oversampling*/
+    if ( ((mode & US_MR_SYNC) == 0) && ((mode & US_MR_OVER) == 0) )
+    {
+        usart->US_BRGR = (masterClock / baudrate) / 16;
+    }
+
+    if( ((mode & US_MR_USART_MODE_SPI_MASTER) == US_MR_USART_MODE_SPI_MASTER)
+     || ((mode & US_MR_SYNC) == US_MR_SYNC))
+    {
+        if( (mode & US_MR_USCLKS_Msk) == US_MR_USCLKS_MCK)
+        {
+            usart->US_BRGR = masterClock / baudrate;
+        }
+        else
+        {
+            if ( (mode & US_MR_USCLKS_DIV) == US_MR_USCLKS_DIV)
+            {
+                usart->US_BRGR = masterClock / baudrate / 8;
+            }
+        }
+    }
+    /* TODO other modes*/
+}
+/**
+ * \brief Enables or disables the transmitter of an USART peripheral.
+ *
+ *
+ * \param usart  Pointer to an USART peripheral
+ * \param enabled  If true, the transmitter is enabled; otherwise it is
+ *                disabled.
+ */
+void USART_SetTransmitterEnabled(Usart *usart, uint8_t enabled)
+{
+    if (enabled) {
+
+        usart->US_CR = US_CR_TXEN;
+    }
+    else {
+
+        usart->US_CR = US_CR_TXDIS;
+    }
+}
+
+/**
+ * \brief Enables or disables the receiver of an USART peripheral
+ *
+ *
+ * \param usart  Pointer to an USART peripheral
+ * \param enabled  If true, the receiver is enabled; otherwise it is disabled.
+ */
+void USART_SetReceiverEnabled(Usart *usart,
+                                     uint8_t enabled)
+{
+    if (enabled) {
+
+        usart->US_CR = US_CR_RXEN;
+    }
+    else {
+
+        usart->US_CR = US_CR_RXDIS;
+    }
+}
+
+/**
+ * \brief Sends one packet of data through the specified USART peripheral. This
+ * function operates synchronously, so it only returns when the data has been
+ * actually sent.
+ *
+ *
+ * \param usart  Pointer to an USART peripheral.
+ * \param data  Data to send including 9nth bit and sync field if necessary (in
+ *        the same format as the US_THR register in the datasheet).
+ * \param timeOut  Time out value (0 = no timeout).
+ */
+void USART_Write(
+    Usart *usart,
+    uint16_t data,
+    volatile uint32_t timeOut)
+{
+    if (timeOut == 0) {
+
+        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+    }
+    else {
+
+        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0) {
+
+            if (timeOut == 0) {
+
+                TRACE_ERROR("USART_Write: Timed out.\n\r");
+                return;
+            }
+            timeOut--;
+        }
+    }
+
+    usart->US_THR = data;
+}
+
+/**
+ * \brief Sends the contents of a data buffer through the specified USART peripheral.
+ * This function returns immediately (1 if the buffer has been queued, 0
+ * otherwise); poll the ENDTX and TXBUFE bits of the USART status register
+ * to check for the transfer completion.
+ *
+ * \param usart  Pointer to an USART peripheral.
+ * \param buffer  Pointer to the data buffer to send.
+ * \param size  Size of the data buffer (in bytes).
+ */
+uint8_t USART_WriteBuffer(
+    Usart *usart,
+    void *buffer,
+    uint32_t size)
+{
+    /* Check if the first PDC bank is free*/
+    if ((usart->US_TCR == 0) && (usart->US_TNCR == 0)) {
+
+        usart->US_TPR = (uint32_t) buffer;
+        usart->US_TCR = size;
+        usart->US_PTCR = US_PTCR_TXTEN;
+
+        return 1;
+    }
+    /* Check if the second PDC bank is free*/
+    else if (usart->US_TNCR == 0) {
+
+        usart->US_TNPR = (uint32_t) buffer;
+        usart->US_TNCR = size;
+
+        return 1;
+    }
+    else {
+
+        return 0;
+    }
+}
+
+
+/**
+ * \brief  Reads and return a packet of data on the specified USART peripheral. This
+ * function operates asynchronously, so it waits until some data has been
+ * received.
+ *
+ * \param usart  Pointer to an USART peripheral.
+ * \param timeOut  Time out value (0 -> no timeout).
+ */
+uint16_t USART_Read(
+    Usart *usart,
+    volatile uint32_t timeOut)
+{
+    if (timeOut == 0) {
+
+        while ((usart->US_CSR & US_CSR_RXRDY) == 0);
+    }
+    else {
+
+        while ((usart->US_CSR & US_CSR_RXRDY) == 0) {
+
+            if (timeOut == 0) {
+
+                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
+                return 0;
+            }
+            timeOut--;
+        }
+    }
+
+    return usart->US_RHR;
+}
+
+/**
+ * \brief  Reads data from an USART peripheral, filling the provided buffer until it
+ * becomes full. This function returns immediately with 1 if the buffer has
+ * been queued for transmission; otherwise 0.
+ *
+ * \param usart  Pointer to an USART peripheral.
+ * \param buffer  Pointer to the buffer where the received data will be stored.
+ * \param size  Size of the data buffer (in bytes).
+ */
+uint8_t USART_ReadBuffer(Usart *usart,
+                                      void *buffer,
+                                      uint32_t size)
+{
+    /* Check if the first PDC bank is free*/
+    if ((usart->US_RCR == 0) && (usart->US_RNCR == 0)) {
+
+        usart->US_RPR = (uint32_t) buffer;
+        usart->US_RCR = size;
+        usart->US_PTCR = US_PTCR_RXTEN;
+
+        return 1;
+    }
+    /* Check if the second PDC bank is free*/
+    else if (usart->US_RNCR == 0) {
+
+        usart->US_RNPR = (uint32_t) buffer;
+        usart->US_RNCR = size;
+
+        return 1;
+    }
+    else {
+
+        return 0;
+    }
+}
+
+/**
+ * \brief  Returns 1 if some data has been received and can be read from an USART;
+ * otherwise returns 0.
+ *
+ * \param usart  Pointer to an Usart instance.
+ */
+uint8_t USART_IsDataAvailable(Usart *usart)
+{
+    if ((usart->US_CSR & US_CSR_RXRDY) != 0) {
+
+        return 1;
+    }
+    else {
+
+        return 0;
+    }
+}
+
+/**
+ * \brief  Sets the filter value for the IRDA demodulator.
+ *
+ * \param pUsart  Pointer to an Usart instance.
+ * \param filter  Filter value.
+ */
+void USART_SetIrdaFilter(Usart *pUsart, uint8_t filter)
+{
+    assert( pUsart != NULL ) ;
+
+    pUsart->US_IF = filter;
+}
+
+/**
+ * \brief  Sends one packet of data through the specified USART peripheral. This
+ * function operates synchronously, so it only returns when the data has been
+ * actually sent.
+ *
+ * \param usart  Pointer to an USART peripheral.
+ * \param c  Character to send
+ */
+void USART_PutChar(
+    Usart *usart,
+    uint8_t c)
+{
+    /* Wait for the transmitter to be ready*/
+    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+
+    /* Send character*/
+    usart->US_THR = c;
+
+    /* Wait for the transfer to complete*/
+    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+}
+
+/**
+ * \brief   Return 1 if a character can be read in USART
+ */
+uint32_t USART_IsRxReady(Usart *usart)
+{
+    return (usart->US_CSR & US_CSR_RXRDY);
+}
+/**
+ * \brief   Get present status
+ */
+uint32_t USART_GetStatus(Usart *usart)
+{
+    return usart->US_CSR;
+}
+/**
+ * \brief   Enable interrupt
+ */
+void USART_EnableIt(Usart *usart,uint32_t mode)
+{
+    usart->US_IER = mode;
+}
+/**
+ * \brief   Disable interrupt
+ */
+void USART_DisableIt(Usart *usart,uint32_t mode)
+{
+    usart->US_IDR = mode;
+}
+/**
+ * \brief  Reads and returns a character from the USART.
+ *
+ * \note This function is synchronous (i.e. uses polling).
+ * \param usart  Pointer to an USART peripheral.
+ * \return Character received.
+ */
+uint8_t USART_GetChar(Usart *usart)
+{
+    while ((usart->US_CSR & US_CSR_RXRDY) == 0);
+    return usart->US_RHR;
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/wdt.c

@@ -1,132 +1,132 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Implementation of Watchdog Timer (WDT) controller.
- *
- */
-
-/** \addtogroup wdt_module Working with WDT
- * The WDT driver provides the interface to configure and use the WDT
- * peripheral.
- *
- * The WDT can be used to prevent system lock-up if the software becomes
- * trapped in a deadlock. It can generate a general reset or a processor
- * reset only. It is clocked by slow clock divided by 128.
- *
- * The WDT is running at reset with 16 seconds watchdog period (slow clock at 32.768 kHz)
- * and external reset generation enabled. The user must either disable it or
- * reprogram it to meet the application requires.
- *
- * To use the WDT, the user could follow these few steps:
- * <ul>
- * <li>Enable watchdog with given mode using \ref WDT_Enable().
- * <li>Restart the watchdog using \ref WDT_Restart() within the watchdog period.
- * </ul>
- *
- * For more accurate information, please look at the WDT section of the
- * Datasheet.
- *
- * \note
- * The Watchdog Mode Register (WDT_MR) can be written only once.\n
- *
- * Related files :\n
- * \ref wdt.c\n
- * \ref wdt.h.\n
- */
-/*@{*/
-/*@}*/
-
-/*---------------------------------------------------------------------------
- *        Headers
- *---------------------------------------------------------------------------*/
-
-#include "chip.h"
-
-#include <stdint.h>
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Enable watchdog with given mode.
- *
- * \note The Watchdog Mode Register (WDT_MR) can be written only once.
- * Only a processor reset resets it.
- *
- * \param dwMode   WDT mode to be set
- */
-extern void WDT_Enable( Wdt* pWDT, uint32_t dwMode )
-{
-    pWDT->WDT_MR = dwMode ;
-}
-
-/**
- * \brief Disable watchdog.
- *
- * \note The Watchdog Mode Register (WDT_MR) can be written only once.
- * Only a processor reset resets it.
- */
-extern void WDT_Disable( Wdt* pWDT )
-{
-    pWDT->WDT_MR = WDT_MR_WDDIS;
-}
-
-/**
- * \brief Watchdog restart.
- */
-extern void WDT_Restart( Wdt* pWDT )
-{
-    pWDT->WDT_CR = 0xA5000001;
-}
-
-/**
- * \brief Watchdog get status.
- */
-extern uint32_t WDT_GetStatus( Wdt* pWDT )
-{
-    return (pWDT->WDT_SR & 0x3) ;
-}
-
-/**
- * \brief Watchdog get period.
- *
- * \param dwMs   desired watchdog period in millisecond.
- */
-extern uint32_t WDT_GetPeriod( uint32_t dwMs )
-{
-    if ( (dwMs < 4) || (dwMs > 16000) )
-    {
-        return 0 ;
-    }
-    return ((dwMs << 8) / 1000) ;
-}
+/* ----------------------------------------------------------------------------
+ *         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.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ * Implementation of Watchdog Timer (WDT) controller.
+ *
+ */
+
+/** \addtogroup wdt_module Working with WDT
+ * The WDT driver provides the interface to configure and use the WDT
+ * peripheral.
+ *
+ * The WDT can be used to prevent system lock-up if the software becomes
+ * trapped in a deadlock. It can generate a general reset or a processor
+ * reset only. It is clocked by slow clock divided by 128.
+ *
+ * The WDT is running at reset with 16 seconds watchdog period (slow clock at 32.768 kHz)
+ * and external reset generation enabled. The user must either disable it or
+ * reprogram it to meet the application requires.
+ *
+ * To use the WDT, the user could follow these few steps:
+ * <ul>
+ * <li>Enable watchdog with given mode using \ref WDT_Enable().
+ * <li>Restart the watchdog using \ref WDT_Restart() within the watchdog period.
+ * </ul>
+ *
+ * For more accurate information, please look at the WDT section of the
+ * Datasheet.
+ *
+ * \note
+ * The Watchdog Mode Register (WDT_MR) can be written only once.\n
+ *
+ * Related files :\n
+ * \ref wdt.c\n
+ * \ref wdt.h.\n
+ */
+/*@{*/
+/*@}*/
+
+/*---------------------------------------------------------------------------
+ *        Headers
+ *---------------------------------------------------------------------------*/
+
+#include "chip.h"
+
+#include <stdint.h>
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Enable watchdog with given mode.
+ *
+ * \note The Watchdog Mode Register (WDT_MR) can be written only once.
+ * Only a processor reset resets it.
+ *
+ * \param dwMode   WDT mode to be set
+ */
+extern void WDT_Enable( Wdt* pWDT, uint32_t dwMode )
+{
+    pWDT->WDT_MR = dwMode ;
+}
+
+/**
+ * \brief Disable watchdog.
+ *
+ * \note The Watchdog Mode Register (WDT_MR) can be written only once.
+ * Only a processor reset resets it.
+ */
+extern void WDT_Disable( Wdt* pWDT )
+{
+    pWDT->WDT_MR = WDT_MR_WDDIS;
+}
+
+/**
+ * \brief Watchdog restart.
+ */
+extern void WDT_Restart( Wdt* pWDT )
+{
+    pWDT->WDT_CR = 0xA5000001;
+}
+
+/**
+ * \brief Watchdog get status.
+ */
+extern uint32_t WDT_GetStatus( Wdt* pWDT )
+{
+    return (pWDT->WDT_SR & 0x3) ;
+}
+
+/**
+ * \brief Watchdog get period.
+ *
+ * \param dwMs   desired watchdog period in millisecond.
+ */
+extern uint32_t WDT_GetPeriod( uint32_t dwMs )
+{
+    if ( (dwMs < 4) || (dwMs > 16000) )
+    {
+        return 0 ;
+    }
+    return ((dwMs << 8) / 1000) ;
+}

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.
  *
@@ -250,7 +251,7 @@ static void GetDescriptor(
     switch (type) {
 
         case USBGenericDescriptor_DEVICE:
-            TRACE_INFO_WP("Dev ");
+            TRACE_DEBUG_WP("Dev ");
 
             /* Adjust length and send descriptor */
 
@@ -262,7 +263,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_CONFIGURATION:
-            TRACE_INFO_WP("Cfg ");
+            TRACE_DEBUG_WP("Cfg ");
 
             /* Adjust length and send descriptor */
 
@@ -279,7 +280,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_DEVICEQUALIFIER:
-            TRACE_INFO_WP("Qua ");
+            TRACE_DEBUG_WP("Qua ");
 
             /* Check if descriptor exists */
 
@@ -300,7 +301,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_OTHERSPEEDCONFIGURATION:
-            TRACE_INFO_WP("OSC ");
+            TRACE_DEBUG_WP("OSC ");
 
             /* Check if descriptor exists */
 
@@ -326,13 +327,18 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_STRING:
-            TRACE_INFO_WP("Str%d ", indexRDesc);
+            TRACE_DEBUG_WP("Str%d ", indexRDesc);
 
             /* Check if descriptor exists */
 
             if (indexRDesc >= numStrings) {
-
-                USBD_Stall(0);
+                /* Sometimes descriptor string 0xee is requested.
+                 * 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 {
 
@@ -498,13 +504,13 @@ void USBDDriver_RequestHandler(
     uint32_t length;
     uint32_t address;
 
-    TRACE_INFO_WP("Std ");
+    TRACE_DEBUG_WP("Std ");
 
     /* Check request code */
     switch (USBGenericRequest_GetRequest(pRequest)) {
 
         case USBGenericRequest_GETDESCRIPTOR:
-            TRACE_INFO_WP("gDesc ");
+            TRACE_DEBUG_WP("gDesc ");
 
             /* Send the requested descriptor */
             type = USBGetDescriptorRequest_GetDescriptorType(pRequest);
@@ -514,7 +520,7 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_SETADDRESS:
-            TRACE_INFO_WP("sAddr ");
+            TRACE_DEBUG_WP("sAddr ");
 
             /* Sends a zero-length packet and then set the device address */
             address = USBSetAddressRequest_GetAddress(pRequest);
@@ -522,7 +528,7 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_SETCONFIGURATION:
-            TRACE_INFO_WP("sCfg ");
+            TRACE_DEBUG_WP("sCfg ");
 
             /* Set the requested configuration */
             cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest);
@@ -530,27 +536,27 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_GETCONFIGURATION:
-            TRACE_INFO_WP("gCfg ");
+            TRACE_DEBUG_WP("gCfg ");
 
             /* Send the current configuration number */
             GetConfiguration(pDriver);
             break;
 
         case USBGenericRequest_GETSTATUS:
-            TRACE_INFO_WP("gSta ");
+            TRACE_DEBUG_WP("gSta ");
 
             /* Check who is the recipient */
             switch (USBGenericRequest_GetRecipient(pRequest)) {
 
                 case USBGenericRequest_DEVICE:
-                    TRACE_INFO_WP("Dev ");
+                    TRACE_DEBUG_WP("Dev ");
 
                     /* Send the device status */
                     GetDeviceStatus(pDriver);
                     break;
 
                 case USBGenericRequest_ENDPOINT:
-                    TRACE_INFO_WP("Ept ");
+                    TRACE_DEBUG_WP("Ept ");
 
                     /* Send the endpoint status */
                     eptnum = USBGenericRequest_GetEndpointNumber(pRequest);
@@ -566,13 +572,13 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_CLEARFEATURE:
-            TRACE_INFO_WP("cFeat ");
+            TRACE_DEBUG_WP("cFeat ");
 
             /* Check which is the requested feature */
             switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {
 
                 case USBFeatureRequest_ENDPOINTHALT:
-                    TRACE_INFO_WP("Hlt ");
+                    TRACE_DEBUG_WP("Hlt ");
 
                     /* Unhalt endpoint and send a zero-length packet */
                     USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest));
@@ -580,7 +586,7 @@ void USBDDriver_RequestHandler(
                     break;
 
                 case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                    TRACE_INFO_WP("RmWU ");
+                    TRACE_DEBUG_WP("RmWU ");
 
                     /* Disable remote wake-up and send a zero-length packet */
                     pDriver->isRemoteWakeUpEnabled = 0;
@@ -596,13 +602,13 @@ void USBDDriver_RequestHandler(
             break;
 
     case USBGenericRequest_SETFEATURE:
-        TRACE_INFO_WP("sFeat ");
+        TRACE_DEBUG_WP("sFeat ");
 
         /* Check which is the selected feature */
         switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {
 
             case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                TRACE_INFO_WP("RmWU ");
+                TRACE_DEBUG_WP("RmWU ");
 
                 /* Enable remote wake-up and send a ZLP */
                 pDriver->isRemoteWakeUpEnabled = 1;
@@ -610,25 +616,25 @@ void USBDDriver_RequestHandler(
                 break;
 
             case USBFeatureRequest_ENDPOINTHALT:
-                TRACE_INFO_WP("Halt ");
+                TRACE_DEBUG_WP("Halt ");
                 /* Halt endpoint */
                 USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest));
                 USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_B_HNP_ENABLE:
-                    TRACE_INFO_WP("OTG_B_HNP_ENABLE ");
+                    TRACE_DEBUG_WP("OTG_B_HNP_ENABLE ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_B_HNP_ENABLE;
                     USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_A_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_HNP_SUPPORT ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_A_HNP_SUPPORT;
                     USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_ALT_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_ALT_HNP_SUPPORT ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT;
                     USBD_Write(0, 0, 0, 0, 0);
@@ -643,7 +649,7 @@ void USBDDriver_RequestHandler(
         break;
 
     case USBGenericRequest_SETINTERFACE:
-        TRACE_INFO_WP("sInterface ");
+        TRACE_DEBUG_WP("sInterface ");
 
         infnum = USBInterfaceRequest_GetInterface(pRequest);
         setting = USBInterfaceRequest_GetAlternateSetting(pRequest);
@@ -651,7 +657,7 @@ void USBDDriver_RequestHandler(
         break;
 
     case USBGenericRequest_GETINTERFACE:
-        TRACE_INFO_WP("gInterface ");
+        TRACE_DEBUG_WP("gInterface ");
 
         infnum = USBInterfaceRequest_GetInterface(pRequest);
         GetInterface(pDriver, infnum);

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
+#define DFURT_IF_DESCRIPTOR_STRUCT
+#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,22 @@
+/* SIMtrace 2 common board pin definitions
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #ifndef _BOARD_
 #define _BOARD_
 
@@ -37,10 +56,8 @@
 /** Core definition */
 #define cortexm3
 
-#define BOARD_MCK     48000000
-
-#define PIO_LED_RED	PIO_PA17
-#define PIO_LED_GREEN	PIO_PA17
+#define PIO_LED_RED     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}
@@ -63,12 +80,16 @@
 #define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 
 /** UART0 */
-/** Console baudrate always using 115200. */
-#define CONSOLE_BAUDRATE    115200
-/** Usart Hw interface used by the console (UART0). */
-#define CONSOLE_USART       UART0
-/** Usart Hw ID used by the console (UART0). */
+/** Console baud rate in bps */
+#define CONSOLE_BAUDRATE    921600
+/** UART peripheral used by the console (UART0). */
+#define CONSOLE_UART       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 +98,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
-#define ID_USART_PHONE    ID_USART1
+/* Interrupt request ID of USART peripheral connected to the SIM card */
+#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 +126,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_600O_F		= 7,
-	BLINK_CUSTOM		= 8,
+	BLINK_2O_F		= 6,
+	BLINK_200O_F		= 7,
+	BLINK_600O_F		= 8,
+	BLINK_CUSTOM		= 9,
+	BLINK_2F_O,
 	_NUM_LED_BLINK
 };
 

firmware/libboard/common/include/manifest.h

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

firmware/libboard/common/include/sim_switch.h

@@ -1,4 +1,26 @@
+/* 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
 
+/** switch card lines to use physical or emulated card
+ *  @param[in] nr card interface number (i.e. slot)
+ *  @param[in] physical which physical interface to switch to (e.g. 0: physical, 1: virtual)
+ *  @return 0 on success, negative else
+ */
 int sim_switch_use_physical(unsigned int nr, int physical);
+/** initialise card switching capabilities
+ *  @return number of switchable card interfaces
+ */
 int sim_switch_init(void);

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

@@ -1,203 +1,208 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2010, 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 "board_lowlevel.h"
-
-/*----------------------------------------------------------------------------
- *        Exported variables
- *----------------------------------------------------------------------------*/
-
-/* Stack Configuration */  
-#define STACK_SIZE       0x900     /** Stack size (in DWords) */
-__attribute__ ((aligned(8),section(".stack")))
-uint32_t pdwStack[STACK_SIZE] ;     
-
-/* Initialize segments */
-extern uint32_t _sfixed;
-extern uint32_t _efixed;
-extern uint32_t _etext;
-extern uint32_t _srelocate;
-extern uint32_t _erelocate;
-extern uint32_t _szero;
-extern uint32_t _ezero;
-
-
-/*----------------------------------------------------------------------------
- *        ProtoTypes
- *----------------------------------------------------------------------------*/
-
-/** \cond DOXYGEN_SHOULD_SKIP_THIS */
-extern int main( void ) ;
-/** \endcond */
-void ResetException( void ) ;
-
-/*------------------------------------------------------------------------------
- *         Exception Table
- *------------------------------------------------------------------------------*/
-
-__attribute__((section(".vectors")))
-IntFunc exception_table[] = {
-
-    /* Configure Initial Stack Pointer, using linker-generated symbols */
-    (IntFunc)(&pdwStack[STACK_SIZE-1]),
-    ResetException,
-
-    NMI_Handler,
-    HardFault_Handler,
-    MemManage_Handler,
-    BusFault_Handler,
-    UsageFault_Handler,
-    0, 0, 0, 0,         /* Reserved */
-    SVC_Handler,
-    DebugMon_Handler,
-    0,                  /* Reserved  */
-    PendSV_Handler,
-    SysTick_Handler,
-
-    /* Configurable interrupts  */
-    SUPC_IrqHandler,    /* 0  Supply Controller */
-    RSTC_IrqHandler,    /* 1  Reset Controller */
-    RTC_IrqHandler,     /* 2  Real Time Clock */
-    RTT_IrqHandler,     /* 3  Real Time Timer */
-    WDT_IrqHandler,     /* 4  Watchdog Timer */
-    PMC_IrqHandler,     /* 5  PMC */
-    EEFC_IrqHandler,    /* 6  EEFC */
-    IrqHandlerNotUsed,  /* 7  Reserved */
-    UART0_IrqHandler,   /* 8  UART0 */
-    UART1_IrqHandler,   /* 9  UART1 */
-    SMC_IrqHandler,     /* 10 SMC */
-    PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
-    PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
-    PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
-    USART0_IrqHandler,  /* 14 USART 0 */
-    USART1_IrqHandler,  /* 15 USART 1 */
-    IrqHandlerNotUsed,  /* 16 Reserved */
-    IrqHandlerNotUsed,  /* 17 Reserved */
-    MCI_IrqHandler,     /* 18 MCI */
-    TWI0_IrqHandler,    /* 19 TWI 0 */
-    TWI1_IrqHandler,    /* 20 TWI 1 */
-    SPI_IrqHandler,     /* 21 SPI */
-    SSC_IrqHandler,     /* 22 SSC */
-    TC0_IrqHandler,     /* 23 Timer Counter 0 */
-    TC1_IrqHandler,     /* 24 Timer Counter 1 */
-    TC2_IrqHandler,     /* 25 Timer Counter 2 */
-    TC3_IrqHandler,     /* 26 Timer Counter 3 */
-    TC4_IrqHandler,     /* 27 Timer Counter 4 */
-    TC5_IrqHandler,     /* 28 Timer Counter 5 */
-    ADC_IrqHandler,     /* 29 ADC controller */
-    DAC_IrqHandler,     /* 30 DAC controller */
-    PWM_IrqHandler,     /* 31 PWM */
-    CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
-    ACC_IrqHandler,     /* 33 Analog Comparator */
-    USBD_IrqHandler,    /* 34 USB Device Port */
-    IrqHandlerNotUsed   /* 35 not used */
-};
-
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
-#include "usb/device/dfu/dfu.h"
-static void BootIntoApp(void)
-{
-	unsigned int *pSrc;
-	void (*appReset)(void);
-
-	pSrc = (unsigned int *) ((unsigned char *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE);
-	SCB->VTOR = ((unsigned int)(pSrc)) | (0x0 << 7);
-	appReset = pSrc[1];
-
-	g_dfu->state = DFU_STATE_appIDLE;
-
-	appReset();
-}
-#endif
-
-/**
- * \brief This is the code that gets called on processor reset.
- * To initialize the device, and call the main() routine.
- */
-void ResetException( void )
-{
-    uint32_t *pSrc, *pDest ;
-
-    /* Low level Initialize */
-    LowLevelInit() ;
-
-
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
-    /* we are before the text segment has been relocated, so g_dfu is
-     * not initialized yet */
-    g_dfu = &_g_dfu;
-    if ((g_dfu->magic != USB_DFU_MAGIC) && !USBDFU_OverrideEnterDFU()) {
-        BootIntoApp();
-        /* Infinite loop */
-        while ( 1 ) ;
-    }
-#endif
-
-    /* Initialize the relocate segment */
-    pSrc = &_etext ;
-    pDest = &_srelocate ;
-
-    if ( pSrc != pDest )
-    {
-        for ( ; pDest < &_erelocate ; )
-        {
-            *pDest++ = *pSrc++ ;
-        }
-    }
-
-    /* Clear the zero segment */
-    for ( pDest = &_szero ; pDest < &_ezero ; )
-    {
-        *pDest++ = 0;
-    }
-
-    /* Set the vector table base address */
-    pSrc = (uint32_t *)&_sfixed;
-    SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
-    
-    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 */
-    __enable_irq();
-
-    /* Branch to main function */
-    main() ;
-
-    /* Infinite loop */
-    while ( 1 ) ;
-}
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ *
+ * 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 "board_lowlevel.h"
+
+/*----------------------------------------------------------------------------
+ *        Exported variables
+ *----------------------------------------------------------------------------*/
+
+/* Stack Configuration */  
+#define STACK_SIZE       0x900     /** Stack size (in DWords) */
+__attribute__ ((aligned(8),section(".stack")))
+uint32_t pdwStack[STACK_SIZE] ;     
+
+/* Initialize segments */
+extern uint32_t _sfixed;
+extern uint32_t _efixed;
+extern uint32_t _etext;
+extern uint32_t _srelocate;
+extern uint32_t _erelocate;
+extern uint32_t _szero;
+extern uint32_t _ezero;
+
+
+/*----------------------------------------------------------------------------
+ *        ProtoTypes
+ *----------------------------------------------------------------------------*/
+
+/** \cond DOXYGEN_SHOULD_SKIP_THIS */
+extern int main( void ) ;
+/** \endcond */
+void ResetException( void ) ;
+
+/*------------------------------------------------------------------------------
+ *         Exception Table
+ *------------------------------------------------------------------------------*/
+
+__attribute__((section(".vectors")))
+IntFunc exception_table[] = {
+
+	/* Configure Initial Stack Pointer, using linker-generated symbols */
+	(IntFunc)(&pdwStack[STACK_SIZE-1]),
+	ResetException,
+
+	NMI_Handler,
+	HardFault_Handler,
+	MemManage_Handler,
+	BusFault_Handler,
+	UsageFault_Handler,
+	0, 0, 0, 0,         /* Reserved */
+	SVC_Handler,
+	DebugMon_Handler,
+	0,                  /* Reserved  */
+	PendSV_Handler,
+	SysTick_Handler,
+
+	/* Configurable interrupts  */
+	SUPC_IrqHandler,    /* 0  Supply Controller */
+	RSTC_IrqHandler,    /* 1  Reset Controller */
+	RTC_IrqHandler,     /* 2  Real Time Clock */
+	RTT_IrqHandler,     /* 3  Real Time Timer */
+	WDT_IrqHandler,     /* 4  Watchdog Timer */
+	PMC_IrqHandler,     /* 5  PMC */
+	EEFC_IrqHandler,    /* 6  EEFC */
+	IrqHandlerNotUsed,  /* 7  Reserved */
+	UART0_IrqHandler,   /* 8  UART0 */
+	UART1_IrqHandler,   /* 9  UART1 */
+	SMC_IrqHandler,     /* 10 SMC */
+	PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
+	PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
+	PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
+	USART0_IrqHandler,  /* 14 USART 0 */
+	USART1_IrqHandler,  /* 15 USART 1 */
+	IrqHandlerNotUsed,  /* 16 Reserved */
+	IrqHandlerNotUsed,  /* 17 Reserved */
+	MCI_IrqHandler,     /* 18 MCI */
+	TWI0_IrqHandler,    /* 19 TWI 0 */
+	TWI1_IrqHandler,    /* 20 TWI 1 */
+	SPI_IrqHandler,     /* 21 SPI */
+	SSC_IrqHandler,     /* 22 SSC */
+	TC0_IrqHandler,     /* 23 Timer Counter 0 */
+	TC1_IrqHandler,     /* 24 Timer Counter 1 */
+	TC2_IrqHandler,     /* 25 Timer Counter 2 */
+	TC3_IrqHandler,     /* 26 Timer Counter 3 */
+	TC4_IrqHandler,     /* 27 Timer Counter 4 */
+	TC5_IrqHandler,     /* 28 Timer Counter 5 */
+	ADC_IrqHandler,     /* 29 ADC controller */
+	DAC_IrqHandler,     /* 30 DAC controller */
+	PWM_IrqHandler,     /* 31 PWM */
+	CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
+	ACC_IrqHandler,     /* 33 Analog Comparator */
+	USBD_IrqHandler,    /* 34 USB Device Port */
+	IrqHandlerNotUsed   /* 35 not used */
+};
+
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
+#include "usb/device/dfu/dfu.h"
+static void BootIntoApp(void)
+{
+	unsigned int *pSrc;
+	void (*appReset)(void);
+
+	pSrc = (unsigned int *) ((unsigned char *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE);
+	/* set vector table to application vector table (store at the beginning of the application) */
+	SCB->VTOR = (unsigned int)(pSrc);
+	/* set stack pointer to address provided in the beginning of the application (loaded into a register first) */
+	__asm__ volatile ("MSR msp,%0" : :"r"(*pSrc));
+	/* start application (by jumping to the reset function which address is stored as second entry of the vector table) */
+	appReset = (void(*)(void))pSrc[1];
+
+	g_dfu->state = DFU_STATE_appIDLE;
+
+	appReset();
+}
+#endif
+
+/**
+ * \brief This is the code that gets called on processor reset.
+ * To initialize the device, and call the main() routine.
+ */
+void ResetException( void )
+{
+	uint32_t *pSrc, *pDest ;
+
+	/* Low level Initialize */
+	LowLevelInit() ;
+
+
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
+	if (!USBDFU_OverrideEnterDFU()) {
+		UART_Exit();
+		__disable_irq();
+		BootIntoApp();
+		/* Infinite loop */
+		while ( 1 ) ;
+	}
+#endif
+
+	/* Initialize the relocate segment */
+	pSrc = &_etext ;
+	pDest = &_srelocate ;
+
+	if ( pSrc != pDest )
+	{
+		for ( ; pDest < &_erelocate ; )
+		{
+		    *pDest++ = *pSrc++ ;
+		}
+	}
+
+	/* Clear the zero segment */
+	for ( pDest = &_szero ; pDest < &_ezero ; )
+	{
+		*pDest++ = 0;
+	}
+
+	/* Set the vector table base address */
+	pSrc = (uint32_t *)&_sfixed;
+	SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
+	
+	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 */
+	__enable_irq();
+
+	/* Branch to main function */
+	main() ;
+
+	/* Infinite loop */
+	while ( 1 ) ;
+}
+

firmware/libboard/common/source/board_lowlevel.c

@@ -1,216 +1,217 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Provides the low-level initialization function that called on chip startup.
- */
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "board.h"
-
-/*----------------------------------------------------------------------------
- *        Local definitions
- *----------------------------------------------------------------------------*/
-
-#define BOARD_OSCOUNT   (CKGR_MOR_MOSCXTST(0x8))
-#define BOARD_MCKR      (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK)
-
-#if (BOARD_MCK == 48000000)
-#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_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(5))
-#elif (BOARD_MAINOSC == 12000000)
-/* QMod has 12 MHz clock, so multply by 8 (96 MHz) and divide by 2 */
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(8-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
-#else
-#error "Please define PLLA config for your MAINOSC frequency"
-#endif /* MAINOSC */
-#elif (BOARD_MCK == 64000000)
-#if (BOARD_MAINOSC == 18432000)
-/* Clock settings at 64MHz  for 18 MHz crystal: 64.512 MHz */
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(7-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | 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_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(2))
-#error "Please define PLLA config for your MAINOSC frequency"
-#endif /* MAINOSC */
-#else
-    #error "No PLL settings for current BOARD_MCK."
-#endif
-
-#if (BOARD_MAINOSC == 12000000)
-#define PLLB_CFG (CKGR_PLLBR_DIVB(2)|CKGR_PLLBR_MULB(8-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
-#elif (BOARD_MAINOSC == 18432000)
-#define PLLB_CFG (CKGR_PLLBR_DIVB(5)|CKGR_PLLBR_MULB(13-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
-#else
-#error "Please configure PLLB for your MAINOSC freq"
-#endif
-
-/* Define clock timeout */
-#define CLOCK_TIMEOUT    0xFFFFFFFF
-
-/**
- * \brief Configure 48MHz Clock for USB
- */
-static void _ConfigureUsbClock(void)
-{
-	/* Enable PLLB for USB */
-	PMC->CKGR_PLLBR = PLLB_CFG;
-	while ((PMC->PMC_SR & PMC_SR_LOCKB) == 0) ;
-
-	/* USB Clock uses PLLB */
-	PMC->PMC_USB = PMC_USB_USBDIV(0)	/* /1 (no divider)  */
-			    | PMC_USB_USBS;	/* PLLB */
-}
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief Performs the low-level initialization of the chip.
- * This includes EFC and master clock configuration.
- * It also enable a low level on the pin NRST triggers a user reset.
- */
-extern WEAK void LowLevelInit( void )
-{
-    uint32_t timeout = 0;
-
-    /* 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
-     * might be some kind of leakage that creeps in some way, but is not
-     * the "official" power supply */
-    SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
-	    	      SUPC_SMMR_SMRSTEN_ENABLE;
-
-    /* enable both LED and green LED */
-    PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
-    PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
-    PIOA->PIO_CODR |= PIO_LED_RED | PIO_LED_GREEN;
-
-    /* Set 3 FWS for Embedded Flash Access */
-    EFC->EEFC_FMR = EEFC_FMR_FWS(3);
-
-    /* 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));
-        timeout = 0;
-        while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
-    }
-*/
-
-#ifndef qmod
-    /* Initialize main oscillator */
-    if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
-    {
-        PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
-        timeout = 0;
-        while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
-    }
-
-    /* Switch to 3-20MHz Xtal oscillator */
-    PIOB->PIO_PDR = (1 << 8) | (1 << 9);
-    PIOB->PIO_PUDR = (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;
-    /* wait for Main XTAL oscillator stabilization */
-    timeout = 0;
-    while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
-#else
-    /* QMOD has external 12MHz clock source */
-    PIOB->PIO_PDR = (1 << 9);
-    PIOB->PIO_PUDR = (1 << 9);
-    PIOB->PIO_PPDDR = (1 << 9);
-    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 */
-    PIOA->PIO_SODR = PIO_LED_RED;
-
-    /* "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;
-    /* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
-
-    /* Initialize PLLA */
-    PMC->CKGR_PLLAR = BOARD_PLLAR;
-    /* Wait for PLLA to lock */
-    timeout = 0;
-    while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
-
-    /* Switch to main clock (again ?!?) */
-    PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
-    /* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
-
-    /* switch to PLLA as master clock source */
-    PMC->PMC_MCKR = BOARD_MCKR ;
-    /* wait for master clock to be ready */
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
-
-    /* Configure SysTick for 1ms */
-    SysTick_Config(BOARD_MCK/1000);
-
-    _ConfigureUsbClock();
-}
-
-/* SysTick based delay function */
-
-volatile uint32_t jiffies;
-
-/* Interrupt handler for SysTick interrupt */
-void SysTick_Handler(void)
-{
-	jiffies++;
-}
-
-void mdelay(unsigned int msecs)
-{
-	uint32_t jiffies_start = jiffies;
-	do {
-	} while ((jiffies - jiffies_start) < msecs);
-}
+/* ----------------------------------------------------------------------------
+ *         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.
+ *
+ * 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.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ * Provides the low-level initialization function that called on chip startup.
+ */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "board.h"
+
+/*----------------------------------------------------------------------------
+ *        Local definitions
+ *----------------------------------------------------------------------------*/
+
+#define BOARD_OSCOUNT   (CKGR_MOR_MOSCXTST(0x8))
+#define BOARD_MCKR      (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK)
+
+/** configure PLL to generate main clock based on main oscillator frequency */
+#if (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 48000000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(8-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(2))
+#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 58000000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(29-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(6))
+#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 60000000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(10-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(2))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 47923200)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(13-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(5))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 58982400)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(16-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(5))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 64512000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(7-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(2))
+#else
+	#error "Please define PLLA config for your BOARD_MCK/MAINOSC frequency"
+#endif
+
+#if (BOARD_MAINOSC == 12000000)
+#define PLLB_CFG (CKGR_PLLBR_DIVB(2)|CKGR_PLLBR_MULB(8-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
+#elif (BOARD_MAINOSC == 18432000)
+#define PLLB_CFG (CKGR_PLLBR_DIVB(5)|CKGR_PLLBR_MULB(13-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
+#else
+#error "Please configure PLLB for your MAINOSC freq"
+#endif
+
+/* Define clock timeout */
+#define CLOCK_TIMEOUT    0xFFFFFFFF
+
+/**
+ * \brief Configure 48MHz Clock for USB
+ */
+static void _ConfigureUsbClock(void)
+{
+	/* Enable PLLB for USB */
+	PMC->CKGR_PLLBR = PLLB_CFG;
+	while ((PMC->PMC_SR & PMC_SR_LOCKB) == 0) ;
+
+	/* USB Clock uses PLLB */
+	PMC->PMC_USB = PMC_USB_USBDIV(0)	/* /1 (no divider)  */
+			    | PMC_USB_USBS;	/* PLLB */
+}
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Performs the low-level initialization of the chip.
+ * This includes EFC and master clock configuration.
+ * It also enable a low level on the pin NRST triggers a user reset.
+ */
+extern WEAK void LowLevelInit( void )
+{
+	uint32_t timeout = 0;
+
+	/* 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
+	 * might be some kind of leakage that creeps in some way, but is not
+	 * the "official" power supply */
+	SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
+	    	      SUPC_SMMR_SMRSTEN_ENABLE;
+
+	/* enable both LED and green LED */
+	PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
+	PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
+	PIOA->PIO_CODR |= PIO_LED_RED | PIO_LED_GREEN;
+
+	/* Set 3 FWS for Embedded Flash Access */
+	EFC->EEFC_FMR = EEFC_FMR_FWS(3);
+
+	/* 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));
+		timeout = 0;
+		while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
+	}
+*/
+
+#ifndef qmod
+	/* Initialize main oscillator */
+	if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
+	{
+		PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
+		timeout = 0;
+		while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
+	}
+
+	/* Switch to 3-20MHz Xtal oscillator */
+	PIOB->PIO_PDR = (1 << 8) | (1 << 9);
+	PIOB->PIO_PUDR = (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;
+	/* wait for Main XTAL oscillator stabilization */
+	timeout = 0;
+	while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
+#else
+	/* QMOD has external 12MHz clock source */
+	PIOB->PIO_PDR = (1 << 9);
+	PIOB->PIO_PUDR = (1 << 9);
+	PIOB->PIO_PPDDR = (1 << 9);
+	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 */
+	PIOA->PIO_SODR = PIO_LED_RED;
+
+	/* "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;
+	/* wait for master clock to be ready */
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+
+	/* Initialize PLLA */
+	PMC->CKGR_PLLAR = BOARD_PLLAR;
+	/* Wait for PLLA to lock */
+	timeout = 0;
+	while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
+
+	/* Switch to main clock (again ?!?) */
+	PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
+	/* wait for master clock to be ready */
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+
+	/* switch to PLLA as master clock source */
+	PMC->PMC_MCKR = BOARD_MCKR ;
+	/* wait for master clock to be ready */
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+
+	/* Configure SysTick for 1ms */
+	SysTick_Config(BOARD_MCK/1000);
+
+	_ConfigureUsbClock();
+}
+
+/* SysTick based delay function */
+
+volatile uint32_t jiffies;
+
+/* Interrupt handler for SysTick interrupt */
+void SysTick_Handler(void)
+{
+	jiffies++;
+}
+
+void mdelay(unsigned int msecs)
+{
+	uint32_t jiffies_start = jiffies;
+	do {
+	} while ((jiffies - jiffies_start) < msecs);
+}

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/uart_console.c

@@ -1,380 +1,453 @@
-/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Implements UART console.
- *
- */
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "board.h"
-
-#include <stdio.h>
-#include <stdint.h>
-
-/*----------------------------------------------------------------------------
- *        Definitions
- *----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
- *        Variables
- *----------------------------------------------------------------------------*/
-
-/** Is Console Initialized. */
-static uint8_t _ucIsConsoleInitialized=0 ;
-
-/**
- * \brief Configures an USART peripheral with the specified parameters.
- *
- * \param baudrate  Baudrate at which the USART should operate (in Hz).
- * \param masterClock  Frequency of the system master clock (in Hz).
- */
-extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
-{
-    const Pin pPins[] = CONSOLE_PINS;
-    Uart *pUart = CONSOLE_USART;
-
-    /* Configure PIO */
-    PIO_Configure(pPins, PIO_LISTSIZE(pPins));
-
-    /* Configure PMC */
-    PMC->PMC_PCER0 = 1 << CONSOLE_ID;
-
-    /* Reset and disable receiver & transmitter */
-    pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
-                   | UART_CR_RXDIS | UART_CR_TXDIS;
-
-    /* Configure mode */
-    pUart->UART_MR =  UART_MR_PAR_NO;
-
-    /* Configure baudrate */
-    /* Asynchronous, no oversampling */
-    pUart->UART_BRGR = (masterClock / baudrate) / 16;
-
-    /* Disable PDC channel */
-    pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
-
-    /* Enable receiver and transmitter */
-    pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
-
-    _ucIsConsoleInitialized=1 ;
-}
-
-/**
- * \brief Outputs a character on the UART line.
- *
- * \note This function is synchronous (i.e. uses polling).
- * \param c  Character to send.
- */
-extern void UART_PutChar( uint8_t c )
-{
-    Uart *pUart=CONSOLE_USART ;
-
-    if ( !_ucIsConsoleInitialized )
-    {
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-    }
-
-    /* Wait for the transmitter to be ready */
-    while ( (pUart->UART_SR & UART_SR_TXEMPTY) == 0 ) ;
-
-    /* Send character */
-    pUart->UART_THR=c ;
-
-}
-
-/**
- * \brief Input a character from the UART line.
- *
- * \note This function is synchronous
- * \return character received.
- */
-extern uint32_t UART_GetChar( void )
-{
-    Uart *pUart=CONSOLE_USART ;
-
-    if ( !_ucIsConsoleInitialized )
-    {
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-    }
-
-    while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 ) ;
-
-    return pUart->UART_RHR ;
-}
-
-/**
- * \brief Check if there is Input from UART line.
- *
- * \return true if there is Input.
- */
-extern uint32_t UART_IsRxReady( void )
-{
-    Uart *pUart=CONSOLE_USART ;
-
-    if ( !_ucIsConsoleInitialized )
-    {
-        UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
-    }
-
-    return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
-}
-
-/**
- *  Displays the content of the given frame on the UART0.
- *
- *  \param pucFrame Pointer to the frame to dump.
- *  \param dwSize   Buffer size in bytes.
- */
-extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
-{
-    uint32_t dw ;
-
-    for ( dw=0 ; dw < dwSize ; dw++ )
-    {
-        printf( "%02X ", pucFrame[dw] ) ;
-    }
-
-    printf( "\n\r" ) ;
-}
-
-/**
- *  Displays the content of the given buffer on the UART0.
- *
- *  \param pucBuffer  Pointer to the buffer to dump.
- *  \param dwSize     Buffer size in bytes.
- *  \param dwAddress  Start address to display
- */
-extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
-{
-    uint32_t i ;
-    uint32_t j ;
-    uint32_t dwLastLineStart ;
-    uint8_t* pucTmp ;
-
-    for ( i=0 ; i < (dwSize / 16) ; i++ )
-    {
-        printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
-        pucTmp = (uint8_t*)&pucBuffer[i*16] ;
-
-        for ( j=0 ; j < 4 ; j++ )
-        {
-            printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
-            pucTmp += 4 ;
-        }
-
-        pucTmp=(uint8_t*)&pucBuffer[i*16] ;
-
-        for ( j=0 ; j < 16 ; j++ )
-        {
-            UART_PutChar( *pucTmp++ ) ;
-        }
-
-        printf( "\n\r" ) ;
-    }
-
-    if ( (dwSize%16) != 0 )
-    {
-        dwLastLineStart=dwSize - (dwSize%16) ;
-
-        printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
-        for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
-        {
-            if ( (j!=dwLastLineStart) && (j%4 == 0) )
-            {
-                printf( " " ) ;
-            }
-
-            if ( j < dwSize )
-            {
-                printf( "%02X", pucBuffer[j] ) ;
-            }
-            else
-            {
-                printf("  ") ;
-            }
-        }
-
-        printf( " " ) ;
-        for ( j=dwLastLineStart ; j < dwSize ; j++ )
-        {
-            UART_PutChar( pucBuffer[j] ) ;
-        }
-
-        printf( "\n\r" ) ;
-    }
-}
-
-/**
- *  Reads an integer
- *
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
- */
-extern uint32_t UART_GetInteger( uint32_t* pdwValue )
-{
-    uint8_t ucKey ;
-    uint8_t ucNbNb=0 ;
-    uint32_t dwValue=0 ;
-
-    while ( 1 )
-    {
-        ucKey=UART_GetChar() ;
-        UART_PutChar( ucKey ) ;
-
-        if ( ucKey >= '0' &&  ucKey <= '9' )
-        {
-            dwValue = (dwValue * 10) + (ucKey - '0');
-            ucNbNb++ ;
-        }
-        else
-        {
-            if ( ucKey == 0x0D || ucKey == ' ' )
-            {
-                if ( ucNbNb == 0 )
-                {
-                    printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
-                    return 0 ;
-                }
-                else
-                {
-                    printf( "\n\r" ) ;
-                    *pdwValue=dwValue ;
-
-                    return 1 ;
-                }
-            }
-            else
-            {
-                printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
-
-                return 0 ;
-            }
-        }
-    }
-}
-
-/**
- *  Reads an integer and check the value
- *
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
- *  \param dwMin     Minimum value
- *  \param dwMax     Maximum value
- */
-extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
-{
-    uint32_t dwValue=0 ;
-
-    if ( UART_GetInteger( &dwValue ) == 0 )
-    {
-        return 0 ;
-    }
-
-    if ( dwValue < dwMin || dwValue > dwMax )
- {
-        printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
-
-        return 0 ;
-    }
-
-    printf( "\n\r" ) ;
-
-    *pdwValue = dwValue ;
-
-    return 1 ;
-}
-
-/**
- *  Reads an hexadecimal number
- *
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
- */
-extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
-{
-    uint8_t ucKey ;
-    uint32_t dw = 0 ;
-    uint32_t dwValue = 0 ;
-
-    for ( dw=0 ; dw < 8 ; dw++ )
-    {
-        ucKey = UART_GetChar() ;
-        UART_PutChar( ucKey ) ;
-
-        if ( ucKey >= '0' &&  ucKey <= '9' )
-        {
-            dwValue = (dwValue * 16) + (ucKey - '0') ;
-        }
-        else
-        {
-            if ( ucKey >= 'A' &&  ucKey <= 'F' )
-            {
-                dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
-            }
-            else
-            {
-                if ( ucKey >= 'a' &&  ucKey <= 'f' )
-                {
-                    dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
-                }
-                else
-                {
-                    printf( "\n\rIt is not a hexa character!\n\r" ) ;
-
-                    return 0 ;
-                }
-            }
-        }
-    }
-
-    printf("\n\r" ) ;
-    *pdwValue = dwValue ;
-
-    return 1 ;
-}
-
-#if defined __ICCARM__ /* IAR Ewarm 5.41+ */
-/**
- * \brief Outputs a character on the UART.
- *
- * \param c  Character to output.
- *
- * \return The character that was output.
- */
-extern WEAK signed int putchar( signed int c )
-{
-    UART_PutChar( c ) ;
-
-    return c ;
-}
-#endif // defined __ICCARM__
-
+/* ----------------------------------------------------------------------------
+ *         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.
+ *
+ * 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.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ * Implements UART console.
+ *
+ */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "board.h"
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "ringbuffer.h"
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------
+ *        Variables
+ *----------------------------------------------------------------------------*/
+
+/** Is Console Initialized. */
+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.
+ *
+ * \param baudrate  Baudrate at which the USART should operate (in Hz).
+ * \param masterClock  Frequency of the system master clock (in Hz).
+ */
+extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
+{
+	const Pin pPins[] = CONSOLE_PINS;
+	Uart *pUart = CONSOLE_UART;
+
+	/* Configure PIO */
+	PIO_Configure(pPins, PIO_LISTSIZE(pPins));
+
+	/* Configure PMC */
+	PMC->PMC_PCER0 = 1 << CONSOLE_ID;
+
+	/* Reset and disable receiver & transmitter */
+	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
+				   | UART_CR_RXDIS | UART_CR_TXDIS;
+
+	/* Configure mode */
+	pUart->UART_MR =  UART_MR_PAR_NO;
+
+	/* Configure baudrate */
+	/* Asynchronous, no oversampling */
+	//pUart->UART_BRGR = (masterClock / baudrate) / 16;
+	if ((masterClock / baudrate) % 16 >= 7) {
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1;
+	} else {
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0;
+	}
+
+	/* Disable PDC channel */
+	pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
+
+	/* Reset transmit ring buffer */
+	rbuf_reset(&uart_tx_buffer);
+
+	/* 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 asynchronous (i.e. uses a buffer and interrupt to complete the transfer).
+ * \param c  Character to send.
+ */
+void UART_PutChar( uint8_t uc )
+{
+	Uart *pUart = CONSOLE_UART ;
+
+	/* Initialize console is not already done */
+	if ( !_ucIsConsoleInitialized )
+	{
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	}
+
+	if (!rbuf_is_full(&uart_tx_buffer)) {
+		rbuf_write(&uart_tx_buffer, uc);
+		if (!(pUart->UART_IMR & UART_IMR_TXRDY)) {
+			pUart->UART_IER = UART_IER_TXRDY;
+			CONSOLE_ISR();
+		}
+	}
+}
+
+/**
+ * \brief Outputs a character on the UART line.
+ *
+ * \note This function is synchronous (i.e. uses polling and blocks until the transfer is complete).
+ * \param c  Character to send.
+ */
+void UART_PutChar_Sync( uint8_t uc )
+{
+	Uart *pUart = CONSOLE_UART ;
+
+	/* Initialize console is not already done */
+	if ( !_ucIsConsoleInitialized )
+	{
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	}
+
+	while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to be empty */
+	pUart->UART_THR = uc; /* Send data to UART peripheral */
+	while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to transferred to shift register */
+	while (!(pUart->UART_SR & UART_SR_TXEMPTY)); /* Wait for transfer shift register to be empty (i.e. transfer is complete) */
+}
+
+/**
+ * \brief Input a character from the UART line.
+ *
+ * \note This function is synchronous
+ * \return character received.
+ */
+extern uint32_t UART_GetChar( void )
+{
+	Uart *pUart = CONSOLE_UART ;
+
+	if ( !_ucIsConsoleInitialized )
+	{
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	}
+
+	while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 )
+		WDT_Restart(WDT);
+
+	return pUart->UART_RHR ;
+}
+
+/**
+ * \brief Check if there is Input from UART line.
+ *
+ * \return true if there is Input.
+ */
+extern uint32_t UART_IsRxReady( void )
+{
+	Uart *pUart = CONSOLE_UART;
+
+	if ( !_ucIsConsoleInitialized )
+	{
+		UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
+	}
+
+	return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
+}
+
+/**
+ *  Displays the content of the given frame on the UART0.
+ *
+ *  \param pucFrame Pointer to the frame to dump.
+ *  \param dwSize   Buffer size in bytes.
+ */
+extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
+{
+	uint32_t dw ;
+
+	for ( dw=0 ; dw < dwSize ; dw++ )
+	{
+		printf( "%02X ", pucFrame[dw] ) ;
+	}
+
+	printf( "\n\r" ) ;
+}
+
+/**
+ *  Displays the content of the given buffer on the UART0.
+ *
+ *  \param pucBuffer  Pointer to the buffer to dump.
+ *  \param dwSize     Buffer size in bytes.
+ *  \param dwAddress  Start address to display
+ */
+extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
+{
+	uint32_t i ;
+	uint32_t j ;
+	uint32_t dwLastLineStart ;
+	uint8_t* pucTmp ;
+
+	for ( i=0 ; i < (dwSize / 16) ; i++ )
+	{
+		printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
+		pucTmp = (uint8_t*)&pucBuffer[i*16] ;
+
+		for ( j=0 ; j < 4 ; j++ )
+		{
+			printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
+			pucTmp += 4 ;
+		}
+
+		pucTmp=(uint8_t*)&pucBuffer[i*16] ;
+
+		for ( j=0 ; j < 16 ; j++ )
+		{
+			UART_PutChar( *pucTmp++ ) ;
+		}
+
+		printf( "\n\r" ) ;
+	}
+
+	if ( (dwSize%16) != 0 )
+	{
+		dwLastLineStart=dwSize - (dwSize%16) ;
+
+		printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
+		for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
+		{
+			if ( (j!=dwLastLineStart) && (j%4 == 0) )
+			{
+				printf( " " ) ;
+			}
+
+			if ( j < dwSize )
+			{
+				printf( "%02X", pucBuffer[j] ) ;
+			}
+			else
+			{
+				printf("  ") ;
+			}
+		}
+
+		printf( " " ) ;
+		for ( j=dwLastLineStart ; j < dwSize ; j++ )
+		{
+			UART_PutChar( pucBuffer[j] ) ;
+		}
+
+		printf( "\n\r" ) ;
+	}
+}
+
+/**
+ *  Reads an integer
+ *
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+ */
+extern uint32_t UART_GetInteger( uint32_t* pdwValue )
+{
+	uint8_t ucKey ;
+	uint8_t ucNbNb=0 ;
+	uint32_t dwValue=0 ;
+
+	while ( 1 )
+	{
+		ucKey=UART_GetChar() ;
+		UART_PutChar( ucKey ) ;
+
+		if ( ucKey >= '0' &&  ucKey <= '9' )
+		{
+			dwValue = (dwValue * 10) + (ucKey - '0');
+			ucNbNb++ ;
+		}
+		else
+		{
+			if ( ucKey == 0x0D || ucKey == ' ' )
+			{
+				if ( ucNbNb == 0 )
+				{
+					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
+					return 0 ;
+				}
+				else
+				{
+					printf( "\n\r" ) ;
+					*pdwValue=dwValue ;
+
+					return 1 ;
+				}
+			}
+			else
+			{
+				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
+
+				return 0 ;
+			}
+		}
+		WDT_Restart(WDT);
+	}
+}
+
+/**
+ *  Reads an integer and check the value
+ *
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+ *  \param dwMin     Minimum value
+ *  \param dwMax     Maximum value
+ */
+extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
+{
+	uint32_t dwValue=0 ;
+
+	if ( UART_GetInteger( &dwValue ) == 0 )
+	{
+		return 0 ;
+	}
+
+	if ( dwValue < dwMin || dwValue > dwMax )
+ {
+		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
+
+		return 0 ;
+	}
+
+	printf( "\n\r" ) ;
+
+	*pdwValue = dwValue ;
+
+	return 1 ;
+}
+
+/**
+ *  Reads an hexadecimal number
+ *
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+ */
+extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
+{
+	uint8_t ucKey ;
+	uint32_t dw = 0 ;
+	uint32_t dwValue = 0 ;
+
+	for ( dw=0 ; dw < 8 ; dw++ )
+	{
+		ucKey = UART_GetChar() ;
+		UART_PutChar( ucKey ) ;
+
+		if ( ucKey >= '0' &&  ucKey <= '9' )
+		{
+			dwValue = (dwValue * 16) + (ucKey - '0') ;
+		}
+		else
+		{
+			if ( ucKey >= 'A' &&  ucKey <= 'F' )
+			{
+				dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
+			}
+			else
+			{
+				if ( ucKey >= 'a' &&  ucKey <= 'f' )
+				{
+					dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
+				}
+				else
+				{
+					printf( "\n\rIt is not a hexa character!\n\r" ) ;
+
+					return 0 ;
+				}
+			}
+		}
+	}
+
+	printf("\n\r" ) ;
+	*pdwValue = dwValue ;
+
+	return 1 ;
+}
+
+#if defined __ICCARM__ /* IAR Ewarm 5.41+ */
+/**
+ * \brief Outputs a character on the UART.
+ *
+ * \param c  Character to output.
+ *
+ * \return The character that was output.
+ */
+extern WEAK signed int putchar( signed int c )
+{
+	UART_PutChar( c ) ;
+
+	return c ;
+}
+#endif // defined __ICCARM__
+

firmware/libboard/owhw/include/board.h

@@ -1,12 +1,35 @@
+/* OWHW board definition
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 #include "board_common.h"
+#include "simtrace_usb.h"
 
 /** Name of the board */
 #define BOARD_NAME "OWHW"
 /** Board definition */
 #define owhw
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
 
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}

firmware/libboard/owhw/source/owhw.c

@@ -1,28 +1,55 @@
-/* Card simulator specific functions */
-/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
+/* Card simulator specific functions
  *
- *  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.
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
- *  This program is 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.
+ * 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This 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 "chip.h"
 #include "board.h"
 #include "utils.h"
+#include "usb_buf.h"
 
 static const Pin pins_cardsim[] = PINS_CARDSIM;
 
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\n\r");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	default:
+		printf("Unknown command '%c'\n\r", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+#endif
+}
+
 void cardsim_set_simpres(uint8_t slot, int present)
 {
 	if (slot > 1)
@@ -36,5 +63,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/owhw/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/qmod/include/board.h

@@ -1,12 +1,37 @@
+/* sysmocom quad-modem sysmoQMOD board definition
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 #include "board_common.h"
+#include "simtrace_usb.h"
+
+#define LED_USIM1	LED_GREEN
+#define LED_USIM2	LED_RED
 
 /** Name of the board */
 #define BOARD_NAME "QMOD"
 /** Board definition */
 #define qmod
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 12000000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58000000 // 18.432 * 29 / 6
 
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
@@ -70,4 +95,7 @@
 #define CARDEMU_SECOND_UART
 #define DETECT_VCC_BY_ADC
 
+/** sysmoQMOD only supports card emulation */
+#ifdef APPLICATION_cardem
 #define HAVE_CARDEM
+#endif

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,15 +1,32 @@
-/* Quad-modem speciic application code */
-/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
-
+/* sysmocom quad-modem sysmoQMOD application code
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
+#include "led.h"
 #include "wwan_led.h"
 #include "wwan_perst.h"
 #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 +72,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,22 +79,25 @@ static int write_hub_eeprom(void)
 
 	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		/* if the result was negative, repeat that write */
-		if (rc < 0)
-			i--;
+		if (rc < 0) {
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
+				i, __eeprom_bin[i]);
+			return 1;
+		}
 	}
 
 	/* then pursue re-reading it again and again */
 	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_INFO("0x%02x: %02x\n\r", i, byte);
+		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
 			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
 					i, __eeprom_bin[i], byte);
 	}
+	TRACE_INFO("EEPROM written\n\r");
 
 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -87,6 +105,29 @@ static int write_hub_eeprom(void)
 	return 0;
 }
 
+static int erase_hub_eeprom(void)
+{
+	int i;
+
+	/* wait */
+	mdelay(100);
+
+	TRACE_INFO("Erasing EEPROM...\n\r");
+	/* write the EEPROM once */
+	for (i = 0; i < 256; i++) {
+		int rc = eeprom_write_byte(0x50, i, 0xff);
+		if (rc < 0) {
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
+				i, __eeprom_bin[i]);
+			return 1;
+		}
+	}
+	TRACE_INFO("EEPROM erased\n\r");
+
+	return 0;
+}
+
+
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -99,6 +140,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 +167,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);
@@ -144,8 +188,13 @@ void board_exec_dbg_cmd(int ch)
 	case '?':
 		printf("\t?\thelp\n\r");
 		printf("\tR\treset SAM3\n\r");
+		printf("\tl\tswitch off LED 1\n\r");
+		printf("\tL\tswitch off LED 1\n\r");
+		printf("\tg\tswitch off LED 2\n\r");
+		printf("\tG\tswitch off LED 2\n\r");
 		if (qmod_sam3_is_12()) {
 			printf("\tE\tprogram EEPROM\n\r");
+			printf("\te\tErase EEPROM\n\r");
 			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
 			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
 			printf("\tH\tRelease HUB RESET (high)\n\r");
@@ -166,6 +215,22 @@ void board_exec_dbg_cmd(int ch)
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
+	case 'l':
+		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
+		printf("LED 1 switched off\n\r");
+		break;
+	case 'L':
+		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+		printf("LED 1 switched on\n\r");
+		break;
+	case 'g':
+		led_blink(LED_RED, BLINK_ALWAYS_OFF);
+		printf("LED 2 switched off\n\r");
+		break;
+	case 'G':
+		led_blink(LED_RED, BLINK_ALWAYS_ON);
+		printf("LED 2 switched on\n\r");
+		break;
 	case 'X':
 		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
 		PIO_Clear(&pin_peer_rst);
@@ -249,3 +314,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]) {
-			TRACE_INFO("Card Detect %d Status %d -> %d\r\n", i, last_state[i], state);
+		if (state != last_state[i]) {
+			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/sim_switch.c

@@ -0,0 +1,90 @@
+/* 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
+static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+#ifdef PIN_SIM_SWITCH2
+static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+
+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");
+		sim_switch_init();
+	}
+
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
+		   physical ? "physical" : "virtual");
+
+	switch (nr) {
+#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:
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
+		return -1;
+	}
+
+	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;
+}
+
+int sim_switch_init(void)
+{
+	int num_switch = 0;
+#ifdef PIN_SIM_SWITCH1
+	PIO_Configure(&pin_conn_usim1, 1);
+	num_switch++;
+#endif
+#ifdef PIN_SIM_SWITCH2
+	PIO_Configure(&pin_conn_usim2, 1);
+	num_switch++;
+#endif
+	initialized = 1;
+	return num_switch;
+}

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);
-	TRACE_INFO("WWAN2 LED %u\r\n", active);
+	int active = wwan_led_active(1);
+	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,163 @@
+/* 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
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
 
-/** Phone (SIM card emulator)/CCID Reader/MITM configuration    **/
-/*  Normally the communication lines between phone and SIM card are disconnected    */
-// Disconnect SIM card I/O, VPP line from the phone lines
-// FIXME: Per default pins are input, therefore high-impedance, therefore they don not activate the bus switch, right?
-#define PIN_SC_SW_DEFAULT               {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-// Disconnect SIM card RST, CLK line from the phone lines
-#define PIN_IO_SW_DEFAULT               {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PINS_BUS_DEFAULT                PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+/** Pin configuration **/
+/* Button to force bootloader start (shorted to ground when pressed */
+#define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
+#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+/* Card presence pin */
+#define SW_SIM                  PIO_PA8
+/* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA4B_TCLK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
+
+/** Phone connection **/
+/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
+#define PIN_USIM1_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_USIM1_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}
+/** card emulation configuration */
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_CARDEMU   {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Disable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_CARDEMU    {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Disable power to SIM */
+#define PINS_PWR_CARDEMU        PIN_SIM_PWEN_CARDEMU, PIN_VCC_FWD_CARDEMU
 
-#define PWR_PINS                                                         \
-    /* 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: on */ \
-    {VCC_FWD, 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 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}
+/** Pin configuration to control USB pull-up on D+
+ *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
+ */
+#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 
+/** USB definitions */
+/* OpenMoko SIMtrace 2 USB vendor ID */
+#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
+/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
+/* USB release number (bcdDevice, shown as 0.00) */
+#define BOARD_USB_RELEASE	0x000
+/* Indicate SIMtrace is bus power in USB attributes */
 #define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
 
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
-#define BOARD_USB_RELEASE	0x000
-
+/** Supported modes */
+/* SIMtrace board supports sniffer mode */
+#ifdef APPLICATION_trace
 #define HAVE_SNIFFER
-#define HAVE_CCID
+#endif
+/* SIMtrace board supports CCID mode */
+#ifdef APPLICATION_ccid
+//#define HAVE_CCID
+#endif
+/* SIMtrace board supports card emulation mode */
+#ifdef APPLICATION_cardem
 #define HAVE_CARDEM
-#define HAVE_MITM
+#endif
+/* SIMtrace board supports man-in-the-middle mode */
+#ifdef APPLICATION_mitm
+//#define HAVE_MITM
+#endif

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/libboard/simtrace/source/sim_switch.c

@@ -0,0 +1,63 @@
+/* Code to switch between local (physical) and remote (emulated) SIM
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
+#include "board.h"
+#include "trace.h"
+#include "led.h"
+#include "sim_switch.h"
+
+#ifdef PIN_SIM_SWITCH1
+static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+#ifdef PIN_SIM_SWITCH2
+static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+
+static int initialized = 0;
+
+int sim_switch_use_physical(unsigned int nr, int physical)
+{
+	const Pin pin_sc = PIN_SC_SW_DEFAULT; // pin to control bus switch for VCC/RST/CLK signals
+	const Pin pin_io = PIN_IO_SW_DEFAULT; // pin to control bus switch for I/O signal
+
+	if (nr > 0) {
+		TRACE_ERROR("SIM interface for Modem %d can't be switched\r\n", nr);
+		return -1;
+	}
+
+	TRACE_INFO("Modem %u: %s SIM\n\r", nr, physical ? "physical" : "virtual");
+
+	if (physical) {
+		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
+		PIO_Set(&pin_sc);
+		PIO_Set(&pin_io);
+	} else {
+		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
+		PIO_Clear(&pin_sc);
+		PIO_Clear(&pin_io);
+	}
+
+	return 0;
+}
+
+int sim_switch_init(void)
+{
+	// the bus switch is already initialised
+	return 1; // SIMtrace hardware has only one switchable interface
+}

firmware/libcommon/include/assert.h

@@ -65,41 +65,41 @@
 //         Definitions
 //------------------------------------------------------------------------------
 #if defined(NOASSERT)
-    #define ASSERT(...)
-    #define SANITY_CHECK(...)
+	#define ASSERT(...)
+	#define SANITY_CHECK(...)
 #else
 
-    #if (TRACE_LEVEL == 0)
-        /// Checks that the given condition is true, 
-        /// otherwise stops the program execution.
-        /// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
-            if (!(condition)) { \
-                while (1); \
-            } \
-        }
+	#if (TRACE_LEVEL == 0)
+		/// Checks that the given condition is true, 
+		/// otherwise stops the program execution.
+		/// \param condition  Condition to verify.
+		#define ASSERT(condition)  { \
+			if (!(condition)) { \
+				while (1); \
+			} \
+		}
 
-        /// Performs the same duty as the ASSERT() macro
-        /// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, ...)
+		/// Performs the same duty as the ASSERT() macro
+		/// \param condition  Condition to verify.
+		#define SANITY_CHECK(condition) ASSERT(condition, ...)
 
-    #else
-        /// Checks that the given condition is true, otherwise displays an error
-        /// message and stops the program execution.
-        /// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
-            if (!(condition)) { \
-                printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
-                while (1); \
-            } \
-        }
-        #define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
-    
-        /// Performs the same duty as the ASSERT() macro, except a default error
-        /// message is output if the condition is false.
-        /// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, SANITY_ERROR, __FILE__, __LINE__)
-    #endif
+	#else
+		/// Checks that the given condition is true, otherwise displays an error
+		/// message and stops the program execution.
+		/// \param condition  Condition to verify.
+		#define ASSERT(condition)  { \
+			if (!(condition)) { \
+				printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
+				while (1); \
+			} \
+		}
+		#define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
+	
+		/// Performs the same duty as the ASSERT() macro, except a default error
+		/// message is output if the condition is false.
+		/// \param condition  Condition to verify.
+		#define SANITY_CHECK(condition) ASSERT(condition, SANITY_ERROR, __FILE__, __LINE__)
+	#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>
@@ -29,10 +48,42 @@ struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch);
 void card_emu_have_new_uart_tx(struct card_handle *ch);
 void card_emu_report_status(struct card_handle *ch);
 
+/*! call when the waiting time has half-expired
+ *  param[in] ch card for which the waiting time half expired
+ */
+void card_emu_wt_halfed(struct card_handle *ch);
+/*! call when the waiting time has expired
+ *  param[in] ch card for which the waiting time expired
+ */
+void card_emu_wt_expired(struct card_handle *ch);
+
 #define ENABLE_TX	0x01
 #define ENABLE_RX	0x02
 
-int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
+// the following functions are callbacks implement in mode_cardemu.c
+
+/*! update F and D on USART peripheral
+ *  @param[in] usart USART peripheral to configure
+ *  @param[in] f clock rate conversion integer F value
+ *  @param[in] d baud rate adjustment factor D value
+ *  @note this should happen after reset and protocol select (through PPS or implicit)
+ */
+void card_emu_uart_update_fd(uint8_t uart_chan, uint16_t f, uint8_t d);
+/*! update WT on USART peripheral
+ *  @param[in] usart USART peripheral to configure
+ *  @param[in] wt inactivity Waiting Time before card_emu_wt_expired is called (0 to disable)
+ */
+void card_emu_uart_update_wt(uint8_t uart_chan, uint32_t wt);
+/*! reset waiting timeout count down on USART peripheral
+ *  @param[in] usart USART peripheral to configure
+ */
+void card_emu_uart_reset_wt(uint8_t uart_chan);
+/*! set I/O line high
+ *  @param[in] usart USART peripheral to configure
+ *  @param[in] set if I/O line should be set high (true), or cleared low (false)
+ */
+void card_emu_uart_io_set(uint8_t uart_chan, bool set);
 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.
-    unsigned char bTimerOut;
-    /// Several parameters for the PIN format options
-    unsigned char bmFormatString;
-    /// Define the length of the PIN to present in the APDU command
-    unsigned char bmPINBlockString;
-    /// Allows the length PIN insertion in the APDU command
-    unsigned char bmPINLengthFormat;
-    /// Minimum PIN size in digit and Maximum PIN size in digit
-    unsigned char wPINMaxExtraDigit;
-    /// The value is a bit wise OR operation.
-    unsigned char bEntryValidationCondition;
-    /// Number of messages to display for the PIN modify command
-    unsigned char bNumberMessage;
-    /// Language used to display the messages.
-    unsigned char wLangId;
-    /// Message index in the Reader message table
-    unsigned char bMsgIndex;
-    /// T=1 I-block prologue field to use
-    unsigned char bTeoPrologue[3];
-    /// APDU to send to the ICC
-    unsigned char abPINApdu[255];
+	/// Number of seconds.
+	unsigned char bTimerOut;
+	/// Several parameters for the PIN format options
+	unsigned char bmFormatString;
+	/// Define the length of the PIN to present in the APDU command
+	unsigned char bmPINBlockString;
+	/// Allows the length PIN insertion in the APDU command
+	unsigned char bmPINLengthFormat;
+	/// Minimum PIN size in digit and Maximum PIN size in digit
+	unsigned char wPINMaxExtraDigit;
+	/// The value is a bit wise OR operation.
+	unsigned char bEntryValidationCondition;
+	/// Number of messages to display for the PIN modify command
+	unsigned char bNumberMessage;
+	/// Language used to display the messages.
+	unsigned char wLangId;
+	/// Message index in the Reader message table
+	unsigned char bMsgIndex;
+	/// T=1 I-block prologue field to use
+	unsigned char bTeoPrologue[3];
+	/// APDU to send to the ICC
+	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.
-    unsigned char bTimeOut;
-    /// Several parameters for the PIN format options (defined in § 6.1.11.4)
-    unsigned char bmFormatString4;
-    /// Define the length of the PIN to present in the APDU command
-    unsigned char bmPINBlockString;
-    /// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
-    unsigned char bmPinLengthFormat;
-    /// Insertion position offset in byte for the current PIN
-    unsigned char bInsertionOffsetOld;
-    /// Insertion position offset in byte for the new PIN
-    unsigned char bInsertionOffsetNew;
-    /// XXYYh
-    /// XX: Minimum PIN size in digit
-    /// YY: Maximum PIN size in digit
-    unsigned char wPINMaxExtraDigit;
-    /// 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 the current PIN must be entered and set in the same APDU field of not.
-    unsigned char bConfirmPIN;
-    /// The value is a bit wise OR operation.
-    /// 01h Max size reached
-    /// 02h Validation key pressed
-    /// 04h Timeout occurred
-    unsigned char bEntryValidationCondition;
-    /// 00h,01h,02h,03h,or FFh
-    /// Number of messages to display for the PIN modify command.
-    unsigned char bNumberMessage;
-    /// Language used to display the messages. The 16 bit
-    unsigned char wLangId;
-    /// Message index in the Reader message table (should be 00h or 01h).
-    unsigned char bMsgIndex1;
-    /// Message index in the Reader message table (should be 01h or 02h).
-    unsigned char bMsgIndex2;
-    /// Message index in the Reader message table (should be 02h).
-    unsigned char bMsgIndex3;
-    /// T=1 I-block prologue field to use. Significant only if protocol in use is T=1.
-    unsigned char bTeoPrologue[3];
-    /// Byte array APDU to send to the ICC
-    unsigned char abPINApdu[255];
+	/// Number of seconds. If 00h then CCID default value is used.
+	unsigned char bTimeOut;
+	/// Several parameters for the PIN format options (defined in § 6.1.11.4)
+	unsigned char bmFormatString4;
+	/// Define the length of the PIN to present in the APDU command
+	unsigned char bmPINBlockString;
+	/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
+	unsigned char bmPinLengthFormat;
+	/// Insertion position offset in byte for the current PIN
+	unsigned char bInsertionOffsetOld;
+	/// Insertion position offset in byte for the new PIN
+	unsigned char bInsertionOffsetNew;
+	/// XXYYh
+	/// XX: Minimum PIN size in digit
+	/// YY: Maximum PIN size in digit
+	unsigned char wPINMaxExtraDigit;
+	/// 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 the current PIN must be entered and set in the same APDU field of not.
+	unsigned char bConfirmPIN;
+	/// The value is a bit wise OR operation.
+	/// 01h Max size reached
+	/// 02h Validation key pressed
+	/// 04h Timeout occurred
+	unsigned char bEntryValidationCondition;
+	/// 00h,01h,02h,03h,or FFh
+	/// Number of messages to display for the PIN modify command.
+	unsigned char bNumberMessage;
+	/// Language used to display the messages. The 16 bit
+	unsigned char wLangId;
+	/// Message index in the Reader message table (should be 00h or 01h).
+	unsigned char bMsgIndex1;
+	/// Message index in the Reader message table (should be 01h or 02h).
+	unsigned char bMsgIndex2;
+	/// Message index in the Reader message table (should be 02h).
+	unsigned char bMsgIndex3;
+	/// T=1 I-block prologue field to use. Significant only if protocol in use is T=1.
+	unsigned char bTeoPrologue[3];
+	/// Byte array APDU to send to the ICC
+	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 
-    /// clock rate conversion factor
-    /// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
-    /// baud rate conversion factor
-    unsigned char bmFindexDindex;
-    /// For T=0 ,B0 – 0b, B7-2 – 000000b
-    /// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
-    unsigned char bmTCCKST0;         // 0 to 2
-    /// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
-    /// guardtime of 12etu. FFh is the same as 00h.
-    unsigned char bGuardTimeT0;      // 0 to FF
-    /// WI for T=0 used to define WWT
-    unsigned char bWaitingIntegerT0; // 0 to FF
-    /// ICC Clock Stop Support
-    /// 00 = Stopping the Clock is not allowed
-    /// 01 = Stop with Clock signal Low
-    /// 02 = Stop with Clock signal High
-    /// 03 = Stop with Clock either High or Low
-    unsigned char bClockStop;        // 0 to 3
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
+	/// clock rate conversion factor
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
+	/// baud rate conversion factor
+	unsigned char bmFindexDindex;
+	/// For T=0 ,B0 – 0b, B7-2 – 000000b
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	unsigned char bmTCCKST0;         // 0 to 2
+	/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
+	/// guardtime of 12etu. FFh is the same as 00h.
+	unsigned char bGuardTimeT0;      // 0 to FF
+	/// WI for T=0 used to define WWT
+	unsigned char bWaitingIntegerT0; // 0 to FF
+	/// ICC Clock Stop Support
+	/// 00 = Stopping the Clock is not allowed
+	/// 01 = Stop with Clock signal Low
+	/// 02 = Stop with Clock signal High
+	/// 03 = Stop with Clock either High or Low
+	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 
-    /// clock rate conversion factor
-    /// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
-    /// baud rate conversion factor
-    unsigned char bmFindexDindex;
-    /// For T=1, B7-2 – 000100b
-    /// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
-    /// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
-    unsigned char bmTCCKST1;           // 10h, 11h, 12h, 13h
-    /// Extra Guardtime (0 to 254 etu between two characters). 
-    /// If value is FFh, then guardtime is reduced by 1.
-    unsigned char bGuardTimeT1;        // 0 to FF
-    /// B7-4 = BWI
-    /// B3-0 = CWI
-    unsigned char bmWaitingIntegersT1; // 0 to 9
-    /// ICC Clock Stop Support
-    /// 00 = Stopping the Clock is not allowed
-    /// 01 = Stop with Clock signal Low
-    /// 02 = Stop with Clock signal High
-    /// 03 = Stop with Clock either High or Low
-    unsigned char bClockStop;          // 0 to 3
-    /// Size of negotiated IFSC
-    unsigned char bIFSC;               // 0 to FE
-    /// Nad value used by CCID
-    unsigned char bNadValue;           // 0 to FF
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
+	/// clock rate conversion factor
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
+	/// baud rate conversion factor
+	unsigned char bmFindexDindex;
+	/// For T=1, B7-2 – 000100b
+	/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	unsigned char bmTCCKST1;           // 10h, 11h, 12h, 13h
+	/// Extra Guardtime (0 to 254 etu between two characters). 
+	/// If value is FFh, then guardtime is reduced by 1.
+	unsigned char bGuardTimeT1;        // 0 to FF
+	/// B7-4 = BWI
+	/// B3-0 = CWI
+	unsigned char bmWaitingIntegersT1; // 0 to 9
+	/// ICC Clock Stop Support
+	/// 00 = Stopping the Clock is not allowed
+	/// 01 = Stop with Clock signal Low
+	/// 02 = Stop with Clock signal High
+	/// 03 = Stop with Clock either High or Low
+	unsigned char bClockStop;          // 0 to 3
+	/// Size of negotiated IFSC
+	unsigned char bIFSC;               // 0 to FE
+	/// Nad value used by CCID
+	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 bHardwareErrorCode );
+					                       unsigned char bSeq, 
+					                       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,
-                               TransferCallback fCallback,
-                               void *pArgument);
+					           unsigned int dLength,
+					           TransferCallback fCallback,
+					           void *pArgument);
 extern unsigned char CCID_Write(void *pBuffer,
-                                unsigned int dLength,
-                                TransferCallback fCallback,
-                                void *pArgument);
+					            unsigned int dLength,
+					            TransferCallback fCallback,
+					            void *pArgument);
 extern unsigned char CCID_Insertion( void );
 extern unsigned char CCID_Removal( void );
 

firmware/libcommon/include/iso7816_3.h

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2019 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+/* this library provides utilities to handle the ISO-7816 part 3 communication aspects (e.g. related to F and D) */
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/** default clock rate conversion integer Fd
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.1
+ */
+#define ISO7816_3_DEFAULT_FD 372
+/** default baud rate adjustment factor Dd
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.1
+ */
+#define ISO7816_3_DEFAULT_DD 1
+/** default clock rate conversion integer Fi
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.3
+ *  @note non-default value is optionally specified in TA1
+ */
+#define ISO7816_3_DEFAULT_FI 372
+/** default baud rate adjustment factor Di
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.3
+ *  @note non-default value is optionally specified in TA1
+ */
+#define ISO7816_3_DEFAULT_DI 1
+/** default maximum clock frequency, in Hz
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.3
+ *  @note non-default value is optionally specified in TA1
+ */
+#define ISO7816_3_DEFAULT_FMAX 5000000UL
+/** default Waiting Integer (WI) value for T=0
+ *  @implements ISO/IEC 7816-3:2006(E) section 10.2
+ *  @note non-default value is optionally specified in TC2
+ */
+#define ISO7816_3_DEFAULT_WI 10
+/** default Waiting Time (WT) value, in ETU
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.1
+ *  @note depends on Fi, Di, and WI if protocol T=0 is selected
+ */
+#define ISO7816_3_DEFAULT_WT 9600
+
+/** Table encoding the clock rate conversion integer Fi
+ *  @note Fi is indicated in TA1, but the same table is used for F and Fn during PPS
+ *  @implements ISO/IEC 7816-3:2006(E) table 7
+ */
+extern const uint16_t iso7816_3_fi_table[];
+
+/** Table encoding the maximum clock frequency f_max in Hz
+ *  @implements ISO/IEC 7816-3:2006(E) table 7
+ *  @note f_max is indicated in TA1, but the same table is used for F and Fn during PPS
+ */
+extern const uint32_t iso7816_3_fmax_table[];
+
+/** Table encoding the baud rate adjust integer Di
+ *  @implements ISO/IEC 7816-3:2006(E) table 8
+ *  @note Di is indicated in TA1, but the same table is used for D and Dn during PPS
+ */
+extern const uint8_t iso7816_3_di_table[];
+
+/* verify if the clock rate conversion integer F value is valid
+ * @param[in] f F value to be validated
+ * @return if F value is valid
+ * @note only values in ISO/IEC 7816-3:2006(E) table 7 are valid
+ */
+bool iso7816_3_valid_f(uint16_t f);
+/* verify if the baud rate adjustment factor D value is valid
+ * @param[in] d D value to be validated
+ * @return if D value is valid
+ * @note only values in ISO/IEC 7816-3:2006(E) table 8 are valid
+ */
+bool iso7816_3_valid_d(uint8_t d);
+/** calculate Waiting Time (WT)
+ *  @param[in] wi Waiting Integer
+ *  @param[in] fi clock rate conversion integer Fi value
+ *  @param[in] di baud rate adjustment factor Di value
+ *  @param[in] f clock rate conversion integer F value
+ *  @param[in] d baud rate adjustment factor D value
+ *  @return Waiting Time WT, in ETU, or < 0 on error (see code for return codes)
+ *  @note this should happen after reset and T=0 protocol select (through PPS or implicit)
+ *  @implements ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
+ */
+int32_t iso7816_3_calculate_wt(uint8_t wi, uint16_t fi, uint8_t di, uint16_t f, uint8_t d);

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,
-                                        uint16_t wLength,
-                                        uint16_t *retlen);
+					                    uint8_t *pMessage,
+					                    uint16_t wLength,
+					                    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"
-
-/* Endpoint numbers */
-#define DATAOUT     1
-#define DATAIN      2
-#define INT         3
+#include <usb/device/dfu/dfu.h>
 
 #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
-    USBConfigurationDescriptor configuration;
-    /// Interface descriptor
-    USBInterfaceDescriptor     interface;
-    /// CCID descriptor
-    CCIDDescriptor             ccid;
-    /// Bulk OUT endpoint descriptor
-    USBEndpointDescriptor      bulkOut;
-    /// Bulk IN endpoint descriptor
-    USBEndpointDescriptor      bulkIn;
-    /// Interrupt OUT endpoint descriptor
-    USBEndpointDescriptor      interruptIn;
+	/// Configuration descriptor
+	USBConfigurationDescriptor configuration;
+	/// Interface descriptor
+	USBInterfaceDescriptor     interface;
+	/// CCID descriptor
+	CCIDDescriptor             ccid;
+	/// Bulk OUT endpoint descriptor
+	USBEndpointDescriptor      bulkOut;
+	/// Bulk IN endpoint descriptor
+	USBEndpointDescriptor      bulkIn;
+	/// Interrupt OUT endpoint descriptor
+	USBEndpointDescriptor      interruptIn;
+	DFURT_IF_DESCRIPTOR_STRUCT
 } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
 
 extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
 
-int check_data_from_phone();
-void update_fidi(uint8_t fidi);
+/*! Update USART baud rate to Fi/Di ratio
+ *  @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>
-
-/* 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
- *
- */
+#include <stdbool.h>
 
 /***********************************************************************
  * 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 */
-	SIMTRACE_MSGC_TRACE,
+	/* Reader/phone-car/SIM communication sniff */
+	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 */
-enum simtrace_msg_type_trace {
-	/* FIXME */
-	_dummy,
+/* SIMTRACE_MSGC_SNIFF */
+enum simtrace_msg_type_sniff {
+	/* Status change (card inserted, reset, ...) */
+	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 {
@@ -221,11 +228,10 @@ struct cardemu_usb_msg_status {
 	uint32_t flags;
 	/* phone-applied target voltage in mV */
 	uint16_t voltage_mv;
-	/* Fi/Di related information */
-	uint8_t fi;
-	uint8_t di;
-	uint8_t wi;
-	uint32_t waiting_time;
+	uint8_t f; /*!< index of F and f_max values as encoded in ISO/IEC 7816-3:2006(E) Table 7 */
+	uint8_t d; /*!< index of D value as encoded in ISO/IEC 7816-3:2006(E) Table 8 */
+	uint8_t wi; /*!< Waiting Integer as defined in ISO/IEC 7816-3:2006(E) Section 10.2 */
+	uint32_t wt; /*!< Waiting Time in ETU as defined in ISO/IEC 7816-3:2006(E) Section 8.1 */
 } __attribute__ ((packed));
 
 /* CEMU_USB_MSGT_DO_PTS */
@@ -253,7 +259,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 +282,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/msgb.h"
+#include <osmocom/core/linuxlist.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 */
-/* (C) 2010-2017 by Harald Welte <hwelte@hmw-consulting.de>
+/* ISO7816-3 state machine for the card side
  *
- *  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.
+ * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
- *  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.
+ * 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This 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
  */
-
-//#define TRACE_LEVEL 6
-
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
@@ -28,14 +26,12 @@
 
 #include "utils.h"
 #include "trace.h"
-#include "iso7816_fidi.h"
-#include "tc_etu.h"
+#include "iso7816_3.h"
 #include "card_emu.h"
 #include "simtrace_prot.h"
 #include "usb_buf.h"
-#include "osmocom/core/linuxlist.h"
-#include "osmocom/core/msgb.h"
-
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 
 #define NUM_SLOTS		2
 
@@ -56,6 +52,46 @@ enum iso7816_3_card_state {
 	ISO_S_IN_TPDU,		/* inside a TPDU */
 };
 
+const struct value_string iso7816_3_card_state_names[] = {
+	{
+		.value = ISO_S_WAIT_POWER,
+		.str = "WAIT_POWER",
+	},
+	{
+		.value = ISO_S_WAIT_CLK,
+		.str = "WAIT_CLK",
+	},
+	{
+		.value = ISO_S_WAIT_RST,
+		.str = "WAIT_RST",
+	},
+	{
+		.value = ISO_S_WAIT_ATR,
+		.str = "WAIT_ATR",
+	},
+	{
+		.value = ISO_S_IN_ATR,
+		.str = "IN_ATR",
+	},
+	{
+		.value = ISO_S_IN_PTS,
+		.str = "IN_PTS",
+	},
+	{
+		.value = ISO_S_WAIT_TPDU,
+		.str = "WAIT_TPDU",
+	},
+	{
+		.value = ISO_S_IN_TPDU,
+		.str = "IN_TPDU",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+
 /* detailed sub-states of ISO_S_IN_PTS */
 enum pts_state {
 	PTS_S_WAIT_REQ_PTSS,
@@ -72,6 +108,7 @@ enum pts_state {
 	PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10,
 };
 
+/* PTS field byte index */
 #define _PTSS	0
 #define _PTS0	1
 #define _PTS1	2
@@ -87,10 +124,50 @@ enum tpdu_state {
 	TPDU_S_WAIT_P2,		/* waiting for P2 byte from reader */
 	TPDU_S_WAIT_P3,		/* waiting for P3 byte from reader */
 	TPDU_S_WAIT_PB,		/* waiting for Tx of procedure byte */
-	TPDU_S_WAIT_RX,		/* waiitng for more data from reader */
+	TPDU_S_WAIT_RX,		/* waiting for more data from reader */
 	TPDU_S_WAIT_TX,		/* waiting for more data to reader */
 };
 
+const struct value_string tpdu_state_names[] = {
+	{
+		.value = TPDU_S_WAIT_CLA,
+		.str = "WAIT_CLA",
+	},
+	{
+		.value = TPDU_S_WAIT_INS,
+		.str = "WAIT_INS",
+	},
+	{
+		.value = TPDU_S_WAIT_P1,
+		.str = "WAIT_P1",
+	},
+	{
+		.value = TPDU_S_WAIT_P2,
+		.str = "WAIT_P2",
+	},
+	{
+		.value = TPDU_S_WAIT_P3,
+		.str = "WAIT_P3",
+	},
+	{
+		.value = TPDU_S_WAIT_PB,
+		.str = "WAIT_PB",
+	},
+	{
+		.value = TPDU_S_WAIT_RX,
+		.str = "WAIT_RX",
+	},
+	{
+		.value = TPDU_S_WAIT_TX,
+		.str = "WAIT_TX",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
+};
+
+/* TPDU field byte index */
 #define	_CLA	0
 #define	_INS	1
 #define	_P1	2
@@ -98,7 +175,7 @@ enum tpdu_state {
 #define	_P3	4
 
 struct card_handle {
-	uint32_t num;
+	unsigned int num;
 
 	enum iso7816_3_card_state state;
 
@@ -107,18 +184,53 @@ struct card_handle {
 	uint8_t in_reset;	/* 1 = RST low, 0 = RST high */
 	uint8_t clocked;	/* 1 = active, 0 = inactive */
 
-	/* timing parameters, from PTS */
-	uint8_t fi;
-	uint8_t di;
-	uint8_t wi;
-
 	uint8_t tc_chan;	/* TC channel number */
 	uint8_t uart_chan;	/* UART channel */
 
 	uint8_t in_ep;		/* USB IN EP */
 	uint8_t irq_ep;		/* USB IN EP */
 
-	uint32_t waiting_time;	/* in clocks */
+	/*! clock rate conversion integer F
+	 *  @implements ISO/IEC 7816-3:2006(E) section 7.1
+	 *  @note this represents the current value used
+	 */
+	uint16_t f;
+	/*! baud rate adjustment factor D
+	 *  @implements ISO/IEC 7816-3:2006(E) section 7.1
+	 *  @note this represents the current value used
+	 */
+	uint8_t d;
+	/*! clock frequency in Hz
+	 *  @implements ISO/IEC 7816-3:2006(E) section 7.1
+	 *  @note the USART peripheral in slave mode does not provide the current value. we could measure it but this is not really useful. instead we remember the maximum possible value corresponding to the selected F value
+	 */
+	uint32_t f_cur;
+	/*! clock rate conversion integer Fi
+	 *  @implements ISO/IEC 7816-3:2006(E) Table 7
+	 *  @note this represents the maximum value supported by the card, and can be indicated in TA1
+	 *  @note this value can be set in TA1
+	 */
+	uint16_t fi;
+	/*! baud rate adjustment factor Di
+	 *  @implements ISO/IEC 7816-3:2006(E) Table 8
+	 *  @note this represents the maximum value supported by the card, and can be indicated in TA1
+	 */
+	uint8_t di;
+	/*! clock frequency, in Hz
+	 *  @implements ISO/IEC 7816-3:2006(E) Table 7
+	 *  @note this represents the maximum value supported by the card, and can be indicated in TA1
+	 */
+	uint32_t f_max;
+	/*! Waiting Integer
+	 *  @implements ISO/IEC 7816-3:2006(E) Section 10.2
+	 *  @note this value can be set in TA2
+	 */
+	uint8_t wi;
+	/*! Waiting Time, in ETU
+	 *  @implements ISO/IEC 7816-3:2006(E) Section 8.1
+	 *  @note this depends on Fi, Di, and WI if T=0 is used
+	 */
+	uint32_t wt;
 
 	/* ATR state machine */
 	struct {
@@ -192,7 +304,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 +317,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)
 {
@@ -263,23 +378,6 @@ static void flush_pts(struct card_handle *ch)
 	usb_buf_upd_len_and_submit(msg);
 }
 
-static void emu_update_fidi(struct card_handle *ch)
-{
-	int rc;
-
-	rc = compute_fidi_ratio(ch->fi, ch->di);
-	if (rc > 0 && rc < 0x400) {
-		TRACE_INFO("%u: computed Fi(%u) Di(%u) ratio: %d\r\n",
-			    ch->num, ch->fi, ch->di, rc);
-		/* make sure UART uses new F/D ratio */
-		card_emu_uart_update_fidi(ch->uart_chan, rc);
-		/* notify ETU timer about this */
-		tc_etu_set_etu(ch->tc_chan, rc);
-	} else
-		TRACE_INFO("%u: computed FiDi ration %d unsupported\r\n",
-			   ch->num, rc);
-}
-
 /* Update the ISO 7816-3 TPDU receiver state */
 static void card_set_state(struct card_handle *ch,
 			   enum iso7816_3_card_state new_state)
@@ -287,44 +385,59 @@ 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,
-		    ch->state, new_state);
+	TRACE_DEBUG("%u: 7816 card state %s -> %s\r\n", ch->num,
+		    get_value_string(iso7816_3_card_state_names, ch->state),
+		    get_value_string(iso7816_3_card_state_names, new_state));
 	ch->state = new_state;
 
 	switch (new_state) {
 	case ISO_S_WAIT_POWER:
 	case ISO_S_WAIT_CLK:
 	case ISO_S_WAIT_RST:
-		/* disable Rx and Tx of UART */
-		card_emu_uart_enable(ch->uart_chan, 0);
+		card_emu_uart_enable(ch->uart_chan, 0); // disable Rx and Tx of UART
+		card_emu_uart_update_wt(ch->uart_chan, 0); // disable timeout
+		if (ISO_S_WAIT_POWER == new_state) {
+			card_emu_uart_io_set(ch->uart_chan, false); // pull I/O line low
+		} else {
+			card_emu_uart_io_set(ch->uart_chan, true); // pull I/O line high
+		}
 		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
-		 * receive TC2, and it will be programmed into hardware after
-		 * ATR is finished */
+		// reset the ETU-related values
+		ch->f = ISO7816_3_DEFAULT_FD;
+		ch->d = ISO7816_3_DEFAULT_DD;
+		card_emu_uart_update_fd(ch->uart_chan, ch->f, ch->d); // set baud rate
+
+		// reset values optionally specified in the ATR
+		ch->fi = ISO7816_3_DEFAULT_FI;
+		ch->di = ISO7816_3_DEFAULT_DI;
 		ch->wi = ISO7816_3_DEFAULT_WI;
-		/* update waiting time to initial waiting time */
-		ch->waiting_time = ISO7816_3_INIT_WTIME;
-		tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);
+		int32_t wt = iso7816_3_calculate_wt(ch->wi, ch->fi, ch->di, ch->f, ch->d); // get default waiting time
+		if (wt <= 0) {
+			TRACE_FATAL("%u: invalid WT %ld\r\n", ch->num, wt);
+		}
+		ch->wt = wt;
+		card_emu_uart_enable(ch->uart_chan, ENABLE_TX); // enable TX to be able to use the timeout
+		/* the ATR should only be sent 400 to 40k clock cycles after the RESET.
+		 * we use the tc_etu mechanism to wait this time.
+		 * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU.
+		 */
+		card_emu_uart_update_wt(ch->uart_chan, 2);
+		break;
+	case ISO_S_IN_ATR:
+		// FIXME disable timeout while sending ATR
 		/* Set ATR sub-state to initial state */
 		ch->atr.idx = 0;
-		//set_atr_state(ch, ATR_S_WAIT_TS);
-		/* Notice that we are just coming out of reset */
-		//ch->sh.flags |= SIMTRACE_FLAG_ATR;
+		/* enable USART transmission to reader */
 		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 +445,77 @@ 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 */
+		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 */
+						}
+					}
+				}
+			}
+		}
+		/* FIXME update waiting time in case of card is specific mode */
+		/* 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",
@@ -388,9 +566,12 @@ from_pts3:
 	return PTS_S_WAIT_REQ_PCK | is_resp;
 }
 
-
-static int
-process_byte_pts(struct card_handle *ch, uint8_t byte)
+/*! process incoming PTS byte
+ *  @param[in] ch card handle on which the byte has been received
+ *  @param[in] byte received PTS byte
+ *  @return new iso7816_3_card_state or -1 at the end of PTS request
+ */
+static int process_byte_pts(struct card_handle *ch, uint8_t byte)
 {
 	switch (ch->pts.state) {
 	case PTS_S_WAIT_REQ_PTSS:
@@ -417,7 +598,7 @@ process_byte_pts(struct card_handle *ch, uint8_t byte)
 			set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 			return ISO_S_WAIT_TPDU;
 		}
-		/* FIXME: check if proposal matches capabilities in ATR */
+		/* FIXME check if proposal matches capabilities in TA1 */
 		memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp));
 		break;
 	default:
@@ -456,11 +637,17 @@ static int tx_byte_pts(struct card_handle *ch)
 		break;
 	case PTS_S_WAIT_RESP_PTS1:
 		byte = ch->pts.resp[_PTS1];
-		/* This must be TA1 */
-		ch->fi = byte >> 4;
-		ch->di = byte & 0xf;
-		TRACE_DEBUG("%u: found Fi=%u Di=%u\r\n", ch->num,
-			    ch->fi, ch->di);
+		// TODO the value should have been validated when receiving the request
+		ch->f = iso7816_3_fi_table[byte >> 4]; // save selected Fn
+		if (0 == ch->f) {
+			TRACE_ERROR("%u: invalid F index in PPS response: %u\r\n", ch->num, byte >> 4);
+			// TODO become unresponsive to signal error condition
+		}
+		ch->d = iso7816_3_di_table[byte & 0xf]; // save selected Dn
+		if (0 == ch->d) {
+			TRACE_ERROR("%u: invalid D index in PPS response: %u\r\n", ch->num, byte & 0xf);
+			// TODO become unresponsive to signal error condition
+		}
 		break;
 	case PTS_S_WAIT_RESP_PTS2:
 		byte = ch->pts.resp[_PTS2];
@@ -485,8 +672,15 @@ static int tx_byte_pts(struct card_handle *ch)
 	switch (ch->pts.state) {
 	case PTS_S_WAIT_RESP_PCK:
 		card_emu_uart_wait_tx_idle(ch->uart_chan);
-		/* update baud rate generator with Fi/Di */
-		emu_update_fidi(ch);
+		card_emu_uart_update_fd(ch->uart_chan, ch->f, ch->d); // set selected baud rate
+		int32_t wt = iso7816_3_calculate_wt(ch->wi, ch->fi, ch->di, ch->f, ch->d); // get new waiting time
+		if (wt <= 0) {
+			TRACE_ERROR("%u: invalid WT calculated: %ld\r\n", ch->num, wt);
+			// TODO become unresponsive to signal error condition
+		} else {
+			ch->wt = wt;
+		}
+		// FIXME disable WT
 		/* Wait for the next TPDU */
 		card_set_state(ch, ISO_S_WAIT_TPDU);
 		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
@@ -557,22 +751,31 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
 {
 	if (ch->tpdu.state == new_ts)
 		return;
+	if (ISO_S_IN_TPDU != ch->state && ISO_S_WAIT_TPDU != ch->state) {
+		TRACE_ERROR("%u: setting TPDU state in %s state\r\n", ch->num,
+			get_value_string(iso7816_3_card_state_names, ch->state));
+	}
 
-	TRACE_DEBUG("%u: 7816 TPDU state %u -> %u\r\n", ch->num,
-		    ch->tpdu.state, new_ts);
-
+	TRACE_DEBUG("%u: 7816 TPDU state %s -> %s\r\n", ch->num,
+		get_value_string(tpdu_state_names, ch->tpdu.state),
+		get_value_string(tpdu_state_names, new_ts));
 	ch->tpdu.state = new_ts;
 
 	switch (new_ts) {
-	case TPDU_S_WAIT_CLA:
-	case TPDU_S_WAIT_RX:
-		card_emu_uart_enable(ch->uart_chan, ENABLE_RX);
+	case TPDU_S_WAIT_CLA: // we will be waiting for the next incoming TDPU
+		card_emu_uart_enable(ch->uart_chan, ENABLE_RX); // switch back to receiving mode
+		card_emu_uart_update_wt(ch->uart_chan, 0); // disable waiting time since we don't expect any data
+		break;
+	case TPDU_S_WAIT_INS: // the reader started sending the TPDU header
+		card_emu_uart_update_wt(ch->uart_chan, ch->wt); // start waiting for the rest of the header/body
+		break;
+	case TPDU_S_WAIT_RX: // the reader should send us the TPDU body data
+		card_emu_uart_enable(ch->uart_chan, ENABLE_RX); // switch to receive mode to receive the body
+		card_emu_uart_update_wt(ch->uart_chan, ch->wt); // start waiting for the rest body
 		break;
 	case TPDU_S_WAIT_PB:
-		/* we just completed the TPDU header from reader to card
-		 * and now need to disable the receiver, enable the
-		 * transmitter and transmit the procedure byte */
-		card_emu_uart_enable(ch->uart_chan, ENABLE_TX);
+		card_emu_uart_enable(ch->uart_chan, ENABLE_TX); // header is completely received, now we need to transmit the procedure byte
+		card_emu_uart_update_wt(ch->uart_chan, ch->wt); // prepare to extend the waiting time once half of it is reached
 		break;
 	default:
 		break;
@@ -718,7 +921,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 +968,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 +981,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 +999,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) {
-			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);
-		}
+		rc = tx_byte_atr(ch);
 		break;
 	case ISO_S_IN_PTS:
 		rc = tx_byte_pts(ch);
@@ -865,11 +1054,11 @@ void card_emu_report_status(struct card_handle *ch)
 		sts->flags |= CEMU_STATUS_F_CLK_ACTIVE;
 	if (ch->in_reset)
 		sts->flags |= CEMU_STATUS_F_RESET_ACTIVE;
-	/* FIXME: voltage + card insert */
-	sts->fi = ch->fi;
-	sts->di = ch->di;
+	/* FIXME set voltage and card insert values */
+	sts->f = ch->f;
+	sts->d = ch->d;
 	sts->wi = ch->wi;
-	sts->waiting_time = ch->waiting_time;
+	sts->wt = ch->wt;
 
 	usb_buf_upd_len_and_submit(msg);
 }
@@ -881,7 +1070,6 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 	case CARD_IO_VCC:
 		if (active == 0 && ch->vcc_active == 1) {
 			TRACE_INFO("%u: VCC deactivated\r\n", ch->num);
-			tc_etu_disable(ch->tc_chan);
 			card_set_state(ch, ISO_S_WAIT_POWER);
 		} else if (active == 1 && ch->vcc_active == 0) {
 			TRACE_INFO("%u: VCC activated\r\n", ch->num);
@@ -902,19 +1090,18 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 	case CARD_IO_RST:
 		if (active == 0 && ch->in_reset) {
 			TRACE_INFO("%u: RST released\r\n", ch->num);
-			if (ch->vcc_active && ch->clocked) {
-				/* enable the TC/ETU counter once reset has been released */
-				tc_etu_enable(ch->tc_chan);
+			if (ch->vcc_active && ch->clocked && ISO_S_WAIT_RST == ch->state) {
+				/* 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);
-			tc_etu_disable(ch->tc_chan);
+			card_set_state(ch, ISO_S_WAIT_RST);
 		}
 		ch->in_reset = active;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -924,46 +1111,61 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len)
 	if (len > sizeof(ch->atr.atr))
 		return -1;
 
+/* ignore new ATR for now since we PPS has not been tested
 	memcpy(ch->atr.atr, atr, 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 < len; i++) {
+		TRACE_INFO_WP("%02x ", atr[i]);
+	}
+	TRACE_INFO_WP("\n\r");
+	TRACE_INFO("%u: ATR set currently ignored\n\r", ch->num);
+#endif
+	/* FIXME: race condition with transmitting ATR to reader? */
 
 	return 0;
 }
 
-/* hardware driver informs us that one (more) ETU has expired */
-void tc_etu_wtime_half_expired(void *handle)
+void card_emu_wt_halfed(struct card_handle *ch)
 {
-	struct card_handle *ch = handle;
-	/* transmit NULL procedure byte well before waiting time expires */
 	switch (ch->state) {
 	case ISO_S_IN_TPDU:
 		switch (ch->tpdu.state) {
-		case TPDU_S_WAIT_PB:
 		case TPDU_S_WAIT_TX:
+		case TPDU_S_WAIT_PB:
 			putchar('N');
-			card_emu_uart_tx(ch->uart_chan, ISO7816_3_PB_NULL);
+			card_emu_uart_tx(ch->uart_chan, ISO7816_3_PB_NULL); // we are waiting for data from the user. send a procedure byte to ask the reader to wait more time
+			card_emu_uart_reset_wt(ch->uart_chan); // reset WT
 			break;
 		default:
 			break;
 		}
-		break;
 	default:
 		break;
 	}
 }
 
-/* hardware driver informs us that one (more) ETU has expired */
-void tc_etu_wtime_expired(void *handle)
+void card_emu_wt_expired(struct card_handle *ch)
 {
-	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:
+		// TODO become unresponsive
+		TRACE_ERROR("%u: wtime_exp\r\n", ch->num);
+		break;
+	}
 }
 
-/* shortest ATR found in smartcard_list.txt */
-static const uint8_t default_atr[] = { 0x3B, 0x02, 0x14, 0x50 };
+/* shortest ATR possible (uses default speed and no options) */
+static const uint8_t default_atr[] = { 0x3B, 0x00 };
 
 static struct card_handle card_handles[NUM_SLOTS];
 
@@ -981,7 +1183,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;
@@ -990,13 +1192,13 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 	ch->in_reset = 1;
 	ch->clocked = 0;
 
-	ch->fi = 0;
-	ch->di = 1;
+	ch->fi = ISO7816_3_DEFAULT_FI;
+	ch->di = ISO7816_3_DEFAULT_DI;
 	ch->wi = ISO7816_3_DEFAULT_WI;
+	ch->wt = ISO7816_3_DEFAULT_WT;;
 
 	ch->tc_chan = tc_chan;
 	ch->uart_chan = uart_chan;
-	ch->waiting_time = ISO7816_3_INIT_WTIME;
 
 	ch->atr.idx = 0;
 	ch->atr.len = sizeof(default_atr);
@@ -1005,7 +1207,5 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 	ch->pts.state = PTS_S_WAIT_REQ_PTSS;
 	ch->tpdu.state = TPDU_S_WAIT_CLA;
 
-	tc_etu_init(ch->tc_chan, ch);
-
 	return ch;
 }

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/msgb.h"
+#include <osmocom/core/linuxlist.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_3.c

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2019 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#include <stdint.h>
+#include <stddef.h>
+
+#include "utils.h"
+#include "iso7816_3.h"
+
+const uint16_t iso7816_3_fi_table[16] = {
+	372, 372, 558, 744, 1116, 1488, 1860, 0,
+	0, 512, 768, 1024, 1536, 2048, 0, 0
+};
+
+const uint32_t iso7816_3_fmax_table[16] = {
+	4000000, 5000000, 6000000, 8000000, 12000000, 16000000, 20000000, 0,
+	0, 5000000, 7500000, 10000000, 15000000, 20000000, 0, 0
+};
+
+const uint8_t iso7816_3_di_table[16] = {
+	0, 1, 2, 4, 8, 16, 32, 64,
+	12, 20, 0, 0, 0, 0, 0, 0,
+};
+
+/* all values are based on the Elementary Time Unit (ETU), defined in ISO/IEC 7816-3 section 7.1
+ * this is the time required to transmit a bit, and is calculated as follows: 1 ETU = (F / D) x (1 / f) where:
+ * - F is the clock rate conversion integer
+ * - D is the baud rate adjustment factor
+ * - f is the clock frequency
+ * the possible F, f(max), and D values are defined in ISO/IEC 7816-3 table 7 and 8
+ * - the initial value for F (after reset) is Fd = 372
+ * - the initial value for D (after reset) is Dd = 1
+ * - the initial maximum frequency f(max) is 5 MHz
+ * the card must measure the ETU based on the clock signal provided by the reader
+ * one ETU (e.g. 1 bit) takes F/D clock cycles, which the card must count
+ *
+ * the card can indicate an alternative set of supported values Fi (with corresponding f(max)) and Di for higher baud rate in TA1 in the ATR (see ISO/IEC 7816-3 section 8.3)
+ * these values are selected according to ISO/IEC 7816-3 section 6.3.1:
+ * - card in specific mode: they are enforced if TA2 is present (the reader can deactivate the card if it does not support these values)
+ * - card in negotiable mode:
+ * -- they can be selected by the reader using the Protocol and Parameters Selection (PPS) procedure
+ * -- the first offered protocol and default values are used when no PPS is started
+ *
+ * PPS is done with Fd and Dd (see ISO/IEC 7816-3 section 9)
+ * the reader can propose any F and D values between from Fd to Fi, and from Dd to Di (Fi and Di are indicated in TA1)
+ * the in PPS agreed values F and D are called Fn and Dn and are applied after a successful exchange, corresponding to PPS1_Response bit 5
+ *
+ * the F and D values must be provided to the SAM3S USART peripheral (after reset and PPS)
+ */
+
+bool iso7816_3_valid_f(uint16_t f)
+{
+	if (0 == f) {
+		return false;
+	}
+	uint8_t i = 0;
+	for (i = 0; i < ARRAY_SIZE(iso7816_3_fi_table) && iso7816_3_fi_table[i] != f; i++);
+	return (i < ARRAY_SIZE(iso7816_3_fi_table) && iso7816_3_fi_table[i] == f);
+}
+
+bool iso7816_3_valid_d(uint8_t d)
+{
+	if (0 == d) {
+		return false;
+	}
+	uint8_t i = 0;
+	for (i = 0; i < ARRAY_SIZE(iso7816_3_di_table) && iso7816_3_di_table[i] != d; i++);
+	return (i < ARRAY_SIZE(iso7816_3_di_table) && iso7816_3_di_table[i] == d);
+}
+
+/*
+ * the ETU is not only used to define the baud rate, but also the Waiting Time (WT) (see ISO/IEC 7816-3 section 8.1)
+ * when exceeding WT without card response, the reader flags the card as unresponsive, and resets it
+ * this can be used by the card to indicate errors or unsupported operations
+ * if the card requires more time to respond, it shall send a procedure byte to restart WT
+ * WT is calculated as follows (for T=0, see ISO/IEC 7816-3 section 10.2): WT = WI x 960 x (Fi / f(max)) where
+ * - WI is encoded in TC2 in the ATR (10 if absent)
+ * - WI does not depend on D/Di (used for the ETU)
+ * - after reset WT is 9600 ETU
+ * - WI (e.g. the new WT) is applied when T=0 is used (after 6.3.1), even if Fi is not Fn (this WT extension is important to know for the reader so to have the right timeout)
+ */
+
+int32_t iso7816_3_calculate_wt(uint8_t wi, uint16_t fi, uint8_t di, uint16_t f, uint8_t d)
+{
+	// sanity checks
+	if (0 == wi) {
+		return -1;
+	}
+	if (!iso7816_3_valid_f(fi)) {
+		return -2;
+	}
+	if (!iso7816_3_valid_d(di)) {
+		return -3;
+	}
+	if (!iso7816_3_valid_f(f)) {
+		return -4;
+	}
+	if (!iso7816_3_valid_d(d)) {
+		return -5;
+	}
+	if (f > fi) {
+		return -6;
+	}
+	if (d > di) {
+		return -7;
+	}
+
+	return wi * 960UL * (fi/f) * (di/d); // calculate timeout value in ETU
+}

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 timeout=0;
+	uint32_t status;
+	uint32_t timeout=0;
 
-    Usart *us_base = usart->base;
-    uint32_t us_id = usart->id;
+	Usart *us_base = usart->base;
+	uint32_t us_id = usart->id;
 
-    if( usart->state == USART_SEND ) {
-        while((us_base->US_CSR & US_CSR_TXEMPTY) == 0) {}
-        us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-        usart->state = USART_RCV;
-    }
+	if( usart->state == USART_SEND ) {
+		while((us_base->US_CSR & US_CSR_TXEMPTY) == 0) {}
+		us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+		usart->state = USART_RCV;
+	}
 
-    /* Wait USART ready for reception */
-    while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
-        if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
-            TRACE_WARNING("TimeOut\n\r");
-            return( 0 );
-        }
-    }
+	/* Wait USART ready for reception */
+	while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
+	WDT_Restart(WDT);
+		if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
+			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 */
-    *pCharToReceive = ((us_base->US_RHR) & 0xFF);
+	/* Get a char */
+	*pCharToReceive = ((us_base->US_RHR) & 0xFF);
 
-    status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
-                                      US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
-                                      (1<<10)));
+	status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
+					                  US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
+					                  (1<<10)));
 
-    if (status != 0 ) {
-        TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
-        TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
-        TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
-        us_base->US_CR = US_CR_RSTSTA;
-    }
+	if (status != 0 ) {
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
+		TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
+		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;
-    uint32_t us_id = usart->id;
+	Usart *us_base = usart->base;
+	uint32_t us_id = usart->id;
 
-    if( usart->state == USART_RCV ) {
-        us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-        usart->state = USART_SEND;
-    }
+	if( usart->state == USART_RCV ) {
+		us_base->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+		usart->state = USART_SEND;
+	}
 
-    /* Wait USART ready for transmit */
-    int i = 0;
-    while((us_base->US_CSR & (US_CSR_TXRDY)) == 0)  {
-        i++;
-        if (!(i%1000000)) {
-            printf("s: %x ", us_base->US_CSR);
-            printf("s: %x\r\n", us_base->US_RHR & 0xFF);
-            us_base->US_CR = US_CR_RSTTX;
-            us_base->US_CR = US_CR_RSTRX;
-      }
-    }
-    /* There is no character in the US_THR */
+	/* Wait USART ready for transmit */
+	int i = 0;
+	while((us_base->US_CSR & (US_CSR_TXRDY)) == 0)  {
+		i++;
+		if (!(i%1000000)) {
+			printf("s: %lx ", us_base->US_CSR);
+			printf("s: %lx\r\n", us_base->US_RHR & 0xFF);
+			us_base->US_CR = US_CR_RSTTX;
+			us_base->US_CR = US_CR_RSTRX;
+	  }
+	}
+	/* There is no character in the US_THR */
 
-    /* Transmit a char */
-    us_base->US_THR = CharToSend;
+	/* Transmit a char */
+	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|
-                                      US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
-                                      (1<<10)));
+	status = (us_base->US_CSR&(US_CSR_OVRE|US_CSR_FRAME|
+					                  US_CSR_PARE|US_CSR_TIMEOUT|US_CSR_NACK|
+					                  (1<<10)));
 
-    if (status != 0 ) {
-        TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
-                    ", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
-                    status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
-                    ((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("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
-        us_base->US_CR = US_CR_RSTSTA;
-    }
+	if (status != 0 ) {
+		TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
+					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
+					status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
+					((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("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
+		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 */
-    if (st_pinIso7816RstMC) {
-        PIO_Set(st_pinIso7816RstMC);
-    }
+	/* Set RESET Master Card */
+	if (st_pinIso7816RstMC) {
+		PIO_Set(st_pinIso7816RstMC);
+	}
 }
 
 /*----------------------------------------------------------------------------
@@ -191,10 +192,10 @@ static void ISO7816_IccPowerOn( void )
  */
 void ISO7816_IccPowerOff( void )
 {
-    /* Clear RESET Master Card */
-    if (st_pinIso7816RstMC) {
-        PIO_Clear(st_pinIso7816RstMC);
-    }
+	/* Clear RESET Master Card */
+	if (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,
-                                        uint16_t wLength,
-                                        uint16_t *retlen )
+					                    uint8_t *pMessage,
+					                    uint16_t wLength,
+					                    uint16_t *retlen )
 {
-    uint16_t NeNc;
-    uint16_t indexApdu = 4;
-    uint16_t indexMsg = 0;
-    uint8_t SW1 = 0;
-    uint8_t procByte;
-    uint8_t cmdCase;
-    uint32_t status = 0;
+	uint16_t NeNc;
+	uint16_t indexApdu = 4;
+	uint16_t indexMsg = 0;
+	uint8_t SW1 = 0;
+	uint8_t procByte;
+	uint8_t cmdCase;
+	uint32_t status = 0;
 
-    TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
-    TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
-    TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
-    TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
-    TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
-    TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
-    TRACE_INFO("wlength=%d\n\r",wLength);
+	TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
+	TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
+	TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
+	TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
+	TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
+	TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
+	TRACE_INFO("wlength=%d\n\r",wLength);
 
-    ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
-    ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
-    ISO7816_SendChar( pAPDU[2], &usart_sim ); /* P1 */
-    ISO7816_SendChar( pAPDU[3], &usart_sim ); /* P2 */
-    ISO7816_SendChar( pAPDU[4], &usart_sim ); /* P3 */
+	ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
+	ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
+	ISO7816_SendChar( pAPDU[2], &usart_sim ); /* P1 */
+	ISO7816_SendChar( pAPDU[3], &usart_sim ); /* P2 */
+	ISO7816_SendChar( pAPDU[4], &usart_sim ); /* P3 */
 
-    /* Handle the four structures of command APDU */
-    indexApdu = 5;
+	/* Handle the four structures of command APDU */
+	indexApdu = 5;
 
-    if( wLength == 4 ) {
-        cmdCase = CASE1;
-        NeNc = 0;
-    }
-    else if( wLength == 5) {
-        cmdCase = CASE2;
-        NeNc = pAPDU[4]; /* C5 */
-        if (NeNc == 0) {
-            NeNc = 256;
-        }
-    }
-    else if( wLength == 6) {
-        NeNc = pAPDU[4]; /* C5 */
-        cmdCase = CASE3;
-    }
-    else if( wLength == 7) {
-        NeNc = pAPDU[4]; /* C5 */
-        if( NeNc == 0 ) {
-            cmdCase = CASE2;
-            NeNc = (pAPDU[5]<<8)+pAPDU[6];
-        }
-        else {
-            cmdCase = CASE3;
-        }
-    }
-    else {
-        NeNc = pAPDU[4]; /* C5 */
-        if( NeNc == 0 ) {
-            cmdCase = CASE3;
-            NeNc = (pAPDU[5]<<8)+pAPDU[6];
-        }
-        else {
-            cmdCase = CASE3;
-        }
-    }
+	if( wLength == 4 ) {
+		cmdCase = CASE1;
+		NeNc = 0;
+	}
+	else if( wLength == 5) {
+		cmdCase = CASE2;
+		NeNc = pAPDU[4]; /* C5 */
+		if (NeNc == 0) {
+			NeNc = 256;
+		}
+	}
+	else if( wLength == 6) {
+		NeNc = pAPDU[4]; /* C5 */
+		cmdCase = CASE3;
+	}
+	else if( wLength == 7) {
+		NeNc = pAPDU[4]; /* C5 */
+		if( NeNc == 0 ) {
+			cmdCase = CASE2;
+			NeNc = (pAPDU[5]<<8)+pAPDU[6];
+		}
+		else {
+			cmdCase = CASE3;
+		}
+	}
+	else {
+		NeNc = pAPDU[4]; /* C5 */
+		if( NeNc == 0 ) {
+			cmdCase = CASE3;
+			NeNc = (pAPDU[5]<<8)+pAPDU[6];
+		}
+		else {
+			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 */
-    do {
-        status = ISO7816_GetChar(&procByte, &usart_sim);
-        if (status != 0) {
-            return status;
-        }
-        TRACE_INFO("procByte: 0x%X\n\r", procByte);
-        /* Handle NULL */
-        if ( procByte == ISO_NULL_VAL ) {
-            TRACE_INFO("INS\n\r");
-            continue;
-        }
-        /* Handle SW1 */
-        else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
-            TRACE_INFO("SW1\n\r");
-            SW1 = 1;
-        }
-        /* Handle INS */
-        else if ( pAPDU[1] == procByte) {
-            TRACE_INFO("HdlINS\n\r");
-            if (cmdCase == CASE2) {
-                /* receive data from card */
-                do {
-                    status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
-                } while(( 0 != --NeNc) && (status == 0) );
-                if (status != 0) {
-                    return status;
-                }
-            }
-            else {
-                 /* Send data */
-                do {
-                    TRACE_INFO("Send %X", pAPDU[indexApdu]);
-                    ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
-                } while( 0 != --NeNc );
-            }
-        }
-        /* Handle INS ^ 0xff */
-        else
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wsign-compare"
-        if ( pAPDU[1] == (procByte ^ 0xff)) {
-        #pragma GCC diagnostic pop
-            TRACE_INFO("HdlINS+\n\r");
-            if (cmdCase == CASE2) {
-                /* receive data from card */
-                status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
-                if (status != 0) {
-                    return status;
-                }
-                TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
-            }
-            else {
-                status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
-                if (status != 0) {
-                    return status;
-                }
-            }
-            NeNc--;
-        }
-        else {
-            /* ?? */
-            TRACE_INFO("procByte=0x%X\n\r", procByte);
-            break;
-        }
-    } while (NeNc != 0);
+	/* Handle Procedure Bytes */
+	do {
+		status = ISO7816_GetChar(&procByte, &usart_sim);
+		if (status != 0) {
+			return status;
+		}
+		TRACE_INFO("procByte: 0x%X\n\r", procByte);
+		/* Handle NULL */
+		if ( procByte == ISO_NULL_VAL ) {
+			TRACE_INFO("INS\n\r");
+			continue;
+		}
+		/* Handle SW1 */
+		else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
+			TRACE_INFO("SW1\n\r");
+			SW1 = 1;
+		}
+		/* Handle INS */
+		else if ( pAPDU[1] == procByte) {
+			TRACE_INFO("HdlINS\n\r");
+			if (cmdCase == CASE2) {
+				/* receive data from card */
+				do {
+					status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
+				} while(( 0 != --NeNc) && (status == 0) );
+				if (status != 0) {
+					return status;
+				}
+			}
+			else {
+				 /* Send data */
+				do {
+					TRACE_INFO("Send %X", pAPDU[indexApdu]);
+					ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
+				} while( 0 != --NeNc );
+			}
+		}
+		/* Handle INS ^ 0xff */
+		else
+		#pragma GCC diagnostic push
+		#pragma GCC diagnostic ignored "-Wsign-compare"
+		if ( pAPDU[1] == (procByte ^ 0xff)) {
+		#pragma GCC diagnostic pop
+			TRACE_INFO("HdlINS+\n\r");
+			if (cmdCase == CASE2) {
+				/* receive data from card */
+				status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
+				if (status != 0) {
+					return status;
+				}
+				TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
+			}
+			else {
+				status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
+				if (status != 0) {
+					return status;
+				}
+			}
+			NeNc--;
+		}
+		else {
+			/* ?? */
+			TRACE_INFO("procByte=0x%X\n\r", procByte);
+			break;
+		}
+	} while (NeNc != 0);
 
-    /* Status Bytes */
-    if (SW1 == 0) {
-        status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW1 */
-        if (status != 0) {
-            return status;
-        }
-    }
-    else {
-        pMessage[indexMsg++] = procByte;
-    }
-    status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW2 */
-    if (status != 0) {
-        return status;
-    }
+	/* Status Bytes */
+	if (SW1 == 0) {
+		status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW1 */
+		if (status != 0) {
+			return status;
+		}
+	}
+	else {
+		pMessage[indexMsg++] = procByte;
+	}
+	status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim); /* SW2 */
+	if (status != 0) {
+		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;
-    return status;
+	*retlen = indexMsg;
+	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");
-    USART_SIM->US_BRGR = 13;
+	TRACE_DEBUG("ISO7816_RestartClock\n\r");
+	USART_SIM->US_BRGR = 13;
 }
 
 /**
@@ -384,8 +385,8 @@ void ISO7816_RestartClock( void )
  */
 void ISO7816_StopClock( void )
 {
-    TRACE_DEBUG("ISO7816_StopClock\n\r");
-    USART_SIM->US_BRGR = 0;
+	TRACE_DEBUG("ISO7816_StopClock\n\r");
+	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("Not supported at this time\n\r");
+	TRACE_DEBUG("ISO7816_toAPDU\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 j;
-    uint32_t y;
-    uint32_t status = 0; 
+	uint32_t i;
+	uint32_t j;
+	uint32_t y;
+	uint32_t status = 0; 
 
-    *pLength = 0;
+	*pLength = 0;
 
-    /* Read ATR TS */
-    // FIXME: There should always be a check for the GetChar return value..0 means timeout
-    status = ISO7816_GetChar(&pAtr[0], &usart_sim);
-    if (status != 0) {
-        return status;
-    }
+	/* Read ATR TS */
+	// FIXME: There should always be a check for the GetChar return value..0 means timeout
+	status = ISO7816_GetChar(&pAtr[0], &usart_sim);
+	if (status != 0) {
+		return status;
+	}
 
-    /* Read ATR T0 */
-    status = ISO7816_GetChar(&pAtr[1], &usart_sim);
-    if (status != 0) {
-        return status;
-    }
-    y = pAtr[1] & 0xF0;
-    i = 2;
+	/* Read ATR T0 */
+	status = ISO7816_GetChar(&pAtr[1], &usart_sim);
+	if (status != 0) {
+		return status;
+	}
+	y = pAtr[1] & 0xF0;
+	i = 2;
 
-    /* Read ATR Ti */
-    while (y && (status == 0)) {
+	/* Read ATR Ti */
+	while (y && (status == 0)) {
 
-        if (y & 0x10) {  /* TA[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
-        if (y & 0x20) {  /* TB[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
-        if (y & 0x40) {  /* TC[i] */
-            status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-        }
-        if (y & 0x80) {  /* TD[i] */
-            status = ISO7816_GetChar(&pAtr[i], &usart_sim);
-            y =  pAtr[i++] & 0xF0;
-        }
-        else {
-            y = 0;
-        }
-    }
-    if (status != 0) {
-        return status;
-    }
+		if (y & 0x10) {  /* TA[i] */
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+		}
+		if (y & 0x20) {  /* TB[i] */
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+		}
+		if (y & 0x40) {  /* TC[i] */
+			status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+		}
+		if (y & 0x80) {  /* TD[i] */
+			status = ISO7816_GetChar(&pAtr[i], &usart_sim);
+			y =  pAtr[i++] & 0xF0;
+		}
+		else {
+			y = 0;
+		}
+	}
+	if (status != 0) {
+		return status;
+	}
 
-    /* Historical Bytes */
-    y = pAtr[1] & 0x0F;
-    for( j=0; (j < y) && (status == 0); j++ ) {
-        status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
-    }
+	/* Historical Bytes */
+	y = pAtr[1] & 0x0F;
+	for( j=0; (j < y) && (status == 0); j++ ) {
+		status = ISO7816_GetChar(&pAtr[i++], &usart_sim);
+	}
 
-    if (status != 0) {
-        return status;
-    }
+	if (status != 0) {
+		return status;
+	}
 
-    *pLength = i;
-    return status;
+	*pLength = i;
+	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 */
-    /* CD  = MCK / SCK */
-    /* SCK = FIDI x BAUD = 372 x 9600 */
-    /* BOARD_MCK */
-    /* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
-    USART_SIM->US_BRGR = BOARD_MCK / (dwClockFrequency*1000);
+	/* Define the baud rate divisor register */
+	/* CD  = MCK / SCK */
+	/* SCK = FIDI x BAUD = 372 x 9600 */
+	/* BOARD_MCK */
+	/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
+	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) {
-        return PIO_Get(st_pinIso7816RstMC);
-    }
-    return 0;
+	if (st_pinIso7816RstMC) {
+		return PIO_Get(st_pinIso7816RstMC);
+	}
+	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*/
-    for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
-    }
+	/* tb: wait ??? cycles*/
+	for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
+	}
 
-    USART_SIM->US_RHR;
-    USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+	USART_SIM->US_RHR;
+	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 */
-    for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
-    }
+	/* tb: wait ??? cycles */
+	for( i=0; i<(400*(BOARD_MCK/1000000)); i++ ) {
+	}
 
-    USART_SIM->US_RHR;
-    USART_SIM->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
+	USART_SIM->US_RHR;
+	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 j;
-    uint32_t y;
-    uint8_t offset;
+	uint32_t i;
+	uint32_t j;
+	uint32_t y;
+	uint8_t offset;
 
-    printf("\n\r");
-    printf("ATR: Answer To Reset:\n\r");
-    printf("TS = 0x%X Initial character ",pAtr[0]);
-    if( pAtr[0] == 0x3B ) {
+	printf("\n\r");
+	printf("ATR: Answer To Reset:\n\r");
+	printf("TS = 0x%X Initial character ",pAtr[0]);
+	if( pAtr[0] == 0x3B ) {
 
-        printf("Direct Convention\n\r");
-    }
-    else {
-        if( pAtr[0] == 0x3F ) {
+		printf("Direct Convention\n\r");
+	}
+	else {
+		if( pAtr[0] == 0x3F ) {
 
-            printf("Inverse Convention\n\r");
-        }
-        else {
-            printf("BAD Convention\n\r");
-        }
-    }
+			printf("Inverse Convention\n\r");
+		}
+		else {
+			printf("BAD Convention\n\r");
+		}
+	}
 
-    printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
-    printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
-    printf("    Presence further interface byte:\n\r");
-    if( pAtr[1]&0x80 ) {
-        printf("TA ");
-    }
-    if( pAtr[1]&0x40 ) {
-        printf("TB ");
-    }
-    if( pAtr[1]&0x20 ) {
-        printf("TC ");
-    }
-    if( pAtr[1]&0x10 ) {
-        printf("TD ");
-    }
-    if( pAtr[1] != 0 ) {
-        printf(" present\n\r");
-    }
+	printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
+	printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
+	printf("    Presence further interface byte:\n\r");
+	if( pAtr[1]&0x80 ) {
+		printf("TA ");
+	}
+	if( pAtr[1]&0x40 ) {
+		printf("TB ");
+	}
+	if( pAtr[1]&0x20 ) {
+		printf("TC ");
+	}
+	if( pAtr[1]&0x10 ) {
+		printf("TD ");
+	}
+	if( pAtr[1] != 0 ) {
+		printf(" present\n\r");
+	}
 
-    i = 2;
-    y = pAtr[1] & 0xF0;
+	i = 2;
+	y = pAtr[1] & 0xF0;
 
-    /* Read ATR Ti */
-    offset = 1;
-    while (y) {
+	/* Read ATR Ti */
+	offset = 1;
+	while (y) {
 
-        if (y & 0x10) {  /* TA[i] */
-            printf("TA[%d] = 0x%X ", offset, pAtr[i]);
-            if( offset == 1 ) {
-                printf("FI = %d ", (pAtr[i]>>8));
-                printf("DI = %d", (pAtr[i]&0x0F));
-            }
-            printf("\n\r");
-            i++;
-        }
-        if (y & 0x20) {  /* TB[i] */
-            printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
-            i++;
-        }
-        if (y & 0x40) {  /* TC[i] */
-            printf("TC[%d] = 0x%X ", offset, pAtr[i]);
-            if( offset == 1 ) {
-                printf("Extra Guard Time: N = %d", pAtr[i]);
-            }
-            printf("\n\r");
-            i++;
-        }
-        if (y & 0x80) {  /* TD[i] */
-            printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
-            y =  pAtr[i++] & 0xF0;
-        }
-        else {
-            y = 0;
-        }
-        offset++;
-    }
+		if (y & 0x10) {  /* TA[i] */
+			printf("TA[%d] = 0x%X ", offset, pAtr[i]);
+			if( offset == 1 ) {
+				printf("FI = %d ", (pAtr[i]>>8));
+				printf("DI = %d", (pAtr[i]&0x0F));
+			}
+			printf("\n\r");
+			i++;
+		}
+		if (y & 0x20) {  /* TB[i] */
+			printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
+			i++;
+		}
+		if (y & 0x40) {  /* TC[i] */
+			printf("TC[%d] = 0x%X ", offset, pAtr[i]);
+			if( offset == 1 ) {
+				printf("Extra Guard Time: N = %d", pAtr[i]);
+			}
+			printf("\n\r");
+			i++;
+		}
+		if (y & 0x80) {  /* TD[i] */
+			printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
+			y =  pAtr[i++] & 0xF0;
+		}
+		else {
+			y = 0;
+		}
+		offset++;
+	}
 
-    /* Historical Bytes */
-    printf("Historical bytes:\n\r");
-    y = pAtr[1] & 0x0F;
-    for( j=0; j < y; j++ ) {
-        printf(" 0x%X", pAtr[i]);
-        i++;
-    }
-    printf("\n\r\n\r");
+	/* Historical Bytes */
+	printf("Historical bytes:\n\r");
+	y = pAtr[1] & 0x0F;
+	for( j=0; j < y; j++ ) {
+		printf(" 0x%X", pAtr[i]);
+		i++;
+	}
+	printf("\n\r\n\r");
 
 }
 
 void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC) {
-    /* Pin ISO7816 initialize */
-    st_pinIso7816RstMC  = (Pin *)pPinIso7816RstMC;
+	/* Pin ISO7816 initialize */
+	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;
-    TRACE_DEBUG("ISO_Init\n\r");
+	uint32_t clk;
+	TRACE_DEBUG("ISO_Init\n\r");
 
-    Usart *us_base = usart->base;
-    uint32_t us_id = usart->id;
+	Usart *us_base = usart->base;
+	uint32_t us_id = usart->id;
 
-    if (master_clock == true) {
-        clk = US_MR_USCLKS_MCK;
-    } else {
-        clk = US_MR_USCLKS_SCK;
-    }
+	if (master_clock == true) {
+		clk = US_MR_USCLKS_MCK;
+	} else {
+		clk = US_MR_USCLKS_SCK;
+	}
 
-    USART_Configure( us_base,
-                     US_MR_USART_MODE_IS07816_T_0
-                     | clk
-                     | US_MR_NBSTOP_1_BIT
-                     | US_MR_PAR_EVEN
-                     | US_MR_CHRL_8_BIT
-                     | US_MR_CLKO
-                     | US_MR_INACK  /* Inhibit errors */
-                     | (3<<24), /* MAX_ITERATION */
-                     1,
-                     0);
+	USART_Configure( us_base,
+					 US_MR_USART_MODE_IS07816_T_0
+					 | clk
+					 | US_MR_NBSTOP_1_BIT
+					 | US_MR_PAR_EVEN
+					 | US_MR_CHRL_8_BIT
+					 | US_MR_CLKO
+					 | US_MR_INACK  /* Inhibit errors */
+					 | (3<<24), /* MAX_ITERATION */
+					 1,
+					 0);
 
-    /* Disable interrupts */
-    us_base->US_IDR = (uint32_t) -1;
+	/* Disable interrupts */
+	us_base->US_IDR = (uint32_t) -1;
 
-    /* Configure USART */
-    PMC_EnablePeripheral(us_id);
+	/* Configure USART */
+	PMC_EnablePeripheral(us_id);
 
-    us_base->US_FIDI = 372;  /* by default */
-    /* Define the baud rate divisor register */
-    /* CD  = MCK / SCK */
-    /* SCK = FIDI x BAUD = 372 x 9600 */
-    /* BOARD_MCK */
-    /* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
-    if (master_clock == true) {
-        us_base->US_BRGR = BOARD_MCK / (372*9600);
-    } else {
-        us_base->US_BRGR = US_BRGR_CD(1);
-    }
+	us_base->US_FIDI = 372;  /* by default */
+	/* Define the baud rate divisor register */
+	/* CD  = MCK / SCK */
+	/* SCK = FIDI x BAUD = 372 x 9600 */
+	/* BOARD_MCK */
+	/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
+	if (master_clock == true) {
+		us_base->US_BRGR = BOARD_MCK / (372*9600);
+	} else {
+		us_base->US_BRGR = US_BRGR_CD(1);
+	}
 }
 

firmware/libcommon/source/iso7816_fidi.c

@@ -1,22 +1,21 @@
-/* ISO7816-3 Fi/Di tables + computation */
-/* (C) 2010-2015 by Harald Welte <hwelte@hmw-consulting.de>
+/* ISO7816-3 Fi/Di tables + computation
  *
- *  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.
+ * (C) 2010-2015 by Harald Welte <laforge@gnumonks.org>
  *
- *  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.
+ * 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This 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 <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-2019 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 "iso7816_3.h"
 #include "utils.h"
-#include "osmocom/core/linuxlist.h"
-#include "osmocom/core/msgb.h"
+#include <osmocom/core/linuxlist.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,15 +50,19 @@ 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;
+	uint32_t wt; /*!< receiver waiting time to trigger timeout (0 to deactivate it) */
+	uint32_t wt_remaining; /*!< remaining waiting time */
+	bool wt_halfed; /*!< if at least half of the waiting time passed */
 	struct Usart_info usart_info;
 	int usb_pending_old;
 	uint8_t ep_out;
 	uint8_t ep_in;
 	uint8_t ep_int;
+	const Pin pin_io;
 	const Pin pin_insert;
 	uint32_t vcc_uv;
 	uint32_t vcc_uv_last;
@@ -54,9 +76,10 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART1,
 			.state = USART_RCV
 		},
-		.ep_out = PHONE_DATAOUT,
-		.ep_in = PHONE_DATAIN,
-		.ep_int = PHONE_INT,
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
+		.pin_io = PIN_USIM1_IO,
 #ifdef PIN_SET_USIM1_PRES
 		.pin_insert = PIN_SET_USIM1_PRES,
 #endif
@@ -69,9 +92,10 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART0,
 			.state = USART_RCV
 		},
-		.ep_out = CARDEM_USIM2_DATAOUT,
-		.ep_in = CARDEM_USIM2_DATAIN,
-		.ep_int = CARDEM_USIM2_INT,
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
+		.pin_io = PIN_USIM2_IO,
 #ifdef PIN_SET_USIM2_PRES
 		.pin_insert = PIN_SET_USIM2_PRES,
 #endif
@@ -81,15 +105,11 @@ struct cardem_inst cardem_inst[] = {
 
 static Usart *get_usart_by_chan(uint8_t uart_chan)
 {
-	switch (uart_chan) {
-	case 0:
-		return USART1;
-#ifdef CARDEMU_SECOND_UART
-	case 1:
-		return USART0;
-#endif
+	if (uart_chan < ARRAY_SIZE(cardem_inst)) {
+		return cardem_inst[uart_chan].usart_info.base;
+	} else {
+		return NULL;
 	}
-	return NULL;
 }
 
 /***********************************************************************
@@ -103,7 +123,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++;
 	}
@@ -126,7 +146,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 		 * receiver enabled during transmit */
 		USART_SetReceiverEnabled(usart, 1);
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-		USART_EnableIt(usart, US_IER_TXRDY);
+		USART_EnableIt(usart, US_IER_TXRDY | US_IER_TIMEOUT);
 		USART_SetTransmitterEnabled(usart, 1);
 		break;
 	case ENABLE_RX:
@@ -136,7 +156,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 		USART_SetTransmitterEnabled(usart, 1);
 		wait_tx_idle(usart);
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-		USART_EnableIt(usart, US_IER_RXRDY);
+		USART_EnableIt(usart, US_IER_RXRDY | US_IER_TIMEOUT);
 		USART_SetReceiverEnabled(usart, 1);
 		break;
 	case 0:
@@ -160,7 +180,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;
@@ -174,56 +194,171 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 	return 1;
 }
 
-
 /* FIXME: integrate this with actual irq handler */
 static void usart_irq_rx(uint8_t inst_num)
 {
+	if (inst_num >= ARRAY_SIZE(cardem_inst)) {
+		TRACE_ERROR("%u: UART channel out of bounds\r\n", inst_num);
+		return;
+	}
 	Usart *usart = get_usart_by_chan(inst_num);
 	struct cardem_inst *ci = &cardem_inst[inst_num];
 	uint32_t csr;
 	uint8_t byte = 0;
 
-	csr = usart->US_CSR & usart->US_IMR;
+	csr = usart->US_CSR & usart->US_IMR; // save state/flags before they get changed
 
-	if (csr & US_CSR_RXRDY) {
-        	byte = (usart->US_RHR) & 0xFF;
-		rbuf_write(&ci->rb, byte);
+	if (csr & US_CSR_RXRDY) { // bytes has been received
+		byte = (usart->US_RHR) & 0xFF; // ready out byte
+		if (rbuf_write(&ci->rb, byte) < 0) // store byte in buffer
+			TRACE_ERROR("rbuf overrun\r\n"); // error if could not store in buffer
 	}
 
-	if (csr & US_CSR_TXRDY) {
-		if (card_emu_tx_byte(ci->ch) == 0)
-			USART_DisableIt(usart, US_IER_TXRDY);
+	if (csr & US_CSR_TXRDY) { // ready to transmit the next byte
+		if (card_emu_tx_byte(ci->ch) == 0) // transmit next byte, and check if a byte is being transmitted
+			USART_DisableIt(usart, US_IER_TXRDY); // stop the TX ready signal if not byte has been transmitted
 	}
 
-	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);
+	if (csr & (US_CSR_OVRE | US_CSR_FRAME | US_CSR_PARE | US_CSR_NACK | (1 << 10))) { // error flag set
+		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK; // reset UART state to clear flag
+		TRACE_ERROR("%u USART error on 0x%x status: 0x%lx\n", ci->num, byte, csr); // warn user about error
+	}
+
+	// handle timeout
+	if (csr & US_CSR_TIMEOUT) { // RX has been inactive for some time
+		if (ci->wt_remaining <= (usart->US_RTOR & 0xffff)) { // waiting time has passed
+			ci->wt_remaining = 0; // timeout reached (will stop the timer)
+		} else {
+			ci->wt_remaining -= (usart->US_RTOR & 0xffff); // be sure to subtract the actual timeout since the new might not have been set and reloaded yet
+		}
+		if (0 == ci->wt_remaining) {
+			card_emu_wt_expired(ci->ch); // let the state know WT has expired
+		} else if (ci->wt_remaining <= ci->wt / 2 && !ci->wt_halfed) {
+			ci->wt_halfed = true;
+			card_emu_wt_halfed(ci->ch); // let the state know WT has half expired
+		}
+		if (ci->wt_remaining > 0xffff) { // value exceeds the USART TO range
+			usart->US_RTOR = 0xffff; // use the MAX
+		} else {
+			usart->US_RTOR = ci->wt_remaining;
+		}
+		usart->US_CR |= US_CR_STTTO; // clear timeout flag (and stop timeout until next character is received)
+		usart->US_CR |= US_CR_RETTO; // restart the counter (it wt is 0, the timeout is not started)
 	}
 }
 
+/*! ISR called for USART0 */
 void mode_cardemu_usart0_irq(void)
 {
 	/* USART0 == Instance 1 == USIM 2 */
 	usart_irq_rx(1);
 }
 
+/*! ISR called for USART1 */
 void mode_cardemu_usart1_irq(void)
 {
 	/* USART1 == Instance 0 == USIM 1 */
 	usart_irq_rx(0);
 }
 
-/* call-back from card_emu.c to change UART baud rate */
-int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
-{
-	int rc;
-	Usart *usart = get_usart_by_chan(uart_chan);
+// call-back from card_emu.c to change UART baud rate
 
-	usart->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
-	usart->US_FIDI = fidi & 0x3ff;
-	usart->US_CR |= US_CR_RXEN | US_CR_STTTO;
-	return 0;
+void card_emu_uart_update_fd(uint8_t uart_chan, uint16_t f, uint8_t d)
+{
+	Usart *usart = get_usart_by_chan(uart_chan); // get the USART based on the card handle
+	if (NULL == usart) {
+		TRACE_ERROR("%u: USART not found by chan\r\n", uart_chan);
+		return;
+	}
+	if (!iso7816_3_valid_f(f)) {
+		TRACE_ERROR("%u: invalid F: %u\r\n", uart_chan, f);
+		return;
+	}
+	if (!iso7816_3_valid_d(d)) {
+		TRACE_ERROR("%u: invalid D: %u\r\n", uart_chan, d);
+		return;
+	}
+
+	uint16_t ratio = f / d;
+	if (ratio > 0 && ratio < 2048) {
+		/* make sure USART uses new F/D ratio */
+		usart->US_CR |= US_CR_RXDIS | US_CR_RSTRX; // disable USART before changing baud rate
+		usart->US_FIDI = (ratio & 0x7ff); // change baud rate (ratio)
+		usart->US_CR |= US_CR_RXEN | US_CR_STTTO; // re-enable USART (and stop timeout)
+		TRACE_INFO("%u: USART F/D set to %u/%u\r\n", uart_chan, f, d);
+	} else {
+		TRACE_ERROR("%u: USART could not set F/D to %u/%u\r\n", uart_chan, f, d);
+		// TODO become unresponsive
+	}
+}
+
+void card_emu_uart_update_wt(uint8_t uart_chan, uint32_t wt)
+{
+	if (uart_chan >= ARRAY_SIZE(cardem_inst)) {
+		TRACE_ERROR("%u: UART channel out of bounds\r\n", uart_chan);
+		return;
+	}
+	struct cardem_inst *ci = &cardem_inst[uart_chan];
+	Usart *usart = get_usart_by_chan(uart_chan); // get the USART based on the card handle
+	if (NULL == usart) {
+		TRACE_ERROR("%u: USART not found by chan\r\n", uart_chan);
+		return;
+	}
+
+	ci->wt = wt; // save value
+	card_emu_uart_reset_wt(uart_chan); // reset and start timer
+	TRACE_INFO("%u: USART WT set to %lu ETU\r\n", uart_chan, wt);
+}
+
+void card_emu_uart_reset_wt(uint8_t uart_chan)
+{
+	if (uart_chan >= ARRAY_SIZE(cardem_inst)) {
+		TRACE_ERROR("%u: UART channel out of bounds\r\n", uart_chan);
+		return;
+	}
+	struct cardem_inst *ci = &cardem_inst[uart_chan];
+	Usart *usart = get_usart_by_chan(uart_chan); // get the USART based on the card handle
+	if (NULL == usart) {
+		TRACE_ERROR("%u: USART not found by chan\r\n", uart_chan);
+		return;
+	}
+
+	ci->wt_remaining = ci->wt; // reload WT value
+	ci->wt_halfed = false; // reset half expired
+	if (ci->wt_remaining > 0xffff) { // value exceeds the USART TO range
+		usart->US_RTOR = 0xffff; // use the MAX
+	} else {
+		usart->US_RTOR = ci->wt_remaining;
+	}
+	usart->US_CR |= US_CR_RETTO; // restart the counter (if wt is 0, the timeout is not started)
+}
+
+void card_emu_uart_io_set(uint8_t uart_chan, bool set)
+{
+	if (uart_chan >= ARRAY_SIZE(cardem_inst)) {
+		TRACE_ERROR("%u: UART channel out of bounds\r\n", uart_chan);
+		return;
+	}
+	struct cardem_inst *ci = &cardem_inst[uart_chan];
+	if (set) {
+		PIO_Set(&ci->pin_io);
+	} else {
+		PIO_Clear(&ci->pin_io);
+	}
+}
+
+/* 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);
+	}
 }
 
 /***********************************************************************
@@ -279,7 +414,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 +433,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 +458,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)
@@ -344,7 +472,7 @@ static void usim1_vcc_irqhandler(const Pin *pPin)
 {
 	int active = PIO_Get(&pin_usim1_vcc) ? 1 : 0;
 	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active);
-	/* FIXME do this for real */
+	/* FIXME readers enable clock after providing power and before releasing reset, but we should check it */
 	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active);
 }
 #endif /* !DETECT_VCC_BY_ADC */
@@ -361,7 +489,7 @@ static void usim2_vcc_irqhandler(const Pin *pPin)
 {
 	int active = PIO_Get(&pin_usim2_vcc) ? 1 : 0;
 	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active);
-	/* FIXME do this for real */
+	/* FIXME readers enable clock after providing power and before releasing reset, but we should check it */
 	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active);
 }
 #endif /* !DETECT_VCC_BY_ADC */
@@ -380,31 +508,47 @@ void mode_cardemu_init(void)
 
 	TRACE_ENTRY();
 
+#ifdef PINS_PWR_CARDEMU
+	// enable power on required peripherals, else disable
+	Pin pins_pwr_cardemu[] = { PINS_PWR_CARDEMU };
+	PIO_Configure(pins_pwr_cardemu, PIO_LISTSIZE(pins_pwr_cardemu));
+#endif /* PINS_PWR_CARDEMU */
 #ifdef PINS_CARDSIM
 	PIO_Configure(pins_cardsim, PIO_LISTSIZE(pins_cardsim));
 #endif
+	// ADC channel 6 and 7 are used to measure VCC (else they are grounded)
+	ADC->ADC_CHER |= ADC_CHER_CH6 | ADC_CHER_CH7; // enable the ADC channels to put them in high impedance (else they leak current)
 #ifdef DETECT_VCC_BY_ADC
-	card_vcc_adc_init();
+	card_vcc_adc_init(); // configure the ADC to measure VCC
 #endif /* DETECT_VCC_BY_ADC */
+	// TODO pull SIMtrace board SIM lines low, else they can leak current back to VCC
 
 	INIT_LLIST_HEAD(&cardem_inst[0].usb_out_queue);
 	rbuf_reset(&cardem_inst[0].rb);
 	PIO_Configure(pins_usim1, PIO_LISTSIZE(pins_usim1));
-	ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE);
-	NVIC_EnableIRQ(USART1_IRQn);
-	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);
-	PIO_EnableIt(&pin_usim1_rst);
+	ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE); // configure USART as ISO-7816 slave (e.g. card)
+	cardem_inst[0].usart_info.base->US_RTOR = 0; // don't use receive timeout timer for now
+	USART_EnableIt(cardem_inst[0].usart_info.base, US_IER_RXRDY | US_IER_TIMEOUT); // enable interrupts to indicate when data has been received or timeout occurred
+	NVIC_EnableIRQ(USART1_IRQn); // enable interrupt requests for the USART peripheral
+	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler); // register ISR to handle reset signal change
+	PIO_EnableIt(&pin_usim1_rst); // enable interrupt for reset pin change
 #ifndef DETECT_VCC_BY_ADC
-	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler);
-	PIO_EnableIt(&pin_usim1_vcc);
+	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler); // register ISR to handle VCC signal change
+	PIO_EnableIt(&pin_usim1_vcc); // enable interrupt for VCC pin change
 #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);
+#ifndef DETECT_VCC_BY_ADC
+	usim1_vcc_irqhandler(NULL); // check VCC/CLK state
+#endif
+	usim1_rst_irqhandler(NULL); // force RST state
 
 #ifdef CARDEMU_SECOND_UART
 	INIT_LLIST_HEAD(&cardem_inst[1].usb_out_queue);
 	rbuf_reset(&cardem_inst[1].rb);
 	PIO_Configure(pins_usim2, PIO_LISTSIZE(pins_usim2));
 	ISO7816_Init(&cardem_inst[1].usart_info, CLK_SLAVE);
+	// TODO enable timeout
 	NVIC_EnableIRQ(USART0_IRQn);
 	PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler);
 	PIO_EnableIt(&pin_usim2_rst);
@@ -412,8 +556,11 @@ 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);
+	// TODO check rst and vcc
 #endif /* CARDEMU_SECOND_UART */
+
 }
 
 /* called if config is deactivated */
@@ -478,6 +625,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 +650,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 +662,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 +672,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 +726,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 +738,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("+++++ Mask: 0x%X\n\r", pinSmartCard.mask);
+	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);
 Output:
-    +++++ Trying to check for pending interrupts (PIO ISR: 0x400)) = 1<<10
-    +++++ Mask: 0x100 = 1<<8
+	+++++ Trying to check for pending interrupts (PIO ISR: 0x400)) = 1<<10
+	+++++ 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__);
@@ -79,7 +80,7 @@ void ISR_PhoneRST(const Pin * pPin)
 }
 
 /*
- *  char_stat is zero if no error occured.
+ *  char_stat is zero if no error occurred.
  *  Otherwise it is filled with the content of the status register.
  */
 void mode_trace_usart1_irq(void)
@@ -109,27 +110,34 @@ void mode_trace_usart1_irq(void)
 			rbuf_write(&sim_rcv_buf, c);
 		} else {
 			TRACE_DEBUG("e %x st: %x\n", c, stat);
-		}		/* else: error occured */
+		}		/* else: error occurred */
 
 		char_stat = stat;
 	}
 }
 
 /*  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 (rc > 0 && rc < 0x400) {
-		TRACE_INFO("computed Fi(%u) Di(%u) ratio: %d", fi, di, rc);
-		/* make sure UART uses new F/D ratio */
-		USART_PHONE->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
-		USART_PHONE->US_FIDI = rc & 0x3ff;
-		USART_PHONE->US_CR |= US_CR_RXEN | US_CR_STTTO;
-	} else
-		TRACE_INFO("computed FiDi ratio %d unsupported", rc);
+	if (ratio > 0 && ratio < 0x8000) {
+		/* make sure USART uses new F/D ratio */
+		usart->base->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
+		/* disable write protection */
+		if (usart->base->US_WPMR) {
+			usart->base->US_WPMR = US_WPMR_WPKEY(0x555341);
+		}
+		usart->base->US_FIDI = (ratio & 0x7ff);
+		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 */
+	}
 }