sniffing: decrease USB IRQ prioprity to prevent USART overrun

Change-Id: I870a0aa8e251bbb53249c54bfcaa45de5b5a9486

Handling the USB message queue is done in an ISR and take quite some time.
This can cause a USART/SIM sniffing buffer overrun, resulting in data loss.
By setting the USB IRQ lower than the USART IRQ, the USB ISR can be
interrupted (for short) and no data gets lost.

.gitignore

@@ -18,8 +18,6 @@ tags
 *.bin
 *.p
 host/simtrace2-list
-host/simtrace2-cardem-pcsc
+host/simtrace2-remsim
-host/contrib/simtrace2.spec
+host/simtrace2-remsim-usb2udp
 usb_strings_generated.h
-firmware/usbstring/usbstring
-firmware/apps/*/usb_strings.txt.patched

Makefile

@@ -1,32 +0,0 @@
-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:
-	(cd host && \
-	 autoreconf -fi && \
-	 ./configure --prefix=/usr --disable-werror && \
-	 make)
-
-clean: fw-clean
-	if [ -e host/Makefile ]; then \
-		make -C host clean; \
-	fi
-
-install:
-	make -C firmware install
-	make -C host install

README.md

@@ -5,6 +5,9 @@ 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
@@ -13,6 +16,12 @@ 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)
@@ -28,11 +37,3 @@ 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
-
-
-The host software includes
-
-* libosmo-simtrace2 - a shared library to talk to devices running the simtrace2 firmware
-* simtrace2-list - list any USB-attached devices running simtrace2 firmware
-* simtrace2-sniff - interface the 'trace' firmware to obtain card protocol traces
-* simtrace2-cardem-pcsc - interface the 'cardem' fimrware to use a SIM in a PC/SC reader

TODO-RELEASE

@@ -1,10 +0,0 @@
-# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
-# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
-# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
-# LIBVERSION=c:r:a
-# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
-# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
-# If any interfaces have been added since the last public release: c:r:a + 1.
-# If any interfaces have been removed or changed since the last public release: c:r:0.
-#library	what			description / commit summary line
-simtrace2	API/ABI change		osmo_st2_transport new member

contrib/flash.py

@@ -1,162 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-# python: 3.8.1
-
-# library to enumerate USB devices
-import usb.core
-from usb.util import *
-# more elegant structure
-from typing import NamedTuple
-# regular expressions utilities
-import re
-# open utilities to handle files
-import os, sys
-# to download the firmwares
-import urllib.request
-# to flash using DFU-util
-import subprocess
-
-# SIMtrace 2 device information
-class Device(NamedTuple):
-	usb_vendor_id: int
-	usb_product_id: int
-	name: str
-	url: dict # 1: sniff/trace firmware, 2: card emulation firmware
-
-# SIMtrace 2 devices definitions
-DEVICE_SIMTRACE = Device(usb_vendor_id=0x1d50, usb_product_id=0x60e3, name="SIMtrace 2", url={"trace": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-trace-dfu-latest.bin", "cardem": "https://osmocom.org/attachments/download/3868/simtrace-cardem-dfu.bin"})
-DEVICE_QMOD = Device(usb_vendor_id=0x1d50, usb_product_id=0x4004, name="sysmoQMOD (Quad Modem)", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/qmod-cardem-dfu-latest.bin"})
-DEVICE_OWHW = Device(usb_vendor_id=0x1d50, usb_product_id=0x4001, name="OWHW", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/owhw-cardem-dfu-latest.bin"})
-DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD]
-
-# which firmware does the SIMtrace USN interface subclass correspond
-FIRMWARE_SUBCLASS = {1: "trace", 2: "cardem"}
-
-def print_help():
-	print("this script will flash SIMtrace 2 - based devices")
-	print("when no argument is provided, it will try to flash the application firmware of all SIMtrace 2 devices connected to USB with the latest version")
-	print("to flash a specific firmware, provide the name as argument")
-	print("the possible firmwares are: trace, cardem")
-	print("to list all devices connected to USB, provide the argument \"list\"")
-
-# the firmware to flash
-to_flash = None
-
-# parse command line argument
-if len(sys.argv) == 2:
-  to_flash = sys.argv[1]
-if to_flash not in ["list", "trace", "cardem"] and len(sys.argv) > 1:
-	print_help()
-	exit(0)
-
-# get all USB devices
-devices = []
-devices_nb = 0
-updated_nb = 0
-usb_devices = usb.core.find(find_all=True)
-for usb_device in usb_devices:
-	# find SIMtrace devices
-	definitions = list(filter(lambda x: x.usb_vendor_id == usb_device.idVendor and x.usb_product_id == usb_device.idProduct, DEVICES))
-	if 1 != len(definitions):
-		continue
-	devices_nb += 1
-	definition = definitions[0]
-	serial = usb_device.serial_number or "unknown"
-	usb_path = str(usb_device.bus) + "-" + ".".join(map(str, usb_device.port_numbers))
-	print("found " + definition.name + " device (chip ID " + serial + ") at USB path " + usb_path)
-	# determine if we are running DFU (in most cases the bootloader, but could also be the application)
-	dfu_interface = None
-	for configuration in usb_device:
-		# get DFU interface descriptor
-		dfu_interface = dfu_interface or find_descriptor(configuration, bInterfaceClass=254, bInterfaceSubClass=1)
-	if (None == dfu_interface):
-		print("no DFU USB interface found")
-		continue
-	dfu_mode = (2 == dfu_interface.bInterfaceProtocol) # InterfaceProtocol 1 is runtime mode, 2 is DFU mode
-	# determine firmware type (when not in DFU mode)
-	firmware = None
-	simtrace_interface = None
-	for configuration in usb_device:
-		simtrace_interface = simtrace_interface or find_descriptor(configuration, bInterfaceClass=255)
-	if simtrace_interface and simtrace_interface.bInterfaceSubClass in FIRMWARE_SUBCLASS:
-		firmware = firmware or FIRMWARE_SUBCLASS[simtrace_interface.bInterfaceSubClass]
-	if dfu_mode:
-		firmware = 'dfu'
-	if firmware:
-		print("installed firmware: " + firmware)
-	else:
-		print("unknown installed firmware")
-		continue
-	# determine version of the application/bootloader firmware
-	version = None
-	version_interface = None
-	for configuration in usb_device:
-		# get custom interface with string
-		version_interface = version_interface or find_descriptor(configuration, bInterfaceClass=255, bInterfaceSubClass=255)
-	if version_interface and version_interface.iInterface and version_interface.iInterface > 0 and get_string(usb_device, version_interface.iInterface):
-		version = get_string(usb_device, version_interface.iInterface)
-	if not version:
-		# the USB serial is set (in the application) since version 0.5.1.34-e026 from 2019-08-06
-		# https://git.osmocom.org/simtrace2/commit/?id=e0265462d8c05ebfa133db2039c2fbe3ebbd286e
-		# the USB serial is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18
-		# https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a
-		# the firmware version is set (in the application) since version 0.5.1.37-ede8 from 2019-08-13
-		# https://git.osmocom.org/simtrace2/commit/?id=ede87e067dadd07119f24e96261b66ac92b3af6f
-		# the firmware version is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18
-		# https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a
-		if dfu_mode:
-			if serial:
-				version = "< 0.5.1.45-ac7e"
-			else:
-				versoin = "< 0.5.1.45-ac7e"
-		else:
-			if serial:
-				version = "< 0.5.1.37-ede8"
-			else:
-				versoin = "< 0.5.1.34-e026"
-	print("device firmware version: " + version)
-	# flash latest firmware
-	if to_flash == "list": # we just want to list the devices, not flash them
-		continue
-	# check the firmware exists
-	if firmware == "dfu" and to_flash is None:
-		print("device is currently in DFU mode. you need to specify which firmware to flash")
-		continue
-	to_flash = to_flash or firmware
-	if to_flash not in definition.url.keys():
-		print("no firmware image available for " + firmware + " firmware")
-		continue
-	# download firmware
-	try:
-		dl_path, header = urllib.request.urlretrieve(definition.url[to_flash])
-	except:
-		print("could not download firmware " + definition.url[to_flash])
-		continue
-	dl_file = open(dl_path, "rb")
-	dl_data = dl_file.read()
-	dl_file.close()
-	# compare versions
-	dl_version = re.search(b'firmware \d+\.\d+\.\d+\.\d+-[0-9a-fA-F]{4}', dl_data)
-	if dl_version is None:
-		print("could not get version from downloaded firmware image")
-		os.remove(dl_path)
-		continue
-	dl_version = dl_version.group(0).decode("utf-8").split(" ")[1]
-	print("latest firmware version: " + dl_version)
-	versions = list(map(lambda x: int(x), version.split(" ")[-1].split("-")[0].split(".")))
-	dl_versions = list(map(lambda x: int(x), dl_version.split("-")[0].split(".")))
-	dl_newer = (versions[0] < dl_versions[0] or (versions[0] == dl_versions[0] and versions[1] < dl_versions[1]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] < dl_versions[2]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] == dl_versions[2] and versions[3] < dl_versions[3]))
-	if not dl_newer:
-		print("no need to flash latest version")
-		os.remove(dl_path)
-		continue
-	print("flashing latest version")
-	dfu_result = subprocess.run(["dfu-util", "--device", hex(definition.usb_vendor_id) + ":" + hex(definition.usb_product_id), "--path", usb_path, "--cfg", "1", "--alt", "1", "--reset", "--download", dl_path])
-	os.remove(dl_path)
-	if 0 != dfu_result.returncode:
-		printf("flashing firmware using dfu-util failed. ensure dfu-util is installed and you have the permissions to access this USB device")
-		continue
-	updated_nb += 1
-
-print(str(devices_nb)+ " SIMtrace 2 device(s) found")
-print(str(updated_nb)+ " SIMtrace 2 device(s) updated")

contrib/jenkins.sh

@@ -9,7 +9,6 @@ fi
 
 set -e
 
-publish="$1"
 base="$PWD"
 deps="$base/deps"
 inst="$deps/install"
@@ -21,14 +20,11 @@ mkdir "$deps" || true
 
 osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
 
-# verify only after building the dependency (to ensure we have most recent source of dependency)
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
-
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
 BUILDS=""
-BUILDS+="simtrace/dfu simtrace/trace "
+BUILDS+="simtrace/dfu simtrace/cardem " # simtrace/trace simtrace/triple_play
 BUILDS+="qmod/dfu qmod/cardem "
 BUILDS+="owhw/dfu owhw/cardem "
 
@@ -39,6 +35,7 @@ for build in $BUILDS; do
 	echo
 	echo "=============== $board / $app START  =============="
 	make BOARD="$board" APP="$app"
+	make BOARD="$board" APP="$app" clean
 	echo "=============== $board / $app RES:$? =============="
 done
 
@@ -53,44 +50,8 @@ make clean
 echo
 echo "=============== HOST START  =============="
 cd $TOPDIR/host
-autoreconf --install --force
+make clean
-./configure --enable-sanitize --enable-werror
+make
-$MAKE $PARALLEL_MAKE
+make clean
-#$MAKE distcheck || cat-testlogs.sh
-make dist
-
-#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
-#	make -C "$base/doc/manuals" publish
-#fi
-
-rm -rf $TOPDIR/firmware/bin/simtrace-cardem*
-
-if [ "x$publish" = "x--publish" ]; then
-	echo
-	echo "=============== UPLOAD BUILD  =============="
-	$TOPDIR/contrib/prepare_upload.sh
-
-	cat > "/build/known_hosts" <<EOF
-[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
-[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
-[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
-EOF
-	SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48"
-	rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/latest/
-	rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/
-fi
-
-echo
-echo "=============== HOST CLEAN  =============="
-$MAKE maintainer-clean
-
-echo
-echo "=============== FIRMWARE CLEAN  =============="
-cd $TOPDIR/firmware/
-for build in $BUILDS; do
-	board=`echo $build | cut -d "/" -f 1`
-	app=`echo $build | cut -d "/" -f 2`
-	make BOARD="$board" APP="$app" clean
-done
 
 osmo-clean-workspace.sh

contrib/prepare_upload.sh

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
-cd "$(dirname "$0")/.."
-
-GIT_VERSION="$(./git-version-gen .tarball-version)"
-
-echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."
-
-cd firmware/bin
-for ext in bin elf; do
-	for file in *."$ext"; do
-		without_ext="${file%.*}"
-		cp -v "$file" "$without_ext-latest.$ext"
-		cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
-	done
-done

debian/changelog

@@ -1,17 +0,0 @@
-simtrace2 (0.5.2) UNRELEASED; urgency=medium
-
-  * adapt to host tools in autotools
-
- -- Harald Welte <lafore@gnumonks.org>  Thu, 28 Nov 2019 00:44:57 +0100
-
-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

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

debian/control

@@ -1,65 +0,0 @@
-Source: simtrace2
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Section: devel
-Priority: optional
-Build-Depends: debhelper (>= 9),
-               autotools-dev,
-               autoconf,
-               automake,
-               libtool,
-               pkg-config,
-               git,
-               dh-autoreconf,
-               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}, libosmo-simtrace2-0
-Recommends: simtrace2-firmware
-Description: Host utilities to communicate with SIMtrace2 USB Devices.
-
-Package: libosmo-simtrace2-0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Osmocom SIMtrace2 library
-  This library contains core "driver" functionality to interface with the
-  Osmocom SIMtrace2 (and compatible) USB device firmware.  It enables
-  applications to implement SIM card / smart card tracing as well as
-  SIM / smart card emulation functions.
-
-Package: libosmo-simtrace2-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libosmo-simtrace2-0, ${misc:Depends}
-Description: Development headers for Osmocom SIMtrace2 library
-  This library contains core "driver" functionality to interface with the
-  Osmocom SIMtrace2 (and compatible) USB device firmware.  It enables
-  applications to implement SIM card / smart card tracing as well as
-  SIM / smart card emulation functions.
-  .
-  The header files provided by this package may be used to develop
-  with any of the libosmocore libraries.
-  .
-  Also static libraries are installed with this package.

debian/libosmo-simtrace2-0.install

@@ -1 +0,0 @@
-usr/lib/libosmo-simtrace2*.so.*

debian/libosmo-simtrace2-dev.install

@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/lib/pkgconfig/*

debian/rules

@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
-VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
-
-
-%:
-	dh $@
-
-override_dh_autoreconf:
-	cd host && dh_autoreconf

debian/simtrace2-firmware.install

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

debian/simtrace2-utils.install

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

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

firmware/Makefile

@@ -28,33 +28,22 @@
 
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
 
-# verbosity
-V ?= 0
-ifneq ("$(V)","0")
-SILENT :=
-else
-SILENT := @
-endif
-
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
 CHIP  ?= sam3s4
 BOARD ?= qmod
-APP ?= dfu
 
 # Defines which are the available memory targets for the SAM3S-EK board.
-ifeq ($(APP), dfu)
 MEMORIES ?= flash dfu
-else
-MEMORIES ?= dfu
-endif
 
-# Output directories and filename
+# Output file basename
+APP ?= dfu
+
+# Output directories
 OUTPUT = $(BOARD)-$(APP)
 BIN = bin
 OBJ = obj/$(BOARD)
@@ -84,6 +73,7 @@ GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
 TOP=..
+GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 
 #-------------------------------------------------------------------------------
 #		Files
@@ -107,11 +97,10 @@ C_LIBCHIP  = $(notdir $(wildcard $(AT91LIB)/libchip_sam3s/source/*.c) $(wildcard
 C_LIBUSB     = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c
 C_LIBUSB_RT  = dfu.c dfu_runtime.c
 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_LIBCOMMON  = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c
-	       main_common.c stack_check.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))
 
@@ -131,15 +120,15 @@ C_OBJECTS  = $(C_FILES:%.c=%.o)
 # TRACE_LEVEL_NO_TRACE   0
 TRACE_LEVEL ?= 4
 
-# allow asserting the peer SAM3S ERASE signal to completely erase the flash
+DEBUG_PHONE_SNIFF?=0
-# only applicable for qmod board
-ALLOW_PEER_ERASE?=0
 
 #CFLAGS+=-DUSB_NO_DEBUG=1
 
 # Optimization level, put in comment for debugging
 OPTIMIZATION ?= -Os
 
+
+
 # Flags
 INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
 
@@ -152,12 +141,13 @@ INCLUDES += -Ilibosmocore/include
 INCLUDES += -Isrc_simtrace -Iinclude
 INCLUDES += -Iapps/$(APP)
 
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
+CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
 CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
 CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef
 CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
 CFLAGS += -Waggregate-return #-Wsign-compare
+CFLAGS += -Wformat=0
 CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations
 CFLAGS += #-Wpacked
 CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
@@ -172,17 +162,18 @@ CFLAGS += -Wno-suggest-attribute=noreturn
 # -mlong-calls  -Wall
 #CFLAGS += -save-temps -fverbose-asm
 #CFLAGS += -Wa,-a,-ad
-CFLAGS += -D__ARM -fno-builtin
+CFLAGS += -D__ARM
 CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
-CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
+CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDEBUG_PHONE_SNIFF=$(DEBUG_PHONE_SNIFF)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
 ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--print-memory-usage -Wl,--no-undefined $(LIB)
+LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB)
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
 
-# Append BIN directories to output filename
+
+# Append OBJ and BIN directories to output filename
 OUTPUT := $(BIN)/$(OUTPUT)
 
 #-------------------------------------------------------------------------------
@@ -206,11 +197,7 @@ $(BIN) $(OBJ):
 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@
 
-.PHONY: apps/$(APP)/usb_strings.txt.patched
+apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring
-apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt
-	sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@
-
-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring
 	cat $< | usbstring/usbstring > $@
 
 define RULES
@@ -218,18 +205,18 @@ C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
 ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
 
 $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	$(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
-	$(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
+	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
-	$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
+	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
-	$(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf
+	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
+	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	$(SILENT)@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
 
 debug_$(1): $(1)
 	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
@@ -242,13 +229,8 @@ program:
 
 SERIAL ?= /dev/ttyUSB0
 log:
-	stty -F $(SERIAL) 921600
+	stty -F $(SERIAL) 115200
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )
 
 clean:
-	-rm -f apps/$(APP)/usb_strings.txt.patched
 	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`
-
-install:
-	mkdir -p $(DESTDIR)/usr/share/simtrace2
-	cp $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(DESTDIR)/usr/share/simtrace2

firmware/README.txt

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

firmware/apps/cardem/Makefile

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

firmware/apps/cardem/main.c

@@ -1,22 +1,4 @@
-/* SIMtrace 2 firmware card emulation application
+// FIXME: Copyright license here
- *
- * (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
  *------------------------------------------------------------------------------*/
@@ -24,9 +6,10 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "main_common.h"
 #include <osmocom/core/timer.h>
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -39,7 +22,7 @@ typedef struct {
 	void (*exit) (void);
 	/* main loop content for given configuration */
 	void (*run) (void);
-	/* Interrupt handler for USART0 */
+	/* Interrupt handler for USART1 */
 	void (*usart0_irq) (void);
 	/* Interrupt handler for USART1 */
 	void (*usart1_irq) (void);
@@ -53,8 +36,6 @@ static const conf_func config_func_ptrs[] = {
 		.init = Sniffer_init,
 		.exit = Sniffer_exit,
 		.run = Sniffer_run,
-		.usart0_irq = Sniffer_usart0_irq,
-		.usart1_irq = Sniffer_usart1_irq,
 	},
 #endif
 #ifdef HAVE_CCID
@@ -103,11 +84,7 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
-	if (cfgnum < ARRAY_SIZE(config_func_ptrs)) {
+	simtrace_config = cfgnum;
-		simtrace_config = cfgnum;
-	} else {
-		TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum);
-	}
 }
 
 void USART1_IrqHandler(void)
@@ -131,8 +108,7 @@ 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);
 }
 
@@ -147,16 +123,27 @@ extern int main(void)
 	unsigned int i = 0;
 
 	led_init();
-	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	led_blink(LED_RED, BLINK_3O_5F);
-	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
 
-	/* Enable watchdog for 2000ms, with no window */
+	/* Enable watchdog for 500ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	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%08x (Ext 0x%08x)\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);
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");
@@ -177,15 +164,14 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling configure of all configurations...\n\r");
-	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
+	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+	     ++i) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}
 
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	if (config_func_ptrs[simtrace_config].init) {
+	config_func_ptrs[simtrace_config].init();
-		config_func_ptrs[simtrace_config].init();
-	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -213,17 +199,11 @@ extern int main(void)
 		if (last_simtrace_config != simtrace_config) {
 			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
-			if (config_func_ptrs[last_simtrace_config].exit) {
+			config_func_ptrs[last_simtrace_config].exit();
-				config_func_ptrs[last_simtrace_config].exit();
+			config_func_ptrs[simtrace_config].init();
-			}
-			if (config_func_ptrs[simtrace_config].init) {
-				config_func_ptrs[simtrace_config].init();
-			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			if (config_func_ptrs[simtrace_config].run) {
+			config_func_ptrs[simtrace_config].run();
-				config_func_ptrs[simtrace_config].run();
-			}
 		}
 	}
 }

firmware/apps/cardem/usb_strings.txt

@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-PRODUCT_STRING
+SIMtrace 2 compatible device
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Card Emulation
+SIMtrace Phone
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2

firmware/apps/dfu/main.c

@@ -1,40 +1,13 @@
-/* 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>
 
-/* USB alternate interface index used to identify which partition to flash */
-/** USB alternate interface index indicating RAM partition */
 #define ALTIF_RAM 0
-/** USB alternate interface index indicating flash partition */
-#if defined(ENVIRONMENT_flash)
 #define ALTIF_FLASH 1
-#elif defined(ENVIRONMENT_dfu)
-#define ALTIF_FLASH 2
-#endif
 
 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 */
@@ -51,18 +24,10 @@ static const Pin pinsLeds[] = { PINS_LEDS } ;
  *----------------------------------------------------------------------------*/
 
 #define RAM_ADDR(offset) (IRAM_ADDR + BOARD_DFU_RAM_SIZE + offset)
-#if defined(ENVIRONMENT_flash)
 #define FLASH_ADDR(offset) (IFLASH_ADDR + BOARD_DFU_BOOT_SIZE + offset)
-#elif defined(ENVIRONMENT_dfu)
-#define FLASH_ADDR(offset) (IFLASH_ADDR + offset)
-#endif
 
-#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE)
+#define IFLASH_END	((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
-#if defined(ENVIRONMENT_flash)
+#define IRAM_END	((uint8_t *)IRAM_ADDR + IRAM_SIZE)
-#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
-#elif defined(ENVIRONMENT_dfu)
-#define IFLASH_END ((uint8_t *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE)
-#endif
 
 /* incoming call-back: Host has transferred 'len' bytes (stored at
  * 'data'), which we shall write to 'offset' into the partition
@@ -81,11 +46,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		WDT_Restart(WDT);
 	}
 
-#if TRACE_LEVEL >= TRACE_LEVEL_INFO
+	printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
-	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]);
@@ -105,11 +66,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		break;
 	case ALTIF_FLASH:
 		addr = FLASH_ADDR(offset);
-#if defined(ENVIRONMENT_flash)
 		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) {
-#elif defined(ENVIRONMENT_dfu)
-		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-#endif
 			g_dfu->state = DFU_STATE_dfuERROR;
 			g_dfu->status = DFU_STATUS_errADDRESS;
 			rc = DFU_RET_STALL;
@@ -137,6 +94,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		rc = DFU_RET_ZLP;
 		break;
 	default:
+		/* FIXME: set error codes */
 		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
 		rc = DFU_RET_STALL;
 		break;
@@ -202,30 +160,22 @@ WEAK int board_override_enter_dfu(void)
 int USBDFU_OverrideEnterDFU(void)
 {
 	uint32_t *app_part = (uint32_t *)FLASH_ADDR(0);
-	/* at the first call we are before the text segment has been relocated,
-	 * so g_dfu is not initialized yet */
-	g_dfu = &_g_dfu;
-	if (USB_DFU_MAGIC == g_dfu->magic) {
-		return 1;
-	}
 
 	/* If the loopback jumper is set, we enter DFU mode */
-	if (board_override_enter_dfu()) {
+	if (board_override_enter_dfu())
-		return 2;
+		return 1;
-	}
 
 	/* 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)) {
+	if ((app_part[0] < IRAM_ADDR) ||
-		return 3;
+	    ((uint8_t *)app_part[0] > IRAM_END))
-	}
+		return 1;
 
 	/* if the second word of the application partition doesn't look
 	 * like a function from flash (reset vector), enter DFU mode */
 	if (((uint32_t *)app_part[1] < app_part) ||
-	    ((uint8_t *)app_part[1] > IFLASH_END)) {
+	    ((uint8_t *)app_part[1] > IFLASH_END))
-		return 4;
+		return 1;
-	}
 
 	return 0;
 }
@@ -243,17 +193,6 @@ static void check_exec_dbg_cmd(void)
 	//board_exec_dbg_cmd(ch);
 }
 
-/* print a horizontal line of '=' characters; Doing this in a loop vs. using a 'const'
- * string saves us ~60 bytes of executable size (matters particularly for DFU loader) */
-static void print_line(void)
-{
-	int i;
-	for (i = 0; i < 78; i++)
-		fputc('=', stdout);
-	fputc('\n', stdout);
-	fputc('\r', stdout);
-}
-
 /*------------------------------------------------------------------------------
  *        Main
  *------------------------------------------------------------------------------*/
@@ -276,62 +215,25 @@ extern int main(void)
 	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
 #endif
 
+	/* Enable watchdog for 500ms, with no window */
+	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
+
+	PIO_InitializeInterrupts(0);
+
 	EEFC_ReadUniqueID(g_unique_id);
 
-	printf("\n\r\n\r");
+        printf("\n\r\n\r"
-	print_line();
+		"=============================================================================\n\r"
-	printf("DFU bootloader %s for board %s\n\r"
+		"DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r"
-		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r",
+		"=============================================================================\n\r",
 		manifest_revision, manifest_board);
-	print_line();
 
-#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	static const char* reset_causes[] = {
+	TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);
-		"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
-
-#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:
-		if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-			TRACE_INFO_WP("unknown\n\r");
-		} else {
-			TRACE_INFO_WP("DFU is the main application\n\r");
-		}
-		break;
-	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)
@@ -341,17 +243,11 @@ extern int main(void)
 
 	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
-	USBD_Disconnect();
-#ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
 	PIO_Configure(&usb_dp_pullup, 1);
 	PIO_Set(&usb_dp_pullup);
-#endif
+	mdelay(15);
-	mdelay(50);
-#ifdef PIN_USB_PULLUP
 	PIO_Clear(&usb_dp_pullup);
-#endif
-
 	USBDFU_Initialize(&dfu_descriptors);
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -359,8 +255,8 @@ extern int main(void)
 		check_exec_dbg_cmd();
 #if 1
 		if (i >= MAX_USB_ITER * 3) {
-			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
+			TRACE_ERROR("Resetting board (USB could "
-			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}

firmware/apps/dfu/usb_strings.txt

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

firmware/apps/freq_ctr/Makefile

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

firmware/apps/freq_ctr/freq_ctr.c

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

firmware/apps/freq_ctr/main.c

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

firmware/apps/freq_ctr/usb_strings.txt

@@ -1,10 +0,0 @@
-sysmocom - s.f.m.c. GmbH
-PRODUCT_STRING
-SIMtrace Sniffer
-SIMtrace CCID
-SIMtrace Card Emulation
-SIMtrace MITM
-CardEmulator Modem 1
-CardEmulator Modem 2
-CardEmulator Modem 3
-CardEmulator Modem 4

firmware/apps/gpio_test/Makefile

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

firmware/apps/gpio_test/gpio_test.c

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

firmware/apps/gpio_test/main.c

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

firmware/apps/gpio_test/usb_strings.txt

@@ -1,10 +0,0 @@
-sysmocom - s.f.m.c. GmbH
-PRODUCT_STRING
-SIMtrace Sniffer
-SIMtrace CCID
-SIMtrace Card Emulation
-SIMtrace MITM
-CardEmulator Modem 1
-CardEmulator Modem 2
-CardEmulator Modem 3
-CardEmulator Modem 4

firmware/apps/trace/Makefile

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

firmware/apps/trace/main.c

@@ -1,21 +1,21 @@
-/* SIMtrace 2 firmware sniffer application
+/*
+ * (C) 2010-2017 by Harald Welte <hwelte@sysmocom.de>
+ * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
+ * All Rights Reserved
  *
- * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * This program is free software; you can redistribute it and/or modify
- * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * it under the terms of the GNU Affero General Public License as published by
- *
+ * the Free Software Foundation; either version 3 of the License, or
- * This program is free software; you can redistribute it and/or
+ * (at your option) any later version.
- * 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.
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 /*------------------------------------------------------------------------------
  *          Headers
@@ -24,9 +24,10 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "main_common.h"
 #include "osmocom/core/timer.h"
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -103,6 +104,9 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+	if (cfgnum >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
+		TRACE_FATAL_WP("no functions defined for configuration %d\n\r", cfgnum);
+	}
 	simtrace_config = cfgnum;
 }
 
@@ -141,15 +145,10 @@ extern int main(void)
 	enum confNum last_simtrace_config = simtrace_config;
 	unsigned int i = 0;
 
-	/* Configure LED output
+	/* Configure LED output (red = on, green = activity */
-	 * 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);
+	led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
 
 	/* Enable watchdog for 2000 ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
@@ -157,11 +156,25 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	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%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
+		   g_unique_id[0], g_unique_id[1],
+		   g_unique_id[2], g_unique_id[3]);
+	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	TRACE_INFO("USB configuration used: %d\n\r", simtrace_config);
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
+	TRACE_INFO_WP("USBD_Inited\n\r");
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
 		WDT_Restart(WDT);
@@ -178,13 +191,26 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling configure of all configurations...\n\r");
-	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
+	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); ++i) {
-		if (config_func_ptrs[i].configure)
+		if (config_func_ptrs[i].configure) {
 			config_func_ptrs[i].configure();
+		} else {
+			TRACE_WARNING("no configure function defined for configuration %d\n\r", i);
+		}
 	}
 
+	TRACE_INFO("cfg %d\n\r", simtrace_config);
+
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	config_func_ptrs[simtrace_config].init();
+	if (simtrace_config >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
+		TRACE_ERROR("no functions defined for configuration %d\n\r", simtrace_config);
+	} else {
+		if (config_func_ptrs[simtrace_config].init) {
+			config_func_ptrs[simtrace_config].init();
+		} else {
+			TRACE_ERROR("no init function defined for configuration %d\n\r", simtrace_config);
+		}
+	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -212,11 +238,31 @@ 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();
+			if (last_simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-			config_func_ptrs[simtrace_config].init();
+				if (config_func_ptrs[last_simtrace_config].exit) {
+					config_func_ptrs[last_simtrace_config].exit();
+				} else {
+					TRACE_WARNING("exit not defined for configuration %d\n\r", last_simtrace_config);
+				}
+			} else {
+				TRACE_ERROR("no functions defined for configuration %d\n\r", last_simtrace_config);
+			}
+			if (simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
+				if (config_func_ptrs[simtrace_config].init) {
+					config_func_ptrs[simtrace_config].init();
+				} else {
+					 TRACE_WARNING("init not defined for configuration %d\n\r", simtrace_config);
+				}
+			} else {
+				TRACE_FATAL("no functions defined for configuration %d\n\r", simtrace_config);
+			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			config_func_ptrs[simtrace_config].run();
+			if (config_func_ptrs[simtrace_config].run) {
+				config_func_ptrs[simtrace_config].run();
+			} else {
+				TRACE_ERROR("run not defined for configuration %d\n\r", simtrace_config);
+			}
 		}
 	}
 }

firmware/apps/trace/usb_strings.txt

@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-PRODUCT_STRING
+SIMtrace 2 compatible device
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Card Emulation
+SIMtrace Phone
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2

firmware/apps/triple_play/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.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,21 +1,4 @@
-/* SIMtrace 2 firmware card emulation, CCID, and sniffer application
+// FIXME: Copyright license here
- *
- * (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
  *------------------------------------------------------------------------------*/
@@ -26,6 +9,8 @@
 #include "req_ctx.h"
 #include <osmocom/core/timer.h>
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -147,7 +132,17 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	EEFC_ReadUniqueID(g_unique_id);
+
+        printf("\r\n\r\n"
+		"=============================================================================\r\n"
+		"SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
+		"=============================================================================\r\n");
+
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+		   g_unique_id[0], g_unique_id[1],
+		   g_unique_id[2], g_unique_id[3]);
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\r\n");

firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c

@@ -45,6 +45,11 @@
  *      Headers
  *---------------------------------------------------------------------------*/
 
+#ifdef TRACE_LEVEL
+#undef TRACE_LEVEL
+#endif
+#define TRACE_LEVEL TRACE_LEVEL_WARNING
+
 #include "chip.h"
 #include "USBD_HAL.h"
 #include <usb/device/dfu/dfu.h>
@@ -1077,14 +1082,6 @@ static inline uint8_t UDP_Read(uint8_t  bEndpoint,
  *      Exported functions
  *---------------------------------------------------------------------------*/
 
-
-uint16_t USBD_GetEndpointSize(uint8_t bEndpoint)
-{
-    Endpoint *pEndpoint = &(endpoints[bEndpoint]);
-
-    return pEndpoint->size;
-}
-
 /**
  * USBD (UDP) interrupt handler
  * Manages device resume, suspend, end of bus reset.
@@ -1141,7 +1138,7 @@ void USBD_IrqHandler(void)
     /* Resume (Wakeup) */
     if ((status & (UDP_ISR_WAKEUP | UDP_ISR_RXRSM)) != 0) {
 
-        TRACE_DEBUG_WP("Res ");
+        TRACE_INFO_WP("Res ");
         /* Clear and disable resume interrupts */
         UDP->UDP_ICR = UDP_ICR_WAKEUP | UDP_ICR_RXRSM | UDP_ICR_RXSUSP;
         UDP->UDP_IDR = UDP_IDR_WAKEUP | UDP_IDR_RXRSM;
@@ -1153,7 +1150,7 @@ void USBD_IrqHandler(void)
        This interrupt is always treated last (hence the '==') */
     if (status == UDP_ISR_RXSUSP) {
 
-        TRACE_DEBUG_WP("Susp ");
+        TRACE_INFO_WP("Susp ");
         /* Enable wakeup */
         UDP->UDP_IER = UDP_IER_WAKEUP | UDP_IER_RXRSM;
         /* Acknowledge interrupt */
@@ -1164,26 +1161,19 @@ void USBD_IrqHandler(void)
     /* End of bus reset */
     else if ((status & UDP_ISR_ENDBUSRES) != 0) {
 
-        TRACE_DEBUG_WP("EoBRes ");
+        TRACE_INFO_WP("EoBRes ");
 
 #if defined(BOARD_USB_DFU)
 #if defined(APPLICATION_dfu)
 	/* if we are currently in the DFU bootloader, and we are beyond
 	 * the MANIFEST stage, we shall switch to the normal
 	 * application */
-	if (g_dfu->past_manifest) {
+	if (g_dfu->past_manifest)
-#if defined(ENVIRONMENT_flash)
 		USBDFU_SwitchToApp();
-#elif defined(ENVIRONMENT_dfu)
-		USBDFU_SwitchToDFU();
-#endif
-	}
-
 #else
 	/* if we are currently in the main application, and we are in
-	 * appDETACH state or past downloading, switch into the DFU bootloader.
+	 * appDETACH state, switch into the DFU bootloader */
-	 */
+	if (g_dfu->state == DFU_STATE_appDETACH)
-	if (g_dfu->state == DFU_STATE_appDETACH || g_dfu->state == DFU_STATE_dfuMANIFEST)
 		DFURT_SwitchToDFU();
 #endif /* APPLICATION_dfu */
 #endif /* BOARD_USB_DFU */
@@ -1212,7 +1202,7 @@ void USBD_IrqHandler(void)
 
                 if (status != 0) {
 
-                    TRACE_DEBUG_WP("\n\r  - ");
+                    TRACE_INFO_WP("\n\r  - ");
                 }
             }
             eptnum++;
@@ -1221,7 +1211,7 @@ void USBD_IrqHandler(void)
 
     /* Toggle LED back to its previous state */
     TRACE_DEBUG_WP("!");
-    TRACE_DEBUG_WP("\n\r");
+    TRACE_INFO_WP("\n\r");
     if (USBD_GetState() >= USBD_STATE_POWERED) {
 
         //LED_Clear(USBD_LEDUSB);
@@ -1371,7 +1361,7 @@ uint8_t USBD_HAL_ConfigureEP(const USBEndpointDescriptor *pDescriptor)
         UDP->UDP_IER = (1 << bEndpoint);
     }
 
-    TRACE_DEBUG_WP("CfgEp%d ", bEndpoint);
+    TRACE_INFO_WP("CfgEp%d ", bEndpoint);
     return bEndpoint;
 }
 
@@ -1539,7 +1529,7 @@ void USBD_HAL_RemoteWakeUp(void)
     UDP_EnableUsbClock();
     UDP_EnableTransceiver();
 
-    TRACE_DEBUG_WP("RWUp ");
+    TRACE_INFO_WP("RWUp ");
 
     // Activates a remote wakeup (edge on ESR), then clear ESR
     UDP->UDP_GLB_STAT |= UDP_GLB_STAT_ESR;
@@ -1702,10 +1692,7 @@ void USBD_HAL_Suspend(void)
     /* The device enters the Suspended state */
     UDP_DisableTransceiver();
     UDP_DisableUsbClock();
-    /* Don't disable peripheral clock; this somehow breaks completion of any IN transfers
+    UDP_DisablePeripheralClock();
-     * that have already been written to the peripheral, and which we expect to complete
-     * after resume */
-    //UDP_DisablePeripheralClock();
 }
 
 /**

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

@@ -163,7 +163,7 @@ extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwP
     wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
     wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
 
-    TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
+    TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
     /* Store values */
     if ( pEfc )
     {

firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c

@@ -134,7 +134,7 @@ static void ComputeLockRange( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwAct
     // Store actual page numbers
     EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ;
     EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ;
-    TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ;
+    TRACE_DEBUG( "Actual lock range is 0x%06X - 0x%06X\n\r", *pdwActualStart, *pdwActualEnd ) ;
 }
 
 

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c

@@ -211,16 +211,6 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
     NVIC_EnableIRQ( PIOC_IRQn ) ;
 }
 
-static InterruptSource *find_intsource4pin(const Pin *pPin)
-{
-    unsigned int i ;
-    for (i = 0; i < _dwNumSources; i++) {
-        if (_aIntSources[i].pPin == pPin)
-	    return &_aIntSources[i];
-    }
-    return NULL;
-}
-
 /**
  * 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
@@ -238,17 +228,15 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
 
     assert( pPin ) ;
     pio = pPin->pio ;
+    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
 
-    pSource = find_intsource4pin(pPin);
+    /* Define new source */
-    if (!pSource) {
+    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
-        /* Define new source */
+
-        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+    pSource = &(_aIntSources[_dwNumSources]) ;
-        assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
+    pSource->pPin = pPin ;
-        pSource = &(_aIntSources[_dwNumSources]) ;
-        pSource->pPin = pPin ;
-        _dwNumSources++ ;
-    }
     pSource->handler = handler ;
+    _dwNumSources++ ;
 
     /* PIO3 with additional interrupt support
      * Configure additional interrupt mode registers */

firmware/atmel_softpack_libraries/libchip_sam3s/source/unique_id.c

@@ -8,11 +8,6 @@ void EEFC_ReadUniqueID(unsigned int *pdwUniqueID)
 {
 	unsigned int status;
 
-	/* disable interrupts, as interrupt vectors are stored in flash,
-	 * and after STUI was issued, we can no longer access flassh until
-	 * SPUI complets */
-	__disable_irq();
-
 	/* Errata / Workaround: Set bit 16 of EEFC Flash Mode Register
 	 * to 1 */
 	EFC->EEFC_FMR |= (1 << 16);
@@ -45,6 +40,4 @@ void EEFC_ReadUniqueID(unsigned int *pdwUniqueID)
 	do {
 		status = EFC->EEFC_FSR;
 	} while ((status & EEFC_FSR_FRDY) != EEFC_FSR_FRDY);
-
-	__enable_irq();
 }

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

@@ -300,7 +300,7 @@ void USBD_SetConfiguration(uint8_t cfgnum)
     else {
         deviceState = USBD_STATE_ADDRESS;
         /* Reset all endpoints */
-        USBD_HAL_ResetEPs(0xFFFFFFFE, USBD_STATUS_RESET, 0);
+        USBD_HAL_ResetEPs(0xFFFFFFFF, USBD_STATUS_RESET, 0);
     }
 }
 

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

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

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

@@ -39,8 +39,8 @@ struct dfu_desc {
 #define DFU_FUNC_DESC  {						\
 	.bLength		= USB_DT_DFU_SIZE,			\
 	.bDescriptorType	= USB_DT_DFU,				\
-	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH, \
+	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \
-	.wDetachTimeOut		= 0x00,				\
+	.wDetachTimeOut		= 0xff00,				\
 	.wTransferSize		= BOARD_DFU_PAGE_SIZE,			\
 	.bcdDFUVersion		= 0x0100,				\
 }
@@ -101,7 +101,7 @@ struct dfudata {
 extern struct dfudata _g_dfu;
 extern struct dfudata *g_dfu;
 
-void set_usb_serial_str(void);
+void set_usb_serial_str(const uint8_t *serial_usbstr);
 
 void DFURT_SwitchToDFU(void);
 
@@ -124,9 +124,6 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors);
 /* USBD tells us to switch from DFU mode to application mode */
 void USBDFU_SwitchToApp(void);
 
-/* USBD tells us to switch from to DFU mode */
-void USBDFU_SwitchToDFU(void);
-
 /* Return values to be used by USBDFU_handle_{dn,up}load */
 #define DFU_RET_NOTHING	0
 #define DFU_RET_ZLP	1

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

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

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

@@ -33,7 +33,8 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-/** specific memory location shared across bootloader and application */
+/* FIXME: this was used for a special ELF section which then got called
+ * by DFU code and Application code, across flash partitions */
 #define __dfudata __attribute__ ((section (".dfudata")))
 #define __dfufunc
 
@@ -41,14 +42,11 @@
 static USBDDriver usbdDriver;
 static unsigned char if_altsettings[1];
 
-/** structure containing the DFU state and magic value to know if DFU or application should be started */
 __dfudata struct dfudata _g_dfu = {
-	.state = DFU_STATE_dfuIDLE,
+  	.state = DFU_STATE_appIDLE,
 	.past_manifest = 0,
 	.total_bytes = 0,
 };
-
-/** variable to structure containing DFU state */
 struct dfudata *g_dfu = &_g_dfu;
 
 WEAK void dfu_drv_updstatus(void)
@@ -85,7 +83,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -449,7 +447,6 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors)
 	/* We already start in DFU idle mode */
 	g_dfu->state = DFU_STATE_dfuIDLE;
 
-	set_usb_serial_str();
 	USBDDriver_Initialize(&usbdDriver, pDescriptors, if_altsettings);
 	USBD_Init();
 	USBD_Connect();
@@ -463,20 +460,7 @@ void USBDFU_SwitchToApp(void)
 	/* make sure the MAGIC is not set to enter DFU again */
 	g_dfu->magic = 0;
 
-	/* disconnect from USB to ensure re-enumeration */
+	printf("switching to app\r\n");
-	USBD_Disconnect();
-
-	/* disable any interrupts during transition */
-	__disable_irq();
-
-	/* Tell the hybrid to execute FTL JUMP! */
-	NVIC_SystemReset();
-}
-
-void USBDFU_SwitchToDFU(void)
-{
-	/* make sure the MAGIC is not set to enter DFU again */
-	g_dfu->magic = USB_DFU_MAGIC;
 
 	/* disconnect from USB to ensure re-enumeration */
 	USBD_Disconnect();

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

@@ -36,12 +36,7 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-/** specific memory location shared across bootloader and application */
+struct dfudata *g_dfu = (struct dfudata *) IRAM_ADDR;
-#define __dfudata __attribute__ ((section (".dfudata")))
-/** structure containing the magic value to know if DFU or application should be started */
-__dfudata struct dfudata _g_dfu;
-/** variable to structure containing the magic value to know if DFU or application should be started */
-struct dfudata *g_dfu = &_g_dfu;
 
 /* FIXME: this was used for a special ELF section which then got called
  * by DFU code and Application code, across flash partitions */
@@ -68,7 +63,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -165,8 +160,6 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 			 * will then trigger DFURT_SwitchToDFU() below */
 			TRACE_DEBUG("\r\n====dfu_detach\n\r");
 			g_dfu->state = DFU_STATE_appDETACH;
-			USBD_Write(0, 0, 0, 0, 0);
-			DFURT_SwitchToDFU();
 			ret = DFU_RET_ZLP;
 			goto out;
 			break;
@@ -211,14 +204,13 @@ out:
 
 void DFURT_SwitchToDFU(void)
 {
-	__disable_irq();
-
 	/* store the magic value that the DFU loader can detect and
 	 * activate itself, rather than boot into the application */
 	g_dfu->magic = USB_DFU_MAGIC;
-	__DMB();
+
-	/* Disconnect the USB by removing the pull-up */
+	/* Disconnect the USB by remoting the pull-up */
 	USBD_Disconnect();
+	__disable_irq();
 
 	/* reset the processor, we will start execution with the
 	 * ResetVector of the bootloader */

firmware/atmel_softpack_libraries/usb/include/USBD.h

@@ -214,8 +214,6 @@ typedef void (*MblTransferCallback)(void *pArg,
  *         Exported functions
  *------------------------------------------------------------------------------*/
 
-extern uint16_t USBD_GetEndpointSize(uint8_t bEndpoint);
-
 //extern void USBD_IrqHandler(void);
 
 extern void USBD_Init(void);

firmware/libboard/common/include/board_common.h

@@ -1,22 +1,3 @@
-/* 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_
 
@@ -56,12 +37,18 @@
 /** Core definition */
 #define cortexm3
 
-/* LEDs are used to indicate the status
+#define BOARD_MCK     48000000
- * the LED definition is board specific
+
- * most boards have two LEDs, one green and one red
+#define PIO_LED_RED     PIO_PA17
- * the red LED indicates of the main firmware is ready (on) or if there is an error (blinking)
+#define PIO_LED_GREEN   PIO_PA18
- * the green LED indicates if the firmware is idling (on) or if there is activity (blinking)
+
- */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+
+#define LED_NUM_RED     0
+#define LED_NUM_GREEN   1
+
 /** USART0 pin RX */
 #define PIN_USART0_RXD    {PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /** USART0 pin TX */
@@ -76,8 +63,8 @@
 #define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 
 /** UART0 */
-/** Console baud rate in bps */
+/** Console baudrate always using 115200. */
-#define CONSOLE_BAUDRATE    921600
+#define CONSOLE_BAUDRATE    115200
 /** UART peripheral used by the console (UART0). */
 #define CONSOLE_UART       UART0
 /** UART peripheral ID used by the console (UART0). */
@@ -108,17 +95,24 @@
 /* Interrupt request ID of USART peripheral connected to the phone */
 #define IRQ_USART_PHONE USART1_IRQn
 
+#define SIM_PWEN        PIO_PA5
+#define VCC_FWD         PIO_PA26
+
+/** Pin configuration to control USB pull-up on D+
+ *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
+ */
+#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
 // Board has UDP controller
 #define BOARD_USB_UDP
+// D+ has external pull-up
+#define BOARD_USB_PULLUP_EXTERNAL
 
 #define BOARD_USB_DFU
-
-
 #define BOARD_DFU_BOOT_SIZE	(16 * 1024)
 #define BOARD_DFU_RAM_SIZE	(2 * 1024)
 #define BOARD_DFU_PAGE_SIZE	512
-/** number of DFU interfaces (used to flash specific partitions) */
+#define BOARD_DFU_NUM_IF	2
-#define BOARD_DFU_NUM_IF	3
 
 extern void board_exec_dbg_cmd(int ch);
 extern void board_main_top(void);

firmware/libboard/common/include/board_lowlevel.h

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

firmware/libboard/common/include/boardver_adc.h

@@ -1,18 +1,4 @@
-/* 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);
+int get_board_version_adc(void);

firmware/libboard/common/include/led.h

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

firmware/libboard/common/include/manifest.h

@@ -1,17 +1,4 @@
-/* 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,26 +1,4 @@
-/* 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,7 +2,6 @@
  *         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.
  *
@@ -27,17 +26,19 @@
  * 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/resources/sam3s4/dfu.ld

@@ -39,9 +39,9 @@ SEARCH_DIR(.)
 MEMORY
 {
 	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
-	rom (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */
+	rom (rx)  : ORIGIN = 0x00404000, LENGTH = 0x0003c000 /* flash, 256K */
-	/* note: dfudata will be at the start */
+	/* reserve the first 32 (= 0x20) bytes for the _g_dfu struct */
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
+	ram (rwx) : ORIGIN = 0x20000020, LENGTH = 0x0000bfe0 /* sram, 48K */
 }
 
 /* Section Definitions */ 
@@ -111,8 +111,6 @@ SECTIONS
     {
         . = ALIGN(4);
         _srelocate = .;
-        /* we must make sure the .dfudata is linked to start of RAM */
-        *(.dfudata .dfudata.*);
         *(.ramfunc .ramfunc.*);
         *(.data .data.*);
         . = ALIGN(4);

firmware/libboard/common/resources/sam3s4/flash.ld

@@ -38,8 +38,8 @@ SEARCH_DIR(.)
 /* Memory Spaces Definitions */
 MEMORY
 {
-	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 16K /* flash, 256K, but only the first 16K should be used for the bootloader */
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */
 }
 
 /* Section Definitions */ 

firmware/libboard/common/source/board_cstartup_gnu.c

@@ -2,8 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2010, Atmel Corporation
- * Copyright (c) 2017, Harald Welte <laforge@gnumonks.org>
+ * Copyright (C) 2017, Harald Welte <laforge@gnumonks.org>
- * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -71,62 +70,62 @@ void ResetException( void ) ;
 __attribute__((section(".vectors")))
 IntFunc exception_table[] = {
 
-	/* Configure Initial Stack Pointer, using linker-generated symbols */
+    /* Configure Initial Stack Pointer, using linker-generated symbols */
-	(IntFunc)(&pdwStack[STACK_SIZE-1]),
+    (IntFunc)(&pdwStack[STACK_SIZE-1]),
-	ResetException,
+    ResetException,
 
-	NMI_Handler,
+    NMI_Handler,
-	HardFault_Handler,
+    HardFault_Handler,
-	MemManage_Handler,
+    MemManage_Handler,
-	BusFault_Handler,
+    BusFault_Handler,
-	UsageFault_Handler,
+    UsageFault_Handler,
-	0, 0, 0, 0,         /* Reserved */
+    0, 0, 0, 0,         /* Reserved */
-	SVC_Handler,
+    SVC_Handler,
-	DebugMon_Handler,
+    DebugMon_Handler,
-	0,                  /* Reserved  */
+    0,                  /* Reserved  */
-	PendSV_Handler,
+    PendSV_Handler,
-	SysTick_Handler,
+    SysTick_Handler,
 
-	/* Configurable interrupts  */
+    /* Configurable interrupts  */
-	SUPC_IrqHandler,    /* 0  Supply Controller */
+    SUPC_IrqHandler,    /* 0  Supply Controller */
-	RSTC_IrqHandler,    /* 1  Reset Controller */
+    RSTC_IrqHandler,    /* 1  Reset Controller */
-	RTC_IrqHandler,     /* 2  Real Time Clock */
+    RTC_IrqHandler,     /* 2  Real Time Clock */
-	RTT_IrqHandler,     /* 3  Real Time Timer */
+    RTT_IrqHandler,     /* 3  Real Time Timer */
-	WDT_IrqHandler,     /* 4  Watchdog Timer */
+    WDT_IrqHandler,     /* 4  Watchdog Timer */
-	PMC_IrqHandler,     /* 5  PMC */
+    PMC_IrqHandler,     /* 5  PMC */
-	EEFC_IrqHandler,    /* 6  EEFC */
+    EEFC_IrqHandler,    /* 6  EEFC */
-	IrqHandlerNotUsed,  /* 7  Reserved */
+    IrqHandlerNotUsed,  /* 7  Reserved */
-	UART0_IrqHandler,   /* 8  UART0 */
+    UART0_IrqHandler,   /* 8  UART0 */
-	UART1_IrqHandler,   /* 9  UART1 */
+    UART1_IrqHandler,   /* 9  UART1 */
-	SMC_IrqHandler,     /* 10 SMC */
+    SMC_IrqHandler,     /* 10 SMC */
-	PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
+    PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
-	PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
+    PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
-	PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
+    PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
-	USART0_IrqHandler,  /* 14 USART 0 */
+    USART0_IrqHandler,  /* 14 USART 0 */
-	USART1_IrqHandler,  /* 15 USART 1 */
+    USART1_IrqHandler,  /* 15 USART 1 */
-	IrqHandlerNotUsed,  /* 16 Reserved */
+    IrqHandlerNotUsed,  /* 16 Reserved */
-	IrqHandlerNotUsed,  /* 17 Reserved */
+    IrqHandlerNotUsed,  /* 17 Reserved */
-	MCI_IrqHandler,     /* 18 MCI */
+    MCI_IrqHandler,     /* 18 MCI */
-	TWI0_IrqHandler,    /* 19 TWI 0 */
+    TWI0_IrqHandler,    /* 19 TWI 0 */
-	TWI1_IrqHandler,    /* 20 TWI 1 */
+    TWI1_IrqHandler,    /* 20 TWI 1 */
-	SPI_IrqHandler,     /* 21 SPI */
+    SPI_IrqHandler,     /* 21 SPI */
-	SSC_IrqHandler,     /* 22 SSC */
+    SSC_IrqHandler,     /* 22 SSC */
-	TC0_IrqHandler,     /* 23 Timer Counter 0 */
+    TC0_IrqHandler,     /* 23 Timer Counter 0 */
-	TC1_IrqHandler,     /* 24 Timer Counter 1 */
+    TC1_IrqHandler,     /* 24 Timer Counter 1 */
-	TC2_IrqHandler,     /* 25 Timer Counter 2 */
+    TC2_IrqHandler,     /* 25 Timer Counter 2 */
-	TC3_IrqHandler,     /* 26 Timer Counter 3 */
+    TC3_IrqHandler,     /* 26 Timer Counter 3 */
-	TC4_IrqHandler,     /* 27 Timer Counter 4 */
+    TC4_IrqHandler,     /* 27 Timer Counter 4 */
-	TC5_IrqHandler,     /* 28 Timer Counter 5 */
+    TC5_IrqHandler,     /* 28 Timer Counter 5 */
-	ADC_IrqHandler,     /* 29 ADC controller */
+    ADC_IrqHandler,     /* 29 ADC controller */
-	DAC_IrqHandler,     /* 30 DAC controller */
+    DAC_IrqHandler,     /* 30 DAC controller */
-	PWM_IrqHandler,     /* 31 PWM */
+    PWM_IrqHandler,     /* 31 PWM */
-	CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
+    CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
-	ACC_IrqHandler,     /* 33 Analog Comparator */
+    ACC_IrqHandler,     /* 33 Analog Comparator */
-	USBD_IrqHandler,    /* 34 USB Device Port */
+    USBD_IrqHandler,    /* 34 USB Device Port */
-	IrqHandlerNotUsed   /* 35 not used */
+    IrqHandlerNotUsed   /* 35 not used */
 };
 
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
 #include "usb/device/dfu/dfu.h"
 static void BootIntoApp(void)
 {
@@ -134,11 +133,7 @@ static void BootIntoApp(void)
 	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)) | (0x0 << 7);
-	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;
@@ -153,57 +148,68 @@ static void BootIntoApp(void)
  */
 void ResetException( void )
 {
-	uint32_t *pSrc, *pDest ;
+    uint32_t *pSrc, *pDest ;
 
-	/* Low level Initialize */
+    /* Low level Initialize */
-	LowLevelInit() ;
+    LowLevelInit() ;
 
 
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
-	// boot application if there is not DFU override
+    /* we are before the text segment has been relocated, so g_dfu is
-	if (!USBDFU_OverrideEnterDFU() && SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
+     * not initialized yet */
-		UART_Exit();
+    g_dfu = &_g_dfu;
-		__disable_irq();
+    if ((g_dfu->magic != USB_DFU_MAGIC) && !USBDFU_OverrideEnterDFU()) {
-		BootIntoApp();
+        /* start application if valid
-		/* Infinite loop */
+         * the application starts with the vector table
-		while ( 1 ) ;
+         * the first entry in the vector table is the initial stack pointer (SP) address
-	}
+         * the stack will be placed in RAM, which begins at 0x2000 0000
+         * there is up to 48 KB of RAM (0xc000)
+         * since the stack grown "downwards" it should start at the end of the RAM: max 0x2000 c000
+         * if the SP is not in this range (e.g. flash has been erased) there is no valid application
+         * the second entry in the vector table is the reset address, corresponding to the application start
+         */
+        if (((*((uint32_t*)(IFLASH_ADDR+BOARD_DFU_BOOT_SIZE)))&0xFFFF0000)==0x20000000) {
+            BootIntoApp();
+            /* Infinite loop */
+            while ( 1 ) ;
+        }
+    }
 #endif
 
-	/* Initialize the relocate segment */
+    /* Initialize the relocate segment */
-	pSrc = &_etext ;
+    pSrc = &_etext ;
-	pDest = &_srelocate ;
+    pDest = &_srelocate ;
 
-	if ( pSrc != pDest )
+    if ( pSrc != pDest )
-	{
+    {
-		for ( ; pDest < &_erelocate ; )
+        for ( ; pDest < &_erelocate ; )
-		{
+        {
-		    *pDest++ = *pSrc++ ;
+            *pDest++ = *pSrc++ ;
-		}
+        }
-	}
+    }
 
-	/* Clear the zero segment */
+    /* Clear the zero segment */
-	for ( pDest = &_szero ; pDest < &_ezero ; )
+    for ( pDest = &_szero ; pDest < &_ezero ; )
-	{
+    {
-		*pDest++ = 0;
+        *pDest++ = 0;
-	}
+    }
 
-	/* Set the vector table base address */
+    /* Set the vector table base address */
-	pSrc = (uint32_t *)&_sfixed;
+    pSrc = (uint32_t *)&_sfixed;
-	SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
+    SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
     
-	if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
+    if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
-	{
+    {
 	    SCB->VTOR |= 1 << SCB_VTOR_TBLBASE_Pos ;
-	}
+    }
 
-	/* App should have disabled interrupts during the transition */
+    /* App should have disabled interrupts during the transition */
-	__enable_irq();
+    __enable_irq();
 
-	/* Branch to main function */
+    /* Branch to main function */
-	main() ;
+    main() ;
 
-	/* Infinite loop */
+    /* Infinite loop */
-	while ( 1 ) ;
+    while ( 1 ) ;
 }
 

firmware/libboard/common/source/board_lowlevel.c

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

firmware/libboard/common/source/boardver_adc.c

@@ -1,21 +1,7 @@
-/* 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"
 
-#define UV_PER_LSB	((3300 * 1000) / 4096)
+#define UV_PER_LSB     ((3300 * 1000) / 4096)
 uint32_t adc2uv(uint16_t adc)
 {
 	uint32_t uv = (uint32_t) adc * UV_PER_LSB;
@@ -86,7 +72,7 @@ int get_board_version_adc(void)
 	/* convert to voltage */
 	sample = ADC->ADC_CDR[2];
 	uv = adc2uv(sample);
-	TRACE_INFO("VERSION_DET ADC=%u => %lu uV\r\n", sample, uv);
+	TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv);
 
 	/* FIXME: convert to board version based on thresholds */
 

firmware/libboard/common/source/led.c

@@ -1,22 +1,3 @@
-/* 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>
@@ -35,9 +16,9 @@ static void led_set(enum led led, int on)
 	ASSERT(led < PIO_LISTSIZE(pinsLeds));
 
 	if (on)
-			PIO_Clear(&pinsLeds[led]);
+        	PIO_Clear(&pinsLeds[led]);
 	else
-			PIO_Set(&pinsLeds[led]);
+        	PIO_Set(&pinsLeds[led]);
 }
 
 /* LED blinking code */
@@ -73,23 +54,16 @@ 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 {
@@ -135,11 +109,6 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_600on_off,
 		.size = ARRAY_SIZE(bs_600on_off),
 	},
-	[BLINK_2F_O] = {
-		.states = bs_2off_on,
-		.size = ARRAY_SIZE(bs_2off_on),
-	},
-
 };
 
 struct led_state {

firmware/libboard/common/source/manifest.c

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

firmware/libboard/common/source/sim_switch.c

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

firmware/libboard/common/source/uart_console.c

@@ -2,7 +2,6 @@
  *         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.
  *
@@ -67,62 +66,41 @@ static ringbuf uart_tx_buffer;
  */
 extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
 {
-	const Pin pPins[] = CONSOLE_PINS;
+    const Pin pPins[] = CONSOLE_PINS;
-	Uart *pUart = CONSOLE_UART;
+    Uart *pUart = CONSOLE_UART;
 
-	/* Configure PIO */
+    /* Configure PIO */
-	PIO_Configure(pPins, PIO_LISTSIZE(pPins));
+    PIO_Configure(pPins, PIO_LISTSIZE(pPins));
 
-	/* Configure PMC */
+    /* Configure PMC */
-	PMC->PMC_PCER0 = 1 << CONSOLE_ID;
+    PMC->PMC_PCER0 = 1 << CONSOLE_ID;
 
-	/* Reset and disable receiver & transmitter */
+    /* Reset and disable receiver & transmitter */
-	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
+    pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
-				   | UART_CR_RXDIS | UART_CR_TXDIS;
+                   | UART_CR_RXDIS | UART_CR_TXDIS;
 
-	/* Configure mode */
+    /* Configure mode */
-	pUart->UART_MR =  UART_MR_PAR_NO;
+    pUart->UART_MR =  UART_MR_PAR_NO;
 
-	/* Configure baudrate */
+    /* Configure baudrate */
-	/* Asynchronous, no oversampling */
+    /* Asynchronous, no oversampling */
-	//pUart->UART_BRGR = (masterClock / baudrate) / 16;
+    pUart->UART_BRGR = (masterClock / baudrate) / 16;
-	if ((masterClock / baudrate) % 16 >= 7) {
-		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1;
-	} else {
-		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0;
-	}
 
-	/* Disable PDC channel */
+    /* Disable PDC channel */
-	pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
+    pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
 
-	/* Reset transmit ring buffer */
+    /* Reset transmit ring buffer */
-	rbuf_reset(&uart_tx_buffer);
+    rbuf_reset(&uart_tx_buffer);
 
-	/* Enable TX interrupts */
+    /* Enable TX interrupts */
-	pUart->UART_IER = UART_IER_TXRDY;
+    pUart->UART_IER = UART_IER_TXRDY;
-	NVIC_EnableIRQ(CONSOLE_IRQ);
+    NVIC_EnableIRQ(CONSOLE_IRQ);
     
-	/* Enable receiver and transmitter */
+    /* Enable receiver and transmitter */
-	pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
+    pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
 
-	/* Remember the configuration is complete */
+    /* Remember the configuration is complete */
-	_ucIsConsoleInitialized=1 ;
+    _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 */
@@ -131,6 +109,7 @@ void CONSOLE_ISR(void)
 	Uart *uart = CONSOLE_UART;
 	if (uart->UART_SR & UART_SR_TXRDY) {
 		if (!rbuf_is_empty(&uart_tx_buffer)) {
+			//uart->UART_IER = UART_IER_TXRDY;
 			uart->UART_THR = rbuf_read(&uart_tx_buffer);
 		} else {
 			uart->UART_IDR = UART_IER_TXRDY;
@@ -141,48 +120,31 @@ void CONSOLE_ISR(void)
 /**
  * \brief Outputs a character on the UART line.
  *
- * \note This function is asynchronous (i.e. uses a buffer and interrupt to complete the transfer).
+ * \note This function is synchronous (i.e. uses polling).
  * \param c  Character to send.
  */
-void UART_PutChar( uint8_t uc )
+extern void UART_PutChar( uint8_t c )
 {
-	Uart *pUart = CONSOLE_UART ;
+    Uart *pUart = CONSOLE_UART ;
 
-	/* Initialize console is not already done */
+    /* Initialize console is not already done */
-	if ( !_ucIsConsoleInitialized )
+    if ( !_ucIsConsoleInitialized )
-	{
+    {
-		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-	}
+    }
 
-	if (!rbuf_is_full(&uart_tx_buffer)) {
+    /* Only store input if buffer is not full, else drop it */
-		rbuf_write(&uart_tx_buffer, uc);
+    bool trigger_isr = false;
-		if (!(pUart->UART_IMR & UART_IMR_TXRDY)) {
+    if (rbuf_is_empty(&uart_tx_buffer)) {
-			pUart->UART_IER = UART_IER_TXRDY;
+        trigger_isr = true;
-			CONSOLE_ISR();
+    }
-		}
+    if (!rbuf_is_full(&uart_tx_buffer)) {
-	}
+        rbuf_write(&uart_tx_buffer, c);
-}
+    }
-
+    if (trigger_isr) {
-/**
+        pUart->UART_IER = UART_IER_TXRDY;
- * \brief Outputs a character on the UART line.
+        CONSOLE_ISR();
- *
+    }
- * \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) */
 }
 
 /**
@@ -193,17 +155,17 @@ void UART_PutChar_Sync( uint8_t uc )
  */
 extern uint32_t UART_GetChar( void )
 {
-	Uart *pUart = CONSOLE_UART ;
+    Uart *pUart = CONSOLE_UART ;
 
-	if ( !_ucIsConsoleInitialized )
+    if ( !_ucIsConsoleInitialized )
-	{
+    {
-		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-	}
+    }
 
-	while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 )
+    while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 )
-		WDT_Restart(WDT);
+        WDT_Restart(WDT);
 
-	return pUart->UART_RHR ;
+    return pUart->UART_RHR ;
 }
 
 /**
@@ -213,14 +175,14 @@ extern uint32_t UART_GetChar( void )
  */
 extern uint32_t UART_IsRxReady( void )
 {
-	Uart *pUart = CONSOLE_UART;
+    Uart *pUart = CONSOLE_UART;
 
-	if ( !_ucIsConsoleInitialized )
+    if ( !_ucIsConsoleInitialized )
-	{
+    {
-		UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
+        UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
-	}
+    }
 
-	return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
+    return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
 }
 
 /**
@@ -231,14 +193,14 @@ extern uint32_t UART_IsRxReady( void )
  */
 extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
 {
-	uint32_t dw ;
+    uint32_t dw ;
 
-	for ( dw=0 ; dw < dwSize ; dw++ )
+    for ( dw=0 ; dw < dwSize ; dw++ )
-	{
+    {
-		printf( "%02X ", pucFrame[dw] ) ;
+        printf( "%02X ", pucFrame[dw] ) ;
-	}
+    }
 
-	printf( "\n\r" ) ;
+    printf( "\n\r" ) ;
 }
 
 /**
@@ -250,62 +212,62 @@ extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
  */
 extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
 {
-	uint32_t i ;
+    uint32_t i ;
-	uint32_t j ;
+    uint32_t j ;
-	uint32_t dwLastLineStart ;
+    uint32_t dwLastLineStart ;
-	uint8_t* pucTmp ;
+    uint8_t* pucTmp ;
 
-	for ( i=0 ; i < (dwSize / 16) ; i++ )
+    for ( i=0 ; i < (dwSize / 16) ; i++ )
-	{
+    {
-		printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
+        printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
-		pucTmp = (uint8_t*)&pucBuffer[i*16] ;
+        pucTmp = (uint8_t*)&pucBuffer[i*16] ;
 
-		for ( j=0 ; j < 4 ; j++ )
+        for ( j=0 ; j < 4 ; j++ )
-		{
+        {
-			printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
+            printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
-			pucTmp += 4 ;
+            pucTmp += 4 ;
-		}
+        }
 
-		pucTmp=(uint8_t*)&pucBuffer[i*16] ;
+        pucTmp=(uint8_t*)&pucBuffer[i*16] ;
 
-		for ( j=0 ; j < 16 ; j++ )
+        for ( j=0 ; j < 16 ; j++ )
-		{
+        {
-			UART_PutChar( *pucTmp++ ) ;
+            UART_PutChar( *pucTmp++ ) ;
-		}
+        }
 
-		printf( "\n\r" ) ;
+        printf( "\n\r" ) ;
-	}
+    }
 
-	if ( (dwSize%16) != 0 )
+    if ( (dwSize%16) != 0 )
-	{
+    {
-		dwLastLineStart=dwSize - (dwSize%16) ;
+        dwLastLineStart=dwSize - (dwSize%16) ;
 
-		printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
+        printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
-		for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
+        for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
-		{
+        {
-			if ( (j!=dwLastLineStart) && (j%4 == 0) )
+            if ( (j!=dwLastLineStart) && (j%4 == 0) )
-			{
+            {
-				printf( " " ) ;
+                printf( " " ) ;
-			}
+            }
 
-			if ( j < dwSize )
+            if ( j < dwSize )
-			{
+            {
-				printf( "%02X", pucBuffer[j] ) ;
+                printf( "%02X", pucBuffer[j] ) ;
-			}
+            }
-			else
+            else
-			{
+            {
-				printf("  ") ;
+                printf("  ") ;
-			}
+            }
-		}
+        }
 
-		printf( " " ) ;
+        printf( " " ) ;
-		for ( j=dwLastLineStart ; j < dwSize ; j++ )
+        for ( j=dwLastLineStart ; j < dwSize ; j++ )
-		{
+        {
-			UART_PutChar( pucBuffer[j] ) ;
+            UART_PutChar( pucBuffer[j] ) ;
-		}
+        }
 
-		printf( "\n\r" ) ;
+        printf( "\n\r" ) ;
-	}
+    }
 }
 
 /**
@@ -315,46 +277,46 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
  */
 extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 {
-	uint8_t ucKey ;
+    uint8_t ucKey ;
-	uint8_t ucNbNb=0 ;
+    uint8_t ucNbNb=0 ;
-	uint32_t dwValue=0 ;
+    uint32_t dwValue=0 ;
 
-	while ( 1 )
+    while ( 1 )
-	{
+    {
-		ucKey=UART_GetChar() ;
+        ucKey=UART_GetChar() ;
-		UART_PutChar( ucKey ) ;
+        UART_PutChar( ucKey ) ;
 
-		if ( ucKey >= '0' &&  ucKey <= '9' )
+        if ( ucKey >= '0' &&  ucKey <= '9' )
-		{
+        {
-			dwValue = (dwValue * 10) + (ucKey - '0');
+            dwValue = (dwValue * 10) + (ucKey - '0');
-			ucNbNb++ ;
+            ucNbNb++ ;
-		}
+        }
-		else
+        else
-		{
+        {
-			if ( ucKey == 0x0D || ucKey == ' ' )
+            if ( ucKey == 0x0D || ucKey == ' ' )
-			{
+            {
-				if ( ucNbNb == 0 )
+                if ( ucNbNb == 0 )
-				{
+                {
-					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
+                    printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
-					return 0 ;
+                    return 0 ;
-				}
+                }
-				else
+                else
-				{
+                {
-					printf( "\n\r" ) ;
+                    printf( "\n\r" ) ;
-					*pdwValue=dwValue ;
+                    *pdwValue=dwValue ;
 
-					return 1 ;
+                    return 1 ;
-				}
+                }
-			}
+            }
-			else
+            else
-			{
+            {
-				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
+                printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
 
-				return 0 ;
+                return 0 ;
-			}
+            }
-		}
+        }
-		WDT_Restart(WDT);
+        WDT_Restart(WDT);
-	}
+    }
 }
 
 /**
@@ -366,25 +328,25 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
  */
 extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
 {
-	uint32_t dwValue=0 ;
+    uint32_t dwValue=0 ;
 
-	if ( UART_GetInteger( &dwValue ) == 0 )
+    if ( UART_GetInteger( &dwValue ) == 0 )
-	{
+    {
-		return 0 ;
+        return 0 ;
-	}
+    }
 
-	if ( dwValue < dwMin || dwValue > dwMax )
+    if ( dwValue < dwMin || dwValue > dwMax )
  {
-		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
+        printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
 
-		return 0 ;
+        return 0 ;
-	}
+    }
 
-	printf( "\n\r" ) ;
+    printf( "\n\r" ) ;
 
-	*pdwValue = dwValue ;
+    *pdwValue = dwValue ;
 
-	return 1 ;
+    return 1 ;
 }
 
 /**
@@ -394,45 +356,45 @@ extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint3
  */
 extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 {
-	uint8_t ucKey ;
+    uint8_t ucKey ;
-	uint32_t dw = 0 ;
+    uint32_t dw = 0 ;
-	uint32_t dwValue = 0 ;
+    uint32_t dwValue = 0 ;
 
-	for ( dw=0 ; dw < 8 ; dw++ )
+    for ( dw=0 ; dw < 8 ; dw++ )
-	{
+    {
-		ucKey = UART_GetChar() ;
+        ucKey = UART_GetChar() ;
-		UART_PutChar( ucKey ) ;
+        UART_PutChar( ucKey ) ;
 
-		if ( ucKey >= '0' &&  ucKey <= '9' )
+        if ( ucKey >= '0' &&  ucKey <= '9' )
-		{
+        {
-			dwValue = (dwValue * 16) + (ucKey - '0') ;
+            dwValue = (dwValue * 16) + (ucKey - '0') ;
-		}
+        }
-		else
+        else
-		{
+        {
-			if ( ucKey >= 'A' &&  ucKey <= 'F' )
+            if ( ucKey >= 'A' &&  ucKey <= 'F' )
-			{
+            {
-				dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
+                dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
-			}
+            }
-			else
+            else
-			{
+            {
-				if ( ucKey >= 'a' &&  ucKey <= 'f' )
+                if ( ucKey >= 'a' &&  ucKey <= 'f' )
-				{
+                {
-					dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
+                    dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
-				}
+                }
-				else
+                else
-				{
+                {
-					printf( "\n\rIt is not a hexa character!\n\r" ) ;
+                    printf( "\n\rIt is not a hexa character!\n\r" ) ;
 
-					return 0 ;
+                    return 0 ;
-				}
+                }
-			}
+            }
-		}
+        }
-	}
+    }
 
-	printf("\n\r" ) ;
+    printf("\n\r" ) ;
-	*pdwValue = dwValue ;
+    *pdwValue = dwValue ;
 
-	return 1 ;
+    return 1 ;
 }
 
 #if defined __ICCARM__ /* IAR Ewarm 5.41+ */
@@ -445,9 +407,9 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
  */
 extern WEAK signed int putchar( signed int c )
 {
-	UART_PutChar( c ) ;
+    UART_PutChar( c ) ;
 
-	return c ;
+    return c ;
 }
 #endif // defined __ICCARM__
 

firmware/libboard/octsimtest/include/board.h

@@ -1,170 +0,0 @@
-/* octSIMtest with SAM3S board definition
- *
- * (C) 2019 by sysmocom -s.f.m.c. GmbH, Author:Joachim Steiger <jsteiger@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#pragma once
-#include "board_common.h"
-#include "simtrace_usb.h"
-
-/* Name of the board */
-#define BOARD_NAME "OCTSIMTEST"
-/* Board definition */
-#define octsimtest
-
-/** oscillator used as main clock source (in Hz) */
-#define BOARD_MAINOSC 18432000
-/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
-#define BOARD_MCK 58982400 // 18.432 * 16 / 5
-
-/** Pin configuration **/
-
-/** there is no red LED, but the code needs this second LED, thus we provide an unused pin */
-#define PIO_LED_RED     PIO_PB13
-/** MCU pin connected to green LED, which is actually amber, and the logic is inverted since it is connected to an NPN transistor (used as open drain) */
-#define PIO_LED_GREEN   PIO_PA4
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOB, ID_PIOB, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
-
-/* Button to force bootloader start (shorted to ground when pressed */
-#define PIN_BOOTLOADER_SW      {PIO_PA5, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-
-//FIXME SIM_PWEN_PIN collides with PA5/bootloader_sw on octsimtest
-/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define SIM_PWEN_PIN           {PIO_PA12, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Enable powering the SIM card */
-#define PWR_PINS                SIM_PWEN_PIN
-
-// FIXME PA8 is 32khz xtal on octsimtest
-/* Card presence pin */
-#define SW_SIM                  PIO_PA11
-/* Pull card presence pin high (shorted to ground in card slot when card is present) */
-#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
-
-/** Smart card connection **/
-//FIXME
-/* Card RST reset signal input (active low; RST_SIM in schematic) */
-#define PIN_SIM_RST            {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Card I/O data signal input/output (I/O_SIM in schematic) */
-#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Card CLK clock input (CLK_SIM in schematic) */
-#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
-#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-//FIXME PIO_PA4B_TCLK0 PA4 is LED on octsimtest
-/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
-#define PIN_SIM_CLK_INPUT      {PIO_PA14, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/* Pins used to measure ETU timing (using timer counter) */ 
-#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
-
-/** Phone connection **/
-/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
-#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
-/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
-#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Phone CLK clock input (CLK_PHONE in schematic) */
-#define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used for phone USIM slot 1 communication */
-#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
-/* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
-#define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
-#define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-
-/** Default pin configuration **/
-/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
-#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
-#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
-#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
-
-/** Sniffer configuration **/
-/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
-#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
-#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
-#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
-/* Card RST reset signal input (use as input since the phone will drive it) */
-#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
-/* Pins used to sniff phone-card communication */
-#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
-/* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
-#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Use phone VCC to power card */
-#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
-
-/** CCID configuration */
-/* Card RST reset signal input (active low; RST_SIM in schematic) */
-#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* ISO7816-communication related pins */
-#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
-
-/** External SPI flash interface   **/
-/* SPI MISO pin definition */
-#define PIN_SPI_MISO  {PIO_PA12A_MISO, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
-/* SPI MOSI pin definition */
-#define PIN_SPI_MOSI  {PIO_PA13A_MOSI, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI SCK pin definition */
-#define PIN_SPI_SCK   {PIO_PA14A_SPCK, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI pins definition. Contains MISO, MOSI & SCK */
-#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SCK
-/* SPI chip select 0 pin definition */
-#define PIN_SPI_NPCS0 {PIO_PA11A_NPCS0, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI flash write protect pin (active low, pulled low) */
-#define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-/** USB definitions */
-/* OpenMoko SIMtrace 2 USB vendor ID */
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
-/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
-/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
-/* USB release number (bcdDevice, shown as 0.00) */
-#define BOARD_USB_RELEASE	0x000
-/* Indicate SIMtrace is bus power in USB attributes */
-#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
-
-/** Supported modes */
-/* SIMtrace board supports sniffer mode */
-//#define HAVE_SNIFFER
-/* SIMtrace board supports CCID mode */
-//#define HAVE_CCID
-/* SIMtrace board supports card emulation mode */
-//#define HAVE_CARDEM
-/* SIMtrace board supports man-in-the-middle mode */
-//#define HAVE_MITM
-/* octsimtest board supports gpio_test mode */
-#define HAVE_GPIO_TEST

firmware/libboard/octsimtest/include/i2c.h

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

firmware/libboard/octsimtest/include/mcp23017.h

@@ -1,25 +0,0 @@
-/* mcp23017 i2c gpio expander read and write utilities
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#pragma once
-
-#define MCP23017_ADDRESS 0x20
-
-int mcp23017_init(uint8_t slave);
-int mcp23017_test(uint8_t slave);
-int mcp23017_toggle(uint8_t slave);
-//int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
-//int mcp23017_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/octsimtest/product_string.txt

@@ -1 +0,0 @@
-sysmoOCTSIM-Tester

firmware/libboard/octsimtest/source/board_octsimtest.c

@@ -1,81 +0,0 @@
-/* SIMtrace with SAM3S specific application code
- *
- * (C) 2017 by Harald Welte <laforge@gnumonks.org>
- * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#include "board.h"
-#include "simtrace.h"
-#include "utils.h"
-#include "sim_switch.h"
-#include <osmocom/core/timer.h>
-#include "usb_buf.h"
-#include "i2c.h"
-#include "mcp23017.h"
-
-void board_exec_dbg_cmd(int ch)
-{
-	switch (ch) {
-	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
-		printf("\tm\trun mcp23017 test\n\r");
-		printf("\tR\ttoggle MSB of gpio on mcp23017\n\r");
-		break;
-	case 'R':
-		printf("Asking NVIC to reset us\n\r");
-		USBD_Disconnect();
-		NVIC_SystemReset();
-		break;
-	case 'm':
-		mcp23017_test(MCP23017_ADDRESS);
-		break;
-	case 't':
-		mcp23017_toggle(MCP23017_ADDRESS);
-		break;
-	default:
-		printf("Unknown command '%c'\n\r", ch);
-		break;
-	}
-}
-
-void board_main_top(void)
-{
-#ifndef APPLICATION_dfu
-	usb_buf_init();
-
-	i2c_pin_init();
-	if (!mcp23017_init(MCP23017_ADDRESS))
-		printf("mcp23017 not found!\n\r");
-	/* Initialize checking for card insert/remove events */
-	//card_present_init();
-#endif
-}
-
-int board_override_enter_dfu(void)
-{
-	const Pin bl_sw_pin = PIN_BOOTLOADER_SW;
-
-	PIO_Configure(&bl_sw_pin, 1);
-
-	/* Enter DFU bootloader in case the respective button is pressed */
-	if (PIO_Get(&bl_sw_pin) == 0) {
-		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
-		return 1;
-	} else
-		return 0;
-}

firmware/libboard/octsimtest/source/i2c.c

@@ -1,225 +0,0 @@
-/* I2C EEPROM memory read and write utilities
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#include "board.h"
-#include <stdbool.h>
-
-/* Low-Level I2C Routines */
-
-static const Pin pin_sda = {PIO_PA30, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
-static const Pin pin_sda_in = {PIO_PA30, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT };
-static const Pin pin_scl = {PIO_PA31, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
-
-static void i2c_delay()
-{
-	volatile int v;
-	int i;
-
-	/* 100 cycles results in SCL peak length of 44us, so it's about
-	 * 440ns per cycle here */
-	for (i = 0; i < 14; i++) {
-		v = 0;
-	}
-}
-
-void i2c_pin_init(void)
-{
-	PIO_Configure(&pin_scl, PIO_LISTSIZE(pin_scl));
-	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
-}
-
-static void set_scl(void)
-{
-	PIO_Set(&pin_scl);
-	i2c_delay();
-}
-
-static void set_sda(void)
-{
-	PIO_Set(&pin_sda);
-	i2c_delay();
-}
-
-static void clear_scl(void)
-{
-	PIO_Clear(&pin_scl);
-	i2c_delay();
-}
-
-static void clear_sda(void)
-{
-	PIO_Clear(&pin_sda);
-	i2c_delay();
-}
-
-static bool read_sda(void)
-{
-	bool ret;
-
-	PIO_Configure(&pin_sda_in, PIO_LISTSIZE(pin_sda_in));
-	if (PIO_Get(&pin_sda_in))
-		ret = true;
-	else
-		ret = false;
-	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
-
-	return ret;
-}
-
-/* Core I2C Routines */
-
-static bool i2c_started = false;
-
-static void i2c_start_cond(void)
-{
-	if (i2c_started) {
-		set_sda();
-		set_scl();
-	}
-
-	clear_sda();
-	i2c_delay();
-	clear_scl();
-	i2c_started = true;
-}
-
-void i2c_stop_cond(void)
-{
-	clear_sda();
-	set_scl();
-	set_sda();
-	i2c_delay();
-	i2c_started = false;
-}
-
-static void i2c_write_bit(bool bit)
-{
-	if (bit)
-		set_sda();
-	else
-		clear_sda();
-	i2c_delay(); // ?
-	set_scl();
-	clear_scl();
-}
-
-static bool i2c_read_bit(void)
-{
-	bool bit;
-
-	set_sda();
-	set_scl();
-	bit = read_sda();
-	clear_scl();
-
-	return bit;
-}
-
-bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte)
-{
-	uint8_t bit;
-	bool nack;
-
-	if (send_start)
-		i2c_start_cond();
-
-	for (bit = 0; bit < 8; bit++) {
-		i2c_write_bit((byte & 0x80) != 0);
-		byte <<= 1;
-	}
-
-	nack = i2c_read_bit();
-
-	if (send_stop)
-		i2c_stop_cond();
-
-	return nack;
-}
-
-uint8_t i2c_read_byte(bool nack, bool send_stop)
-{
-	uint8_t byte = 0;
-	uint8_t bit;
-
-	for (bit = 0; bit < 8; bit++) {
-		byte = (byte << 1) | i2c_read_bit();
-	}
-
-	i2c_write_bit(nack);
-
-	if (send_stop)
-		i2c_stop_cond();
-
-	return byte;
-}
-
-
-/* EEPROM related code */
-
-int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
-{
-	bool nack;
-
-	WDT_Restart(WDT);
-
-	/* Write slave address */
-	nack = i2c_write_byte(true, false, slave << 1);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, false, addr);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, true, byte);
-	if (nack)
-		goto out_stop;
-	/* Wait tWR time to ensure EEPROM is writing correctly (tWR = 5 ms for AT24C02) */
-	mdelay(5);
-
-out_stop:
-	i2c_stop_cond();
-	if (nack)
-		return -1;
-	else
-		return 0;
-}
-
-int eeprom_read_byte(uint8_t slave, uint8_t addr)
-{
-	bool nack;
-
-	WDT_Restart(WDT);
-
-	/* dummy write cycle */
-	nack = i2c_write_byte(true, false, slave << 1);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, false, addr);
-	if (nack)
-		goto out_stop;
-	/* Re-start with read */
-	nack = i2c_write_byte(true, false, (slave << 1) | 1);
-	if (nack)
-		goto out_stop;
-
-	return i2c_read_byte(true, true);
-
-out_stop:
-	i2c_stop_cond();
-	if (nack)
-		return -1;
-	else
-		return 0;
-}

firmware/libboard/octsimtest/source/mcp23017.c

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

firmware/libboard/owhw/include/board.h

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

firmware/libboard/owhw/product_string.txt

@@ -1 +0,0 @@
-OWHW

firmware/libboard/owhw/source/owhw.c

@@ -1,55 +1,28 @@
-/* Card simulator specific functions
+/* Card simulator specific functions */
+/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
  *
- * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *  This program is free software; you can redistribute it and/or modify
- * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- * This program is free software; you can redistribute it and/or modify
+ *  This program is distributed in the hope that it will be useful,
- * it under the terms of the GNU General Public License as published by
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- * the Free Software Foundation; either version 2 of the License, or
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * (at your option) any later version.
+ *  GNU General Public License for more details.
  *
- * This program is distributed in the hope that it will be useful,
+ *  You should have received a copy of the GNU General Public License
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  along with this program; if not, write to the Free Software
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 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)
@@ -63,18 +36,5 @@ void cardsim_set_simpres(uint8_t slot, int present)
 
 void cardsim_gpio_init(void)
 {
-	PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));
+	PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim));
-}
-
-int board_override_enter_dfu(void)
-{
-	const Pin bl_pin = PIN_BOOTLOADER;
-
-	PIO_Configure(&bl_pin, 1);
-
-	if (PIO_Get(&bl_pin) == 0) { // signal low
-		return 0; // do not override enter DFU
-	} else {
-		return 1; // override enter DFU
-	}
 }

firmware/libboard/owhw/source/sim_switch.c

@@ -1,90 +0,0 @@
-/* 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/include/board.h

@@ -1,53 +1,16 @@
-/* sysmocom quad-modem sysmoQMOD board definition
- *
- * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
 #pragma once
 #include "board_common.h"
 #include "simtrace_usb.h"
 
+#define LED_USIM1	LED_GREEN
+#define LED_USIM2	LED_RED
+
 /** Name of the board */
 #define BOARD_NAME "QMOD"
 /** Board definition */
 #define qmod
 
-/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 12000000
-/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
-#define BOARD_MCK 58000000 // 18.432 * 29 / 6
-
-/** MCU pin connected to red LED */
-#define PIO_LED_RED     PIO_PA17
-/** MCU pin connected to green LED */
-#define PIO_LED_GREEN   PIO_PA18
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
-/** the green LED is actually red and used as indication for USIM1 */
-#define LED_USIM1	LED_GREEN
-/** the green LED is actually red and used as indication for USIM2 */
-#define LED_USIM2	LED_RED
 
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}

firmware/libboard/qmod/include/card_pres.h

@@ -1,21 +1,3 @@
-/* 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,19 +1,3 @@
-/* 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,19 +1,3 @@
-/* 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,19 +1,3 @@
-/* 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/product_string.txt

@@ -1 +0,0 @@
-sysmoQMOD (Quad Modem)

firmware/libboard/qmod/source/board_qmod.c

@@ -1,26 +1,9 @@
-/* sysmocom quad-modem sysmoQMOD application code
+/* Quad-modem speciic application code */
- *
+/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
- * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+
- * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "led.h"
 #include "wwan_led.h"
 #include "wwan_perst.h"
 #include "sim_switch.h"
@@ -28,7 +11,6 @@
 #include "card_pres.h"
 #include <osmocom/core/timer.h>
 #include "usb_buf.h"
-#include "i2c.h"
 
 static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
 static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
@@ -47,7 +29,6 @@ static int qmod_sam3_is_12(void)
 		return 0;
 }
 
-#if (ALLOW_PEER_ERASE > 0)
 const unsigned char __eeprom_bin[256] = {
 	USB_VENDOR_OPENMOKO & 0xff,
 	USB_VENDOR_OPENMOKO >> 8,
@@ -71,8 +52,11 @@ const unsigned char __eeprom_bin[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
 };
 
+#include "i2c.h"
 static int write_hub_eeprom(void)
 {
+	const unsigned int __eeprom_bin_len = 256;
+
 	int i;
 
 	/* wait */
@@ -80,25 +64,22 @@ static int write_hub_eeprom(void)
 
 	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
-	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
+	for (i = 0; i < 256; i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		if (rc < 0) {
+		/* if the result was negative, repeat that write */
-			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
+		if (rc < 0)
-				i, __eeprom_bin[i]);
+			i--;
-			return 1;
-		}
 	}
 
 	/* then pursue re-reading it again and again */
 	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
+	for (i = 0; i < 256; i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
+		TRACE_INFO("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 */
@@ -106,29 +87,6 @@ static int write_hub_eeprom(void)
 	return 0;
 }
 
-static int erase_hub_eeprom(void)
-{
-	int i;
-
-	/* wait */
-	mdelay(100);
-
-	TRACE_INFO("Erasing EEPROM...\n\r");
-	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
-		int rc = eeprom_write_byte(0x50, i, 0xff);
-		if (rc < 0) {
-			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
-				i, __eeprom_bin[i]);
-			return 1;
-		}
-	}
-	TRACE_INFO("EEPROM erased\n\r");
-
-	return 0;
-}
-#endif /* ALLOW_PEER_ERASE */
-
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -138,14 +96,9 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		return;
 
 	switch (ch) {
-#if (ALLOW_PEER_ERASE > 0)
 	case 'E':
 		write_hub_eeprom();
 		break;
-	case 'e':
-		erase_hub_eeprom();
-		break;
-#endif /* ALLOW_PEER_ERASE */
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -154,7 +107,6 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
-#if (ALLOW_PEER_ERASE > 0)
 	case 'H':
 		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
@@ -171,14 +123,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%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
+		printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
-#endif /* ALLOW_PEER_ERASE */
 	case 'r':
 		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
@@ -189,70 +140,32 @@ static void board_exec_dbg_cmd_st12only(int ch)
 /* returns '1' in case we should break any endless loop */
 void board_exec_dbg_cmd(int ch)
 {
-#if (ALLOW_PEER_ERASE > 0)
-	/* this variable controls if it is allowed to assert/release the ERASE line.
-	   this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE.
-	 */
-	static bool allow_erase = false;
-#endif /* ALLOW_PEER_ERASE */
-
 	switch (ch) {
 	case '?':
 		printf("\t?\thelp\n\r");
 		printf("\tR\treset SAM3\n\r");
-		printf("\tl\tswitch off LED 1\n\r");
-		printf("\tL\tswitch off LED 1\n\r");
-		printf("\tg\tswitch off LED 2\n\r");
-		printf("\tG\tswitch off LED 2\n\r");
 		if (qmod_sam3_is_12()) {
-#if (ALLOW_PEER_ERASE > 0)
 			printf("\tE\tprogram EEPROM\n\r");
-			printf("\te\tErase EEPROM\n\r");
-#endif /* ALLOW_PEER_ERASE */
 			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
 			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
-#if (ALLOW_PEER_ERASE > 0)
 			printf("\tH\tRelease HUB RESET (high)\n\r");
 			printf("\th\tAssert HUB RESET (low)\n\r");
 			printf("\tw\tWrite single byte in EEPROM\n\r");
-#endif /* ALLOW_PEER_ERASE */
 			printf("\tr\tRead single byte from EEPROM\n\r");
 		}
 		printf("\tX\tRelease peer SAM3 from reset\n\r");
 		printf("\tx\tAssert peer SAM3 reset\n\r");
-#if (ALLOW_PEER_ERASE > 0)
 		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
-		printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");
 		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
-#endif /* ALLOW_PEER_ERASE */
 		printf("\tU\tProceed to USB Initialization\n\r");
 		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
 		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
-		printf("\t!\tSwitch Channel A from physical -> remote\n\r");
-		printf("\t@\tSwitch Channel B from physical -> remote\n\r");
-		printf("\tt\t(pseudo)talloc report\n\r");
 		break;
 	case 'R':
 		printf("Asking NVIC to reset us\n\r");
 		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);
@@ -261,24 +174,14 @@ void board_exec_dbg_cmd(int ch)
 		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
-#if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
 		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
-	case 'a':
-		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
-		allow_erase = true;
-		break;
 	case 'y':
-		if (allow_erase) {
+		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
-			printf("Setting SIMTRACExx_ERASE (active)\n\r");
+		PIO_Set(&pin_peer_erase);
-			PIO_Set(&pin_peer_erase);
-		} else {
-			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
-		}
 		break;
-#endif /* ALLOW_PEER_ERASE */
 	case '1':
 		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
@@ -293,9 +196,6 @@ void board_exec_dbg_cmd(int ch)
 	case '@':
 		sim_switch_use_physical(0, 0);
 		break;
-	case 't':
-		talloc_report(NULL, stdout);
-		break;
 	default:
 		if (!qmod_sam3_is_12())
 			printf("Unknown command '%c'\n\r", ch);
@@ -303,13 +203,6 @@ void board_exec_dbg_cmd(int ch)
 			board_exec_dbg_cmd_st12only(ch);
 		break;
 	}
-
-#if (ALLOW_PEER_ERASE > 0)
-	// set protection back so it can only run for one command
-	if ('a' != ch) {
-		allow_erase = false;
-	}
-#endif /* ALLOW_PEER_ERASE */
 }
 
 void board_main_top(void)
@@ -342,13 +235,11 @@ void board_main_top(void)
 		TRACE_INFO("Detected Quad-Modem ST12\n\r");
 	} else {
 		TRACE_INFO("Detected Quad-Modem ST34\n\r");
-#ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather
 		 * than 1+2 */
 		usb_strings[7] = usb_strings[9];
 		usb_strings[8] = usb_strings[10];
-#endif
 	}
 
 	/* Obtain the circuit board version (currently just prints voltage */
@@ -370,32 +261,20 @@ static int uart_has_loopback_jumper(void)
 	/* Configure UART pins as I/O */
 	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
 
-	/* Send pattern over UART TX and check if it is received on RX
-	 * If the loop doesn't get interrupted, RxD always follows TxD and thus a
-	 * loopback jumper has been placed on RxD/TxD, and we will boot
-	 * into DFU unconditionally
-	 */
-	int has_loopback_jumper = 1;
 	for (i = 0; i < 10; i++) {
 		/* Set TxD high; abort if RxD doesn't go high either */
 		PIO_Set(&uart_loopback_pins[1]);
-		if (!PIO_Get(&uart_loopback_pins[0])) {
+		if (!PIO_Get(&uart_loopback_pins[0]))
-			has_loopback_jumper = 0;
+			return 0;
-			break;
-		}
 		/* Set TxD low, abort if RxD doesn't go low either */
 		PIO_Clear(&uart_loopback_pins[1]);
-		if (PIO_Get(&uart_loopback_pins[0])) {
+		if (PIO_Get(&uart_loopback_pins[0]))
-			has_loopback_jumper = 0;
+			return 0;
-			break;
-		}
 	}
-
+	/* if we reached here, RxD always follows TxD and thus a
-	/* Put pins back to UART mode */
+	 * loopback jumper has been placed on RxD/TxD, and we will boot
-	const Pin uart_pins[] = {PINS_UART};
+	 * into DFU unconditionally */
-	PIO_Configure(uart_pins, PIO_LISTSIZE(uart_pins));
+	return 1;
-
-	return has_loopback_jumper;
 }
 
 int board_override_enter_dfu(void)

firmware/libboard/qmod/source/card_pres.c

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

firmware/libboard/qmod/source/i2c.c

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

firmware/libboard/qmod/source/wwan_led.c

@@ -1,24 +1,11 @@
 /* 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
+ * Depending on the board this is running on,  it might be possible
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-/* Depending on the board this is running on,  it might be possible
  * for the controller to read the status of the WWAN LED output lines of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_WWAN1 and/or PIN_WWAN2 defines in its board.h file.
  */
+
 #include "board.h"
 #include "wwan_led.h"
 

firmware/libboard/qmod/source/wwan_perst.c

@@ -1,24 +1,11 @@
 /* Code to control the PERST lines of attached modems
  *
- * This program is free software; you can redistribute it and/or modify
+ * Depending on the board this is running on,  it might be possible
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-/* Depending on the board this is running on,  it might be possible
  * for the controller to set the status of the PERST input line of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_PERST1 and/or PIN_PERST2 defines in its board.h file.
  */
+
 #include "board.h"
 #include "trace.h"
 #include "wwan_perst.h"

firmware/libboard/sam3p256/include/board.h

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

firmware/libboard/sam3p256/source/board_sam3p256.c

@@ -1,68 +0,0 @@
-/* Olimex SAM3S-P256 specific application code
- *
- * (C) 2017,2019 by Harald Welte <laforge@gnumonks.org>
- * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
-#include "board.h"
-#include "simtrace.h"
-#include "utils.h"
-#include "sim_switch.h"
-#include <osmocom/core/timer.h>
-#include "usb_buf.h"
-
-void board_exec_dbg_cmd(int ch)
-{
-	switch (ch) {
-	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
-		break;
-	case 'R':
-		printf("Asking NVIC to reset us\n\r");
-		USBD_Disconnect();
-		NVIC_SystemReset();
-		break;
-	default:
-		printf("Unknown command '%c'\n\r", ch);
-		break;
-	}
-}
-
-void board_main_top(void)
-{
-#ifndef APPLICATION_dfu
-	usb_buf_init();
-
-	/* Initialize checking for card insert/remove events */
-	//card_present_init();
-#endif
-}
-
-int board_override_enter_dfu(void)
-{
-	const Pin bl_sw_pin = PIN_BOOTLOADER_SW;
-
-	PIO_Configure(&bl_sw_pin, 1);
-
-	/* Enter DFU bootloader in case the respective button is pressed */
-	if (PIO_Get(&bl_sw_pin) == 0) {
-		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
-		return 1;
-	} else
-		return 0;
-}

firmware/libboard/simtrace/include/board.h

@@ -1,22 +1,3 @@
-/* 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"
@@ -26,31 +7,14 @@
 /* Board definition */
 #define simtrace
 
-/** oscillator used as main clock source (in Hz) */
+/* Board main oscillator frequency (in Hz) */
 #define BOARD_MAINOSC 18432000
-/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
-#define BOARD_MCK 58982400 // 18.432 * 16 / 5
-
-/** MCU pin connected to red LED */
-#define PIO_LED_RED     PIO_PA17
-/** MCU pin connected to green LED */
-#define PIO_LED_GREEN   PIO_PA18
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
 
 /** Pin configuration **/
 /* Button to force bootloader start (shorted to ground when pressed */
 #define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
 /* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define SIM_PWEN_PIN           {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#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 */
@@ -74,15 +38,15 @@
 
 /** 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 }
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
 /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
 /* Phone I/O data signal input/output (I/O_PHONE in schematic) */
-#define PIN_USIM1_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Phone CLK clock input (CLK_PHONE in schematic) */
-#define PIN_USIM1_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#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_USIM1_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
 /* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
 #define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
@@ -108,9 +72,9 @@
 /* Pins used to sniff phone-card communication */
 #define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
 /* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_SNIFF     {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#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      {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#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
 
@@ -134,11 +98,6 @@
 /* SPI flash write protect pin (active low, pulled low) */
 #define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 
-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
 /** USB definitions */
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO

firmware/libboard/simtrace/product_string.txt

@@ -1 +0,0 @@
-SIMtrace 2

firmware/libboard/simtrace/source/board_simtrace.c

@@ -1,22 +1,6 @@
-/* SIMtrace with SAM3S specific application code
+/* SIMtrace specific application code */
- *
+/* (C) 2017 by Harald Welte <laforge@gnumonks.org> */
- * (C) 2017 by Harald Welte <laforge@gnumonks.org>
+
- * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
- */
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"

firmware/libboard/simtrace/source/sim_switch.c

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

firmware/libcommon/include/card_emu.h

@@ -1,22 +1,3 @@
-/* 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,18 +10,8 @@ enum card_io {
 	CARD_IO_CLK,
 };
 
-/** initialise card slot
+struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan,
- *  @param[in] slot_num slot number (arbitrary number)
+				  uint8_t in_ep, uint8_t irq_ep);
- *  @param[in] tc_chan timer counter channel (to measure the ETU)
- *  @param[in] uart_chan UART peripheral channel
- *  @param[in] in_ep USB IN end point number
- *  @param[in] irq_ep USB INTerrupt end point number
- *  @param[in] vcc_active initial VCC signal state (true = on)
- *  @param[in] in_reset initial RST signal state (true = reset asserted)
- *  @param[in] clocked initial CLK signat state (true = active)
- *  @return main card handle reference
- */
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked);
 
 /* process a single byte received from the reader */
 void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte);
@@ -56,24 +27,12 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len);
 
 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, bool report_on_irq);
+void card_emu_report_status(struct card_handle *ch);
 
-void card_emu_wtime_half_expired(void *ch);
+#define ENABLE_TX	0x01
-void card_emu_wtime_expired(void *ch);
+#define ENABLE_RX	0x02
-
-
-#define ENABLE_TX		0x01
-#define ENABLE_RX		0x02
-#define ENABLE_TX_TIMER_ONLY	0x03
 
 int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
-void card_emu_uart_update_wt(uint8_t uart_chan, uint32_t wt);
-void card_emu_uart_reset_wt(uint8_t uart_chan);
 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);
-
-struct cardemu_usb_msg_config;
-int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,
-			unsigned int scfg_len);

firmware/libcommon/include/cciddriver.h

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

firmware/libcommon/include/iso7816_4.h

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

firmware/libcommon/include/iso7816_fidi.h

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

firmware/libcommon/include/llist_irqsafe.h

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

firmware/libcommon/include/main_common.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void print_banner(void);