assert: Use printf_sync() to ensure printing of assert / panic

Change-Id: Icc202e60445d9be1cdcd61176db5ed1704d583e7

.gitignore

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

Makefile

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,38 @@
+SIMtrace v2.0
+=============
+
+This is the repository for the next-generation SIMtrace devices,
+providing abilities to trace the communication between (U)SIM card and
+phone, remote (U)SIM card forward, (U)SIM man-in-the-middle, and more.
+
+NOTE: Nothing in this repository applies to the SIMtrace v1.x hardware
+or its associated firmware.  SIMtrace v1.x is based on a different CPU /
+microcontroller architecture and uses a completely different software
+stack and host software.
+
+Supported Hardware
+------------------
+
+* Osmocom SIMtrace 1.x with SAM3 controller
+** this is open hardware and schematics / PCB design is published
+* sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
+** this is a proprietary device, publicly available from sysmocom
+* sysmocom OWHW (with 2 Modems and 1 SAM3 onboard)
+** this is not publicly available hardware, but still supported
+
+This Repository
+---------------
+
+This repository contains several directory
+
+* firmware - the firmware to run on the actual devices
+* hardware - some information related to the hardware
+* host - Programs to use on the USB host to interface with the hardware
+
+
+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

@@ -0,0 +1,10 @@
+# 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

@@ -0,0 +1,162 @@
+#!/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

@@ -0,0 +1,96 @@
+#!/bin/bash
+
+TOPDIR=`pwd`
+
+if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
+	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
+	exit 2
+fi
+
+set -e
+
+publish="$1"
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
+osmo-clean-workspace.sh
+
+mkdir "$deps" || true
+
+osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
+
+# 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 simtrace/cardem "
+BUILDS+="qmod/dfu qmod/cardem "
+BUILDS+="owhw/dfu owhw/cardem "
+
+cd $TOPDIR/firmware
+for build in $BUILDS; do
+	board=`echo $build | cut -d "/" -f 1`
+	app=`echo $build | cut -d "/" -f 2`
+	echo
+	echo "=============== $board / $app START  =============="
+	make BOARD="$board" APP="$app"
+	echo "=============== $board / $app RES:$? =============="
+done
+
+echo
+echo "=============== FIRMWARE TESTS ==========="
+cd $TOPDIR/firmware/test
+make clean
+make
+./card_emu_test
+make clean
+
+echo
+echo "=============== HOST START  =============="
+cd $TOPDIR/host
+autoreconf --install --force
+./configure --enable-sanitize --enable-werror
+$MAKE $PARALLEL_MAKE
+#$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
+[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
+[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
+[ftp.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@ftp.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@ftp.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

@@ -0,0 +1,16 @@
+#!/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

@@ -0,0 +1,17 @@
+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

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

debian/control

@@ -0,0 +1,65 @@
+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

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

debian/libosmo-simtrace2-dev.install

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

debian/rules

@@ -0,0 +1,19 @@
+#!/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

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

debian/simtrace2-utils.install

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

debian/source/format

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

firmware/Makefile

@@ -28,22 +28,33 @@
 
 #   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
-
-# Defines which are the available memory targets for the SAM3S-EK board.
-MEMORIES ?= flash dfu
-
-# Output file basename
 APP ?= dfu
 
-# Output directories
+# 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 = $(BOARD)-$(APP)
 BIN = bin
 OBJ = obj/$(BOARD)
@@ -73,7 +84,6 @@ GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
 TOP=..
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 
 #-------------------------------------------------------------------------------
 #		Files
@@ -97,10 +107,11 @@ 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))
 
@@ -120,15 +131,15 @@ C_OBJECTS  = $(C_FILES:%.c=%.o)
 # TRACE_LEVEL_NO_TRACE   0
 TRACE_LEVEL ?= 4
 
-DEBUG_PHONE_SNIFF?=0
+# allow asserting the peer SAM3S ERASE signal to completely erase the flash
+# only applicable for qmod board
+ALLOW_PEER_ERASE?=0
 
 #CFLAGS+=-DUSB_NO_DEBUG=1
 
 # Optimization level, put in comment for debugging
 OPTIMIZATION ?= -Os
 
-
-
 # Flags
 INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
 
@@ -141,13 +152,12 @@ INCLUDES += -Ilibosmocore/include
 INCLUDES += -Isrc_simtrace -Iinclude
 INCLUDES += -Iapps/$(APP)
 
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
+CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
 CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
-CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef
+CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef
 CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-CFLAGS += -Wsign-compare -Waggregate-return
+CFLAGS += -Waggregate-return #-Wsign-compare
-CFLAGS += -Wformat=0
 CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations
 CFLAGS += #-Wpacked
 CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
@@ -162,18 +172,25 @@ CFLAGS += -Wno-suggest-attribute=noreturn
 # -mlong-calls  -Wall
 #CFLAGS += -save-temps -fverbose-asm
 #CFLAGS += -Wa,-a,-ad
-CFLAGS += -D__ARM
+CFLAGS += -D__ARM -fno-builtin
 CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
-CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDEBUG_PHONE_SNIFF=$(DEBUG_PHONE_SNIFF)
+CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
+
+# Disable stack protector by default (OS#5081)
+ifeq ($(STACK_PROTECTOR), 1)
+CFLAGS += -fstack-protector
+else
+CFLAGS += -fno-stack-protector
+endif
+
 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,--warn-unresolved-symbols $(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,--print-memory-usage -Wl,--no-undefined $(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)
 
 #-------------------------------------------------------------------------------
@@ -192,12 +209,16 @@ $(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin
 	cat $^ > $@
 
 $(BIN) $(OBJ):
-	mkdir $@
+	mkdir -p $@
 
 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@
 
-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring
+.PHONY: apps/$(APP)/usb_strings.txt.patched
+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
@@ -205,18 +226,18 @@ C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
 ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
 
 $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	$(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
-	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
+	$(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
-	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
+	$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
-	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
+	$(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
+	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	$(SILENT)@$(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
@@ -229,8 +250,13 @@ program:
 
 SERIAL ?= /dev/ttyUSB0
 log:
-	stty -F $(SERIAL) 115200
+	stty -F $(SERIAL) 921600
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )
 
 clean:
+	-rm -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

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

firmware/TODO.txt

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

firmware/apps/cardem/Makefile

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

firmware/apps/cardem/main.c

@@ -1,4 +1,22 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -6,9 +24,8 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "osmocom/core/timer.h"
+#include "main_common.h"
-
+#include <osmocom/core/timer.h>
-unsigned int g_unique_id[4];
 
 /*------------------------------------------------------------------------------
  *         Internal variables
@@ -22,7 +39,7 @@ typedef struct {
 	void (*exit) (void);
 	/* main loop content for given configuration */
 	void (*run) (void);
-	/* Interrupt handler for USART1 */
+	/* Interrupt handler for USART0 */
 	void (*usart0_irq) (void);
 	/* Interrupt handler for USART1 */
 	void (*usart1_irq) (void);
@@ -36,6 +53,8 @@ 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
@@ -84,17 +103,23 @@ static volatile enum confNum simtrace_config = CFG_NUM_CCID;
 void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 {
 	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
-	simtrace_config = cfgnum;
+	if (cfgnum < ARRAY_SIZE(config_func_ptrs)) {
+		simtrace_config = cfgnum;
+	} else {
+		TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum);
+	}
 }
 
 void USART1_IrqHandler(void)
 {
-	config_func_ptrs[simtrace_config].usart1_irq();
+	if (config_func_ptrs[simtrace_config].usart1_irq)
+		config_func_ptrs[simtrace_config].usart1_irq();
 }
 
 void USART0_IrqHandler(void)
 {
-	config_func_ptrs[simtrace_config].usart0_irq();
+	if (config_func_ptrs[simtrace_config].usart0_irq)
+		config_func_ptrs[simtrace_config].usart0_irq();
 }
 
 /* returns '1' in case we should break any endless loop */
@@ -106,7 +131,8 @@ static void check_exec_dbg_cmd(void)
 		return;
 
 	ch = UART_GetChar();
-
+	/* We must echo the character to make python fdexpect happy, which we use in factory testing */
+	fputc(ch, stdout);
 	board_exec_dbg_cmd(ch);
 }
 
@@ -121,27 +147,16 @@ extern int main(void)
 	unsigned int i = 0;
 
 	led_init();
-	led_blink(LED_RED, BLINK_3O_5F);
+	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
 
-	/* Enable watchdog for 500ms, with no window */
+	/* Enable watchdog for 2000ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
 
 	PIO_InitializeInterrupts(0);
 
-	EEFC_ReadUniqueID(g_unique_id);
+	print_banner();
-
-        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");
@@ -162,14 +177,15 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling configure of all configurations...\n\r");
-	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
-	     ++i) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}
 
 	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	config_func_ptrs[simtrace_config].init();
+	if (config_func_ptrs[simtrace_config].init) {
+		config_func_ptrs[simtrace_config].init();
+	}
 	last_simtrace_config = simtrace_config;
 
 	TRACE_INFO("entering main loop...\n\r");
@@ -197,11 +213,17 @@ extern int main(void)
 		if (last_simtrace_config != simtrace_config) {
 			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
-			config_func_ptrs[last_simtrace_config].exit();
+			if (config_func_ptrs[last_simtrace_config].exit) {
-			config_func_ptrs[simtrace_config].init();
+				config_func_ptrs[last_simtrace_config].exit();
+			}
+			if (config_func_ptrs[simtrace_config].init) {
+				config_func_ptrs[simtrace_config].init();
+			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			config_func_ptrs[simtrace_config].run();
+			if (config_func_ptrs[simtrace_config].run) {
+				config_func_ptrs[simtrace_config].run();
+			}
 		}
 	}
 }

firmware/apps/cardem/usb_strings.txt

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

firmware/apps/dfu/main.c

@@ -1,66 +1,152 @@
+/* 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 */
+static bool watchdog_configured = false;
+
+/* There is not enough space in the 16 KiB DFU bootloader to include led.h functions */
+#ifdef PINS_LEDS
+/** LED pin configurations */
+static const Pin pinsLeds[] = { PINS_LEDS } ;
+#endif
 
 /*----------------------------------------------------------------------------
  *       Callbacks
  *----------------------------------------------------------------------------*/
 
 #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 IFLASH_END	((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
+#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE)
-#define IRAM_END	((uint8_t *)IRAM_ADDR + IRAM_SIZE)
+#if defined(ENVIRONMENT_flash)
+#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 transfered 'len' bytes (stored at
+/* incoming call-back: Host has transferred 'len' bytes (stored at
  * 'data'), which we shall write to 'offset' into the partition
- * associated with 'altif'.  Guaranted to be les than
+ * associated with 'altif'.  Guaranted to be less than
  * BOARD_DFU_PAGE_SIZE */
 int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 			 uint8_t *data, unsigned int len)
 {
 	uint32_t addr;
+	unsigned int i;
 	int rc;
+	/* address of the last allocated variable on the stack */
+	uint32_t stack_addr = (uint32_t)&rc;
+	/* kick the dog to have enough time to flash */
+	if (watchdog_configured) {
+		WDT_Restart(WDT);
+	}
 
-	printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
+#if TRACE_LEVEL >= TRACE_LEVEL_INFO
+	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
+#else
+	printf("DL off=%u\n\r", offset);
+#endif
+
+#ifdef PINS_LEDS
+	PIO_Clear(&pinsLeds[LED_NUM_RED]);
+#endif
 
 	switch (altif) {
 	case ALTIF_RAM:
 		addr = RAM_ADDR(offset);
-		if (addr > IRAM_ADDR + IRAM_SIZE) {
+		if (addr < IRAM_ADDR || addr + len >= IRAM_ADDR + IRAM_SIZE || addr + len >= stack_addr) {
 			g_dfu->state = DFU_STATE_dfuERROR;
 			g_dfu->status = DFU_STATUS_errADDRESS;
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
 		}
 		memcpy((void *)addr, data, len);
-		return DFU_RET_ZLP;
+		rc = DFU_RET_ZLP;
+		break;
 	case ALTIF_FLASH:
 		addr = FLASH_ADDR(offset);
-		if (addr > IFLASH_ADDR + IFLASH_SIZE) {
+#if 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;
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
+		}
+		rc = FLASHD_Unlock(addr, addr + len, 0, 0);
+		if (rc != 0) {
+			TRACE_ERROR("DFU download flash unlock failed\n\r");
+			rc =  DFU_RET_STALL;
+			break;
 		}
 		rc = FLASHD_Write(addr, data, len);
 		if (rc != 0) {
-			/* FIXME: set error codes */
+			TRACE_ERROR("DFU download flash erase failed\n\r");
-			return DFU_RET_STALL;
+			rc = DFU_RET_STALL;
+			break;
 		}
-		return DFU_RET_ZLP;
+		for (i = 0; i < len; i++) {
+			if (((uint8_t*)addr)[i]!=data[i]) {
+				TRACE_ERROR("DFU download flash data written not correct\n\r");
+				rc = DFU_RET_STALL;
+				break;
+			}
+		}
+		rc = DFU_RET_ZLP;
+		break;
 	default:
-		/* FIXME: set error codes */
 		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
-		return DFU_RET_STALL;
+		rc = DFU_RET_STALL;
+		break;
 	}
+
+#ifdef PINS_LEDS
+	PIO_Set(&pinsLeds[LED_NUM_RED]);
+#endif
+
+	return rc;
 }
 
 /* incoming call-back: Host has requested to read back 'req_len' bytes
@@ -105,31 +191,10 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
 	return req_len;
 }
 
-static int uart_has_loopback_jumper(void)
+/* can be overridden by board specific code, e.g. by pushbutton */
+WEAK int board_override_enter_dfu(void)
 {
-	unsigned int i;
+	return 0;
-	const Pin uart_loopback_pins[] = {
-		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
-		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-	};
-
-	/* Configure UART pins as I/O */
-	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
-
-	for (i = 0; i < 10; i++) {
-		/* Set TxD high; abort if RxD doesn't go high either */
-		PIO_Set(&uart_loopback_pins[1]);
-		if (!PIO_Get(&uart_loopback_pins[0]))
-			return 0;
-		/* Set TxD low, abort if RxD doesn't go low either */
-		PIO_Clear(&uart_loopback_pins[1]);
-		if (PIO_Get(&uart_loopback_pins[0]))
-			return 0;
-	}
-	/* if we reached here, RxD always follows TxD and thus a
-	 * loopback jumper has been placed on RxD/TxD, and we will boot
-	 * into DFU unconditionally */
-	return 1;
 }
 
 /* using this function we can determine if we should enter DFU mode
@@ -137,22 +202,30 @@ static int uart_has_loopback_jumper(void)
 int USBDFU_OverrideEnterDFU(void)
 {
 	uint32_t *app_part = (uint32_t *)FLASH_ADDR(0);
+	/* at the first call we are before the text segment has been relocated,
+	 * so g_dfu is not initialized yet */
+	g_dfu = &_g_dfu;
+	if (USB_DFU_MAGIC == g_dfu->magic) {
+		return 1;
+	}
 
 	/* If the loopback jumper is set, we enter DFU mode */
-	if (uart_has_loopback_jumper())
+	if (board_override_enter_dfu()) {
-		return 1;
+		return 2;
+	}
 
 	/* if the first word of the application partition doesn't look
 	 * like a stack pointer (i.e. point to RAM), enter DFU mode */
-	if ((app_part[0] < IRAM_ADDR) ||
+	if ((app_part[0] < IRAM_ADDR) || ((uint8_t *)app_part[0] > IRAM_END)) {
-	    ((uint8_t *)app_part[0] > IRAM_END))
+		return 3;
-		return 1;
+	}
 
 	/* if the second word of the application partition doesn't look
 	 * like a function from flash (reset vector), enter DFU mode */
 	if (((uint32_t *)app_part[1] < app_part) ||
-	    ((uint8_t *)app_part[1] > IFLASH_END))
+	    ((uint8_t *)app_part[1] > IFLASH_END)) {
-		return 1;
+		return 4;
+	}
 
 	return 0;
 }
@@ -170,6 +243,17 @@ 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
  *------------------------------------------------------------------------------*/
@@ -180,31 +264,74 @@ extern int main(void)
 	unsigned int i = 0;
 	uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
 
-#if 0
+	/* Enable watchdog for 2000ms, with no window */
-	led_init();
-	led_blink(LED_GREEN, BLINK_3O_30F);
-	led_blink(LED_RED, BLINK_3O_30F);
-#endif
-
-	/* Enable watchdog for 500ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+	watchdog_configured = true;
 
-	PIO_InitializeInterrupts(0);
+#ifdef PINS_LEDS
+	/* Configure LED */
+	PIO_Configure(pinsLeds, sizeof(pinsLeds));
+	PIO_Set(&pinsLeds[LED_NUM_RED]);
+	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
+#endif
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-        printf("\n\r\n\r"
+	printf("\n\r\n\r");
-		"=============================================================================\n\r"
+	print_line();
-		"DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r"
+	printf("DFU bootloader %s for board %s\n\r"
-		"=============================================================================\n\r",
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r",
 		manifest_revision, manifest_board);
+	print_line();
 
-	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
 	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);
+	static const char* reset_causes[] = {
+		"general reset (first power-up reset)",
+		"backup reset (return from backup mode)",
+		"watchdog reset (watchdog fault occurred)",
+		"software reset (processor reset required by the software)",
+		"user reset (NRST pin detected low)",
+	};
+	if (reset_cause < ARRAY_SIZE(reset_causes)) {
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+	} else {
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	}
+#endif
+
+#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)
@@ -213,6 +340,18 @@ extern int main(void)
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");
+	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+	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(50);
+#ifdef PIN_USB_PULLUP
+	PIO_Clear(&usb_dp_pullup);
+#endif
+
 	USBDFU_Initialize(&dfu_descriptors);
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -220,8 +359,8 @@ extern int main(void)
 		check_exec_dbg_cmd();
 #if 1
 		if (i >= MAX_USB_ITER * 3) {
-			TRACE_ERROR("Resetting board (USB could "
+			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
-				    "not be configured)\n\r");
+			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -229,7 +368,9 @@ extern int main(void)
 		i++;
 	}
 
+	/* Initialize the flash to be able to write it, using the IAP ROM code */
 	FLASHD_Initialize(BOARD_MCK, 1);
+
 	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);

firmware/apps/dfu/usb_strings.txt

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

firmware/apps/freq_ctr/Makefile

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

firmware/apps/freq_ctr/freq_ctr.c

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

firmware/apps/freq_ctr/main.c

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

firmware/apps/freq_ctr/usb_strings.txt

@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+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

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

firmware/apps/gpio_test/gpio_test.c

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

firmware/apps/gpio_test/main.c

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

firmware/apps/gpio_test/usb_strings.txt

@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+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

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

firmware/apps/trace/main.c

@@ -0,0 +1,222 @@
+/* SIMtrace 2 firmware sniffer application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/*------------------------------------------------------------------------------
+ *          Headers
+ *------------------------------------------------------------------------------*/
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "main_common.h"
+#include "osmocom/core/timer.h"
+
+/*------------------------------------------------------------------------------
+ *         Internal variables
+ *------------------------------------------------------------------------------*/
+typedef struct {
+	/* static initialization, called whether or not the usb config is active */
+	void (*configure) (void);
+	/* initialization function after the config was selected */
+	void (*init) (void);
+	/* de-initialization before selecting new config */
+	void (*exit) (void);
+	/* main loop content for given configuration */
+	void (*run) (void);
+	/* Interrupt handler for USART0 */
+	void (*usart0_irq) (void);
+	/* Interrupt handler for USART1 */
+	void (*usart1_irq) (void);
+} conf_func;
+
+static const conf_func config_func_ptrs[] = {
+	/* array slot 0 is empty, usb configs start at 1 */
+#ifdef HAVE_SNIFFER
+	[CFG_NUM_SNIFF] = {
+		.configure = Sniffer_configure,
+		.init = Sniffer_init,
+		.exit = Sniffer_exit,
+		.run = Sniffer_run,
+		.usart0_irq = Sniffer_usart0_irq,
+		.usart1_irq = Sniffer_usart1_irq,
+	},
+#endif
+#ifdef HAVE_CCID
+	[CFG_NUM_CCID] = {
+		.configure = CCID_configure,
+		.init = CCID_init,
+		.exit = CCID_exit,
+		.run = CCID_run,
+	},
+#endif
+#ifdef HAVE_CARDEM
+	[CFG_NUM_PHONE] = {
+		.configure = mode_cardemu_configure,
+		.init = mode_cardemu_init,
+		.exit = mode_cardemu_exit,
+		.run = mode_cardemu_run,
+		.usart0_irq = mode_cardemu_usart0_irq,
+		.usart1_irq = mode_cardemu_usart1_irq,
+	},
+#endif
+#ifdef HAVE_MITM
+	[CFG_NUM_MITM] = {
+		.configure = MITM_configure,
+		.init = MITM_init,
+		.exit = MITM_exit,
+		.run = MITM_run,
+	},
+#endif
+};
+
+/*------------------------------------------------------------------------------
+ *         Internal variables
+ *------------------------------------------------------------------------------*/
+#if defined(HAVE_SNIFFER)
+static volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+#elif defined(HAVE_CARDEM)
+static volatile enum confNum simtrace_config = CFG_NUM_PHONE;
+#elif defined(HAVE_CCID)
+static volatile enum confNum simtrace_config = CFG_NUM_CCID;
+#endif
+
+/*----------------------------------------------------------------------------
+ *       Callbacks
+ *----------------------------------------------------------------------------*/
+
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+	TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+	simtrace_config = cfgnum;
+}
+
+void USART1_IrqHandler(void)
+{
+	if (config_func_ptrs[simtrace_config].usart1_irq)
+		config_func_ptrs[simtrace_config].usart1_irq();
+}
+
+void USART0_IrqHandler(void)
+{
+	if (config_func_ptrs[simtrace_config].usart0_irq)
+		config_func_ptrs[simtrace_config].usart0_irq();
+}
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+	int ch;
+
+	if (!UART_IsRxReady())
+		return;
+
+	ch = UART_GetChar();
+
+	board_exec_dbg_cmd(ch);
+}
+
+/*------------------------------------------------------------------------------
+ *        Main
+ *------------------------------------------------------------------------------*/
+#define MAX_USB_ITER BOARD_MCK/72	// This should be around a second
+extern int main(void)
+{
+	uint8_t isUsbConnected = 0;
+	enum confNum last_simtrace_config = simtrace_config;
+	unsigned int i = 0;
+
+	/* Configure LED output
+	 * red on = power
+	 * red blink = error
+	 * green on = running
+	 * green blink = activity
+	 */
+	led_init();
+	led_blink(LED_RED, BLINK_ALWAYS_ON);
+	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+
+	/* Enable watchdog for 2000 ms, with no window */
+	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+
+	PIO_InitializeInterrupts(0);
+
+	print_banner();
+	board_main_top();
+
+	TRACE_INFO("USB init...\n\r");
+	SIMtrace_USB_Initialize();
+
+	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+		WDT_Restart(WDT);
+		check_exec_dbg_cmd();
+#if 0
+		if (i >= MAX_USB_ITER * 3) {
+			TRACE_ERROR("Resetting board (USB could "
+				    "not be configured)\n\r");
+			USBD_Disconnect();
+			NVIC_SystemReset();
+		}
+#endif
+		i++;
+	}
+
+	TRACE_INFO("calling configure of all configurations...\n\r");
+	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
+		if (config_func_ptrs[i].configure)
+			config_func_ptrs[i].configure();
+	}
+
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	config_func_ptrs[simtrace_config].init();
+	last_simtrace_config = simtrace_config;
+
+	TRACE_INFO("entering main loop...\n\r");
+	while (1) {
+		WDT_Restart(WDT);
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+		const char rotor[] = { '-', '\\', '|', '/' };
+		putchar('\b');
+		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+		check_exec_dbg_cmd();
+		osmo_timers_prepare();
+		osmo_timers_update();
+
+		if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+			if (isUsbConnected) {
+				isUsbConnected = 0;
+			}
+		} else if (isUsbConnected == 0) {
+			TRACE_INFO("USB is now configured\n\r");
+
+			isUsbConnected = 1;
+		}
+		if (last_simtrace_config != simtrace_config) {
+			TRACE_INFO("USB config chg %u -> %u\n\r",
+				   last_simtrace_config, simtrace_config);
+			config_func_ptrs[last_simtrace_config].exit();
+			config_func_ptrs[simtrace_config].init();
+			last_simtrace_config = simtrace_config;
+		} else {
+			config_func_ptrs[simtrace_config].run();
+		}
+	}
+}

firmware/apps/trace/usb_strings.txt

@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+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/triple_play/Makefile

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

firmware/apps/triple_play/main.c

@@ -1,4 +1,21 @@
-// FIXME: Copyright license here
+/* SIMtrace 2 firmware card emulation, CCID, and sniffer application
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
@@ -7,9 +24,7 @@
 #include "simtrace.h"
 #include "utils.h"
 #include "req_ctx.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
-
-unsigned int g_unique_id[4];
 
 /*------------------------------------------------------------------------------
  *         Internal variables
@@ -132,17 +147,7 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	EEFC_ReadUniqueID(g_unique_id);
+	print_banner();
-
-        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/include/efc.h

@@ -1,113 +1,113 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * \section Purpose
+ * \section Purpose
- *
+ *
- * Interface for configuration the Enhanced Embedded Flash Controller (EEFC) peripheral.
+ * Interface for configuration the Enhanced Embedded Flash Controller (EEFC) peripheral.
- *
+ *
- * \section Usage
+ * \section Usage
- *
+ *
- * -# Enable/disable %flash ready interrupt sources using EFC_EnableFrdyIt()
+ * -# Enable/disable %flash ready interrupt sources using EFC_EnableFrdyIt()
- *    and EFC_DisableFrdyIt().
+ *    and EFC_DisableFrdyIt().
- * -# Translates the given address into which EEFC, page and offset values
+ * -# Translates the given address into which EEFC, page and offset values
- *    for difference density %flash memory using EFC_TranslateAddress().
+ *    for difference density %flash memory using EFC_TranslateAddress().
- * -# Computes the address of a %flash access given the EFC, page and offset
+ * -# Computes the address of a %flash access given the EFC, page and offset
- *    for difference density %flash memory using EFC_ComputeAddress().
+ *    for difference density %flash memory using EFC_ComputeAddress().
- * -# Start the executing command with EFC_StartCommand()
+ * -# Start the executing command with EFC_StartCommand()
- * -# Retrieve the current status of the EFC using EFC_GetStatus().
+ * -# Retrieve the current status of the EFC using EFC_GetStatus().
- * -# Retrieve the result of the last executed command with EFC_GetResult().
+ * -# Retrieve the result of the last executed command with EFC_GetResult().
- */
+ */
-
+
-#ifndef _EEFC_
+#ifndef _EEFC_
-#define _EEFC_
+#define _EEFC_
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-#include "chip.h"
+#include "chip.h"
-
+
-#include <stdint.h>
+#include <stdint.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Definitions
+ *        Definitions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-/* EFC command */
+/* EFC command */
-#define EFC_FCMD_GETD    0x00
+#define EFC_FCMD_GETD    0x00
-#define EFC_FCMD_WP      0x01
+#define EFC_FCMD_WP      0x01
-#define EFC_FCMD_WPL     0x02
+#define EFC_FCMD_WPL     0x02
-#define EFC_FCMD_EWP     0x03
+#define EFC_FCMD_EWP     0x03
-#define EFC_FCMD_EWPL    0x04
+#define EFC_FCMD_EWPL    0x04
-#define EFC_FCMD_EA      0x05
+#define EFC_FCMD_EA      0x05
-#define EFC_FCMD_SLB     0x08
+#define EFC_FCMD_SLB     0x08
-#define EFC_FCMD_CLB     0x09
+#define EFC_FCMD_CLB     0x09
-#define EFC_FCMD_GLB     0x0A
+#define EFC_FCMD_GLB     0x0A
-#define EFC_FCMD_SFB     0x0B
+#define EFC_FCMD_SFB     0x0B
-#define EFC_FCMD_CFB     0x0C
+#define EFC_FCMD_CFB     0x0C
-#define EFC_FCMD_GFB     0x0D
+#define EFC_FCMD_GFB     0x0D
-#define EFC_FCMD_STUI    0x0E /* Start unique ID */
+#define EFC_FCMD_STUI    0x0E /* Start unique ID */
-#define EFC_FCMD_SPUI    0x0F /* Stop unique ID */
+#define EFC_FCMD_SPUI    0x0F /* Stop unique ID */
-
+
-/* The IAP function entry addreass */
+/* The IAP function entry addreass */
-#define CHIP_FLASH_IAP_ADDRESS  (0x00800008)
+#define CHIP_FLASH_IAP_ADDRESS  (0x00800008)
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
- extern "C" {
+ extern "C" {
-#endif
+#endif
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-extern void EFC_EnableFrdyIt( Efc* efc ) ;
+extern void EFC_EnableFrdyIt( Efc* efc ) ;
-
+
-extern void EFC_DisableFrdyIt( Efc* efc ) ;
+extern void EFC_DisableFrdyIt( Efc* efc ) ;
-
+
-extern void EFC_SetWaitState( Efc* efc, uint8_t cycles ) ;
+extern void EFC_SetWaitState( Efc* efc, uint8_t cycles ) ;
-
+
-extern void EFC_TranslateAddress( Efc** pEfc, uint32_t dwAddress, uint16_t *pwPage, uint16_t *pwOffset ) ;
+extern void EFC_TranslateAddress( Efc** pEfc, uint32_t dwAddress, uint16_t *pwPage, uint16_t *pwOffset ) ;
-
+
-extern void EFC_ComputeAddress( Efc* efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress ) ;
+extern void EFC_ComputeAddress( Efc* efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress ) ;
-
+
-extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument ) ;
+extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument ) ;
-
+
-extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP ) ;
+extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP ) ;
-
+
-extern uint32_t EFC_GetStatus( Efc* efc ) ;
+extern uint32_t EFC_GetStatus( Efc* efc ) ;
-
+
-extern uint32_t EFC_GetResult( Efc* efc ) ;
+extern uint32_t EFC_GetResult( Efc* efc ) ;
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-}
+}
-#endif
+#endif
-
+
-#endif /* #ifndef _EEFC_ */
+#endif /* #ifndef _EEFC_ */
-
+

firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h

@@ -1,79 +1,79 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
-*/
+*/
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * The flash driver provides the unified interface for flash program operations.
+ * The flash driver provides the unified interface for flash program operations.
- *
+ *
- */
+ */
-
+
-#ifndef _FLASHD_
+#ifndef _FLASHD_
-#define _FLASHD_
+#define _FLASHD_
-
+
-#include <stdint.h>
+#include <stdint.h>
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
- extern "C" {
+ extern "C" {
-#endif
+#endif
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP ) ;
+extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP ) ;
-
+
-extern uint32_t FLASHD_Erase( uint32_t dwAddress ) ;
+extern uint32_t FLASHD_Erase( uint32_t dwAddress ) ;
-
+
-extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize ) ;
+extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize ) ;
-
+
-extern uint32_t FLASHD_Lock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
+extern uint32_t FLASHD_Lock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
+
-extern uint32_t FLASHD_Unlock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
+extern uint32_t FLASHD_Unlock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
+
-extern uint32_t FLASHD_IsLocked( uint32_t dwStart, uint32_t dwEnd ) ;
+extern uint32_t FLASHD_IsLocked( uint32_t dwStart, uint32_t dwEnd ) ;
-
+
-extern uint32_t FLASHD_SetGPNVM( uint8_t gpnvm ) ;
+extern uint32_t FLASHD_SetGPNVM( uint8_t gpnvm ) ;
-
+
-extern uint32_t FLASHD_ClearGPNVM( uint8_t gpnvm ) ;
+extern uint32_t FLASHD_ClearGPNVM( uint8_t gpnvm ) ;
-
+
-extern uint32_t FLASHD_IsGPNVMSet( uint8_t gpnvm ) ;
+extern uint32_t FLASHD_IsGPNVMSet( uint8_t gpnvm ) ;
-
+
-#define FLASHD_IsSecurityBitSet() FLASHD_IsGPNVMSet( 0 )
+#define FLASHD_IsSecurityBitSet() FLASHD_IsGPNVMSet( 0 )
-
+
-#define FLASHD_SetSecurityBit()   FLASHD_SetGPNVM( 0 )
+#define FLASHD_SetSecurityBit()   FLASHD_SetGPNVM( 0 )
-
+
-extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID ) ;
+extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID ) ;
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-}
+}
-#endif
+#endif
-
+
-#endif /* #ifndef _FLASHD_ */
+#endif /* #ifndef _FLASHD_ */
-
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

@@ -1,290 +1,290 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/** \addtogroup efc_module Working with EEFC
+/** \addtogroup efc_module Working with EEFC
- * The EEFC driver provides the interface to configure and use the EEFC
+ * The EEFC driver provides the interface to configure and use the EEFC
- * peripheral.
+ * peripheral.
- *
+ *
- * The user needs to set the number of wait states depending on the frequency used.\n
+ * The user needs to set the number of wait states depending on the frequency used.\n
- * Configure number of cycles for flash read/write operations in the FWS field of EEFC_FMR.
+ * Configure number of cycles for flash read/write operations in the FWS field of EEFC_FMR.
- *
+ *
- * It offers a function to send flash command to EEFC and waits for the
+ * It offers a function to send flash command to EEFC and waits for the
- * flash to be ready.
+ * flash to be ready.
- *
+ *
- * To send flash command, the user could do in either of following way:
+ * To send flash command, the user could do in either of following way:
- * <ul>
+ * <ul>
- * <li>Write a correct key, command and argument in EEFC_FCR. </li>
+ * <li>Write a correct key, command and argument in EEFC_FCR. </li>
- * <li>Or, Use IAP (In Application Programming) function which is executed from
+ * <li>Or, Use IAP (In Application Programming) function which is executed from
- * ROM directly, this allows flash programming to be done by code running in flash.</li>
+ * ROM directly, this allows flash programming to be done by code running in flash.</li>
- * <li>Once the command is achieved, it can be detected even by polling EEFC_FSR or interrupt.
+ * <li>Once the command is achieved, it can be detected even by polling EEFC_FSR or interrupt.
- * </ul>
+ * </ul>
- *
+ *
- * The command argument could be a page number,GPNVM number or nothing, it depends on
+ * The command argument could be a page number,GPNVM number or nothing, it depends on
- * the command itself. Some useful functions in this driver could help user tranlate physical
+ * the command itself. Some useful functions in this driver could help user tranlate physical
- * flash address into a page number and vice verse.
+ * flash address into a page number and vice verse.
- *
+ *
- * For more accurate information, please look at the EEFC section of the
+ * For more accurate information, please look at the EEFC section of the
- * Datasheet.
+ * Datasheet.
- *
+ *
- * Related files :\n
+ * Related files :\n
- * \ref efc.c\n
+ * \ref efc.c\n
- * \ref efc.h.\n
+ * \ref efc.h.\n
-*/
+*/
-/*@{*/
+/*@{*/
-/*@}*/
+/*@}*/
-
+
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * Implementation of Enhanced Embedded Flash Controller (EEFC).
+ * Implementation of Enhanced Embedded Flash Controller (EEFC).
- *
+ *
- */
+ */
-
+
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-#include "chip.h"
+#include "chip.h"
-#include "efc.h"
+#include "efc.h"
-
+
-#include <assert.h>
+#include <assert.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Enables the flash ready interrupt source on the EEFC peripheral.
+ * \brief Enables the flash ready interrupt source on the EEFC peripheral.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- */
+ */
-extern void EFC_EnableFrdyIt( Efc* efc )
+extern void EFC_EnableFrdyIt( Efc* efc )
-{
+{
-    efc->EEFC_FMR |= EEFC_FMR_FRDY ;
+    efc->EEFC_FMR |= EEFC_FMR_FRDY ;
-}
+}
-
+
-/**
+/**
- * \brief Disables the flash ready interrupt source on the EEFC peripheral.
+ * \brief Disables the flash ready interrupt source on the EEFC peripheral.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- */
+ */
-
+
-extern void EFC_DisableFrdyIt( Efc* efc )
+extern void EFC_DisableFrdyIt( Efc* efc )
-{
+{
-    efc->EEFC_FMR &= ~((uint32_t)EEFC_FMR_FRDY) ;
+    efc->EEFC_FMR &= ~((uint32_t)EEFC_FMR_FRDY) ;
-}
+}
-
+
-
+
-/**
+/**
- * \brief Set read/write wait state on the EEFC perpherial.
+ * \brief Set read/write wait state on the EEFC perpherial.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- * \param cycles  the number of wait states in cycle.
+ * \param cycles  the number of wait states in cycle.
- */
+ */
-
+
-extern void EFC_SetWaitState( Efc* efc, uint8_t ucCycles )
+extern void EFC_SetWaitState( Efc* efc, uint8_t ucCycles )
-{
+{
-    uint32_t dwValue ;
+    uint32_t dwValue ;
-
+
-    dwValue = efc->EEFC_FMR ;
+    dwValue = efc->EEFC_FMR ;
-    dwValue &= ~((uint32_t)EEFC_FMR_FWS_Msk) ;
+    dwValue &= ~((uint32_t)EEFC_FMR_FWS_Msk) ;
-    dwValue |= EEFC_FMR_FWS(ucCycles);
+    dwValue |= EEFC_FMR_FWS(ucCycles);
-    efc->EEFC_FMR = dwValue ;
+    efc->EEFC_FMR = dwValue ;
-}
+}
-
+
-/**
+/**
- * \brief Returns the current status of the EEFC.
+ * \brief Returns the current status of the EEFC.
- *
+ *
- * \note Keep in mind that this function clears the value of some status bits (LOCKE, PROGE).
+ * \note Keep in mind that this function clears the value of some status bits (LOCKE, PROGE).
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- */
+ */
-extern uint32_t EFC_GetStatus( Efc* efc )
+extern uint32_t EFC_GetStatus( Efc* efc )
-{
+{
-    return efc->EEFC_FSR ;
+    return efc->EEFC_FSR ;
-}
+}
-
+
-/**
+/**
- * \brief Returns the result of the last executed command.
+ * \brief Returns the result of the last executed command.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- */
+ */
-extern uint32_t EFC_GetResult( Efc* efc )
+extern uint32_t EFC_GetResult( Efc* efc )
-{
+{
-    return efc->EEFC_FRR ;
+    return efc->EEFC_FRR ;
-}
+}
-
+
-/**
+/**
- * \brief Translates the given address page and offset values.
+ * \brief Translates the given address page and offset values.
- * \note The resulting values are stored in the provided variables if they are not null.
+ * \note The resulting values are stored in the provided variables if they are not null.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- * \param address  Address to translate.
+ * \param address  Address to translate.
- * \param pPage  First page accessed.
+ * \param pPage  First page accessed.
- * \param pOffset  Byte offset in first page.
+ * \param pOffset  Byte offset in first page.
- */
+ */
-extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwPage, uint16_t* pwOffset )
+extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwPage, uint16_t* pwOffset )
-{
+{
-    Efc *pEfc ;
+    Efc *pEfc ;
-    uint16_t wPage ;
+    uint16_t wPage ;
-    uint16_t wOffset ;
+    uint16_t wOffset ;
-
+
-    assert( dwAddress >= IFLASH_ADDR ) ;
+    assert( dwAddress >= IFLASH_ADDR ) ;
-    assert( dwAddress <= (IFLASH_ADDR + IFLASH_SIZE) ) ;
+    assert( dwAddress <= (IFLASH_ADDR + IFLASH_SIZE) ) ;
-
+
-    pEfc = EFC ;
+    pEfc = EFC ;
-    wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
+    wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
-    wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
+    wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
-
+
-    TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
+    TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
-    /* Store values */
+    /* Store values */
-    if ( pEfc )
+    if ( pEfc )
-    {
+    {
-        *ppEfc = pEfc ;
+        *ppEfc = pEfc ;
-    }
+    }
-
+
-    if ( pwPage )
+    if ( pwPage )
-    {
+    {
-        *pwPage = wPage ;
+        *pwPage = wPage ;
-    }
+    }
-
+
-    if ( pwOffset )
+    if ( pwOffset )
-    {
+    {
-        *pwOffset = wOffset ;
+        *pwOffset = wOffset ;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Computes the address of a flash access given the page and offset.
+ * \brief Computes the address of a flash access given the page and offset.
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- * \param page  Page number.
+ * \param page  Page number.
- * \param offset  Byte offset inside page.
+ * \param offset  Byte offset inside page.
- * \param pAddress  Computed address (optional).
+ * \param pAddress  Computed address (optional).
- */
+ */
-extern void EFC_ComputeAddress( Efc *efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress )
+extern void EFC_ComputeAddress( Efc *efc, uint16_t wPage, uint16_t wOffset, uint32_t *pdwAddress )
-{
+{
-    uint32_t dwAddress ;
+    uint32_t dwAddress ;
-	
+	
-    assert( efc ) ;
+    assert( efc ) ;
-    assert( wPage <= IFLASH_NB_OF_PAGES ) ;
+    assert( wPage <= IFLASH_NB_OF_PAGES ) ;
-    assert( wOffset < IFLASH_PAGE_SIZE ) ;
+    assert( wOffset < IFLASH_PAGE_SIZE ) ;
-	
+	
-    /* Compute address */
+    /* Compute address */
-    dwAddress = IFLASH_ADDR + wPage * IFLASH_PAGE_SIZE + wOffset ;
+    dwAddress = IFLASH_ADDR + wPage * IFLASH_PAGE_SIZE + wOffset ;
-	
+	
-    /* Store result */
+    /* Store result */
-    if ( pdwAddress != NULL )
+    if ( pdwAddress != NULL )
-	{
+	{
-        *pdwAddress = dwAddress ;
+        *pdwAddress = dwAddress ;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Starts the executing the given command on the EEFC and returns as soon as the command is started.
+ * \brief Starts the executing the given command on the EEFC and returns as soon as the command is started.
- *
+ *
- * \note It does NOT set the FMCN field automatically.
+ * \note It does NOT set the FMCN field automatically.
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- * \param command  Command to execute.
+ * \param command  Command to execute.
- * \param argument  Command argument (should be 0 if not used).
+ * \param argument  Command argument (should be 0 if not used).
- */
+ */
-extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument )
+extern void EFC_StartCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument )
-{
+{
-    /* Check command & argument */
+    /* Check command & argument */
-    switch ( dwCommand )
+    switch ( dwCommand )
-    {
+    {
-        case EFC_FCMD_WP:
+        case EFC_FCMD_WP:
-        case EFC_FCMD_WPL:
+        case EFC_FCMD_WPL:
-        case EFC_FCMD_EWP:
+        case EFC_FCMD_EWP:
-        case EFC_FCMD_EWPL:
+        case EFC_FCMD_EWPL:
-        case EFC_FCMD_SLB:
+        case EFC_FCMD_SLB:
-        case EFC_FCMD_CLB:
+        case EFC_FCMD_CLB:
-            assert( dwArgument < IFLASH_NB_OF_PAGES ) ;
+            assert( dwArgument < IFLASH_NB_OF_PAGES ) ;
-        break ;
+        break ;
-
+
-        case EFC_FCMD_SFB:
+        case EFC_FCMD_SFB:
-        case EFC_FCMD_CFB:
+        case EFC_FCMD_CFB:
-            assert( dwArgument < 2 ) ;
+            assert( dwArgument < 2 ) ;
-        break;
+        break;
-
+
-        case EFC_FCMD_GETD:
+        case EFC_FCMD_GETD:
-        case EFC_FCMD_EA:
+        case EFC_FCMD_EA:
-        case EFC_FCMD_GLB:
+        case EFC_FCMD_GLB:
-        case EFC_FCMD_GFB:
+        case EFC_FCMD_GFB:
-        case EFC_FCMD_STUI:
+        case EFC_FCMD_STUI:
-            assert( dwArgument == 0 ) ;
+            assert( dwArgument == 0 ) ;
-        break;
+        break;
-
+
-        default: assert( 0 ) ;
+        default: assert( 0 ) ;
-    }
+    }
-
+
-    /* Start command Embedded flash */
+    /* Start command Embedded flash */
-    assert( (efc->EEFC_FSR & EEFC_FMR_FRDY) == EEFC_FMR_FRDY ) ;
+    assert( (efc->EEFC_FSR & EEFC_FMR_FRDY) == EEFC_FMR_FRDY ) ;
-    efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
+    efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
-}
+}
-
+
-/**
+/**
- * \brief Performs the given command and wait until its completion (or an error).
+ * \brief Performs the given command and wait until its completion (or an error).
- *
+ *
- * \param efc  Pointer to a Efc instance
+ * \param efc  Pointer to a Efc instance
- * \param command  Command to perform.
+ * \param command  Command to perform.
- * \param argument  Optional command argument.
+ * \param argument  Optional command argument.
- *
+ *
- * \return 0 if successful, otherwise returns an error code.
+ * \return 0 if successful, otherwise returns an error code.
- */
+ */
-
+
-extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP )
+extern uint32_t EFC_PerformCommand( Efc* efc, uint32_t dwCommand, uint32_t dwArgument, uint32_t dwUseIAP )
-{
+{
-    if ( dwUseIAP != 0 )
+    if ( dwUseIAP != 0 )
-    {
+    {
-        /* Pointer on IAP function in ROM */
+        /* Pointer on IAP function in ROM */
-        static uint32_t (*IAP_PerformCommand)( uint32_t, uint32_t ) ;
+        static uint32_t (*IAP_PerformCommand)( uint32_t, uint32_t ) ;
-
+
-        IAP_PerformCommand = (uint32_t (*)( uint32_t, uint32_t )) *((uint32_t*)CHIP_FLASH_IAP_ADDRESS ) ;
+        IAP_PerformCommand = (uint32_t (*)( uint32_t, uint32_t )) *((uint32_t*)CHIP_FLASH_IAP_ADDRESS ) ;
-        IAP_PerformCommand( 0, EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ) ;
+        IAP_PerformCommand( 0, EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ) ;
-
+
-        return (efc->EEFC_FSR & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE)) ;
+        return (efc->EEFC_FSR & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE)) ;
-    }
+    }
-    else
+    else
-    {
+    {
-        uint32_t dwStatus ;
+        uint32_t dwStatus ;
-
+
-        efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
+        efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ;
-        do
+        do
-        {
+        {
-            dwStatus = efc->EEFC_FSR ;
+            dwStatus = efc->EEFC_FSR ;
-        }
+        }
-        while ( (dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ;
+        while ( (dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ;
-
+
-        return ( dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE) ) ;
+        return ( dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE) ) ;
-    }
+    }
-}
+}
-
+
-
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio.c

@@ -1,453 +1,453 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2010, Atmel Corporation
+ * Copyright (c) 2010, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/** \file */
+/** \file */
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-#include "chip.h"
+#include "chip.h"
-#include "pio.h"
+#include "pio.h"
-#include "pmc.h"
+#include "pmc.h"
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local functions
+ *        Local functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral A. Optionally, the corresponding internal pull-up(s) can be enabled.
+ * peripheral A. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
+ *                      configured.
- */
+ */
-static void PIO_SetPeripheralA(
+static void PIO_SetPeripheralA(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char enablePullUp)
+    unsigned char enablePullUp)
-{
+{
-    unsigned int abcdsr;
+    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
+    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable the pull-up(s) if necessary */
+    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
+    if (enablePullUp) {
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-    }
+    }
-
+
-    abcdsr = pio->PIO_ABCDSR[0];
+    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
+    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
+    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
+    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
-    pio->PIO_PDR = mask;
+    pio->PIO_PDR = mask;
-}
+}
-
+
-/**
+/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral B. Optionally, the corresponding internal pull-up(s) can be enabled.
+ * peripheral B. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
+ *                      configured.
- */
+ */
-static void PIO_SetPeripheralB(
+static void PIO_SetPeripheralB(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char enablePullUp)
+    unsigned char enablePullUp)
-{
+{
-    unsigned int abcdsr;
+    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
+    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable the pull-up(s) if necessary */
+    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
+    if (enablePullUp) {
-
+
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-    }
+    }
-
+
-    abcdsr = pio->PIO_ABCDSR[0];
+    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] = (mask | abcdsr);
+    pio->PIO_ABCDSR[0] = (mask | abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
+    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
+    pio->PIO_ABCDSR[1] &= (~mask & abcdsr);
-
+
-    pio->PIO_PDR = mask;
+    pio->PIO_PDR = mask;
-}
+}
-
+
-/**
+/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral C. Optionally, the corresponding internal pull-up(s) can be enabled.
+ * peripheral C. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
+ *                      configured.
- */
+ */
-static void PIO_SetPeripheralC(
+static void PIO_SetPeripheralC(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char enablePullUp)
+    unsigned char enablePullUp)
-{
+{
-    unsigned int abcdsr;
+    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
+    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable the pull-up(s) if necessary */
+    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
+    if (enablePullUp) {
-
+
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-    }
+    }
-
+
-    abcdsr = pio->PIO_ABCDSR[0];
+    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
+    pio->PIO_ABCDSR[0] &= (~mask & abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
+    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] = (mask | abcdsr);
+    pio->PIO_ABCDSR[1] = (mask | abcdsr);
-
+
-    pio->PIO_PDR = mask;
+    pio->PIO_PDR = mask;
-}
+}
-
+
-/**
+/**
- * \brief Configures one or more pin(s) of a PIO controller as being controlled by
+ * \brief Configures one or more pin(s) of a PIO controller as being controlled by
- * peripheral D. Optionally, the corresponding internal pull-up(s) can be enabled.
+ * peripheral D. Optionally, the corresponding internal pull-up(s) can be enabled.
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask of one or more pin(s) to configure.
+ * \param mask  Bitmask of one or more pin(s) to configure.
- * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
+ * \param enablePullUp  Indicates if the pin(s) internal pull-up shall be
- *                      configured.
+ *                      configured.
- */
+ */
-static void PIO_SetPeripheralD(
+static void PIO_SetPeripheralD(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char enablePullUp)
+    unsigned char enablePullUp)
-{
+{
-    unsigned int abcdsr;
+    unsigned int abcdsr;
-    /* Disable interrupts on the pin(s) */
+    /* Disable interrupts on the pin(s) */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable the pull-up(s) if necessary */
+    /* Enable the pull-up(s) if necessary */
-    if (enablePullUp) {
+    if (enablePullUp) {
-
+
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-    }
+    }
-
+
-    abcdsr = pio->PIO_ABCDSR[0];
+    abcdsr = pio->PIO_ABCDSR[0];
-    pio->PIO_ABCDSR[0] = (mask | abcdsr);
+    pio->PIO_ABCDSR[0] = (mask | abcdsr);
-    abcdsr = pio->PIO_ABCDSR[1];
+    abcdsr = pio->PIO_ABCDSR[1];
-    pio->PIO_ABCDSR[1] = (mask | abcdsr);
+    pio->PIO_ABCDSR[1] = (mask | abcdsr);
-
+
-    pio->PIO_PDR = mask;
+    pio->PIO_PDR = mask;
-}
+}
-
+
-/**
+/**
- * \brief Configures one or more pin(s) or a PIO controller as inputs. Optionally,
+ * \brief Configures one or more pin(s) or a PIO controller as inputs. Optionally,
- * the corresponding internal pull-up(s) and glitch filter(s) can be enabled.
+ * the corresponding internal pull-up(s) and glitch filter(s) can be enabled.
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask indicating which pin(s) to configure as input(s).
+ * \param mask  Bitmask indicating which pin(s) to configure as input(s).
- * \param enablePullUp  Indicates if the internal pull-up(s) must be enabled.
+ * \param enablePullUp  Indicates if the internal pull-up(s) must be enabled.
- * \param enableFilter  Indicates if the glitch filter(s) must be enabled.
+ * \param enableFilter  Indicates if the glitch filter(s) must be enabled.
- */
+ */
-static void PIO_SetInput(
+static void PIO_SetInput(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char attribute)
+    unsigned char attribute)
-{
+{
-    /* Disable interrupts */
+    /* Disable interrupts */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable pull-up(s) if necessary */
+    /* Enable pull-up(s) if necessary */
-    if (attribute & PIO_PULLUP)
+    if (attribute & PIO_PULLUP)
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    else
+    else
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-
+
-    /* Enable Input Filter if necessary */
+    /* Enable Input Filter if necessary */
-    if (attribute & (PIO_DEGLITCH | PIO_DEBOUNCE))
+    if (attribute & (PIO_DEGLITCH | PIO_DEBOUNCE))
-        pio->PIO_IFER = mask;
+        pio->PIO_IFER = mask;
-    else
+    else
-        pio->PIO_IFDR = mask;
+        pio->PIO_IFDR = mask;
-
+
-    /* Enable de-glitch or de-bounce if necessary */
+    /* Enable de-glitch or de-bounce if necessary */
-    if (attribute & PIO_DEGLITCH)
+    if (attribute & PIO_DEGLITCH)
-    {
+    {
-        pio->PIO_IFSCDR = mask;
+        pio->PIO_IFSCDR = mask;
-    }
+    }
-    else
+    else
-    {
+    {
-        if (attribute & PIO_DEBOUNCE)
+        if (attribute & PIO_DEBOUNCE)
-        {
+        {
-            pio->PIO_IFSCER = mask;
+            pio->PIO_IFSCER = mask;
-        }
+        }
-    }
+    }
-
+
-    /* Configure pin as input */
+    /* Configure pin as input */
-    pio->PIO_ODR = mask;
+    pio->PIO_ODR = mask;
-    pio->PIO_PER = mask;
+    pio->PIO_PER = mask;
-}
+}
-
+
-/**
+/**
- * \brief Configures one or more pin(s) of a PIO controller as outputs, with the
+ * \brief Configures one or more pin(s) of a PIO controller as outputs, with the
- * given default value. Optionally, the multi-drive feature can be enabled
+ * given default value. Optionally, the multi-drive feature can be enabled
- * on the pin(s).
+ * on the pin(s).
- *
+ *
- * \param pio  Pointer to a PIO controller.
+ * \param pio  Pointer to a PIO controller.
- * \param mask  Bitmask indicating which pin(s) to configure.
+ * \param mask  Bitmask indicating which pin(s) to configure.
- * \param defaultValue  Default level on the pin(s).
+ * \param defaultValue  Default level on the pin(s).
- * \param enableMultiDrive  Indicates if the pin(s) shall be configured as
+ * \param enableMultiDrive  Indicates if the pin(s) shall be configured as
- *                          open-drain.
+ *                          open-drain.
- * \param enablePullUp  Indicates if the pin shall have its pull-up activated.
+ * \param enablePullUp  Indicates if the pin shall have its pull-up activated.
- */
+ */
-static void PIO_SetOutput(
+static void PIO_SetOutput(
-    Pio *pio,
+    Pio *pio,
-    unsigned int mask,
+    unsigned int mask,
-    unsigned char defaultValue,
+    unsigned char defaultValue,
-    unsigned char enableMultiDrive,
+    unsigned char enableMultiDrive,
-    unsigned char enablePullUp)
+    unsigned char enablePullUp)
-{
+{
-    /* Disable interrupts */
+    /* Disable interrupts */
-    pio->PIO_IDR = mask;
+    pio->PIO_IDR = mask;
-
+
-    /* Enable pull-up(s) if necessary */
+    /* Enable pull-up(s) if necessary */
-    if (enablePullUp) {
+    if (enablePullUp) {
-
+
-        pio->PIO_PUER = mask;
+        pio->PIO_PUER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_PUDR = mask;
+        pio->PIO_PUDR = mask;
-    }
+    }
-
+
-    /* Enable multi-drive if necessary */
+    /* Enable multi-drive if necessary */
-    if (enableMultiDrive) {
+    if (enableMultiDrive) {
-
+
-        pio->PIO_MDER = mask;
+        pio->PIO_MDER = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_MDDR = mask;
+        pio->PIO_MDDR = mask;
-    }
+    }
-
+
-    /* Set default value */
+    /* Set default value */
-    if (defaultValue) {
+    if (defaultValue) {
-
+
-        pio->PIO_SODR = mask;
+        pio->PIO_SODR = mask;
-    }
+    }
-    else {
+    else {
-
+
-        pio->PIO_CODR = mask;
+        pio->PIO_CODR = mask;
-    }
+    }
-
+
-    /* Configure pin(s) as output(s) */
+    /* Configure pin(s) as output(s) */
-    pio->PIO_OER = mask;
+    pio->PIO_OER = mask;
-    pio->PIO_PER = mask;
+    pio->PIO_PER = mask;
-}
+}
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *         Global functions
+ *         Global functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Configures a list of Pin instances, each of which can either hold a single
+ * \brief Configures a list of Pin instances, each of which can either hold a single
- * pin or a group of pins, depending on the mask value; all pins are configured
+ * pin or a group of pins, depending on the mask value; all pins are configured
- * by this function. The size of the array must also be provided and is easily
+ * by this function. The size of the array must also be provided and is easily
- * computed using PIO_LISTSIZE whenever its length is not known in advance.
+ * computed using PIO_LISTSIZE whenever its length is not known in advance.
- *
+ *
- * \param list  Pointer to a list of Pin instances.
+ * \param list  Pointer to a list of Pin instances.
- * \param size  Size of the Pin list (calculated using PIO_LISTSIZE).
+ * \param size  Size of the Pin list (calculated using PIO_LISTSIZE).
- *
+ *
- * \return 1 if the pins have been configured properly; otherwise 0.
+ * \return 1 if the pins have been configured properly; otherwise 0.
- */
+ */
-uint8_t PIO_Configure( const Pin *list, uint32_t size )
+uint8_t PIO_Configure( const Pin *list, uint32_t size )
-{
+{
-    /* Configure pins */
+    /* Configure pins */
-    while ( size > 0 )
+    while ( size > 0 )
-    {
+    {
-        switch ( list->type )
+        switch ( list->type )
-        {
+        {
-
+
-            case PIO_PERIPH_A:
+            case PIO_PERIPH_A:
-                PIO_SetPeripheralA(list->pio,
+                PIO_SetPeripheralA(list->pio,
-                                   list->mask,
+                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
+            break;
-
+
-            case PIO_PERIPH_B:
+            case PIO_PERIPH_B:
-                PIO_SetPeripheralB(list->pio,
+                PIO_SetPeripheralB(list->pio,
-                                   list->mask,
+                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
+            break;
-
+
-            case PIO_PERIPH_C:
+            case PIO_PERIPH_C:
-                PIO_SetPeripheralC(list->pio,
+                PIO_SetPeripheralC(list->pio,
-                                   list->mask,
+                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
+            break;
-
+
-            case PIO_PERIPH_D:
+            case PIO_PERIPH_D:
-                PIO_SetPeripheralD(list->pio,
+                PIO_SetPeripheralD(list->pio,
-                                   list->mask,
+                                   list->mask,
-                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
+                                   (list->attribute & PIO_PULLUP) ? 1 : 0);
-            break;
+            break;
-            case PIO_INPUT:
+            case PIO_INPUT:
-                PMC_EnablePeripheral(list->id);
+                PMC_EnablePeripheral(list->id);
-                PIO_SetInput(list->pio,
+                PIO_SetInput(list->pio,
-                             list->mask,
+                             list->mask,
-                             list->attribute);
+                             list->attribute);
-                break;
+                break;
-
+
-            case PIO_OUTPUT_0:
+            case PIO_OUTPUT_0:
-            case PIO_OUTPUT_1:
+            case PIO_OUTPUT_1:
-                PIO_SetOutput(list->pio,
+                PIO_SetOutput(list->pio,
-                              list->mask,
+                              list->mask,
-                              (list->type == PIO_OUTPUT_1),
+                              (list->type == PIO_OUTPUT_1),
-                              (list->attribute & PIO_OPENDRAIN) ? 1 : 0,
+                              (list->attribute & PIO_OPENDRAIN) ? 1 : 0,
-                              (list->attribute & PIO_PULLUP) ? 1 : 0);
+                              (list->attribute & PIO_PULLUP) ? 1 : 0);
-                break;
+                break;
-
+
-            default: return 0;
+            default: return 0;
-        }
+        }
-
+
-        list++;
+        list++;
-        size--;
+        size--;
-    }
+    }
-
+
-    return 1;
+    return 1;
-}
+}
-
+
-/**
+/**
- * \brief Sets a high output level on all the PIOs defined in the given Pin instance.
+ * \brief Sets a high output level on all the PIOs defined in the given Pin instance.
- * This has no immediate effects on PIOs that are not output, but the PIO
+ * This has no immediate effects on PIOs that are not output, but the PIO
- * controller will memorize the value they are changed to outputs.
+ * controller will memorize the value they are changed to outputs.
- *
+ *
- * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param pin  Pointer to a Pin instance describing one or more pins.
- */
+ */
-void PIO_Set(const Pin *pin)
+void PIO_Set(const Pin *pin)
-{
+{
-    pin->pio->PIO_SODR = pin->mask;
+    pin->pio->PIO_SODR = pin->mask;
-}
+}
-
+
-/**
+/**
- * \brief Sets a low output level on all the PIOs defined in the given Pin instance.
+ * \brief Sets a low output level on all the PIOs defined in the given Pin instance.
- * This has no immediate effects on PIOs that are not output, but the PIO
+ * This has no immediate effects on PIOs that are not output, but the PIO
- * controller will memorize the value they are changed to outputs.
+ * controller will memorize the value they are changed to outputs.
- *
+ *
- * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param pin  Pointer to a Pin instance describing one or more pins.
- */
+ */
-void PIO_Clear(const Pin *pin)
+void PIO_Clear(const Pin *pin)
-{
+{
-    pin->pio->PIO_CODR = pin->mask;
+    pin->pio->PIO_CODR = pin->mask;
-}
+}
-
+
-/**
+/**
- * \brief Returns 1 if one or more PIO of the given Pin instance currently have
+ * \brief Returns 1 if one or more PIO of the given Pin instance currently have
- * a high level; otherwise returns 0. This method returns the actual value that
+ * a high level; otherwise returns 0. This method returns the actual value that
- * is being read on the pin. To return the supposed output value of a pin, use
+ * is being read on the pin. To return the supposed output value of a pin, use
- * PIO_GetOutputDataStatus() instead.
+ * PIO_GetOutputDataStatus() instead.
- *
+ *
- * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param pin  Pointer to a Pin instance describing one or more pins.
- *
+ *
- * \return 1 if the Pin instance contains at least one PIO that currently has
+ * \return 1 if the Pin instance contains at least one PIO that currently has
- * a high level; otherwise 0.
+ * a high level; otherwise 0.
- */
+ */
-unsigned char PIO_Get( const Pin *pin )
+unsigned char PIO_Get( const Pin *pin )
-{
+{
-    unsigned int reg ;
+    unsigned int reg ;
-
+
-    if ( (pin->type == PIO_OUTPUT_0) || (pin->type == PIO_OUTPUT_1) )
+    if ( (pin->type == PIO_OUTPUT_0) || (pin->type == PIO_OUTPUT_1) )
-    {
+    {
-        reg = pin->pio->PIO_ODSR ;
+        reg = pin->pio->PIO_ODSR ;
-    }
+    }
-    else
+    else
-    {
+    {
-        reg = pin->pio->PIO_PDSR ;
+        reg = pin->pio->PIO_PDSR ;
-    }
+    }
-
+
-    if ( (reg & pin->mask) == 0 )
+    if ( (reg & pin->mask) == 0 )
-    {
+    {
-        return 0 ;
+        return 0 ;
-    }
+    }
-    else
+    else
-    {
+    {
-        return 1 ;
+        return 1 ;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Returns 1 if one or more PIO of the given Pin are configured to output a
+ * \brief Returns 1 if one or more PIO of the given Pin are configured to output a
- * high level (even if they are not output).
+ * high level (even if they are not output).
- * To get the actual value of the pin, use PIO_Get() instead.
+ * To get the actual value of the pin, use PIO_Get() instead.
- *
+ *
- * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param pin  Pointer to a Pin instance describing one or more pins.
- *
+ *
- * \return 1 if the Pin instance contains at least one PIO that is configured
+ * \return 1 if the Pin instance contains at least one PIO that is configured
- * to output a high level; otherwise 0.
+ * to output a high level; otherwise 0.
- */
+ */
-unsigned char PIO_GetOutputDataStatus(const Pin *pin)
+unsigned char PIO_GetOutputDataStatus(const Pin *pin)
-{
+{
-    if ((pin->pio->PIO_ODSR & pin->mask) == 0) {
+    if ((pin->pio->PIO_ODSR & pin->mask) == 0) {
-
+
-        return 0;
+        return 0;
-    }
+    }
-    else {
+    else {
-
+
-        return 1;
+        return 1;
-    }
+    }
-}
+}
-
+
-/*
+/*
- * \brief Configures Glitch or Debouncing filter for input.
+ * \brief Configures Glitch or Debouncing filter for input.
- *
+ *
- * \param pin  Pointer to a Pin instance describing one or more pins.
+ * \param pin  Pointer to a Pin instance describing one or more pins.
- * \param cuttoff  Cutt off frequency for debounce filter.
+ * \param cuttoff  Cutt off frequency for debounce filter.
- */
+ */
-void PIO_SetDebounceFilter( const Pin *pin, uint32_t cuttoff )
+void PIO_SetDebounceFilter( const Pin *pin, uint32_t cuttoff )
-{
+{
-    Pio *pio = pin->pio;
+    Pio *pio = pin->pio;
-
+
-    pio->PIO_IFSCER = pin->mask; /* set Debouncing, 0 bit field no effect */
+    pio->PIO_IFSCER = pin->mask; /* set Debouncing, 0 bit field no effect */
-    pio->PIO_SCDR = ((32678/(2*(cuttoff))) - 1) & 0x3FFF; /* the lowest 14 bits work */
+    pio->PIO_SCDR = ((32678/(2*(cuttoff))) - 1) & 0x3FFF; /* the lowest 14 bits work */
-}
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c

@@ -1,315 +1,327 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2008, Atmel Corporation
+ * Copyright (c) 2008, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/*
+/*
- * \file
+ * \file
- */
+ */
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-#include "chip.h"
+#include "chip.h"
-
+
-#include <assert.h>
+#include <assert.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local definitions
+ *        Local definitions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/* Maximum number of interrupt sources that can be defined. This
+/* Maximum number of interrupt sources that can be defined. This
- * constant can be increased, but the current value is the smallest possible
+ * constant can be increased, but the current value is the smallest possible
- * that will be compatible with all existing projects. */
+ * that will be compatible with all existing projects. */
-#define MAX_INTERRUPT_SOURCES       7
+#define MAX_INTERRUPT_SOURCES       7
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local types
+ *        Local types
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * Describes a PIO interrupt source, including the PIO instance triggering the
+ * Describes a PIO interrupt source, including the PIO instance triggering the
- * interrupt and the associated interrupt handler.
+ * interrupt and the associated interrupt handler.
- */
+ */
-typedef struct _InterruptSource
+typedef struct _InterruptSource
-{
+{
-    /* Pointer to the source pin instance. */
+    /* Pointer to the source pin instance. */
-    const Pin *pPin;
+    const Pin *pPin;
-
+
-    /* Interrupt handler. */
+    /* Interrupt handler. */
-    void (*handler)( const Pin* ) ;
+    void (*handler)( const Pin* ) ;
-} InterruptSource ;
+} InterruptSource ;
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local variables
+ *        Local variables
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/* List of interrupt sources. */
+/* List of interrupt sources. */
-static InterruptSource _aIntSources[MAX_INTERRUPT_SOURCES] ;
+static InterruptSource _aIntSources[MAX_INTERRUPT_SOURCES] ;
-
+
-/* Number of currently defined interrupt sources. */
+/* Number of currently defined interrupt sources. */
-static uint32_t _dwNumSources = 0;
+static uint32_t _dwNumSources = 0;
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local Functions
+ *        Local Functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
-/**
+/**
- * \brief Stub, to handling all PIO Capture interrupts, if not defined.
+ * \brief Stub, to handling all PIO Capture interrupts, if not defined.
- */
+ */
-/*----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
-extern WEAK void PIO_CaptureHandler( void )
+extern WEAK void PIO_CaptureHandler( void )
-{
+{
-}
+}
-
+
-/**
+/**
- * \brief Handles all interrupts on the given PIO controller.
+ * \brief Handles all interrupts on the given PIO controller.
- * \param id  PIO controller ID.
+ * \param id  PIO controller ID.
- * \param pPio  PIO controller base address.
+ * \param pPio  PIO controller base address.
- */
+ */
-extern void PioInterruptHandler( uint32_t id, Pio *pPio )
+extern void PioInterruptHandler( uint32_t id, Pio *pPio )
-{
+{
-    uint32_t status;
+    uint32_t status;
-    uint32_t i;
+    uint32_t i;
-
+
-    /* Read PIO controller status */
+    /* Read PIO controller status */
-    status = pPio->PIO_ISR;
+    status = pPio->PIO_ISR;
-    status &= pPio->PIO_IMR;
+    status &= pPio->PIO_IMR;
-
+
-    /* Check pending events */
+    /* Check pending events */
-    if ( status != 0 )
+    if ( status != 0 )
-    {
+    {
-        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
+        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
-
+
-        /* Find triggering source */
+        /* Find triggering source */
-        i = 0;
+        i = 0;
-        while ( status != 0 )
+        while ( status != 0 )
-        {
+        {
-            /* There cannot be an unconfigured source enabled. */
+            /* There cannot be an unconfigured source enabled. */
-            assert(i < _dwNumSources);
+            assert(i < _dwNumSources);
-
+
-            /* Source is configured on the same controller */
+            /* Source is configured on the same controller */
-            if (_aIntSources[i].pPin->id == id)
+            if (_aIntSources[i].pPin->id == id)
-            {
+            {
-                /* Source has PIOs whose statuses have changed */
+                /* Source has PIOs whose statuses have changed */
-                if ( (status & _aIntSources[i].pPin->mask) != 0 )
+                if ( (status & _aIntSources[i].pPin->mask) != 0 )
-                {
+                {
-                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
+                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
-
+
-                    _aIntSources[i].handler(_aIntSources[i].pPin);
+                    _aIntSources[i].handler(_aIntSources[i].pPin);
-                    status &= ~(_aIntSources[i].pPin->mask);
+                    status &= ~(_aIntSources[i].pPin->mask);
-                }
+                }
-            }
+            }
-            i++;
+            i++;
-        }
+        }
-    }
+    }
-}
+}
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Global Functions
+ *        Global Functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Parallel IO Controller A interrupt handler
+ * \brief Parallel IO Controller A interrupt handler
- * \Redefined PIOA interrupt handler for NVIC interrupt table.
+ * \Redefined PIOA interrupt handler for NVIC interrupt table.
- */
+ */
-extern void PIOA_IrqHandler( void )
+extern void PIOA_IrqHandler( void )
-{
+{
-    if ( PIOA->PIO_PCISR != 0 )
+    if ( PIOA->PIO_PCISR != 0 )
-    {
+    {
-        PIO_CaptureHandler() ;
+        PIO_CaptureHandler() ;
-    }
+    }
-
+
-    PioInterruptHandler( ID_PIOA, PIOA ) ;
+    PioInterruptHandler( ID_PIOA, PIOA ) ;
-}
+}
-
+
-/**
+/**
- * \brief Parallel IO Controller B interrupt handler
+ * \brief Parallel IO Controller B interrupt handler
- * \Redefined PIOB interrupt handler for NVIC interrupt table.
+ * \Redefined PIOB interrupt handler for NVIC interrupt table.
- */
+ */
-extern void PIOB_IrqHandler( void )
+extern void PIOB_IrqHandler( void )
-{
+{
-    PioInterruptHandler( ID_PIOB, PIOB ) ;
+    PioInterruptHandler( ID_PIOB, PIOB ) ;
-}
+}
-
+
-/**
+/**
- * \brief Parallel IO Controller C interrupt handler
+ * \brief Parallel IO Controller C interrupt handler
- * \Redefined PIOC interrupt handler for NVIC interrupt table.
+ * \Redefined PIOC interrupt handler for NVIC interrupt table.
- */
+ */
-extern void PIOC_IrqHandler( void )
+extern void PIOC_IrqHandler( void )
-{
+{
-    PioInterruptHandler( ID_PIOC, PIOC ) ;
+    PioInterruptHandler( ID_PIOC, PIOC ) ;
-}
+}
-
+
-/**
+/**
- * \brief Initializes the PIO interrupt management logic
+ * \brief Initializes the PIO interrupt management logic
- *
+ *
- * The desired priority of PIO interrupts must be provided.
+ * The desired priority of PIO interrupts must be provided.
- * Calling this function multiple times result in the reset of currently
+ * Calling this function multiple times result in the reset of currently
- * configured interrupts.
+ * configured interrupts.
- *
+ *
- * \param priority  PIO controller interrupts priority.
+ * \param priority  PIO controller interrupts priority.
- */
+ */
-extern void PIO_InitializeInterrupts( uint32_t dwPriority )
+extern void PIO_InitializeInterrupts( uint32_t dwPriority )
-{
+{
-    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
-
+
-    /* Reset sources */
+    /* Reset sources */
-    _dwNumSources = 0 ;
+    _dwNumSources = 0 ;
-
+
-    /* Configure PIO interrupt sources */
+    /* Configure PIO interrupt sources */
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOA ) ;
+    PMC_EnablePeripheral( ID_PIOA ) ;
-    PIOA->PIO_ISR ;
+    PIOA->PIO_ISR ;
-    PIOA->PIO_IDR = 0xFFFFFFFF ;
+    PIOA->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOA_IRQn ) ;
+    NVIC_DisableIRQ( PIOA_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOA_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOA_IRQn ) ;
-    NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
+    NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOA_IRQn ) ;
+    NVIC_EnableIRQ( PIOA_IRQn ) ;
-
+
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOB ) ;
+    PMC_EnablePeripheral( ID_PIOB ) ;
-    PIOB->PIO_ISR ;
+    PIOB->PIO_ISR ;
-    PIOB->PIO_IDR = 0xFFFFFFFF ;
+    PIOB->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOB_IRQn ) ;
+    NVIC_DisableIRQ( PIOB_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOB_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOB_IRQn ) ;
-    NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
+    NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOB_IRQn ) ;
+    NVIC_EnableIRQ( PIOB_IRQn ) ;
-
+
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
-    PMC_EnablePeripheral( ID_PIOC ) ;
+    PMC_EnablePeripheral( ID_PIOC ) ;
-    PIOC->PIO_ISR ;
+    PIOC->PIO_ISR ;
-    PIOC->PIO_IDR = 0xFFFFFFFF ;
+    PIOC->PIO_IDR = 0xFFFFFFFF ;
-    NVIC_DisableIRQ( PIOC_IRQn ) ;
+    NVIC_DisableIRQ( PIOC_IRQn ) ;
-    NVIC_ClearPendingIRQ( PIOC_IRQn ) ;
+    NVIC_ClearPendingIRQ( PIOC_IRQn ) ;
-    NVIC_SetPriority( PIOC_IRQn, dwPriority ) ;
+    NVIC_SetPriority( PIOC_IRQn, dwPriority ) ;
-    NVIC_EnableIRQ( PIOC_IRQn ) ;
+    NVIC_EnableIRQ( PIOC_IRQn ) ;
-}
+}
-
+
-/**
+static InterruptSource *find_intsource4pin(const Pin *pPin)
- * 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
+    unsigned int i ;
- * pin as its parameter (enabling different pin instances to share the same
+    for (i = 0; i < _dwNumSources; i++) {
- * handler).
+        if (_aIntSources[i].pPin == pPin)
- * \param pPin  Pointer to a Pin instance.
+	    return &_aIntSources[i];
- * \param handler  Interrupt handler function pointer.
+    }
- */
+    return NULL;
-extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
+}
-{
+
-    Pio* pio ;
+/**
-    InterruptSource* pSource ;
+ * 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
-    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
+ * pin as its parameter (enabling different pin instances to share the same
-
+ * handler).
-    assert( pPin ) ;
+ * \param pPin  Pointer to a Pin instance.
-    pio = pPin->pio ;
+ * \param handler  Interrupt handler function pointer.
-    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
+ */
-
+extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
-    /* Define new source */
+{
-    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+    Pio* pio ;
-
+    InterruptSource* pSource ;
-    pSource = &(_aIntSources[_dwNumSources]) ;
+
-    pSource->pPin = pPin ;
+    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
-    pSource->handler = handler ;
+
-    _dwNumSources++ ;
+    assert( pPin ) ;
-
+    pio = pPin->pio ;
-    /* PIO3 with additional interrupt support
+
-     * Configure additional interrupt mode registers */
+    pSource = find_intsource4pin(pPin);
-    if ( pPin->attribute & PIO_IT_AIME )
+    if (!pSource) {
-    {
+        /* Define new source */
-        // enable additional interrupt mode
+        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
-        pio->PIO_AIMER       = pPin->mask ;
+        assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
-
+        pSource = &(_aIntSources[_dwNumSources]) ;
-        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
+        pSource->pPin = pPin ;
-        if ( pPin->attribute & PIO_IT_RE_OR_HL )
+        _dwNumSources++ ;
-        {
+    }
-            pio->PIO_REHLSR    = pPin->mask ;
+    pSource->handler = handler ;
-        }
+
-        else
+    /* PIO3 with additional interrupt support
-        {
+     * Configure additional interrupt mode registers */
-            pio->PIO_FELLSR     = pPin->mask;
+    if ( pPin->attribute & PIO_IT_AIME )
-        }
+    {
-
+        // enable additional interrupt mode
-        /* if bit field of selected pin is 1, set as edge detection source */
+        pio->PIO_AIMER       = pPin->mask ;
-        if (pPin->attribute & PIO_IT_EDGE)
+
-            pio->PIO_ESR     = pPin->mask;
+        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
-        else
+        if ( pPin->attribute & PIO_IT_RE_OR_HL )
-            pio->PIO_LSR     = pPin->mask;
+        {
-    }
+            pio->PIO_REHLSR    = pPin->mask ;
-    else
+        }
-    {
+        else
-        /* disable additional interrupt mode */
+        {
-        pio->PIO_AIMDR       = pPin->mask;
+            pio->PIO_FELLSR     = pPin->mask;
-    }
+        }
-}
+
-
+        /* if bit field of selected pin is 1, set as edge detection source */
-/**
+        if (pPin->attribute & PIO_IT_EDGE)
- * Enables the given interrupt source if it has been configured. The status
+            pio->PIO_ESR     = pPin->mask;
- * register of the corresponding PIO controller is cleared prior to enabling
+        else
- * the interrupt.
+            pio->PIO_LSR     = pPin->mask;
- * \param pPin  Interrupt source to enable.
+    }
- */
+    else
-extern void PIO_EnableIt( const Pin *pPin )
+    {
-{
+        /* disable additional interrupt mode */
-    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
+        pio->PIO_AIMDR       = pPin->mask;
-
+    }
-    assert( pPin != NULL ) ;
+}
-
+
-#ifndef NOASSERT
+/**
-    uint32_t i = 0;
+ * Enables the given interrupt source if it has been configured. The status
-    uint32_t dwFound = 0;
+ * register of the corresponding PIO controller is cleared prior to enabling
-
+ * the interrupt.
-    while ( (i < _dwNumSources) && !dwFound )
+ * \param pPin  Interrupt source to enable.
-    {
+ */
-        if ( _aIntSources[i].pPin == pPin )
+extern void PIO_EnableIt( const Pin *pPin )
-        {
+{
-            dwFound = 1 ;
+    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
-        }
+
-        i++ ;
+    assert( pPin != NULL ) ;
-    }
+
-    assert( dwFound != 0 ) ;
+#ifndef NOASSERT
-#endif
+    uint32_t i = 0;
-
+    uint32_t dwFound = 0;
-    pPin->pio->PIO_ISR;
+
-    pPin->pio->PIO_IER = pPin->mask ;
+    while ( (i < _dwNumSources) && !dwFound )
-}
+    {
-
+        if ( _aIntSources[i].pPin == pPin )
-/**
+        {
- * Disables a given interrupt source, with no added side effects.
+            dwFound = 1 ;
- *
+        }
- * \param pPin  Interrupt source to disable.
+        i++ ;
- */
+    }
-extern void PIO_DisableIt( const Pin *pPin )
+    assert( dwFound != 0 ) ;
-{
+#endif
-    assert( pPin != NULL ) ;
+
-
+    pPin->pio->PIO_ISR;
-    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
+    pPin->pio->PIO_IER = pPin->mask ;
-
+}
-    pPin->pio->PIO_IDR = pPin->mask;
+
-}
+/**
-
+ * Disables a given interrupt source, with no added side effects.
+ *
+ * \param pPin  Interrupt source to disable.
+ */
+extern void PIO_DisableIt( const Pin *pPin )
+{
+    assert( pPin != NULL ) ;
+
+    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
+
+    pPin->pio->PIO_IDR = pPin->mask;
+}
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c

@@ -1,168 +1,168 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-#include "chip.h"
+#include "chip.h"
-#include "trace.h"
+#include "trace.h"
-
+
-#include <assert.h>
+#include <assert.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local definitions
+ *        Local definitions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-#define MASK_STATUS0 0xFFFFFFFC
+#define MASK_STATUS0 0xFFFFFFFC
-#define MASK_STATUS1 0xFFFFFFFF
+#define MASK_STATUS1 0xFFFFFFFF
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Enables the clock of a peripheral. The peripheral ID is used
+ * \brief Enables the clock of a peripheral. The peripheral ID is used
- * to identify which peripheral is targetted.
+ * to identify which peripheral is targetted.
- *
+ *
- * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
+ * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
- *
+ *
- * \param id  Peripheral ID (ID_xxx).
+ * \param id  Peripheral ID (ID_xxx).
- */
+ */
-extern void PMC_EnablePeripheral( uint32_t dwId )
+extern void PMC_EnablePeripheral( uint32_t dwId )
-{
+{
-    assert( dwId < 35 ) ;
+    assert( dwId < 35 ) ;
-
+
-    if ( dwId < 32 )
+    if ( dwId < 32 )
-    {
+    {
-        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
+        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
-        {
+        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
-        }
+        }
-        else
+        else
-        {
+        {
-            PMC->PMC_PCER0 = 1 << dwId ;
+            PMC->PMC_PCER0 = 1 << dwId ;
-        }
+        }
-    }
+    }
-    else
+    else
-    {
+    {
-        dwId -= 32;
+        dwId -= 32;
-        if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
+        if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
-        {
+        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
-        }
+        }
-        else
+        else
-        {
+        {
-            PMC->PMC_PCER1 = 1 << dwId ;
+            PMC->PMC_PCER1 = 1 << dwId ;
-        }
+        }
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Disables the clock of a peripheral. The peripheral ID is used
+ * \brief Disables the clock of a peripheral. The peripheral ID is used
- * to identify which peripheral is targetted.
+ * to identify which peripheral is targetted.
- *
+ *
- * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
+ * \note The ID must NOT be shifted (i.e. 1 << ID_xxx).
- *
+ *
- * \param id  Peripheral ID (ID_xxx).
+ * \param id  Peripheral ID (ID_xxx).
- */
+ */
-extern void PMC_DisablePeripheral( uint32_t dwId )
+extern void PMC_DisablePeripheral( uint32_t dwId )
-{
+{
-    assert( dwId < 35 ) ;
+    assert( dwId < 35 ) ;
-
+
-    if ( dwId < 32 )
+    if ( dwId < 32 )
-    {
+    {
-        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
+        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
-        {
+        {
-            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
+            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
-        }
+        }
-        else
+        else
-        {
+        {
-            PMC->PMC_PCDR0 = 1 << dwId ;
+            PMC->PMC_PCDR0 = 1 << dwId ;
-        }
+        }
-    }
+    }
-    else
+    else
-    {
+    {
-        dwId -= 32 ;
+        dwId -= 32 ;
-        if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
+        if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
-        {
+        {
-            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
-        }
+        }
-        else
+        else
-        {
+        {
-            PMC->PMC_PCDR1 = 1 << dwId ;
+            PMC->PMC_PCDR1 = 1 << dwId ;
-        }
+        }
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Enable all the periph clock via PMC.
+ * \brief Enable all the periph clock via PMC.
- */
+ */
-extern void PMC_EnableAllPeripherals( void )
+extern void PMC_EnableAllPeripherals( void )
-{
+{
-    PMC->PMC_PCER0 = MASK_STATUS0 ;
+    PMC->PMC_PCER0 = MASK_STATUS0 ;
-    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != MASK_STATUS0 ) ;
+    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != MASK_STATUS0 ) ;
-
+
-    PMC->PMC_PCER1 = MASK_STATUS1 ;
+    PMC->PMC_PCER1 = MASK_STATUS1 ;
-    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
+    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
-
+
-    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
+    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
-}
+}
-
+
-/**
+/**
- * \brief Disable all the periph clock via PMC.
+ * \brief Disable all the periph clock via PMC.
- */
+ */
-extern void PMC_DisableAllPeripherals( void )
+extern void PMC_DisableAllPeripherals( void )
-{
+{
-    PMC->PMC_PCDR0 = MASK_STATUS0 ;
+    PMC->PMC_PCDR0 = MASK_STATUS0 ;
-    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != 0 ) ;
+    while ( (PMC->PMC_PCSR0 & MASK_STATUS0) != 0 ) ;
-
+
-    PMC->PMC_PCDR1 = MASK_STATUS1 ;
+    PMC->PMC_PCDR1 = MASK_STATUS1 ;
-    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
+    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
-
+
-    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
+    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
-}
+}
-
+
-/**
+/**
- * \brief Get Periph Status for the given peripheral ID.
+ * \brief Get Periph Status for the given peripheral ID.
- *
+ *
- * \param id  Peripheral ID (ID_xxx).
+ * \param id  Peripheral ID (ID_xxx).
- */
+ */
-extern uint32_t PMC_IsPeriphEnabled( uint32_t dwId )
+extern uint32_t PMC_IsPeriphEnabled( uint32_t dwId )
-{
+{
-    assert( dwId < 35 ) ;
+    assert( dwId < 35 ) ;
-
+
-    if ( dwId < 32 )
+    if ( dwId < 32 )
-    {
+    {
-        return ( PMC->PMC_PCSR0 & (1 << dwId) ) ;
+        return ( PMC->PMC_PCSR0 & (1 << dwId) ) ;
-    }
+    }
-    else {
+    else {
-        return ( PMC->PMC_PCSR1 & (1 << (dwId - 32)) ) ;
+        return ( PMC->PMC_PCSR1 & (1 << (dwId - 32)) ) ;
-    }
+    }
-}
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/spi.c

@@ -1,352 +1,352 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/** \addtogroup spi_module Working with SPI
+/** \addtogroup spi_module Working with SPI
- * The SPI driver provides the interface to configure and use the SPI
+ * The SPI driver provides the interface to configure and use the SPI
- * peripheral.
+ * peripheral.
- *
+ *
- * The Serial Peripheral Interface (SPI) circuit is a synchronous serial
+ * The Serial Peripheral Interface (SPI) circuit is a synchronous serial
- * data link that provides communication with external devices in Master
+ * data link that provides communication with external devices in Master
- * or Slave Mode.
+ * or Slave Mode.
- *
+ *
- * To use the SPI, the user has to follow these few steps:
+ * To use the SPI, the user has to follow these few steps:
- * -# Enable the SPI pins required by the application (see pio.h).
+ * -# Enable the SPI pins required by the application (see pio.h).
- * -# Configure the SPI using the \ref SPI_Configure(). This enables the
+ * -# Configure the SPI using the \ref SPI_Configure(). This enables the
- *    peripheral clock. The mode register is loaded with the given value.
+ *    peripheral clock. The mode register is loaded with the given value.
- * -# Configure all the necessary chip selects with \ref SPI_ConfigureNPCS().
+ * -# Configure all the necessary chip selects with \ref SPI_ConfigureNPCS().
- * -# Enable the SPI by calling \ref SPI_Enable().
+ * -# Enable the SPI by calling \ref SPI_Enable().
- * -# Send/receive data using \ref SPI_Write() and \ref SPI_Read(). Note that \ref SPI_Read()
+ * -# Send/receive data using \ref SPI_Write() and \ref SPI_Read(). Note that \ref SPI_Read()
- *    must be called after \ref SPI_Write() to retrieve the last value read.
+ *    must be called after \ref SPI_Write() to retrieve the last value read.
- * -# Send/receive data using the PDC with the \ref SPI_WriteBuffer() and
+ * -# Send/receive data using the PDC with the \ref SPI_WriteBuffer() and
- *    \ref SPI_ReadBuffer() functions.
+ *    \ref SPI_ReadBuffer() functions.
- * -# Disable the SPI by calling \ref SPI_Disable().
+ * -# Disable the SPI by calling \ref SPI_Disable().
- *
+ *
- * For more accurate information, please look at the SPI section of the
+ * For more accurate information, please look at the SPI section of the
- * Datasheet.
+ * Datasheet.
- *
+ *
- * Related files :\n
+ * Related files :\n
- * \ref spi.c\n
+ * \ref spi.c\n
- * \ref spi.h.\n
+ * \ref spi.h.\n
-*/
+*/
-/*@{*/
+/*@{*/
-/*@}*/
+/*@}*/
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * Implementation of Serial Peripheral Interface (SPI) controller.
+ * Implementation of Serial Peripheral Interface (SPI) controller.
- *
+ *
- */
+ */
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-#include "chip.h"
+#include "chip.h"
-#include "pmc.h"
+#include "pmc.h"
-#include "spi.h"
+#include "spi.h"
-
+
-#include <stdint.h>
+#include <stdint.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Enables a SPI peripheral.
+ * \brief Enables a SPI peripheral.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- */
+ */
-extern void SPI_Enable( Spi* spi )
+extern void SPI_Enable( Spi* spi )
-{
+{
-    spi->SPI_CR = SPI_CR_SPIEN ;
+    spi->SPI_CR = SPI_CR_SPIEN ;
-}
+}
-
+
-/**
+/**
- * \brief Disables a SPI peripheral.
+ * \brief Disables a SPI peripheral.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- */
+ */
-extern void SPI_Disable( Spi* spi )
+extern void SPI_Disable( Spi* spi )
-{
+{
-    spi->SPI_CR = SPI_CR_SPIDIS ;
+    spi->SPI_CR = SPI_CR_SPIDIS ;
-}
+}
-
+
-/**
+/**
- * \brief Enables one or more interrupt sources of a SPI peripheral.
+ * \brief Enables one or more interrupt sources of a SPI peripheral.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- * \param sources Bitwise OR of selected interrupt sources.
+ * \param sources Bitwise OR of selected interrupt sources.
- */
+ */
-extern void SPI_EnableIt( Spi* spi, uint32_t dwSources )
+extern void SPI_EnableIt( Spi* spi, uint32_t dwSources )
-{
+{
-    spi->SPI_IER = dwSources ;
+    spi->SPI_IER = dwSources ;
-}
+}
-
+
-/**
+/**
- * \brief Disables one or more interrupt sources of a SPI peripheral.
+ * \brief Disables one or more interrupt sources of a SPI peripheral.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- * \param sources Bitwise OR of selected interrupt sources.
+ * \param sources Bitwise OR of selected interrupt sources.
- */
+ */
-extern void SPI_DisableIt( Spi* spi, uint32_t dwSources )
+extern void SPI_DisableIt( Spi* spi, uint32_t dwSources )
-{
+{
-    spi->SPI_IDR = dwSources ;
+    spi->SPI_IDR = dwSources ;
-}
+}
-
+
-/**
+/**
- * \brief Configures a SPI peripheral as specified. The configuration can be computed
+ * \brief Configures a SPI peripheral as specified. The configuration can be computed
- * using several macros (see \ref spi_configuration_macros).
+ * using several macros (see \ref spi_configuration_macros).
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- * \param id   Peripheral ID of the SPI.
+ * \param id   Peripheral ID of the SPI.
- * \param configuration  Value of the SPI configuration register.
+ * \param configuration  Value of the SPI configuration register.
- */
+ */
-extern void SPI_Configure( Spi* spi, uint32_t dwId, uint32_t dwConfiguration )
+extern void SPI_Configure( Spi* spi, uint32_t dwId, uint32_t dwConfiguration )
-{
+{
-    PMC_EnablePeripheral( dwId ) ;
+    PMC_EnablePeripheral( dwId ) ;
-    spi->SPI_CR = SPI_CR_SPIDIS ;
+    spi->SPI_CR = SPI_CR_SPIDIS ;
-
+
-    /* Execute a software reset of the SPI twice */
+    /* Execute a software reset of the SPI twice */
-    spi->SPI_CR = SPI_CR_SWRST ;
+    spi->SPI_CR = SPI_CR_SWRST ;
-    spi->SPI_CR = SPI_CR_SWRST ;
+    spi->SPI_CR = SPI_CR_SWRST ;
-    spi->SPI_MR = dwConfiguration ;
+    spi->SPI_MR = dwConfiguration ;
-}
+}
-
+
-
+
-/**
+/**
- * \brief Configures a chip select of a SPI peripheral. The chip select configuration
+ * \brief Configures a chip select of a SPI peripheral. The chip select configuration
- * is computed using several macros (see \ref spi_configuration_macros).
+ * is computed using several macros (see \ref spi_configuration_macros).
- *
+ *
- * \param spi   Pointer to an Spi instance.
+ * \param spi   Pointer to an Spi instance.
- * \param npcs  Chip select to configure (0, 1, 2 or 3).
+ * \param npcs  Chip select to configure (0, 1, 2 or 3).
- * \param configuration  Desired chip select configuration.
+ * \param configuration  Desired chip select configuration.
- */
+ */
-void SPI_ConfigureNPCS( Spi* spi, uint32_t dwNpcs, uint32_t dwConfiguration )
+void SPI_ConfigureNPCS( Spi* spi, uint32_t dwNpcs, uint32_t dwConfiguration )
-{
+{
-    spi->SPI_CSR[dwNpcs] = dwConfiguration ;
+    spi->SPI_CSR[dwNpcs] = dwConfiguration ;
-}
+}
-
+
-/**
+/**
- * \brief Get the current status register of the given SPI peripheral.
+ * \brief Get the current status register of the given SPI peripheral.
- * \note This resets the internal value of the status register, so further
+ * \note This resets the internal value of the status register, so further
- * read may yield different values.
+ * read may yield different values.
- * \param spi   Pointer to a Spi instance.
+ * \param spi   Pointer to a Spi instance.
- * \return  SPI status register.
+ * \return  SPI status register.
- */
+ */
-extern uint32_t SPI_GetStatus( Spi* spi )
+extern uint32_t SPI_GetStatus( Spi* spi )
-{
+{
-    return spi->SPI_SR ;
+    return spi->SPI_SR ;
-}
+}
-
+
-/**
+/**
- * \brief Reads and returns the last word of data received by a SPI peripheral. This
+ * \brief Reads and returns the last word of data received by a SPI peripheral. This
- * method must be called after a successful SPI_Write call.
+ * method must be called after a successful SPI_Write call.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- *
+ *
- * \return readed data.
+ * \return readed data.
- */
+ */
-extern uint32_t SPI_Read( Spi* spi )
+extern uint32_t SPI_Read( Spi* spi )
-{
+{
-    while ( (spi->SPI_SR & SPI_SR_RDRF) == 0 ) ;
+    while ( (spi->SPI_SR & SPI_SR_RDRF) == 0 ) ;
-
+
-    return spi->SPI_RDR & 0xFFFF ;
+    return spi->SPI_RDR & 0xFFFF ;
-}
+}
-
+
-/**
+/**
- * \brief Sends data through a SPI peripheral. If the SPI is configured to use a fixed
+ * \brief Sends data through a SPI peripheral. If the SPI is configured to use a fixed
- * peripheral select, the npcs value is meaningless. Otherwise, it identifies
+ * peripheral select, the npcs value is meaningless. Otherwise, it identifies
- * the component which shall be addressed.
+ * the component which shall be addressed.
- *
+ *
- * \param spi   Pointer to an Spi instance.
+ * \param spi   Pointer to an Spi instance.
- * \param npcs  Chip select of the component to address (0, 1, 2 or 3).
+ * \param npcs  Chip select of the component to address (0, 1, 2 or 3).
- * \param data  Word of data to send.
+ * \param data  Word of data to send.
- */
+ */
-extern void SPI_Write( Spi* spi, uint32_t dwNpcs, uint16_t wData )
+extern void SPI_Write( Spi* spi, uint32_t dwNpcs, uint16_t wData )
-{
+{
-    /* Send data */
+    /* Send data */
-    while ( (spi->SPI_SR & SPI_SR_TXEMPTY) == 0 ) ;
+    while ( (spi->SPI_SR & SPI_SR_TXEMPTY) == 0 ) ;
-    spi->SPI_TDR = wData | SPI_PCS( dwNpcs ) ;
+    spi->SPI_TDR = wData | SPI_PCS( dwNpcs ) ;
-    while ( (spi->SPI_SR & SPI_SR_TDRE) == 0 ) ;
+    while ( (spi->SPI_SR & SPI_SR_TDRE) == 0 ) ;
-}
+}
-
+
-/**
+/**
- * \brief Check if SPI transfer finish.
+ * \brief Check if SPI transfer finish.
- *
+ *
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
- *
+ *
- * \return Returns 1 if there is no pending write operation on the SPI; otherwise
+ * \return Returns 1 if there is no pending write operation on the SPI; otherwise
- * returns 0.
+ * returns 0.
- */
+ */
-extern uint32_t SPI_IsFinished( Spi* spi )
+extern uint32_t SPI_IsFinished( Spi* spi )
-{
+{
-    return ((spi->SPI_SR & SPI_SR_TXEMPTY) != 0) ;
+    return ((spi->SPI_SR & SPI_SR_TXEMPTY) != 0) ;
-}
+}
-
+
-/**
+/**
- * \brief Enable Spi PDC transmit
+ * \brief Enable Spi PDC transmit
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
-*/
+*/
-extern void SPI_PdcEnableTx( Spi* spi )
+extern void SPI_PdcEnableTx( Spi* spi )
-{
+{
-    spi->SPI_PTCR = SPI_PTCR_TXTEN ;
+    spi->SPI_PTCR = SPI_PTCR_TXTEN ;
-}
+}
-
+
-/**
+/**
- * \brief Disable Spi PDC transmit
+ * \brief Disable Spi PDC transmit
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
-*/
+*/
-extern void SPI_PdcDisableTx( Spi* spi )
+extern void SPI_PdcDisableTx( Spi* spi )
-{
+{
-    spi->SPI_PTCR = SPI_PTCR_TXTDIS ;
+    spi->SPI_PTCR = SPI_PTCR_TXTDIS ;
-}
+}
-
+
-/**
+/**
- * \brief Enable Spi PDC receive
+ * \brief Enable Spi PDC receive
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
-*/
+*/
-extern void SPI_PdcEnableRx( Spi* spi )
+extern void SPI_PdcEnableRx( Spi* spi )
-{
+{
-    spi->SPI_PTCR = SPI_PTCR_RXTEN ;
+    spi->SPI_PTCR = SPI_PTCR_RXTEN ;
-}
+}
-
+
-/**
+/**
- * \brief Disable Spi PDC receive
+ * \brief Disable Spi PDC receive
- * \param spi  Pointer to an Spi instance.
+ * \param spi  Pointer to an Spi instance.
-*/
+*/
-extern void SPI_PdcDisableRx( Spi* spi )
+extern void SPI_PdcDisableRx( Spi* spi )
-{
+{
-    spi->SPI_PTCR = SPI_PTCR_RXTDIS ;
+    spi->SPI_PTCR = SPI_PTCR_RXTDIS ;
-}
+}
-
+
-/**
+/**
- * \brief Set PDC transmit and next transmit buffer address and size.
+ * \brief Set PDC transmit and next transmit buffer address and size.
- *
+ *
- * \param spi    Pointer to an Spi instance.
+ * \param spi    Pointer to an Spi instance.
- * \param txBuf  PDC transmit buffer address.
+ * \param txBuf  PDC transmit buffer address.
- * \param txCount  Length in bytes of the transmit buffer.
+ * \param txCount  Length in bytes of the transmit buffer.
- * \param txNextBuf  PDC next transmit buffer address.
+ * \param txNextBuf  PDC next transmit buffer address.
- * \param txNextCount  Length in bytes of the next transmit buffer.
+ * \param txNextCount  Length in bytes of the next transmit buffer.
- */
+ */
-extern void SPI_PdcSetTx( Spi* spi, void* pvTxBuf, uint32_t dwTxCount, void* pvTxNextBuf, uint32_t dwTxNextCount )
+extern void SPI_PdcSetTx( Spi* spi, void* pvTxBuf, uint32_t dwTxCount, void* pvTxNextBuf, uint32_t dwTxNextCount )
-{
+{
-    spi->SPI_TPR = (uint32_t)pvTxBuf ;
+    spi->SPI_TPR = (uint32_t)pvTxBuf ;
-    spi->SPI_TCR = dwTxCount ;
+    spi->SPI_TCR = dwTxCount ;
-    spi->SPI_TNPR = (uint32_t)pvTxNextBuf ;
+    spi->SPI_TNPR = (uint32_t)pvTxNextBuf ;
-    spi->SPI_TNCR = dwTxNextCount ;
+    spi->SPI_TNCR = dwTxNextCount ;
-}
+}
-
+
-/**
+/**
- * \brief Set PDC receive and next receive buffer address and size.
+ * \brief Set PDC receive and next receive buffer address and size.
- *
+ *
- * \param spi    Pointer to an Spi instance.
+ * \param spi    Pointer to an Spi instance.
- * \param rxBuf  PDC receive buffer address.
+ * \param rxBuf  PDC receive buffer address.
- * \param rxCount  Length in bytes of the receive buffer.
+ * \param rxCount  Length in bytes of the receive buffer.
- * \param rxNextBuf  PDC next receive buffer address.
+ * \param rxNextBuf  PDC next receive buffer address.
- * \param rxNextCount  Length in bytes of the next receive buffer.
+ * \param rxNextCount  Length in bytes of the next receive buffer.
- */
+ */
-extern void SPI_PdcSetRx( Spi* spi, void* pvRxBuf, uint32_t dwRxCount, void* pvRxNextBuf, uint32_t dwRxNextCount )
+extern void SPI_PdcSetRx( Spi* spi, void* pvRxBuf, uint32_t dwRxCount, void* pvRxNextBuf, uint32_t dwRxNextCount )
-{
+{
-    spi->SPI_RPR = (uint32_t)pvRxBuf ;
+    spi->SPI_RPR = (uint32_t)pvRxBuf ;
-    spi->SPI_RCR = dwRxCount ;
+    spi->SPI_RCR = dwRxCount ;
-    spi->SPI_RNPR = (uint32_t)pvRxNextBuf ;
+    spi->SPI_RNPR = (uint32_t)pvRxNextBuf ;
-    spi->SPI_RNCR = dwRxNextCount ;
+    spi->SPI_RNCR = dwRxNextCount ;
-}
+}
-
+
-/**
+/**
- * \brief Sends the contents of buffer through a SPI peripheral, using the PDC to
+ * \brief Sends the contents of buffer through a SPI peripheral, using the PDC to
- * take care of the transfer.
+ * take care of the transfer.
- *
+ *
- * \param spi     Pointer to an Spi instance.
+ * \param spi     Pointer to an Spi instance.
- * \param buffer  Data buffer to send.
+ * \param buffer  Data buffer to send.
- * \param length  Length of the data buffer.
+ * \param length  Length of the data buffer.
- */
+ */
-extern uint32_t SPI_WriteBuffer( Spi* spi, void* pvBuffer, uint32_t dwLength )
+extern uint32_t SPI_WriteBuffer( Spi* spi, void* pvBuffer, uint32_t dwLength )
-{
+{
-    /* Check if first bank is free */
+    /* Check if first bank is free */
-    if ( spi->SPI_TCR == 0 )
+    if ( spi->SPI_TCR == 0 )
-    {
+    {
-        spi->SPI_TPR = (uint32_t)pvBuffer ;
+        spi->SPI_TPR = (uint32_t)pvBuffer ;
-        spi->SPI_TCR = dwLength ;
+        spi->SPI_TCR = dwLength ;
-        spi->SPI_PTCR = PERIPH_PTCR_TXTEN ;
+        spi->SPI_PTCR = PERIPH_PTCR_TXTEN ;
-
+
-        return 1 ;
+        return 1 ;
-    }
+    }
-    /* Check if second bank is free */
+    /* Check if second bank is free */
-    else
+    else
-    {
+    {
-        if ( spi->SPI_TNCR == 0 )
+        if ( spi->SPI_TNCR == 0 )
-        {
+        {
-            spi->SPI_TNPR = (uint32_t)pvBuffer ;
+            spi->SPI_TNPR = (uint32_t)pvBuffer ;
-            spi->SPI_TNCR = dwLength ;
+            spi->SPI_TNCR = dwLength ;
-
+
-            return 1 ;
+            return 1 ;
-        }
+        }
-    }
+    }
-
+
-    /* No free banks */
+    /* No free banks */
-    return 0 ;
+    return 0 ;
-}
+}
-
+
-/**
+/**
- * \brief Reads data from a SPI peripheral until the provided buffer is filled. This
+ * \brief Reads data from a SPI peripheral until the provided buffer is filled. This
- * method does NOT need to be called after SPI_Write or SPI_WriteBuffer.
+ * method does NOT need to be called after SPI_Write or SPI_WriteBuffer.
- *
+ *
- * \param spi     Pointer to an Spi instance.
+ * \param spi     Pointer to an Spi instance.
- * \param buffer  Data buffer to store incoming bytes.
+ * \param buffer  Data buffer to store incoming bytes.
- * \param length  Length in bytes of the data buffer.
+ * \param length  Length in bytes of the data buffer.
- */
+ */
-extern uint32_t SPI_ReadBuffer( Spi* spi, void *pvBuffer, uint32_t dwLength )
+extern uint32_t SPI_ReadBuffer( Spi* spi, void *pvBuffer, uint32_t dwLength )
-{
+{
-    /* Check if the first bank is free */
+    /* Check if the first bank is free */
-    if ( spi->SPI_RCR == 0 )
+    if ( spi->SPI_RCR == 0 )
-    {
+    {
-        spi->SPI_RPR = (uint32_t)pvBuffer ;
+        spi->SPI_RPR = (uint32_t)pvBuffer ;
-        spi->SPI_RCR = dwLength ;
+        spi->SPI_RCR = dwLength ;
-        spi->SPI_PTCR = PERIPH_PTCR_RXTEN ;
+        spi->SPI_PTCR = PERIPH_PTCR_RXTEN ;
-
+
-        return 1 ;
+        return 1 ;
-    }
+    }
-    /* Check if second bank is free */
+    /* Check if second bank is free */
-    else
+    else
-    {
+    {
-        if ( spi->SPI_RNCR == 0 )
+        if ( spi->SPI_RNCR == 0 )
-        {
+        {
-            spi->SPI_RNPR = (uint32_t)pvBuffer ;
+            spi->SPI_RNPR = (uint32_t)pvBuffer ;
-            spi->SPI_RNCR = dwLength ;
+            spi->SPI_RNCR = dwLength ;
-            return 1 ;
+            return 1 ;
-        }
+        }
-    }
+    }
-
+
-    /* No free bank */
+    /* No free bank */
-    return 0 ;
+    return 0 ;
-}
+}
-
+
-
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/tc.c

@@ -1,175 +1,175 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * Implementation of Timer Counter (TC).
+ * Implementation of Timer Counter (TC).
- *
+ *
- */
+ */
-
+
-/*------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------
- *         Headers
+ *         Headers
- *------------------------------------------------------------------------------*/
+ *------------------------------------------------------------------------------*/
-
+
-#include "chip.h"
+#include "chip.h"
-
+
-#include <assert.h>
+#include <assert.h>
-
+
-/*------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------
- *         Global functions
+ *         Global functions
- *------------------------------------------------------------------------------*/
+ *------------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Configures a Timer Counter Channel
+ * \brief Configures a Timer Counter Channel
- *
+ *
- * Configures a Timer Counter to operate in the given mode. Timer is stopped
+ * Configures a Timer Counter to operate in the given mode. Timer is stopped
- * after configuration and must be restarted with TC_Start(). All the
+ * after configuration and must be restarted with TC_Start(). All the
- * interrupts of the timer are also disabled.
+ * interrupts of the timer are also disabled.
- *
+ *
- * \param pTc  Pointer to a Tc instance.
+ * \param pTc  Pointer to a Tc instance.
- * \param channel Channel number.
+ * \param channel Channel number.
- * \param mode  Operating mode (TC_CMR value).
+ * \param mode  Operating mode (TC_CMR value).
- */
+ */
-extern void TC_Configure( Tc *pTc, uint32_t dwChannel, uint32_t dwMode )
+extern void TC_Configure( Tc *pTc, uint32_t dwChannel, uint32_t dwMode )
-{
+{
-    TcChannel* pTcCh ;
+    TcChannel* pTcCh ;
-
+
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-
+
-    /*  Disable TC clock */
+    /*  Disable TC clock */
-    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
+    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
-
+
-    /*  Disable interrupts */
+    /*  Disable interrupts */
-    pTcCh->TC_IDR = 0xFFFFFFFF ;
+    pTcCh->TC_IDR = 0xFFFFFFFF ;
-
+
-    /*  Clear status register */
+    /*  Clear status register */
-    pTcCh->TC_SR ;
+    pTcCh->TC_SR ;
-
+
-    /*  Set mode */
+    /*  Set mode */
-    pTcCh->TC_CMR = dwMode ;
+    pTcCh->TC_CMR = dwMode ;
-}
+}
-
+
-/**
+/**
- * \brief Reset and Start the TC Channel
+ * \brief Reset and Start the TC Channel
- *
+ *
- * Enables the timer clock and performs a software reset to start the counting.
+ * Enables the timer clock and performs a software reset to start the counting.
- *
+ *
- * \param pTc  Pointer to a Tc instance.
+ * \param pTc  Pointer to a Tc instance.
- * \param dwChannel Channel number.
+ * \param dwChannel Channel number.
- */
+ */
-extern void TC_Start( Tc *pTc, uint32_t dwChannel )
+extern void TC_Start( Tc *pTc, uint32_t dwChannel )
-{
+{
-    TcChannel* pTcCh ;
+    TcChannel* pTcCh ;
-
+
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-
+
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-    pTcCh->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG ;
+    pTcCh->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG ;
-}
+}
-
+
-/**
+/**
- * \brief Stop TC Channel
+ * \brief Stop TC Channel
- *
+ *
- * Disables the timer clock, stopping the counting.
+ * Disables the timer clock, stopping the counting.
- *
+ *
- * \param pTc     Pointer to a Tc instance.
+ * \param pTc     Pointer to a Tc instance.
- * \param dwChannel Channel number.
+ * \param dwChannel Channel number.
- */
+ */
-extern void TC_Stop(Tc *pTc, uint32_t dwChannel )
+extern void TC_Stop(Tc *pTc, uint32_t dwChannel )
-{
+{
-    TcChannel* pTcCh ;
+    TcChannel* pTcCh ;
-
+
-    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
+    assert( dwChannel < (sizeof( pTc->TC_CHANNEL )/sizeof( pTc->TC_CHANNEL[0] )) ) ;
-
+
-    pTcCh = pTc->TC_CHANNEL+dwChannel ;
+    pTcCh = pTc->TC_CHANNEL+dwChannel ;
-    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
+    pTcCh->TC_CCR = TC_CCR_CLKDIS ;
-}
+}
-
+
-/**
+/**
- * \brief Find best MCK divisor
+ * \brief Find best MCK divisor
- *
+ *
- * Finds the best MCK divisor given the timer frequency and MCK. The result
+ * Finds the best MCK divisor given the timer frequency and MCK. The result
- * is guaranteed to satisfy the following equation:
+ * is guaranteed to satisfy the following equation:
- * \code
+ * \code
- *   (MCK / (DIV * 65536)) <= freq <= (MCK / DIV)
+ *   (MCK / (DIV * 65536)) <= freq <= (MCK / DIV)
- * \endcode
+ * \endcode
- * with DIV being the highest possible value.
+ * with DIV being the highest possible value.
- *
+ *
- * \param dwFreq  Desired timer frequency.
+ * \param dwFreq  Desired timer frequency.
- * \param dwMCk  Master clock frequency.
+ * \param dwMCk  Master clock frequency.
- * \param dwDiv  Divisor value.
+ * \param dwDiv  Divisor value.
- * \param dwTcClks  TCCLKS field value for divisor.
+ * \param dwTcClks  TCCLKS field value for divisor.
- * \param dwBoardMCK  Board clock frequency.
+ * \param dwBoardMCK  Board clock frequency.
- *
+ *
- * \return 1 if a proper divisor has been found, otherwise 0.
+ * \return 1 if a proper divisor has been found, otherwise 0.
- */
+ */
-extern uint32_t TC_FindMckDivisor( uint32_t dwFreq, uint32_t dwMCk, uint32_t *dwDiv, uint32_t *dwTcClks, uint32_t dwBoardMCK )
+extern uint32_t TC_FindMckDivisor( uint32_t dwFreq, uint32_t dwMCk, uint32_t *dwDiv, uint32_t *dwTcClks, uint32_t dwBoardMCK )
-{
+{
-    const uint32_t adwDivisors[5] = { 2, 8, 32, 128, dwBoardMCK / 32768 } ;
+    const uint32_t adwDivisors[5] = { 2, 8, 32, 128, dwBoardMCK / 32768 } ;
-
+
-    uint32_t dwIndex = 0 ;
+    uint32_t dwIndex = 0 ;
-
+
-    /*  Satisfy lower bound */
+    /*  Satisfy lower bound */
-    while ( dwFreq < ((dwMCk / adwDivisors[dwIndex]) / 65536) )
+    while ( dwFreq < ((dwMCk / adwDivisors[dwIndex]) / 65536) )
-    {
+    {
-        dwIndex++ ;
+        dwIndex++ ;
-
+
-        /*  If no divisor can be found, return 0 */
+        /*  If no divisor can be found, return 0 */
-        if ( dwIndex == (sizeof( adwDivisors )/sizeof( adwDivisors[0] ))  )
+        if ( dwIndex == (sizeof( adwDivisors )/sizeof( adwDivisors[0] ))  )
-        {
+        {
-            return 0 ;
+            return 0 ;
-        }
+        }
-    }
+    }
-
+
-    /*  Try to maximize DIV while satisfying upper bound */
+    /*  Try to maximize DIV while satisfying upper bound */
-    while ( dwIndex < 4 )
+    while ( dwIndex < 4 )
-    {
+    {
-
+
-        if ( dwFreq > (dwMCk / adwDivisors[dwIndex + 1]) )
+        if ( dwFreq > (dwMCk / adwDivisors[dwIndex + 1]) )
-        {
+        {
-            break ;
+            break ;
-        }
+        }
-        dwIndex++ ;
+        dwIndex++ ;
-    }
+    }
-
+
-    /*  Store results */
+    /*  Store results */
-    if ( dwDiv )
+    if ( dwDiv )
-    {
+    {
-        *dwDiv = adwDivisors[dwIndex] ;
+        *dwDiv = adwDivisors[dwIndex] ;
-    }
+    }
-    if ( dwTcClks )
+    if ( dwTcClks )
-    {
+    {
-        *dwTcClks = dwIndex ;
+        *dwTcClks = dwIndex ;
-    }
+    }
-
+
-    return 1 ;
+    return 1 ;
-}
+}
-
+

firmware/atmel_softpack_libraries/libchip_sam3s/source/unique_id.c

@@ -8,6 +8,11 @@ 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);
@@ -40,4 +45,6 @@ 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/libchip_sam3s/source/usart.c

@@ -1,410 +1,410 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/** \addtogroup usart_module Working with USART
+/** \addtogroup usart_module Working with USART
- * The USART driver provides the interface to configure and use the USART peripheral.\n
+ * The USART driver provides the interface to configure and use the USART peripheral.\n
- *
+ *
- * The USART supports several kinds of comminication modes such as full-duplex asynchronous/
+ * The USART supports several kinds of comminication modes such as full-duplex asynchronous/
- * synchronous serial commnunication,RS485 with driver control signal,ISO7816,SPI and Test modes.
+ * synchronous serial commnunication,RS485 with driver control signal,ISO7816,SPI and Test modes.
- *
+ *
- * To start a USART transfer with \ref AT91SAM3S_PDC "PDC" support, the user could follow these steps:
+ * To start a USART transfer with \ref AT91SAM3S_PDC "PDC" support, the user could follow these steps:
- * <ul>
+ * <ul>
- * <li> Configure USART with expected mode and baudrate(see \ref USART_Configure), which could be done by:
+ * <li> Configure USART with expected mode and baudrate(see \ref USART_Configure), which could be done by:
- * -# Resetting and disabling transmitter and receiver by setting US_CR(Control Register). </li>
+ * -# Resetting and disabling transmitter and receiver by setting US_CR(Control Register). </li>
- * -# Conifguring the USART in a specific mode by setting USART_MODE bits in US_MR(Mode Register) </li>
+ * -# Conifguring the USART in a specific mode by setting USART_MODE bits in US_MR(Mode Register) </li>
- * -# Setting baudrate which is different from mode to mode.
+ * -# Setting baudrate which is different from mode to mode.
-   </li>
+   </li>
- * <li> Enable transmitter or receiver respectively by set US_CR_TXEN or US_CR_RXEN in US_CR.</li>
+ * <li> Enable transmitter or receiver respectively by set US_CR_TXEN or US_CR_RXEN in US_CR.</li>
- * <li> Read from or write to the peripheral with  \ref USART_ReadBuffer or \ref USART_WriteBuffer.
+ * <li> Read from or write to the peripheral with  \ref USART_ReadBuffer or \ref USART_WriteBuffer.
-        These operations could be done by polling or interruption. </li>
+        These operations could be done by polling or interruption. </li>
- * <li> For polling, check the status bit US_CSR_ENDRX/US_CSR_RXBUFF (READ) or US_CSR_ENDTX/
+ * <li> For polling, check the status bit US_CSR_ENDRX/US_CSR_RXBUFF (READ) or US_CSR_ENDTX/
-        US_CSR_TXBUFE (WRITE).  </li>
+        US_CSR_TXBUFE (WRITE).  </li>
- * <li> For interruption,"enable" the status bit through US_IER and
+ * <li> For interruption,"enable" the status bit through US_IER and
-        realize the hanler with USARTx_IrqHandler according to IRQ vector
+        realize the hanler with USARTx_IrqHandler according to IRQ vector
-        table which is defined in board_cstartup_<toolchain>.c
+        table which is defined in board_cstartup_<toolchain>.c
-        To enable the interruption of USART,it should be configured with priority and enabled first through
+        To enable the interruption of USART,it should be configured with priority and enabled first through
-        NVIC .</li>
+        NVIC .</li>
- * </ul>
+ * </ul>
- *
+ *
- * For more accurate information, please look at the USART section of the
+ * For more accurate information, please look at the USART section of the
- * Datasheet.
+ * Datasheet.
- *
+ *
- * Related files :\n
+ * Related files :\n
- * \ref usart.c\n
+ * \ref usart.c\n
- * \ref usart.h\n
+ * \ref usart.h\n
-*/
+*/
-
+
-
+
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * Implementation of USART (Universal Synchronous Asynchronous Receiver Transmitter)
+ * Implementation of USART (Universal Synchronous Asynchronous Receiver Transmitter)
- * controller.
+ * controller.
- *
+ *
- */
+ */
-/*------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------
- *         Headers
+ *         Headers
- *------------------------------------------------------------------------------*/
+ *------------------------------------------------------------------------------*/
-#include "chip.h"
+#include "chip.h"
-#include "trace.h"
+#include "trace.h"
-
+
-#include <assert.h>
+#include <assert.h>
-#include <string.h>
+#include <string.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Local definitions
+ *        Local definitions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-
+
-/*------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------
- *         Exported functions
+ *         Exported functions
- *------------------------------------------------------------------------------*/
+ *------------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Configures an USART peripheral with the specified parameters.
+ * \brief Configures an USART peripheral with the specified parameters.
- *
+ *
- *
+ *
- *  \param usart  Pointer to the USART peripheral to configure.
+ *  \param usart  Pointer to the USART peripheral to configure.
- *  \param mode  Desired value for the USART mode register (see the datasheet).
+ *  \param mode  Desired value for the USART mode register (see the datasheet).
- *  \param baudrate  Baudrate at which the USART should operate (in Hz).
+ *  \param baudrate  Baudrate at which the USART should operate (in Hz).
- *  \param masterClock  Frequency of the system master clock (in Hz).
+ *  \param masterClock  Frequency of the system master clock (in Hz).
- */
+ */
-void USART_Configure(Usart *usart,
+void USART_Configure(Usart *usart,
-                            uint32_t mode,
+                            uint32_t mode,
-                            uint32_t baudrate,
+                            uint32_t baudrate,
-                            uint32_t masterClock)
+                            uint32_t masterClock)
-{
+{
-    /* Reset and disable receiver & transmitter*/
+    /* Reset and disable receiver & transmitter*/
-    usart->US_CR = US_CR_RSTRX | US_CR_RSTTX
+    usart->US_CR = US_CR_RSTRX | US_CR_RSTTX
-                   | US_CR_RXDIS | US_CR_TXDIS;
+                   | US_CR_RXDIS | US_CR_TXDIS;
-
+
-    /* Configure mode*/
+    /* Configure mode*/
-    usart->US_MR = mode;
+    usart->US_MR = mode;
-
+
-    /* Configure baudrate*/
+    /* Configure baudrate*/
-    /* Asynchronous, no oversampling*/
+    /* Asynchronous, no oversampling*/
-    if ( ((mode & US_MR_SYNC) == 0) && ((mode & US_MR_OVER) == 0) )
+    if ( ((mode & US_MR_SYNC) == 0) && ((mode & US_MR_OVER) == 0) )
-    {
+    {
-        usart->US_BRGR = (masterClock / baudrate) / 16;
+        usart->US_BRGR = (masterClock / baudrate) / 16;
-    }
+    }
-
+
-    if( ((mode & US_MR_USART_MODE_SPI_MASTER) == US_MR_USART_MODE_SPI_MASTER)
+    if( ((mode & US_MR_USART_MODE_SPI_MASTER) == US_MR_USART_MODE_SPI_MASTER)
-     || ((mode & US_MR_SYNC) == US_MR_SYNC))
+     || ((mode & US_MR_SYNC) == US_MR_SYNC))
-    {
+    {
-        if( (mode & US_MR_USCLKS_Msk) == US_MR_USCLKS_MCK)
+        if( (mode & US_MR_USCLKS_Msk) == US_MR_USCLKS_MCK)
-        {
+        {
-            usart->US_BRGR = masterClock / baudrate;
+            usart->US_BRGR = masterClock / baudrate;
-        }
+        }
-        else
+        else
-        {
+        {
-            if ( (mode & US_MR_USCLKS_DIV) == US_MR_USCLKS_DIV)
+            if ( (mode & US_MR_USCLKS_DIV) == US_MR_USCLKS_DIV)
-            {
+            {
-                usart->US_BRGR = masterClock / baudrate / 8;
+                usart->US_BRGR = masterClock / baudrate / 8;
-            }
+            }
-        }
+        }
-    }
+    }
-    /* TODO other modes*/
+    /* TODO other modes*/
-}
+}
-/**
+/**
- * \brief Enables or disables the transmitter of an USART peripheral.
+ * \brief Enables or disables the transmitter of an USART peripheral.
- *
+ *
- *
+ *
- * \param usart  Pointer to an USART peripheral
+ * \param usart  Pointer to an USART peripheral
- * \param enabled  If true, the transmitter is enabled; otherwise it is
+ * \param enabled  If true, the transmitter is enabled; otherwise it is
- *                disabled.
+ *                disabled.
- */
+ */
-void USART_SetTransmitterEnabled(Usart *usart, uint8_t enabled)
+void USART_SetTransmitterEnabled(Usart *usart, uint8_t enabled)
-{
+{
-    if (enabled) {
+    if (enabled) {
-
+
-        usart->US_CR = US_CR_TXEN;
+        usart->US_CR = US_CR_TXEN;
-    }
+    }
-    else {
+    else {
-
+
-        usart->US_CR = US_CR_TXDIS;
+        usart->US_CR = US_CR_TXDIS;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Enables or disables the receiver of an USART peripheral
+ * \brief Enables or disables the receiver of an USART peripheral
- *
+ *
- *
+ *
- * \param usart  Pointer to an USART peripheral
+ * \param usart  Pointer to an USART peripheral
- * \param enabled  If true, the receiver is enabled; otherwise it is disabled.
+ * \param enabled  If true, the receiver is enabled; otherwise it is disabled.
- */
+ */
-void USART_SetReceiverEnabled(Usart *usart,
+void USART_SetReceiverEnabled(Usart *usart,
-                                     uint8_t enabled)
+                                     uint8_t enabled)
-{
+{
-    if (enabled) {
+    if (enabled) {
-
+
-        usart->US_CR = US_CR_RXEN;
+        usart->US_CR = US_CR_RXEN;
-    }
+    }
-    else {
+    else {
-
+
-        usart->US_CR = US_CR_RXDIS;
+        usart->US_CR = US_CR_RXDIS;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief Sends one packet of data through the specified USART peripheral. This
+ * \brief Sends one packet of data through the specified USART peripheral. This
- * function operates synchronously, so it only returns when the data has been
+ * function operates synchronously, so it only returns when the data has been
- * actually sent.
+ * actually sent.
- *
+ *
- *
+ *
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \param data  Data to send including 9nth bit and sync field if necessary (in
+ * \param data  Data to send including 9nth bit and sync field if necessary (in
- *        the same format as the US_THR register in the datasheet).
+ *        the same format as the US_THR register in the datasheet).
- * \param timeOut  Time out value (0 = no timeout).
+ * \param timeOut  Time out value (0 = no timeout).
- */
+ */
-void USART_Write(
+void USART_Write(
-    Usart *usart,
+    Usart *usart,
-    uint16_t data,
+    uint16_t data,
-    volatile uint32_t timeOut)
+    volatile uint32_t timeOut)
-{
+{
-    if (timeOut == 0) {
+    if (timeOut == 0) {
-
+
-        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-    }
+    }
-    else {
+    else {
-
+
-        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0) {
+        while ((usart->US_CSR & US_CSR_TXEMPTY) == 0) {
-
+
-            if (timeOut == 0) {
+            if (timeOut == 0) {
-
+
-                TRACE_ERROR("USART_Write: Timed out.\n\r");
+                TRACE_ERROR("USART_Write: Timed out.\n\r");
-                return;
+                return;
-            }
+            }
-            timeOut--;
+            timeOut--;
-        }
+        }
-    }
+    }
-
+
-    usart->US_THR = data;
+    usart->US_THR = data;
-}
+}
-
+
-/**
+/**
- * \brief Sends the contents of a data buffer through the specified USART peripheral.
+ * \brief Sends the contents of a data buffer through the specified USART peripheral.
- * This function returns immediately (1 if the buffer has been queued, 0
+ * This function returns immediately (1 if the buffer has been queued, 0
- * otherwise); poll the ENDTX and TXBUFE bits of the USART status register
+ * otherwise); poll the ENDTX and TXBUFE bits of the USART status register
- * to check for the transfer completion.
+ * to check for the transfer completion.
- *
+ *
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \param buffer  Pointer to the data buffer to send.
+ * \param buffer  Pointer to the data buffer to send.
- * \param size  Size of the data buffer (in bytes).
+ * \param size  Size of the data buffer (in bytes).
- */
+ */
-uint8_t USART_WriteBuffer(
+uint8_t USART_WriteBuffer(
-    Usart *usart,
+    Usart *usart,
-    void *buffer,
+    void *buffer,
-    uint32_t size)
+    uint32_t size)
-{
+{
-    /* Check if the first PDC bank is free*/
+    /* Check if the first PDC bank is free*/
-    if ((usart->US_TCR == 0) && (usart->US_TNCR == 0)) {
+    if ((usart->US_TCR == 0) && (usart->US_TNCR == 0)) {
-
+
-        usart->US_TPR = (uint32_t) buffer;
+        usart->US_TPR = (uint32_t) buffer;
-        usart->US_TCR = size;
+        usart->US_TCR = size;
-        usart->US_PTCR = US_PTCR_TXTEN;
+        usart->US_PTCR = US_PTCR_TXTEN;
-
+
-        return 1;
+        return 1;
-    }
+    }
-    /* Check if the second PDC bank is free*/
+    /* Check if the second PDC bank is free*/
-    else if (usart->US_TNCR == 0) {
+    else if (usart->US_TNCR == 0) {
-
+
-        usart->US_TNPR = (uint32_t) buffer;
+        usart->US_TNPR = (uint32_t) buffer;
-        usart->US_TNCR = size;
+        usart->US_TNCR = size;
-
+
-        return 1;
+        return 1;
-    }
+    }
-    else {
+    else {
-
+
-        return 0;
+        return 0;
-    }
+    }
-}
+}
-
+
-
+
-/**
+/**
- * \brief  Reads and return a packet of data on the specified USART peripheral. This
+ * \brief  Reads and return a packet of data on the specified USART peripheral. This
- * function operates asynchronously, so it waits until some data has been
+ * function operates asynchronously, so it waits until some data has been
- * received.
+ * received.
- *
+ *
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \param timeOut  Time out value (0 -> no timeout).
+ * \param timeOut  Time out value (0 -> no timeout).
- */
+ */
-uint16_t USART_Read(
+uint16_t USART_Read(
-    Usart *usart,
+    Usart *usart,
-    volatile uint32_t timeOut)
+    volatile uint32_t timeOut)
-{
+{
-    if (timeOut == 0) {
+    if (timeOut == 0) {
-
+
-        while ((usart->US_CSR & US_CSR_RXRDY) == 0);
+        while ((usart->US_CSR & US_CSR_RXRDY) == 0);
-    }
+    }
-    else {
+    else {
-
+
-        while ((usart->US_CSR & US_CSR_RXRDY) == 0) {
+        while ((usart->US_CSR & US_CSR_RXRDY) == 0) {
-
+
-            if (timeOut == 0) {
+            if (timeOut == 0) {
-
+
-                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
+                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
-                return 0;
+                return 0;
-            }
+            }
-            timeOut--;
+            timeOut--;
-        }
+        }
-    }
+    }
-
+
-    return usart->US_RHR;
+    return usart->US_RHR;
-}
+}
-
+
-/**
+/**
- * \brief  Reads data from an USART peripheral, filling the provided buffer until it
+ * \brief  Reads data from an USART peripheral, filling the provided buffer until it
- * becomes full. This function returns immediately with 1 if the buffer has
+ * becomes full. This function returns immediately with 1 if the buffer has
- * been queued for transmission; otherwise 0.
+ * been queued for transmission; otherwise 0.
- *
+ *
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \param buffer  Pointer to the buffer where the received data will be stored.
+ * \param buffer  Pointer to the buffer where the received data will be stored.
- * \param size  Size of the data buffer (in bytes).
+ * \param size  Size of the data buffer (in bytes).
- */
+ */
-uint8_t USART_ReadBuffer(Usart *usart,
+uint8_t USART_ReadBuffer(Usart *usart,
-                                      void *buffer,
+                                      void *buffer,
-                                      uint32_t size)
+                                      uint32_t size)
-{
+{
-    /* Check if the first PDC bank is free*/
+    /* Check if the first PDC bank is free*/
-    if ((usart->US_RCR == 0) && (usart->US_RNCR == 0)) {
+    if ((usart->US_RCR == 0) && (usart->US_RNCR == 0)) {
-
+
-        usart->US_RPR = (uint32_t) buffer;
+        usart->US_RPR = (uint32_t) buffer;
-        usart->US_RCR = size;
+        usart->US_RCR = size;
-        usart->US_PTCR = US_PTCR_RXTEN;
+        usart->US_PTCR = US_PTCR_RXTEN;
-
+
-        return 1;
+        return 1;
-    }
+    }
-    /* Check if the second PDC bank is free*/
+    /* Check if the second PDC bank is free*/
-    else if (usart->US_RNCR == 0) {
+    else if (usart->US_RNCR == 0) {
-
+
-        usart->US_RNPR = (uint32_t) buffer;
+        usart->US_RNPR = (uint32_t) buffer;
-        usart->US_RNCR = size;
+        usart->US_RNCR = size;
-
+
-        return 1;
+        return 1;
-    }
+    }
-    else {
+    else {
-
+
-        return 0;
+        return 0;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief  Returns 1 if some data has been received and can be read from an USART;
+ * \brief  Returns 1 if some data has been received and can be read from an USART;
- * otherwise returns 0.
+ * otherwise returns 0.
- *
+ *
- * \param usart  Pointer to an Usart instance.
+ * \param usart  Pointer to an Usart instance.
- */
+ */
-uint8_t USART_IsDataAvailable(Usart *usart)
+uint8_t USART_IsDataAvailable(Usart *usart)
-{
+{
-    if ((usart->US_CSR & US_CSR_RXRDY) != 0) {
+    if ((usart->US_CSR & US_CSR_RXRDY) != 0) {
-
+
-        return 1;
+        return 1;
-    }
+    }
-    else {
+    else {
-
+
-        return 0;
+        return 0;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * \brief  Sets the filter value for the IRDA demodulator.
+ * \brief  Sets the filter value for the IRDA demodulator.
- *
+ *
- * \param pUsart  Pointer to an Usart instance.
+ * \param pUsart  Pointer to an Usart instance.
- * \param filter  Filter value.
+ * \param filter  Filter value.
- */
+ */
-void USART_SetIrdaFilter(Usart *pUsart, uint8_t filter)
+void USART_SetIrdaFilter(Usart *pUsart, uint8_t filter)
-{
+{
-    assert( pUsart != NULL ) ;
+    assert( pUsart != NULL ) ;
-
+
-    pUsart->US_IF = filter;
+    pUsart->US_IF = filter;
-}
+}
-
+
-/**
+/**
- * \brief  Sends one packet of data through the specified USART peripheral. This
+ * \brief  Sends one packet of data through the specified USART peripheral. This
- * function operates synchronously, so it only returns when the data has been
+ * function operates synchronously, so it only returns when the data has been
- * actually sent.
+ * actually sent.
- *
+ *
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \param c  Character to send
+ * \param c  Character to send
- */
+ */
-void USART_PutChar(
+void USART_PutChar(
-    Usart *usart,
+    Usart *usart,
-    uint8_t c)
+    uint8_t c)
-{
+{
-    /* Wait for the transmitter to be ready*/
+    /* Wait for the transmitter to be ready*/
-    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-
+
-    /* Send character*/
+    /* Send character*/
-    usart->US_THR = c;
+    usart->US_THR = c;
-
+
-    /* Wait for the transfer to complete*/
+    /* Wait for the transfer to complete*/
-    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
+    while ((usart->US_CSR & US_CSR_TXEMPTY) == 0);
-}
+}
-
+
-/**
+/**
- * \brief   Return 1 if a character can be read in USART
+ * \brief   Return 1 if a character can be read in USART
- */
+ */
-uint32_t USART_IsRxReady(Usart *usart)
+uint32_t USART_IsRxReady(Usart *usart)
-{
+{
-    return (usart->US_CSR & US_CSR_RXRDY);
+    return (usart->US_CSR & US_CSR_RXRDY);
-}
+}
-/**
+/**
- * \brief   Get present status
+ * \brief   Get present status
- */
+ */
-uint32_t USART_GetStatus(Usart *usart)
+uint32_t USART_GetStatus(Usart *usart)
-{
+{
-    return usart->US_CSR;
+    return usart->US_CSR;
-}
+}
-/**
+/**
- * \brief   Enable interrupt
+ * \brief   Enable interrupt
- */
+ */
-void USART_EnableIt(Usart *usart,uint32_t mode)
+void USART_EnableIt(Usart *usart,uint32_t mode)
-{
+{
-    usart->US_IER = mode;
+    usart->US_IER = mode;
-}
+}
-/**
+/**
- * \brief   Disable interrupt
+ * \brief   Disable interrupt
- */
+ */
-void USART_DisableIt(Usart *usart,uint32_t mode)
+void USART_DisableIt(Usart *usart,uint32_t mode)
-{
+{
-    usart->US_IDR = mode;
+    usart->US_IDR = mode;
-}
+}
-/**
+/**
- * \brief  Reads and returns a character from the USART.
+ * \brief  Reads and returns a character from the USART.
- *
+ *
- * \note This function is synchronous (i.e. uses polling).
+ * \note This function is synchronous (i.e. uses polling).
- * \param usart  Pointer to an USART peripheral.
+ * \param usart  Pointer to an USART peripheral.
- * \return Character received.
+ * \return Character received.
- */
+ */
-uint8_t USART_GetChar(Usart *usart)
+uint8_t USART_GetChar(Usart *usart)
-{
+{
-    while ((usart->US_CSR & US_CSR_RXRDY) == 0);
+    while ((usart->US_CSR & US_CSR_RXRDY) == 0);
-    return usart->US_RHR;
+    return usart->US_RHR;
-}
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/wdt.c

@@ -1,132 +1,132 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ *
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * - Redistributions of source code must retain the above copyright notice,
+ * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
+ * this list of conditions and the disclaimer below.
- *
+ *
- * Atmel's name may not be used to endorse or promote products derived from
+ * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * this software without specific prior written permission.
- *
+ *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/**
+/**
- * \file
+ * \file
- *
+ *
- * Implementation of Watchdog Timer (WDT) controller.
+ * Implementation of Watchdog Timer (WDT) controller.
- *
+ *
- */
+ */
-
+
-/** \addtogroup wdt_module Working with WDT
+/** \addtogroup wdt_module Working with WDT
- * The WDT driver provides the interface to configure and use the WDT
+ * The WDT driver provides the interface to configure and use the WDT
- * peripheral.
+ * peripheral.
- *
+ *
- * The WDT can be used to prevent system lock-up if the software becomes
+ * The WDT can be used to prevent system lock-up if the software becomes
- * trapped in a deadlock. It can generate a general reset or a processor
+ * trapped in a deadlock. It can generate a general reset or a processor
- * reset only. It is clocked by slow clock divided by 128.
+ * reset only. It is clocked by slow clock divided by 128.
- *
+ *
- * The WDT is running at reset with 16 seconds watchdog period (slow clock at 32.768 kHz)
+ * The WDT is running at reset with 16 seconds watchdog period (slow clock at 32.768 kHz)
- * and external reset generation enabled. The user must either disable it or
+ * and external reset generation enabled. The user must either disable it or
- * reprogram it to meet the application requires.
+ * reprogram it to meet the application requires.
- *
+ *
- * To use the WDT, the user could follow these few steps:
+ * To use the WDT, the user could follow these few steps:
- * <ul>
+ * <ul>
- * <li>Enable watchdog with given mode using \ref WDT_Enable().
+ * <li>Enable watchdog with given mode using \ref WDT_Enable().
- * <li>Restart the watchdog using \ref WDT_Restart() within the watchdog period.
+ * <li>Restart the watchdog using \ref WDT_Restart() within the watchdog period.
- * </ul>
+ * </ul>
- *
+ *
- * For more accurate information, please look at the WDT section of the
+ * For more accurate information, please look at the WDT section of the
- * Datasheet.
+ * Datasheet.
- *
+ *
- * \note
+ * \note
- * The Watchdog Mode Register (WDT_MR) can be written only once.\n
+ * The Watchdog Mode Register (WDT_MR) can be written only once.\n
- *
+ *
- * Related files :\n
+ * Related files :\n
- * \ref wdt.c\n
+ * \ref wdt.c\n
- * \ref wdt.h.\n
+ * \ref wdt.h.\n
- */
+ */
-/*@{*/
+/*@{*/
-/*@}*/
+/*@}*/
-
+
-/*---------------------------------------------------------------------------
+/*---------------------------------------------------------------------------
- *        Headers
+ *        Headers
- *---------------------------------------------------------------------------*/
+ *---------------------------------------------------------------------------*/
-
+
-#include "chip.h"
+#include "chip.h"
-
+
-#include <stdint.h>
+#include <stdint.h>
-
+
-/*----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
- *        Exported functions
+ *        Exported functions
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/**
- * \brief Enable watchdog with given mode.
+ * \brief Enable watchdog with given mode.
- *
+ *
- * \note The Watchdog Mode Register (WDT_MR) can be written only once.
+ * \note The Watchdog Mode Register (WDT_MR) can be written only once.
- * Only a processor reset resets it.
+ * Only a processor reset resets it.
- *
+ *
- * \param dwMode   WDT mode to be set
+ * \param dwMode   WDT mode to be set
- */
+ */
-extern void WDT_Enable( Wdt* pWDT, uint32_t dwMode )
+extern void WDT_Enable( Wdt* pWDT, uint32_t dwMode )
-{
+{
-    pWDT->WDT_MR = dwMode ;
+    pWDT->WDT_MR = dwMode ;
-}
+}
-
+
-/**
+/**
- * \brief Disable watchdog.
+ * \brief Disable watchdog.
- *
+ *
- * \note The Watchdog Mode Register (WDT_MR) can be written only once.
+ * \note The Watchdog Mode Register (WDT_MR) can be written only once.
- * Only a processor reset resets it.
+ * Only a processor reset resets it.
- */
+ */
-extern void WDT_Disable( Wdt* pWDT )
+extern void WDT_Disable( Wdt* pWDT )
-{
+{
-    pWDT->WDT_MR = WDT_MR_WDDIS;
+    pWDT->WDT_MR = WDT_MR_WDDIS;
-}
+}
-
+
-/**
+/**
- * \brief Watchdog restart.
+ * \brief Watchdog restart.
- */
+ */
-extern void WDT_Restart( Wdt* pWDT )
+extern void WDT_Restart( Wdt* pWDT )
-{
+{
-    pWDT->WDT_CR = 0xA5000001;
+    pWDT->WDT_CR = 0xA5000001;
-}
+}
-
+
-/**
+/**
- * \brief Watchdog get status.
+ * \brief Watchdog get status.
- */
+ */
-extern uint32_t WDT_GetStatus( Wdt* pWDT )
+extern uint32_t WDT_GetStatus( Wdt* pWDT )
-{
+{
-    return (pWDT->WDT_SR & 0x3) ;
+    return (pWDT->WDT_SR & 0x3) ;
-}
+}
-
+
-/**
+/**
- * \brief Watchdog get period.
+ * \brief Watchdog get period.
- *
+ *
- * \param dwMs   desired watchdog period in millisecond.
+ * \param dwMs   desired watchdog period in millisecond.
- */
+ */
-extern uint32_t WDT_GetPeriod( uint32_t dwMs )
+extern uint32_t WDT_GetPeriod( uint32_t dwMs )
-{
+{
-    if ( (dwMs < 4) || (dwMs > 16000) )
+    if ( (dwMs < 4) || (dwMs > 16000) )
-    {
+    {
-        return 0 ;
+        return 0 ;
-    }
+    }
-    return ((dwMs << 8) / 1000) ;
+    return ((dwMs << 8) / 1000) ;
-}
+}

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

@@ -47,6 +47,8 @@
 #include "USBD.h"
 #include "USBD_HAL.h"
 
+extern void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request);
+
 /*---------------------------------------------------------------------------
  *      Definitions
  *---------------------------------------------------------------------------*/
@@ -144,7 +146,11 @@ void USBD_RequestHandler(uint8_t bEndpoint,
                       bEndpoint);
     }
     else {
+#if defined(BOARD_USB_DFU) && !defined(APPLICATION_dfu)
+        USBDFU_Runtime_RequestHandler(pRequest);
+#else
         USBDCallbacks_RequestReceived(pRequest);
+#endif
     }
 }
 
@@ -294,7 +300,7 @@ void USBD_SetConfiguration(uint8_t cfgnum)
     else {
         deviceState = USBD_STATE_ADDRESS;
         /* Reset all endpoints */
-        USBD_HAL_ResetEPs(0xFFFFFFFF, USBD_STATUS_RESET, 0);
+        USBD_HAL_ResetEPs(0xFFFFFFFE, USBD_STATUS_RESET, 0);
     }
 }
 

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

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2008, Atmel Corporation
+ * Copyright (c) 2018, Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -250,7 +251,7 @@ static void GetDescriptor(
     switch (type) {
 
         case USBGenericDescriptor_DEVICE:
-            TRACE_INFO_WP("Dev ");
+            TRACE_DEBUG_WP("Dev ");
 
             /* Adjust length and send descriptor */
 
@@ -262,7 +263,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_CONFIGURATION:
-            TRACE_INFO_WP("Cfg ");
+            TRACE_DEBUG_WP("Cfg ");
 
             /* Adjust length and send descriptor */
 
@@ -279,7 +280,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_DEVICEQUALIFIER:
-            TRACE_INFO_WP("Qua ");
+            TRACE_DEBUG_WP("Qua ");
 
             /* Check if descriptor exists */
 
@@ -300,7 +301,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_OTHERSPEEDCONFIGURATION:
-            TRACE_INFO_WP("OSC ");
+            TRACE_DEBUG_WP("OSC ");
 
             /* Check if descriptor exists */
 
@@ -326,13 +327,18 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_STRING:
-            TRACE_INFO_WP("Str%d ", indexRDesc);
+            TRACE_DEBUG_WP("Str%d ", indexRDesc);
 
             /* Check if descriptor exists */
 
             if (indexRDesc >= numStrings) {
-
+                /* Sometimes descriptor string 0xee is requested.
-                USBD_Stall(0);
+                 * This is a mechanism used by Microsoft Windows to further identify the USB device.
+                 * Instead of stalling, as is the original code, leading to an USB reset, we send an empty packet.
+                 * I am not sure if sending an empty string would be better, but an empty packet seems sufficient.
+                 */
+                //USBD_Stall(0);
+                USBD_Write(0, NULL, 0, 0, 0);
             }
             else {
 
@@ -498,13 +504,13 @@ void USBDDriver_RequestHandler(
     uint32_t length;
     uint32_t address;
 
-    TRACE_INFO_WP("Std ");
+    TRACE_DEBUG_WP("Std ");
 
     /* Check request code */
     switch (USBGenericRequest_GetRequest(pRequest)) {
 
         case USBGenericRequest_GETDESCRIPTOR:
-            TRACE_INFO_WP("gDesc ");
+            TRACE_DEBUG_WP("gDesc ");
 
             /* Send the requested descriptor */
             type = USBGetDescriptorRequest_GetDescriptorType(pRequest);
@@ -514,7 +520,7 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_SETADDRESS:
-            TRACE_INFO_WP("sAddr ");
+            TRACE_DEBUG_WP("sAddr ");
 
             /* Sends a zero-length packet and then set the device address */
             address = USBSetAddressRequest_GetAddress(pRequest);
@@ -522,7 +528,7 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_SETCONFIGURATION:
-            TRACE_INFO_WP("sCfg ");
+            TRACE_DEBUG_WP("sCfg ");
 
             /* Set the requested configuration */
             cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest);
@@ -530,27 +536,27 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_GETCONFIGURATION:
-            TRACE_INFO_WP("gCfg ");
+            TRACE_DEBUG_WP("gCfg ");
 
             /* Send the current configuration number */
             GetConfiguration(pDriver);
             break;
 
         case USBGenericRequest_GETSTATUS:
-            TRACE_INFO_WP("gSta ");
+            TRACE_DEBUG_WP("gSta ");
 
             /* Check who is the recipient */
             switch (USBGenericRequest_GetRecipient(pRequest)) {
 
                 case USBGenericRequest_DEVICE:
-                    TRACE_INFO_WP("Dev ");
+                    TRACE_DEBUG_WP("Dev ");
 
                     /* Send the device status */
                     GetDeviceStatus(pDriver);
                     break;
 
                 case USBGenericRequest_ENDPOINT:
-                    TRACE_INFO_WP("Ept ");
+                    TRACE_DEBUG_WP("Ept ");
 
                     /* Send the endpoint status */
                     eptnum = USBGenericRequest_GetEndpointNumber(pRequest);
@@ -566,13 +572,13 @@ void USBDDriver_RequestHandler(
             break;
 
         case USBGenericRequest_CLEARFEATURE:
-            TRACE_INFO_WP("cFeat ");
+            TRACE_DEBUG_WP("cFeat ");
 
             /* Check which is the requested feature */
             switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {
 
                 case USBFeatureRequest_ENDPOINTHALT:
-                    TRACE_INFO_WP("Hlt ");
+                    TRACE_DEBUG_WP("Hlt ");
 
                     /* Unhalt endpoint and send a zero-length packet */
                     USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest));
@@ -580,7 +586,7 @@ void USBDDriver_RequestHandler(
                     break;
 
                 case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                    TRACE_INFO_WP("RmWU ");
+                    TRACE_DEBUG_WP("RmWU ");
 
                     /* Disable remote wake-up and send a zero-length packet */
                     pDriver->isRemoteWakeUpEnabled = 0;
@@ -596,13 +602,13 @@ void USBDDriver_RequestHandler(
             break;
 
     case USBGenericRequest_SETFEATURE:
-        TRACE_INFO_WP("sFeat ");
+        TRACE_DEBUG_WP("sFeat ");
 
         /* Check which is the selected feature */
         switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {
 
             case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                TRACE_INFO_WP("RmWU ");
+                TRACE_DEBUG_WP("RmWU ");
 
                 /* Enable remote wake-up and send a ZLP */
                 pDriver->isRemoteWakeUpEnabled = 1;
@@ -610,25 +616,25 @@ void USBDDriver_RequestHandler(
                 break;
 
             case USBFeatureRequest_ENDPOINTHALT:
-                TRACE_INFO_WP("Halt ");
+                TRACE_DEBUG_WP("Halt ");
                 /* Halt endpoint */
                 USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest));
                 USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_B_HNP_ENABLE:
-                    TRACE_INFO_WP("OTG_B_HNP_ENABLE ");
+                    TRACE_DEBUG_WP("OTG_B_HNP_ENABLE ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_B_HNP_ENABLE;
                     USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_A_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_HNP_SUPPORT ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_A_HNP_SUPPORT;
                     USBD_Write(0, 0, 0, 0, 0);
                 break;
             case USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_ALT_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_ALT_HNP_SUPPORT ");
                     pDriver->otg_features_supported |=
                         1<<USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT;
                     USBD_Write(0, 0, 0, 0, 0);
@@ -643,7 +649,7 @@ void USBDDriver_RequestHandler(
         break;
 
     case USBGenericRequest_SETINTERFACE:
-        TRACE_INFO_WP("sInterface ");
+        TRACE_DEBUG_WP("sInterface ");
 
         infnum = USBInterfaceRequest_GetInterface(pRequest);
         setting = USBInterfaceRequest_GetAlternateSetting(pRequest);
@@ -651,7 +657,7 @@ void USBDDriver_RequestHandler(
         break;
 
     case USBGenericRequest_GETINTERFACE:
-        TRACE_INFO_WP("gInterface ");
+        TRACE_DEBUG_WP("gInterface ");
 
         infnum = USBInterfaceRequest_GetInterface(pRequest);
         GetInterface(pDriver, infnum);

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

@@ -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, \
+	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH, \
-	.wDetachTimeOut		= 0xff00,				\
+	.wDetachTimeOut		= 0x00,				\
 	.wTransferSize		= BOARD_DFU_PAGE_SIZE,			\
 	.bcdDFUVersion		= 0x0100,				\
 }
@@ -78,8 +78,8 @@ extern const USBDDriverDescriptors dfu_descriptors;
 
 /* no DFU bootloader is being used */
 #define DFURT_NUM_IF	0
-#define DFURT_IF_DESCRIPTOR_STRUCT(a, b)
+#define DFURT_IF_DESCRIPTOR_STRUCT
-#define DFURT_IF_DESCRIPTOR
+#define DFURT_IF_DESCRIPTOR(a, b)
 
 #endif /* BOARD_USB_DFU */
 
@@ -101,7 +101,7 @@ struct dfudata {
 extern struct dfudata _g_dfu;
 extern struct dfudata *g_dfu;
 
-void set_usb_serial_str(const uint8_t *serial_usbstr);
+void set_usb_serial_str(void);
 
 void DFURT_SwitchToDFU(void);
 
@@ -124,6 +124,9 @@ 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,14 +13,107 @@
 #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,
-	STR_SERIAL	= (_STR_FIRST_ALT+BOARD_DFU_NUM_IF),
+	// serial string
+	STR_SERIAL	= (_STR_FIRST_ALT + BOARD_DFU_NUM_IF),
+	// version string (on additional interface)
+	VERSION_CONF_STR,
+	VERSION_STR,
+	// count
+	STRING_DESC_CNT,
 };
 
+/* 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,
@@ -28,18 +121,14 @@ static const USBDeviceDescriptor fsDevice = {
 	.bDeviceClass =		0,
 	.bDeviceSubClass = 	0,
 	.bDeviceProtocol = 	0,
-	.bMaxPacketSize0 =	BOARD_USB_ENDPOINTS_MAXPACKETSIZE(0),
+	.bMaxPacketSize0 = 	USBEndpointDescriptor_MAXCTRLSIZE_FS,
 	.idVendor =		BOARD_USB_VENDOR_ID,
 	.idProduct = 		BOARD_DFU_USB_PRODUCT_ID,
 	.bcdDevice = 		BOARD_USB_RELEASE,
 	.iManufacturer =	STR_MANUF,
 	.iProduct =		STR_PROD,
-#ifdef BOARD_USB_SERIAL
 	.iSerialNumber =	STR_SERIAL,
-#else
+	.bNumConfigurations =	2, // DFU + version configurations
-	.iSerialNumber =	0,
-#endif
-	.bNumConfigurations =	1,
 };
 
 /* Alternate Interface Descriptor, we use one per partition/memory type */
@@ -52,7 +141,7 @@ static const USBDeviceDescriptor fsDevice = {
 		.bNumEndpoints =	0,					\
 		.bInterfaceClass =	0xfe,					\
 		.bInterfaceSubClass =	1,					\
-		.iInterface =		(_STR_FIRST_ALT+ALT),			\
+		.iInterface =		(_STR_FIRST_ALT + ALT),			\
 		.bInterfaceProtocol =	2,					\
 	}
 
@@ -85,17 +174,79 @@ const struct dfu_desc dfu_cfg_descriptor = {
 	.func_dfu = DFU_FUNC_DESC
 };
 
-#include "usb_strings_generated.h"
+void set_usb_serial_str(void)
-
-#if 0
-void set_usb_serial_str(const uint8_t *serial_usbstr)
 {
-	usb_strings[STR_SERIAL] = serial_usbstr;
+	unsigned int i;
-}
+
+	// put device ID into USB serial number description
+	unsigned int device_id[4];
+	EEFC_ReadUniqueID(device_id);
+	char device_id_string[32 + 1];
+	snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x",
+		device_id[0], device_id[1], device_id[2], device_id[3]);
+	for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) {
+		usb_string_serial[2 + 2 * i] = device_id_string[i];
+	}
+
+	// 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;
+}
+
+/* USB descriptor just to show the version */
+typedef struct _SIMTraceDriverConfigurationDescriptorVersion {
+	/** Standard configuration descriptor. */
+	USBConfigurationDescriptor configuration;
+	USBInterfaceDescriptor version;
+} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion;
+
+static const SIMTraceDriverConfigurationDescriptorVersion
+				configurationDescriptorVersion = {
+	/* Standard configuration descriptor for the interface descriptor*/
+	.configuration = {
+		.bLength 		= sizeof(USBConfigurationDescriptor),
+		.bDescriptorType	= USBGenericDescriptor_CONFIGURATION,
+		.wTotalLength		= sizeof(SIMTraceDriverConfigurationDescriptorVersion),
+		.bNumInterfaces		= 1,
+		.bConfigurationValue	= 2,
+		.iConfiguration		= VERSION_CONF_STR,
+		.bmAttributes		= USBD_BMATTRIBUTES,
+		.bMaxPower		= USBConfigurationDescriptor_POWER(100),
+	},
+	/* Interface standard descriptor just holding the version information */
+	.version = {
+		.bLength = sizeof(USBInterfaceDescriptor),
+		.bDescriptorType 	= USBGenericDescriptor_INTERFACE,
+		.bInterfaceNumber	= 0,
+		.bAlternateSetting	= 0,
+		.bNumEndpoints		= 0,
+		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
+		.bInterfaceSubClass	= 0xff,
+		.bInterfaceProtocol	= 0,
+		.iInterface		= VERSION_STR,
+	},
+};
 
 static const USBConfigurationDescriptor *conf_desc_arr[] = {
 	&dfu_cfg_descriptor.ucfg,
+	&configurationDescriptorVersion.configuration,
 };
 
 const USBDDriverDescriptors dfu_descriptors = {
@@ -108,6 +259,6 @@ const USBDDriverDescriptors dfu_descriptors = {
 	.pHsConfiguration = NULL,
 	.pHsQualifier = NULL,
 	.pHsOtherSpeed = NULL,
-	.pStrings = usb_strings,
+	.pStrings = usb_strings_extended,
-	.numStrings = ARRAY_SIZE(usb_strings),
+	.numStrings = ARRAY_SIZE(usb_strings_extended),
 };

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

@@ -33,8 +33,7 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-/* FIXME: this was used for a special ELF section which then got called
+/** specific memory location shared across bootloader and application */
- * by DFU code and Application code, across flash partitions */
 #define __dfudata __attribute__ ((section (".dfudata")))
 #define __dfufunc
 
@@ -42,11 +41,14 @@
 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_appIDLE,
+	.state = DFU_STATE_dfuIDLE,
 	.past_manifest = 0,
 	.total_bytes = 0,
 };
+
+/** variable to structure containing DFU state */
 struct dfudata *g_dfu = &_g_dfu;
 
 WEAK void dfu_drv_updstatus(void)
@@ -83,7 +85,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -217,7 +219,7 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request)
 	uint8_t req = USBGenericRequest_GetRequest(request);
 	uint16_t len = USBGenericRequest_GetLength(request);
 	uint16_t val = USBGenericRequest_GetValue(request);
-	int rc, ret;
+	int rc, ret = DFU_RET_NOTHING;
 
 	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
@@ -447,6 +449,7 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors)
 	/* We already start in DFU idle mode */
 	g_dfu->state = DFU_STATE_dfuIDLE;
 
+	set_usb_serial_str();
 	USBDDriver_Initialize(&usbdDriver, pDescriptors, if_altsettings);
 	USBD_Init();
 	USBD_Connect();
@@ -460,7 +463,20 @@ void USBDFU_SwitchToApp(void)
 	/* make sure the MAGIC is not set to enter DFU again */
 	g_dfu->magic = 0;
 
-	printf("switching to app\r\n");
+	/* disconnect from USB to ensure re-enumeration */
+	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,7 +36,12 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-struct dfudata *g_dfu = (struct dfudata *) IRAM_ADDR;
+/** specific memory location shared across bootloader and application */
+#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 */
@@ -63,7 +68,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -107,7 +112,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	uint8_t req = USBGenericRequest_GetRequest(request);
 	uint16_t len = USBGenericRequest_GetLength(request);
 	uint16_t val = USBGenericRequest_GetValue(request);
-	int rc, ret;
+	int rc, ret = DFU_RET_NOTHING;
 
 	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
@@ -141,7 +146,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	if (USBGenericRequest_GetType(request) != USBGenericRequest_CLASS ||
 	    USBGenericRequest_GetRecipient(request) != USBGenericRequest_INTERFACE) {
 		TRACE_DEBUG("std_ho_usbd ");
-		USBDDriver_RequestHandler(usbdDriver, request);
+		USBDCallbacks_RequestReceived(request);
 		return;
 	}
 
@@ -160,6 +165,8 @@ 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;
@@ -204,21 +211,16 @@ 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 remoting the pull-up */
+	/* Disconnect the USB by removing the pull-up */
 	USBD_Disconnect();
-	__disable_irq();
 
 	/* reset the processor, we will start execution with the
 	 * ResetVector of the bootloader */
 	NVIC_SystemReset();
 }
-
-void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
-{
-	/* FIXME: integration with CCID control point reqeusts */
-	USBDFU_Runtime_RequestHandler(request);
-}

firmware/atmel_softpack_libraries/usb/include/USBD.h

@@ -214,6 +214,8 @@ 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,3 +1,22 @@
+/* SIMtrace 2 common board pin definitions
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #ifndef _BOARD_
 #define _BOARD_
 
@@ -37,18 +56,12 @@
 /** Core definition */
 #define cortexm3
 
-#define BOARD_MCK     48000000
+/* LEDs are used to indicate the status
-
+ * the LED definition is board specific
-#define PIO_LED_RED	PIO_PA17
+ * most boards have two LEDs, one green and one red
-#define PIO_LED_GREEN	PIO_PA17
+ * the red LED indicates of the main firmware is ready (on) or if there is an error (blinking)
-
+ * the green LED indicates if the firmware is idling (on) or if there is activity (blinking)
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+ */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-
-#define LED_NUM_RED     0
-#define LED_NUM_GREEN   1
-
 /** USART0 pin RX */
 #define PIN_USART0_RXD    {PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /** USART0 pin TX */
@@ -63,12 +76,16 @@
 #define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 
 /** UART0 */
-/** Console baudrate always using 115200. */
+/** Console baud rate in bps */
-#define CONSOLE_BAUDRATE    115200
+#define CONSOLE_BAUDRATE    921600
-/** Usart Hw interface used by the console (UART0). */
+/** UART peripheral used by the console (UART0). */
-#define CONSOLE_USART       UART0
+#define CONSOLE_UART       UART0
-/** Usart Hw ID used by the console (UART0). */
+/** UART peripheral ID used by the console (UART0). */
 #define CONSOLE_ID          ID_UART0
+/** UART ISR used by the console (UART0). */
+#define CONSOLE_ISR         UART0_IrqHandler
+/** UART IRQ used by the console (UART0). */
+#define CONSOLE_IRQ         UART0_IRQn
 /** Pins description corresponding to Rxd,Txd, (UART pins) */
 #define CONSOLE_PINS        {PINS_UART}
 
@@ -77,46 +94,33 @@
 #define BOARD_ISO7816_BASE_USART    USART0
 #define BOARD_ISO7816_ID_USART      ID_USART0
 
+/* USART peripherals for a phone and SIM card setup */
+/* USART peripheral connected to the SIM card */
 #define USART_SIM       USART0
+/* ID of USART peripheral connected to the SIM card */
 #define ID_USART_SIM    ID_USART0
-#define USART_PHONE       USART1
+/* Interrupt request ID of USART peripheral connected to the SIM card */
-#define ID_USART_PHONE    ID_USART1
+#define IRQ_USART_SIM   USART0_IRQn
-
+/* USART peripheral connected to the phone */
-#define SIM_PWEN        PIO_PA5
+#define USART_PHONE     USART1
-#define VCC_FWD         PIO_PA26
+/* ID of USART peripheral connected to the phone */
-
+#define ID_USART_PHONE  ID_USART1
-
+/* Interrupt request ID of USART peripheral connected to the phone */
-//**     USB **/
+#define IRQ_USART_PHONE USART1_IRQn
-// USB pull-up control pin definition (PA16).
-// Default: 1 (USB Pullup deactivated) 
-#define PIN_USB_PULLUP  {1 << 16, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 
 // Board has UDP controller
 #define BOARD_USB_UDP
-// D+ has external pull-up
-#define BOARD_USB_PULLUP_EXTERNAL
-
-#define BOARD_USB_NUMENDPOINTS      8
-
-// FIXME: in all other cases return 0?
-#define BOARD_USB_ENDPOINTS_MAXPACKETSIZE(i)    (((i == 4) || (i == 5))? 512 : 64)
-#define BOARD_USB_ENDPOINTS_BANKS(i)            (((i == 0) || (i == 3)) ? 1 : 2)
-
-#define USB_VENDOR_OPENMOKO		0x1d50
-#define USB_PRODUCT_OWHW_SAM3_DFU	0x4001	/* was 0x4000 */
-#define USB_PRODUCT_OWHW_SAM3		0x4001
-#define USB_PRODUCT_QMOD_HUB		0x4002
-#define USB_PRODUCT_QMOD_SAM3_DFU	0x4004	/* was 0x4003 */
-#define USB_PRODUCT_QMOD_SAM3		0x4004
-#define USB_PRODUCT_SIMTRACE2_DFU	0x60e3	/* was 0x60e2 */
-#define USB_PRODUCT_SIMTRACE2		0x60e3
 
 #define BOARD_USB_DFU
+
+
 #define BOARD_DFU_BOOT_SIZE	(16 * 1024)
 #define BOARD_DFU_RAM_SIZE	(2 * 1024)
 #define BOARD_DFU_PAGE_SIZE	512
-#define BOARD_DFU_NUM_IF	2
+/** number of DFU interfaces (used to flash specific partitions) */
+#define BOARD_DFU_NUM_IF	3
 
 extern void board_exec_dbg_cmd(int ch);
 extern void board_main_top(void);
+extern int board_override_enter_dfu(void);
 #endif

firmware/libboard/common/include/board_lowlevel.h

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

firmware/libboard/common/include/boardver_adc.h

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

firmware/libboard/common/include/led.h

@@ -1,3 +1,17 @@
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
 enum led {
@@ -13,9 +27,11 @@ enum led_pattern {
 	BLINK_3O_30F		= 3,
 	BLINK_3O_1F_3O_30F	= 4,
 	BLINK_3O_1F_3O_1F_3O_30F= 5,
-	BLINK_200O_F		= 6,
+	BLINK_2O_F		= 6,
-	BLINK_600O_F		= 7,
+	BLINK_200O_F		= 7,
-	BLINK_CUSTOM		= 8,
+	BLINK_600O_F		= 8,
+	BLINK_CUSTOM		= 9,
+	BLINK_2F_O,
 	_NUM_LED_BLINK
 };
 

firmware/libboard/common/include/manifest.h

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

firmware/libboard/common/include/sim_switch.h

@@ -1,4 +1,26 @@
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 
+/** switch card lines to use physical or emulated card
+ *  @param[in] nr card interface number (i.e. slot)
+ *  @param[in] physical which physical interface to switch to (e.g. 0: physical, 1: virtual)
+ *  @return 0 on success, negative else
+ */
 int sim_switch_use_physical(unsigned int nr, int physical);
+/** initialise card switching capabilities
+ *  @return number of switchable card interfaces
+ */
 int sim_switch_init(void);

firmware/libboard/common/include/uart_console.h

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

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

@@ -39,9 +39,9 @@ SEARCH_DIR(.)
 MEMORY
 {
 	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
-	rom (rx)  : ORIGIN = 0x00404000, LENGTH = 0x0003c000 /* flash, 256K */
+	rom (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */
-	/* reserve the first 32 (= 0x20) bytes for the _g_dfu struct */
+	/* note: dfudata will be at the start */
-	ram (rwx) : ORIGIN = 0x20000020, LENGTH = 0x0000bfe0 /* sram, 48K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
 }
 
 /* Section Definitions */ 
@@ -111,6 +111,8 @@ 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 = 0x00040000 /* flash, 256K */
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 16K /* flash, 256K, but only the first 16K should be used for the bootloader */
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
 }
 
 /* Section Definitions */ 

firmware/libboard/common/source/board_cstartup_gnu.c

@@ -1,203 +1,209 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2010, Atmel Corporation
+ * Copyright (c) 2010, Atmel Corporation
- *
+ * Copyright (c) 2017, Harald Welte <laforge@gnumonks.org>
- * All rights reserved.
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * All rights reserved.
- * modification, are permitted provided that the following conditions are met:
+ *
- *
+ * Redistribution and use in source and binary forms, with or without
- * - Redistributions of source code must retain the above copyright notice,
+ * modification, are permitted provided that the following conditions are met:
- * this list of conditions and the disclaimer below.
+ *
- *
+ * - Redistributions of source code must retain the above copyright notice,
- * Atmel's name may not be used to endorse or promote products derived from
+ * this list of conditions and the disclaimer below.
- * this software without specific prior written permission.
+ *
- *
+ * Atmel's name may not be used to endorse or promote products derived from
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * this software without specific prior written permission.
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * ----------------------------------------------------------------------------
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- */
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+ * ----------------------------------------------------------------------------
-/*----------------------------------------------------------------------------
+ */
- *        Headers
+
- *----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------
-
+ *        Headers
-#include "board.h"
+ *----------------------------------------------------------------------------*/
-#include "board_lowlevel.h"
+
-
+#include "board.h"
-/*----------------------------------------------------------------------------
+#include "board_lowlevel.h"
- *        Exported variables
+
- *----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------
-
+ *        Exported variables
-/* Stack Configuration */  
+ *----------------------------------------------------------------------------*/
-#define STACK_SIZE       0x900     /** Stack size (in DWords) */
+
-__attribute__ ((aligned(8),section(".stack")))
+/* Stack Configuration */  
-uint32_t pdwStack[STACK_SIZE] ;     
+#define STACK_SIZE       0x900     /** Stack size (in DWords) */
-
+__attribute__ ((aligned(8),section(".stack")))
-/* Initialize segments */
+uint32_t pdwStack[STACK_SIZE] ;     
-extern uint32_t _sfixed;
+
-extern uint32_t _efixed;
+/* Initialize segments */
-extern uint32_t _etext;
+extern uint32_t _sfixed;
-extern uint32_t _srelocate;
+extern uint32_t _efixed;
-extern uint32_t _erelocate;
+extern uint32_t _etext;
-extern uint32_t _szero;
+extern uint32_t _srelocate;
-extern uint32_t _ezero;
+extern uint32_t _erelocate;
-
+extern uint32_t _szero;
-
+extern uint32_t _ezero;
-/*----------------------------------------------------------------------------
+
- *        ProtoTypes
+
- *----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------
-
+ *        ProtoTypes
-/** \cond DOXYGEN_SHOULD_SKIP_THIS */
+ *----------------------------------------------------------------------------*/
-extern int main( void ) ;
+
-/** \endcond */
+/** \cond DOXYGEN_SHOULD_SKIP_THIS */
-void ResetException( void ) ;
+extern int main( void ) ;
-
+/** \endcond */
-/*------------------------------------------------------------------------------
+void ResetException( void ) ;
- *         Exception Table
+
- *------------------------------------------------------------------------------*/
+/*------------------------------------------------------------------------------
-
+ *         Exception Table
-__attribute__((section(".vectors")))
+ *------------------------------------------------------------------------------*/
-IntFunc exception_table[] = {
+
-
+__attribute__((section(".vectors")))
-    /* Configure Initial Stack Pointer, using linker-generated symbols */
+IntFunc exception_table[] = {
-    (IntFunc)(&pdwStack[STACK_SIZE-1]),
+
-    ResetException,
+	/* Configure Initial Stack Pointer, using linker-generated symbols */
-
+	(IntFunc)(&pdwStack[STACK_SIZE-1]),
-    NMI_Handler,
+	ResetException,
-    HardFault_Handler,
+
-    MemManage_Handler,
+	NMI_Handler,
-    BusFault_Handler,
+	HardFault_Handler,
-    UsageFault_Handler,
+	MemManage_Handler,
-    0, 0, 0, 0,         /* Reserved */
+	BusFault_Handler,
-    SVC_Handler,
+	UsageFault_Handler,
-    DebugMon_Handler,
+	0, 0, 0, 0,         /* Reserved */
-    0,                  /* Reserved  */
+	SVC_Handler,
-    PendSV_Handler,
+	DebugMon_Handler,
-    SysTick_Handler,
+	0,                  /* Reserved  */
-
+	PendSV_Handler,
-    /* Configurable interrupts  */
+	SysTick_Handler,
-    SUPC_IrqHandler,    /* 0  Supply Controller */
+
-    RSTC_IrqHandler,    /* 1  Reset Controller */
+	/* Configurable interrupts  */
-    RTC_IrqHandler,     /* 2  Real Time Clock */
+	SUPC_IrqHandler,    /* 0  Supply Controller */
-    RTT_IrqHandler,     /* 3  Real Time Timer */
+	RSTC_IrqHandler,    /* 1  Reset Controller */
-    WDT_IrqHandler,     /* 4  Watchdog Timer */
+	RTC_IrqHandler,     /* 2  Real Time Clock */
-    PMC_IrqHandler,     /* 5  PMC */
+	RTT_IrqHandler,     /* 3  Real Time Timer */
-    EEFC_IrqHandler,    /* 6  EEFC */
+	WDT_IrqHandler,     /* 4  Watchdog Timer */
-    IrqHandlerNotUsed,  /* 7  Reserved */
+	PMC_IrqHandler,     /* 5  PMC */
-    UART0_IrqHandler,   /* 8  UART0 */
+	EEFC_IrqHandler,    /* 6  EEFC */
-    UART1_IrqHandler,   /* 9  UART1 */
+	IrqHandlerNotUsed,  /* 7  Reserved */
-    SMC_IrqHandler,     /* 10 SMC */
+	UART0_IrqHandler,   /* 8  UART0 */
-    PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
+	UART1_IrqHandler,   /* 9  UART1 */
-    PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
+	SMC_IrqHandler,     /* 10 SMC */
-    PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
+	PIOA_IrqHandler,    /* 11 Parallel IO Controller A */
-    USART0_IrqHandler,  /* 14 USART 0 */
+	PIOB_IrqHandler,    /* 12 Parallel IO Controller B */
-    USART1_IrqHandler,  /* 15 USART 1 */
+	PIOC_IrqHandler,    /* 13 Parallel IO Controller C */
-    IrqHandlerNotUsed,  /* 16 Reserved */
+	USART0_IrqHandler,  /* 14 USART 0 */
-    IrqHandlerNotUsed,  /* 17 Reserved */
+	USART1_IrqHandler,  /* 15 USART 1 */
-    MCI_IrqHandler,     /* 18 MCI */
+	IrqHandlerNotUsed,  /* 16 Reserved */
-    TWI0_IrqHandler,    /* 19 TWI 0 */
+	IrqHandlerNotUsed,  /* 17 Reserved */
-    TWI1_IrqHandler,    /* 20 TWI 1 */
+	MCI_IrqHandler,     /* 18 MCI */
-    SPI_IrqHandler,     /* 21 SPI */
+	TWI0_IrqHandler,    /* 19 TWI 0 */
-    SSC_IrqHandler,     /* 22 SSC */
+	TWI1_IrqHandler,    /* 20 TWI 1 */
-    TC0_IrqHandler,     /* 23 Timer Counter 0 */
+	SPI_IrqHandler,     /* 21 SPI */
-    TC1_IrqHandler,     /* 24 Timer Counter 1 */
+	SSC_IrqHandler,     /* 22 SSC */
-    TC2_IrqHandler,     /* 25 Timer Counter 2 */
+	TC0_IrqHandler,     /* 23 Timer Counter 0 */
-    TC3_IrqHandler,     /* 26 Timer Counter 3 */
+	TC1_IrqHandler,     /* 24 Timer Counter 1 */
-    TC4_IrqHandler,     /* 27 Timer Counter 4 */
+	TC2_IrqHandler,     /* 25 Timer Counter 2 */
-    TC5_IrqHandler,     /* 28 Timer Counter 5 */
+	TC3_IrqHandler,     /* 26 Timer Counter 3 */
-    ADC_IrqHandler,     /* 29 ADC controller */
+	TC4_IrqHandler,     /* 27 Timer Counter 4 */
-    DAC_IrqHandler,     /* 30 DAC controller */
+	TC5_IrqHandler,     /* 28 Timer Counter 5 */
-    PWM_IrqHandler,     /* 31 PWM */
+	ADC_IrqHandler,     /* 29 ADC controller */
-    CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
+	DAC_IrqHandler,     /* 30 DAC controller */
-    ACC_IrqHandler,     /* 33 Analog Comparator */
+	PWM_IrqHandler,     /* 31 PWM */
-    USBD_IrqHandler,    /* 34 USB Device Port */
+	CRCCU_IrqHandler,   /* 32 CRC Calculation Unit */
-    IrqHandlerNotUsed   /* 35 not used */
+	ACC_IrqHandler,     /* 33 Analog Comparator */
-};
+	USBD_IrqHandler,    /* 34 USB Device Port */
-
+	IrqHandlerNotUsed   /* 35 not used */
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
+};
-#include "usb/device/dfu/dfu.h"
+
-static void BootIntoApp(void)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
-{
+#include "usb/device/dfu/dfu.h"
-	unsigned int *pSrc;
+static void BootIntoApp(void)
-	void (*appReset)(void);
+{
-
+	unsigned int *pSrc;
-	pSrc = (unsigned int *) ((unsigned char *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE);
+	void (*appReset)(void);
-	SCB->VTOR = ((unsigned int)(pSrc)) | (0x0 << 7);
+
-	appReset = pSrc[1];
+	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) */
-	g_dfu->state = DFU_STATE_appIDLE;
+	SCB->VTOR = (unsigned int)(pSrc);
-
+	/* set stack pointer to address provided in the beginning of the application (loaded into a register first) */
-	appReset();
+	__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) */
-#endif
+	appReset = (void(*)(void))pSrc[1];
-
+
-/**
+	g_dfu->state = DFU_STATE_appIDLE;
- * \brief This is the code that gets called on processor reset.
+
- * To initialize the device, and call the main() routine.
+	appReset();
- */
+}
-void ResetException( void )
+#endif
-{
+
-    uint32_t *pSrc, *pDest ;
+/**
-
+ * \brief This is the code that gets called on processor reset.
-    /* Low level Initialize */
+ * To initialize the device, and call the main() routine.
-    LowLevelInit() ;
+ */
-
+void ResetException( void )
-
+{
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
+	uint32_t *pSrc, *pDest ;
-    /* we are before the text segment has been relocated, so g_dfu is
+
-     * not initialized yet */
+	/* Low level Initialize */
-    g_dfu = &_g_dfu;
+	LowLevelInit() ;
-    if ((g_dfu->magic != USB_DFU_MAGIC) && !USBDFU_OverrideEnterDFU()) {
+
-        BootIntoApp();
+
-        /* Infinite loop */
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
-        while ( 1 ) ;
+	// boot application if there is not DFU override
-    }
+	if (!USBDFU_OverrideEnterDFU() && SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-#endif
+		UART_Exit();
-
+		__disable_irq();
-    /* Initialize the relocate segment */
+		BootIntoApp();
-    pSrc = &_etext ;
+		/* Infinite loop */
-    pDest = &_srelocate ;
+		while ( 1 ) ;
-
+	}
-    if ( pSrc != pDest )
+#endif
-    {
+
-        for ( ; pDest < &_erelocate ; )
+	/* Initialize the relocate segment */
-        {
+	pSrc = &_etext ;
-            *pDest++ = *pSrc++ ;
+	pDest = &_srelocate ;
-        }
+
-    }
+	if ( pSrc != pDest )
-
+	{
-    /* Clear the zero segment */
+		for ( ; pDest < &_erelocate ; )
-    for ( pDest = &_szero ; pDest < &_ezero ; )
+		{
-    {
+		    *pDest++ = *pSrc++ ;
-        *pDest++ = 0;
+		}
-    }
+	}
-
+
-    /* Set the vector table base address */
+	/* Clear the zero segment */
-    pSrc = (uint32_t *)&_sfixed;
+	for ( pDest = &_szero ; pDest < &_ezero ; )
-    SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
+	{
-    
+		*pDest++ = 0;
-    if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
+	}
-    {
+
-	    SCB->VTOR |= 1 << SCB_VTOR_TBLBASE_Pos ;
+	/* Set the vector table base address */
-    }
+	pSrc = (uint32_t *)&_sfixed;
-
+	SCB->VTOR = ( (uint32_t)pSrc & SCB_VTOR_TBLOFF_Msk ) ;
-    /* App should have disabled interrupts during the transition */
+	
-    __enable_irq();
+	if ( ((uint32_t)pSrc >= IRAM_ADDR) && ((uint32_t)pSrc < IRAM_ADDR+IRAM_SIZE) )
-
+	{
-    /* Branch to main function */
+	    SCB->VTOR |= 1 << SCB_VTOR_TBLBASE_Pos ;
-    main() ;
+	}
-
+
-    /* Infinite loop */
+	/* App should have disabled interrupts during the transition */
-    while ( 1 ) ;
+	__enable_irq();
-}
+
-
+	/* Branch to main function */
+	main() ;
+
+	/* Infinite loop */
+	while ( 1 ) ;
+}
+

firmware/libboard/common/source/board_lowlevel.c

@@ -1,216 +1,225 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- * All rights reserved.
+ *
- *
+ * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
+ *
- * modification, are permitted provided that the following conditions are met:
+ * Redistribution and use in source and binary forms, with or without
- *
+ * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
+ *
- * this list of conditions and the disclaimer below.
+ * - Redistributions of source code must retain the above copyright notice,
- *
+ * this list of conditions and the disclaimer below.
- * Atmel's name may not be used to endorse or promote products derived from
+ *
- * this software without specific prior written permission.
+ * Atmel's name may not be used to endorse or promote products derived from
- *
+ * this software without specific prior written permission.
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * ----------------------------------------------------------------------------
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ * ----------------------------------------------------------------------------
-
+ */
-/**
+
- * \file
+/**
- *
+ * \file
- * Provides the low-level initialization function that called on chip startup.
+ *
- */
+ * Provides the low-level initialization function that called on chip startup.
-
+ */
-/*----------------------------------------------------------------------------
+
- *        Headers
+/*----------------------------------------------------------------------------
- *----------------------------------------------------------------------------*/
+ *        Headers
-
+ *----------------------------------------------------------------------------*/
-#include "board.h"
+
-
+#include "board.h"
-/*----------------------------------------------------------------------------
+
- *        Local definitions
+/*----------------------------------------------------------------------------
- *----------------------------------------------------------------------------*/
+ *        Local definitions
-
+ *----------------------------------------------------------------------------*/
-#define BOARD_OSCOUNT   (CKGR_MOR_MOSCXTST(0x8))
+
-#define BOARD_MCKR      (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK)
+#define BOARD_OSCOUNT   (CKGR_MOR_MOSCXTST(0x8))
-
+#define BOARD_MCKR      (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK)
-#if (BOARD_MCK == 48000000)
+
-#if (BOARD_MAINOSC == 18432000)
+/** configure PLL to generate main clock based on main oscillator frequency */
-/* Clock settings at 48MHz  for 18 MHz crystal */
+#if (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 48000000)
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-                       | CKGR_PLLAR_MULA(13-1) \
+					   | CKGR_PLLAR_MULA(8-1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_DIVA(5))
+					   | CKGR_PLLAR_DIVA(2))
-#elif (BOARD_MAINOSC == 12000000)
+#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 58000000)
-/* QMod has 12 MHz clock, so multply by 8 (96 MHz) and divide by 2 */
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-#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)
-#else
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-#error "Please define PLLA config for your MAINOSC frequency"
+					   | CKGR_PLLAR_MULA(10-1) \
-#endif /* MAINOSC */
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-#elif (BOARD_MCK == 64000000)
+					   | CKGR_PLLAR_DIVA(2))
-#if (BOARD_MAINOSC == 18432000)
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 47923200)
-/* Clock settings at 64MHz  for 18 MHz crystal: 64.512 MHz */
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_MULA(13-1) \
-                       | CKGR_PLLAR_MULA(7-1) \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+					   | CKGR_PLLAR_DIVA(5))
-                       | CKGR_PLLAR_DIVA(2))
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 58982400)
-#elif (BOARD_MAINOSC == 12000000)
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-/* QMod has 12 MHz clock, so multply by 10 / div by 2: 60 MHz */
+					   | CKGR_PLLAR_MULA(16-1) \
-#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-                       | CKGR_PLLAR_MULA(10-1) \
+					   | CKGR_PLLAR_DIVA(5))
-                       | CKGR_PLLAR_PLLACOUNT(0x1) \
+#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 64512000)
-                       | CKGR_PLLAR_DIVA(2))
+#define BOARD_PLLAR     (CKGR_PLLAR_STUCKTO1 \
-#error "Please define PLLA config for your MAINOSC frequency"
+					   | CKGR_PLLAR_MULA(7-1) \
-#endif /* MAINOSC */
+					   | CKGR_PLLAR_PLLACOUNT(0x1) \
-#else
+					   | CKGR_PLLAR_DIVA(2))
-    #error "No PLL settings for current BOARD_MCK."
+#else
-#endif
+	#error "Please define PLLA config for your BOARD_MCK/MAINOSC frequency"
-
+#endif
-#if (BOARD_MAINOSC == 12000000)
+
-#define PLLB_CFG (CKGR_PLLBR_DIVB(2)|CKGR_PLLBR_MULB(8-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
+#if (BOARD_MAINOSC == 12000000)
-#elif (BOARD_MAINOSC == 18432000)
+#define PLLB_CFG (CKGR_PLLBR_DIVB(2)|CKGR_PLLBR_MULB(8-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
-#define PLLB_CFG (CKGR_PLLBR_DIVB(5)|CKGR_PLLBR_MULB(13-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
+#elif (BOARD_MAINOSC == 18432000)
-#else
+#define PLLB_CFG (CKGR_PLLBR_DIVB(5)|CKGR_PLLBR_MULB(13-1)|CKGR_PLLBR_PLLBCOUNT_Msk)
-#error "Please configure PLLB for your MAINOSC freq"
+#else
-#endif
+#error "Please configure PLLB for your MAINOSC freq"
-
+#endif
-/* Define clock timeout */
+
-#define CLOCK_TIMEOUT    0xFFFFFFFF
+/* Define clock timeout */
-
+#define CLOCK_TIMEOUT    0xFFFFFFFF
-/**
+
- * \brief Configure 48MHz Clock for USB
+/**
- */
+ * \brief Configure 48MHz Clock for USB
-static void _ConfigureUsbClock(void)
+ */
-{
+static void _ConfigureUsbClock(void)
-	/* Enable PLLB for USB */
+{
-	PMC->CKGR_PLLBR = PLLB_CFG;
+	/* Enable PLLB for USB */
-	while ((PMC->PMC_SR & PMC_SR_LOCKB) == 0) ;
+	PMC->CKGR_PLLBR = PLLB_CFG;
-
+	while ((PMC->PMC_SR & PMC_SR_LOCKB) == 0) ;
-	/* USB Clock uses PLLB */
+
-	PMC->PMC_USB = PMC_USB_USBDIV(0)	/* /1 (no divider)  */
+	/* USB Clock uses PLLB */
-			    | PMC_USB_USBS;	/* PLLB */
+	PMC->PMC_USB = PMC_USB_USBDIV(0)	/* /1 (no divider)  */
-}
+			    | PMC_USB_USBS;	/* PLLB */
-
+}
-/*----------------------------------------------------------------------------
+
- *        Exported functions
+/*----------------------------------------------------------------------------
- *----------------------------------------------------------------------------*/
+ *        Exported functions
-
+ *----------------------------------------------------------------------------*/
-/**
+
- * \brief Performs the low-level initialization of the chip.
+/**
- * This includes EFC and master clock configuration.
+ * \brief Performs the low-level initialization of the chip.
- * It also enable a low level on the pin NRST triggers a user reset.
+ * This includes EFC and master clock configuration.
- */
+ * It also enable a low level on the pin NRST triggers a user reset.
-extern WEAK void LowLevelInit( void )
+ */
-{
+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
+
-     * lower than 3.0V.  As we run the board on 3.3V, any lower voltage
+	/* Configure the Supply Monitor to reset the CPU in case VDDIO is
-     * might be some kind of leakage that creeps in some way, but is not
+	 * lower than 3.0V.  As we run the board on 3.3V, any lower voltage
-     * the "official" power supply */
+	 * might be some kind of leakage that creeps in some way, but is not
-    SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
+	 * the "official" power supply */
-	    	      SUPC_SMMR_SMRSTEN_ENABLE;
+	SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
-
+	    	      SUPC_SMMR_SMRSTEN_ENABLE;
-    /* enable both LED and green LED */
+
-    PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
+	/* disable ERASE pin to prevent accidental flash erase */
-    PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
+	MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12;
-    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;
-    /* Select external slow clock */
+
-/*    if ((SUPC->SUPC_SR & SUPC_SR_OSCSEL) != SUPC_SR_OSCSEL_CRYST)
+	/* Set 3 FWS for Embedded Flash Access */
-    {
+	EFC->EEFC_FMR = EEFC_FMR_FWS(3);
-        SUPC->SUPC_CR = (uint32_t)(SUPC_CR_XTALSEL_CRYSTAL_SEL | SUPC_CR_KEY(0xA5));
+
-        timeout = 0;
+	/* Select external slow clock */
-        while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
+/*    if ((SUPC->SUPC_SR & SUPC_SR_OSCSEL) != SUPC_SR_OSCSEL_CRYST)
-    }
+	{
-*/
+		SUPC->SUPC_CR = (uint32_t)(SUPC_CR_XTALSEL_CRYSTAL_SEL | SUPC_CR_KEY(0xA5));
-
+		timeout = 0;
-#ifndef qmod
+		while (!(SUPC->SUPC_SR & SUPC_SR_OSCSEL_CRYST) );
-    /* Initialize main oscillator */
+	}
-    if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
+*/
-    {
+
-        PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
+#ifndef qmod
-        timeout = 0;
+	/* Initialize main oscillator */
-        while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
+	if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
-    }
+	{
-
+		PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN;
-    /* Switch to 3-20MHz Xtal oscillator */
+		timeout = 0;
-    PIOB->PIO_PDR = (1 << 8) | (1 << 9);
+		while (!(PMC->PMC_SR & PMC_SR_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));
-    PIOB->PIO_PUDR = (1 << 8) | (1 << 9);
+	}
-    PIOB->PIO_PPDDR = (1 << 8) | (1 << 9);
+
-    PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN | CKGR_MOR_MOSCSEL;
+	/* Switch to 3-20MHz Xtal oscillator */
-    /* wait for Main XTAL oscillator stabilization */
+	PIOB->PIO_PDR = (1 << 8) | (1 << 9);
-    timeout = 0;
+	PIOB->PIO_PUDR = (1 << 8) | (1 << 9);
-    while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
+	PIOB->PIO_PPDDR = (1 << 8) | (1 << 9);
-#else
+	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | BOARD_OSCOUNT | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTEN | CKGR_MOR_MOSCSEL;
-    /* QMOD has external 12MHz clock source */
+	/* wait for Main XTAL oscillator stabilization */
-    PIOB->PIO_PDR = (1 << 9);
+	timeout = 0;
-    PIOB->PIO_PUDR = (1 << 9);
+	while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
-    PIOB->PIO_PPDDR = (1 << 9);
+#else
-    PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL;
+	/* QMOD has external 12MHz clock source */
-#endif
+	PIOB->PIO_PDR = (1 << 9);
-
+	PIOB->PIO_PUDR = (1 << 9);
-    /* disable the red LED after main clock initialization */
+	PIOB->PIO_PPDDR = (1 << 9);
-    PIOA->PIO_SODR = PIO_LED_RED;
+	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL;
-
+#endif
-    /* "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;
+	/* disable the red LED after main clock initialization */
-    /* wait for master clock to be ready */
+	PIOA->PIO_SODR = PIO_LED_RED;
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+
-
+	/* "switch" to main clock as master clock source (should already be the case */
-    /* Initialize PLLA */
+	PMC->PMC_MCKR = (PMC->PMC_MCKR & ~(uint32_t)PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
-    PMC->CKGR_PLLAR = BOARD_PLLAR;
+	/* wait for master clock to be ready */
-    /* Wait for PLLA to lock */
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
-    timeout = 0;
+
-    while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
+	/* Initialize PLLA */
-
+	PMC->CKGR_PLLAR = BOARD_PLLAR;
-    /* Switch to main clock (again ?!?) */
+	/* Wait for PLLA to lock */
-    PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
+	timeout = 0;
-    /* wait for master clock to be ready */
+	while (!(PMC->PMC_SR & PMC_SR_LOCKA) && (timeout++ < CLOCK_TIMEOUT));
-    for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
+
-
+	/* Switch to main clock (again ?!?) */
-    /* switch to PLLA as master clock source */
+	PMC->PMC_MCKR = (BOARD_MCKR & ~PMC_MCKR_CSS_Msk) | PMC_MCKR_CSS_MAIN_CLK;
-    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) ; );
+
-
+	/* switch to PLLA as master clock source */
-    /* Configure SysTick for 1ms */
+	PMC->PMC_MCKR = BOARD_MCKR ;
-    SysTick_Config(BOARD_MCK/1000);
+	/* wait for master clock to be ready */
-
+	for ( timeout = 0; !(PMC->PMC_SR & PMC_SR_MCKRDY) && (timeout++ < CLOCK_TIMEOUT) ; );
-    _ConfigureUsbClock();
+
-}
+	/* Configure SysTick for 1ms */
-
+	SysTick_Config(BOARD_MCK/1000);
-/* SysTick based delay function */
+
-
+	_ConfigureUsbClock();
-volatile uint32_t jiffies;
+}
-
+
-/* Interrupt handler for SysTick interrupt */
+/* SysTick based delay function */
-void SysTick_Handler(void)
+
-{
+volatile uint32_t jiffies;
-	jiffies++;
+
-}
+/* Interrupt handler for SysTick interrupt */
-
+void SysTick_Handler(void)
-void mdelay(unsigned int msecs)
+{
-{
+	jiffies++;
-	uint32_t jiffies_start = jiffies;
+}
-	do {
+
-	} while ((jiffies - jiffies_start) < msecs);
+void mdelay(unsigned int msecs)
-}
+{
+	uint32_t jiffies_start = jiffies;
+	do {
+	} while ((jiffies - jiffies_start) < msecs);
+}
+
+void abort() {
+	NVIC_SystemReset();
+	while(1) {};
+}

firmware/libboard/common/source/boardver_adc.c

@@ -1,9 +1,22 @@
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include "boardver_adc.h"
 
-/* FIXME: share this with mode_cardemu.c */
 #define UV_PER_LSB	((3300 * 1000) / 4096)
-static uint32_t adc2uv(uint16_t adc)
+uint32_t adc2uv(uint16_t adc)
 {
 	uint32_t uv = (uint32_t) adc * UV_PER_LSB;
 	return uv;
@@ -73,7 +86,7 @@ int get_board_version_adc(void)
 	/* convert to voltage */
 	sample = ADC->ADC_CDR[2];
 	uv = adc2uv(sample);
-	TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv);
+	TRACE_INFO("VERSION_DET ADC=%u => %lu uV\r\n", sample, uv);
 
 	/* FIXME: convert to board version based on thresholds */
 

firmware/libboard/common/source/led.c

@@ -1,3 +1,22 @@
+/* LED control
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
@@ -16,9 +35,9 @@ static void led_set(enum led led, int on)
 	ASSERT(led < PIO_LISTSIZE(pinsLeds));
 
 	if (on)
-        	PIO_Set(&pinsLeds[led]);
+			PIO_Clear(&pinsLeds[led]);
 	else
-        	PIO_Clear(&pinsLeds[led]);
+			PIO_Set(&pinsLeds[led]);
 }
 
 /* LED blinking code */
@@ -27,7 +46,7 @@ static void led_set(enum led led, int on)
 struct blink_state {
 	/* duration of the state in ms */
 	uint16_t duration;
-	/* bringhtness of LED during the state */
+	/* brightness of LED during the state */
 	uint8_t on;
 } __attribute__((packed));
 
@@ -54,13 +73,23 @@ static const struct blink_state bs_3on_1off_3on_30off[] = {
 static const struct blink_state bs_3on_1off_3on_1off_3on_30off[] = {
 	{ 300, 1 }, { 100, 0 }, { 300, 1 }, { 100, 0 }, { 300, 1 }, { 3000, 0 }
 };
+
+static const struct blink_state bs_2on_off[] = {
+	{ 200, 1 }, { 0, 0 },
+};
+
 static const struct blink_state bs_200on_off[] = {
 	{ 20000, 1 }, { 0, 0 },
 };
+
 static const struct blink_state bs_600on_off[] = {
 	{ 60000, 1 }, { 0, 0 },
 };
 
+static const struct blink_state bs_2off_on[] = {
+	{ 200, 0 }, { 0, 1 },
+};
+
 
 /* a blink pattern is an array of blink_states */
 struct blink_pattern {
@@ -94,6 +123,10 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_3on_1off_3on_1off_3on_30off,
 		.size = ARRAY_SIZE(bs_3on_1off_3on_1off_3on_30off),
 	},
+	[BLINK_2O_F] = {
+		.states = bs_2on_off,
+		.size = ARRAY_SIZE(bs_2on_off),
+	},
 	[BLINK_200O_F] = {
 		.states = bs_200on_off,
 		.size = ARRAY_SIZE(bs_200on_off),
@@ -102,6 +135,11 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_600on_off,
 		.size = ARRAY_SIZE(bs_600on_off),
 	},
+	[BLINK_2F_O] = {
+		.states = bs_2off_on,
+		.size = ARRAY_SIZE(bs_2off_on),
+	},
+
 };
 
 struct led_state {
@@ -158,16 +196,16 @@ static void blink_tmr_cb(void *data)
 }
 
 static struct led_state led_state[] = {
-	[LED_GREEN] = {
-		.led = LED_GREEN,
-		.timer.cb = blink_tmr_cb,
-		.timer.data = &led_state[LED_GREEN],
-	},
 	[LED_RED] = {
 		.led = LED_RED,
 		.timer.cb = blink_tmr_cb,
 		.timer.data = &led_state[LED_RED],
 	},
+	[LED_GREEN] = {
+		.led = LED_GREEN,
+		.timer.cb = blink_tmr_cb,
+		.timer.data = &led_state[LED_GREEN],
+	},
 };
 #endif /* PINS_LEDS */
 

firmware/libboard/common/source/manifest.c

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

firmware/libboard/common/source/uart_console.c

@@ -1,380 +1,453 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
+ *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
+ * Copyright (c) 2009, Atmel Corporation
- *
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- * All rights reserved.
+ *
- *
+ * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
+ *
- * modification, are permitted provided that the following conditions are met:
+ * Redistribution and use in source and binary forms, with or without
- *
+ * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
+ *
- * this list of conditions and the disclaimer below.
+ * - Redistributions of source code must retain the above copyright notice,
- *
+ * this list of conditions and the disclaimer below.
- * Atmel's name may not be used to endorse or promote products derived from
+ *
- * this software without specific prior written permission.
+ * Atmel's name may not be used to endorse or promote products derived from
- *
+ * this software without specific prior written permission.
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * ----------------------------------------------------------------------------
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ * ----------------------------------------------------------------------------
-
+ */
-/**
+
- * \file
+/**
- *
+ * \file
- * Implements UART console.
+ *
- *
+ * Implements UART console.
- */
+ *
-
+ */
-/*----------------------------------------------------------------------------
+
- *        Headers
+/*----------------------------------------------------------------------------
- *----------------------------------------------------------------------------*/
+ *        Headers
-
+ *----------------------------------------------------------------------------*/
-#include "board.h"
+
-
+#include "board.h"
-#include <stdio.h>
+
-#include <stdint.h>
+#include <stdio.h>
-
+#include <stdint.h>
-/*----------------------------------------------------------------------------
+
- *        Definitions
+#include "ringbuffer.h"
- *----------------------------------------------------------------------------*/
+
-
+/*----------------------------------------------------------------------------
-/*----------------------------------------------------------------------------
+ *        Definitions
- *        Variables
+ *----------------------------------------------------------------------------*/
- *----------------------------------------------------------------------------*/
+
-
+/*----------------------------------------------------------------------------
-/** Is Console Initialized. */
+ *        Variables
-static uint8_t _ucIsConsoleInitialized=0 ;
+ *----------------------------------------------------------------------------*/
-
+
-/**
+/** Is Console Initialized. */
- * \brief Configures an USART peripheral with the specified parameters.
+static uint8_t _ucIsConsoleInitialized=0;
- *
+/** Ring buffer to queue data to be sent */
- * \param baudrate  Baudrate at which the USART should operate (in Hz).
+static ringbuf uart_tx_buffer;
- * \param masterClock  Frequency of the system master clock (in Hz).
+
- */
+/**
-extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
+ * \brief Configures an USART peripheral with the specified parameters.
-{
+ *
-    const Pin pPins[] = CONSOLE_PINS;
+ * \param baudrate  Baudrate at which the USART should operate (in Hz).
-    Uart *pUart = CONSOLE_USART;
+ * \param masterClock  Frequency of the system master clock (in Hz).
-
+ */
-    /* Configure PIO */
+extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
-    PIO_Configure(pPins, PIO_LISTSIZE(pPins));
+{
-
+	const Pin pPins[] = CONSOLE_PINS;
-    /* Configure PMC */
+	Uart *pUart = CONSOLE_UART;
-    PMC->PMC_PCER0 = 1 << CONSOLE_ID;
+
-
+	/* Configure PIO */
-    /* Reset and disable receiver & transmitter */
+	PIO_Configure(pPins, PIO_LISTSIZE(pPins));
-    pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
+
-                   | UART_CR_RXDIS | UART_CR_TXDIS;
+	/* Configure PMC */
-
+	PMC->PMC_PCER0 = 1 << CONSOLE_ID;
-    /* Configure mode */
+
-    pUart->UART_MR =  UART_MR_PAR_NO;
+	/* Reset and disable receiver & transmitter */
-
+	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX
-    /* Configure baudrate */
+				   | UART_CR_RXDIS | UART_CR_TXDIS;
-    /* Asynchronous, no oversampling */
+
-    pUart->UART_BRGR = (masterClock / baudrate) / 16;
+	/* Configure mode */
-
+	pUart->UART_MR =  UART_MR_PAR_NO;
-    /* Disable PDC channel */
+
-    pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
+	/* Configure baudrate */
-
+	/* Asynchronous, no oversampling */
-    /* Enable receiver and transmitter */
+	//pUart->UART_BRGR = (masterClock / baudrate) / 16;
-    pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
+	if ((masterClock / baudrate) % 16 >= 7) {
-
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1;
-    _ucIsConsoleInitialized=1 ;
+	} else {
-}
+		pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0;
-
+	}
-/**
+
- * \brief Outputs a character on the UART line.
+	/* Disable PDC channel */
- *
+	pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
- * \note This function is synchronous (i.e. uses polling).
+
- * \param c  Character to send.
+	/* Reset transmit ring buffer */
- */
+	rbuf_reset(&uart_tx_buffer);
-extern void UART_PutChar( uint8_t c )
+
-{
+	/* Enable TX interrupts */
-    Uart *pUart=CONSOLE_USART ;
+	pUart->UART_IER = UART_IER_TXRDY;
-
+	NVIC_EnableIRQ(CONSOLE_IRQ);
-    if ( !_ucIsConsoleInitialized )
+	
-    {
+	/* Enable receiver and transmitter */
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+	pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
-    }
+
-
+	/* Remember the configuration is complete */
-    /* Wait for the transmitter to be ready */
+	_ucIsConsoleInitialized=1 ;
-    while ( (pUart->UART_SR & UART_SR_TXEMPTY) == 0 ) ;
+}
-
+
-    /* Send character */
+/**
-    pUart->UART_THR=c ;
+ * \brief Disables the USART peripheral and related IRQ
-
+ */
-}
+void UART_Exit(void)
-
+{
-/**
+	if (!_ucIsConsoleInitialized) {
- * \brief Input a character from the UART line.
+		return;
- *
+	}
- * \note This function is synchronous
+
- * \return character received.
+	Uart *pUart = CONSOLE_UART;
- */
+	pUart->UART_IDR = UART_IDR_TXRDY;
-extern uint32_t UART_GetChar( void )
+	pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS | UART_CR_RSTSTA;
-{
+	PMC->PMC_PCDR0 = 1 << CONSOLE_ID;
-    Uart *pUart=CONSOLE_USART ;
+	NVIC_DisableIRQ(CONSOLE_IRQ);
-
+}
-    if ( !_ucIsConsoleInitialized )
+
-    {
+/** Interrupt Service routine to transmit queued data */
-        UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
+void CONSOLE_ISR(void)
-    }
+{
-
+	Uart *uart = CONSOLE_UART;
-    while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 ) ;
+	if (uart->UART_SR & UART_SR_TXRDY) {
-
+		if (!rbuf_is_empty(&uart_tx_buffer)) {
-    return pUart->UART_RHR ;
+			uart->UART_THR = rbuf_read(&uart_tx_buffer);
-}
+		} else {
-
+			uart->UART_IDR = UART_IER_TXRDY;
-/**
+		}
- * \brief Check if there is Input from UART line.
+	}
- *
+}
- * \return true if there is Input.
+
- */
+/**
-extern uint32_t UART_IsRxReady( void )
+ * \brief Outputs a character on the UART line.
-{
+ *
-    Uart *pUart=CONSOLE_USART ;
+ * \note This function is asynchronous (i.e. uses a buffer and interrupt to complete the transfer).
-
+ * \param c  Character to send.
-    if ( !_ucIsConsoleInitialized )
+ */
-    {
+void UART_PutChar( uint8_t uc )
-        UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
+{
-    }
+	Uart *pUart = CONSOLE_UART ;
-
+
-    return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
+	/* Initialize console is not already done */
-}
+	if ( !_ucIsConsoleInitialized )
-
+	{
-/**
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
- *  Displays the content of the given frame on the UART0.
+	}
- *
+
- *  \param pucFrame Pointer to the frame to dump.
+	if (!rbuf_is_full(&uart_tx_buffer)) {
- *  \param dwSize   Buffer size in bytes.
+		rbuf_write(&uart_tx_buffer, uc);
- */
+		if (!(pUart->UART_IMR & UART_IMR_TXRDY)) {
-extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
+			pUart->UART_IER = UART_IER_TXRDY;
-{
+			CONSOLE_ISR();
-    uint32_t dw ;
+		}
-
+	}
-    for ( dw=0 ; dw < dwSize ; dw++ )
+}
-    {
+
-        printf( "%02X ", pucFrame[dw] ) ;
+/**
-    }
+ * \brief Outputs a character on the UART line.
-
+ *
-    printf( "\n\r" ) ;
+ * \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 )
- *  Displays the content of the given buffer on the UART0.
+{
- *
+	Uart *pUart = CONSOLE_UART ;
- *  \param pucBuffer  Pointer to the buffer to dump.
+
- *  \param dwSize     Buffer size in bytes.
+	/* Initialize console is not already done */
- *  \param dwAddress  Start address to display
+	if ( !_ucIsConsoleInitialized )
- */
+	{
-extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-{
+	}
-    uint32_t i ;
+
-    uint32_t j ;
+	while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to be empty */
-    uint32_t dwLastLineStart ;
+	pUart->UART_THR = uc; /* Send data to UART peripheral */
-    uint8_t* pucTmp ;
+	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) */
-    for ( i=0 ; i < (dwSize / 16) ; i++ )
+}
-    {
+
-        printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
+/**
-        pucTmp = (uint8_t*)&pucBuffer[i*16] ;
+ * \brief Input a character from the UART line.
-
+ *
-        for ( j=0 ; j < 4 ; j++ )
+ * \note This function is synchronous
-        {
+ * \return character received.
-            printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
+ */
-            pucTmp += 4 ;
+extern uint32_t UART_GetChar( void )
-        }
+{
-
+	Uart *pUart = CONSOLE_UART ;
-        pucTmp=(uint8_t*)&pucBuffer[i*16] ;
+
-
+	if ( !_ucIsConsoleInitialized )
-        for ( j=0 ; j < 16 ; j++ )
+	{
-        {
+		UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK);
-            UART_PutChar( *pucTmp++ ) ;
+	}
-        }
+
-
+	while ( (pUart->UART_SR & UART_SR_RXRDY) == 0 )
-        printf( "\n\r" ) ;
+		WDT_Restart(WDT);
-    }
+
-
+	return pUart->UART_RHR ;
-    if ( (dwSize%16) != 0 )
+}
-    {
+
-        dwLastLineStart=dwSize - (dwSize%16) ;
+/**
-
+ * \brief Check if there is Input from UART line.
-        printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
+ *
-        for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
+ * \return true if there is Input.
-        {
+ */
-            if ( (j!=dwLastLineStart) && (j%4 == 0) )
+extern uint32_t UART_IsRxReady( void )
-            {
+{
-                printf( " " ) ;
+	Uart *pUart = CONSOLE_UART;
-            }
+
-
+	if ( !_ucIsConsoleInitialized )
-            if ( j < dwSize )
+	{
-            {
+		UART_Configure( CONSOLE_BAUDRATE, BOARD_MCK ) ;
-                printf( "%02X", pucBuffer[j] ) ;
+	}
-            }
+
-            else
+	return (pUart->UART_SR & UART_SR_RXRDY) > 0 ;
-            {
+}
-                printf("  ") ;
+
-            }
+/**
-        }
+ *  Displays the content of the given frame on the UART0.
-
+ *
-        printf( " " ) ;
+ *  \param pucFrame Pointer to the frame to dump.
-        for ( j=dwLastLineStart ; j < dwSize ; j++ )
+ *  \param dwSize   Buffer size in bytes.
-        {
+ */
-            UART_PutChar( pucBuffer[j] ) ;
+extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
-        }
+{
-
+	uint32_t dw ;
-        printf( "\n\r" ) ;
+
-    }
+	for ( dw=0 ; dw < dwSize ; dw++ )
-}
+	{
-
+		printf( "%02X ", pucFrame[dw] ) ;
-/**
+	}
- *  Reads an integer
+
- *
+	printf( "\n\r" ) ;
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+}
- */
+
-extern uint32_t UART_GetInteger( uint32_t* pdwValue )
+/**
-{
+ *  Displays the content of the given buffer on the UART0.
-    uint8_t ucKey ;
+ *
-    uint8_t ucNbNb=0 ;
+ *  \param pucBuffer  Pointer to the buffer to dump.
-    uint32_t dwValue=0 ;
+ *  \param dwSize     Buffer size in bytes.
-
+ *  \param dwAddress  Start address to display
-    while ( 1 )
+ */
-    {
+extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress )
-        ucKey=UART_GetChar() ;
+{
-        UART_PutChar( ucKey ) ;
+	uint32_t i ;
-
+	uint32_t j ;
-        if ( ucKey >= '0' &&  ucKey <= '9' )
+	uint32_t dwLastLineStart ;
-        {
+	uint8_t* pucTmp ;
-            dwValue = (dwValue * 10) + (ucKey - '0');
+
-            ucNbNb++ ;
+	for ( i=0 ; i < (dwSize / 16) ; i++ )
-        }
+	{
-        else
+		printf( "0x%08X: ", (unsigned int)(dwAddress + (i*16)) ) ;
-        {
+		pucTmp = (uint8_t*)&pucBuffer[i*16] ;
-            if ( ucKey == 0x0D || ucKey == ' ' )
+
-            {
+		for ( j=0 ; j < 4 ; j++ )
-                if ( ucNbNb == 0 )
+		{
-                {
+			printf( "%02X%02X%02X%02X ", pucTmp[0], pucTmp[1], pucTmp[2], pucTmp[3] ) ;
-                    printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
+			pucTmp += 4 ;
-                    return 0 ;
+		}
-                }
+
-                else
+		pucTmp=(uint8_t*)&pucBuffer[i*16] ;
-                {
+
-                    printf( "\n\r" ) ;
+		for ( j=0 ; j < 16 ; j++ )
-                    *pdwValue=dwValue ;
+		{
-
+			UART_PutChar( *pucTmp++ ) ;
-                    return 1 ;
+		}
-                }
+
-            }
+		printf( "\n\r" ) ;
-            else
+	}
-            {
+
-                printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
+	if ( (dwSize%16) != 0 )
-
+	{
-                return 0 ;
+		dwLastLineStart=dwSize - (dwSize%16) ;
-            }
+
-        }
+		printf( "0x%08X: ", (unsigned int)(dwAddress + dwLastLineStart) ) ;
-    }
+		for ( j=dwLastLineStart ; j < dwLastLineStart+16 ; j++ )
-}
+		{
-
+			if ( (j!=dwLastLineStart) && (j%4 == 0) )
-/**
+			{
- *  Reads an integer and check the value
+				printf( " " ) ;
- *
+			}
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+
- *  \param dwMin     Minimum value
+			if ( j < dwSize )
- *  \param dwMax     Maximum value
+			{
- */
+				printf( "%02X", pucBuffer[j] ) ;
-extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
+			}
-{
+			else
-    uint32_t dwValue=0 ;
+			{
-
+				printf("  ") ;
-    if ( UART_GetInteger( &dwValue ) == 0 )
+			}
-    {
+		}
-        return 0 ;
+
-    }
+		printf( " " ) ;
-
+		for ( j=dwLastLineStart ; j < dwSize ; j++ )
-    if ( dwValue < dwMin || dwValue > dwMax )
+		{
- {
+			UART_PutChar( pucBuffer[j] ) ;
-        printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
+		}
-
+
-        return 0 ;
+		printf( "\n\r" ) ;
-    }
+	}
-
+}
-    printf( "\n\r" ) ;
+
-
+/**
-    *pdwValue = dwValue ;
+ *  Reads an integer
-
+ *
-    return 1 ;
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
-}
+ */
-
+extern uint32_t UART_GetInteger( uint32_t* pdwValue )
-/**
+{
- *  Reads an hexadecimal number
+	uint8_t ucKey ;
- *
+	uint8_t ucNbNb=0 ;
- *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+	uint32_t dwValue=0 ;
- */
+
-extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
+	while ( 1 )
-{
+	{
-    uint8_t ucKey ;
+		ucKey=UART_GetChar() ;
-    uint32_t dw = 0 ;
+		UART_PutChar( ucKey ) ;
-    uint32_t dwValue = 0 ;
+
-
+		if ( ucKey >= '0' &&  ucKey <= '9' )
-    for ( dw=0 ; dw < 8 ; dw++ )
+		{
-    {
+			dwValue = (dwValue * 10) + (ucKey - '0');
-        ucKey = UART_GetChar() ;
+			ucNbNb++ ;
-        UART_PutChar( ucKey ) ;
+		}
-
+		else
-        if ( ucKey >= '0' &&  ucKey <= '9' )
+		{
-        {
+			if ( ucKey == 0x0D || ucKey == ' ' )
-            dwValue = (dwValue * 16) + (ucKey - '0') ;
+			{
-        }
+				if ( ucNbNb == 0 )
-        else
+				{
-        {
+					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
-            if ( ucKey >= 'A' &&  ucKey <= 'F' )
+					return 0 ;
-            {
+				}
-                dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
+				else
-            }
+				{
-            else
+					printf( "\n\r" ) ;
-            {
+					*pdwValue=dwValue ;
-                if ( ucKey >= 'a' &&  ucKey <= 'f' )
+
-                {
+					return 1 ;
-                    dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
+				}
-                }
+			}
-                else
+			else
-                {
+			{
-                    printf( "\n\rIt is not a hexa character!\n\r" ) ;
+				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
-
+
-                    return 0 ;
+				return 0 ;
-                }
+			}
-            }
+		}
-        }
+		WDT_Restart(WDT);
-    }
+	}
-
+}
-    printf("\n\r" ) ;
+
-    *pdwValue = dwValue ;
+/**
-
+ *  Reads an integer and check the value
-    return 1 ;
+ *
-}
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
-
+ *  \param dwMin     Minimum value
-#if defined __ICCARM__ /* IAR Ewarm 5.41+ */
+ *  \param dwMax     Maximum value
-/**
+ */
- * \brief Outputs a character on the UART.
+extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint32_t dwMax )
- *
+{
- * \param c  Character to output.
+	uint32_t dwValue=0 ;
- *
+
- * \return The character that was output.
+	if ( UART_GetInteger( &dwValue ) == 0 )
- */
+	{
-extern WEAK signed int putchar( signed int c )
+		return 0 ;
-{
+	}
-    UART_PutChar( c ) ;
+
-
+	if ( dwValue < dwMin || dwValue > dwMax )
-    return c ;
+ {
-}
+		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
-#endif // defined __ICCARM__
+
-
+		return 0 ;
+	}
+
+	printf( "\n\r" ) ;
+
+	*pdwValue = dwValue ;
+
+	return 1 ;
+}
+
+/**
+ *  Reads an hexadecimal number
+ *
+ *  \param pdwValue  Pointer to the uint32_t variable to contain the input value.
+ */
+extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
+{
+	uint8_t ucKey ;
+	uint32_t dw = 0 ;
+	uint32_t dwValue = 0 ;
+
+	for ( dw=0 ; dw < 8 ; dw++ )
+	{
+		ucKey = UART_GetChar() ;
+		UART_PutChar( ucKey ) ;
+
+		if ( ucKey >= '0' &&  ucKey <= '9' )
+		{
+			dwValue = (dwValue * 16) + (ucKey - '0') ;
+		}
+		else
+		{
+			if ( ucKey >= 'A' &&  ucKey <= 'F' )
+			{
+				dwValue = (dwValue * 16) + (ucKey - 'A' + 10) ;
+			}
+			else
+			{
+				if ( ucKey >= 'a' &&  ucKey <= 'f' )
+				{
+					dwValue = (dwValue * 16) + (ucKey - 'a' + 10) ;
+				}
+				else
+				{
+					printf( "\n\rIt is not a hexa character!\n\r" ) ;
+
+					return 0 ;
+				}
+			}
+		}
+	}
+
+	printf("\n\r" ) ;
+	*pdwValue = dwValue ;
+
+	return 1 ;
+}
+
+#if defined __ICCARM__ /* IAR Ewarm 5.41+ */
+/**
+ * \brief Outputs a character on the UART.
+ *
+ * \param c  Character to output.
+ *
+ * \return The character that was output.
+ */
+extern WEAK signed int putchar( signed int c )
+{
+	UART_PutChar( c ) ;
+
+	return c ;
+}
+#endif // defined __ICCARM__
+

firmware/libboard/octsimtest/include/board.h

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

firmware/libboard/octsimtest/include/i2c.h

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

firmware/libboard/octsimtest/include/mcp23017.h

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

firmware/libboard/octsimtest/product_string.txt

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

firmware/libboard/octsimtest/source/board_octsimtest.c

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

firmware/libboard/octsimtest/source/i2c.c

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

firmware/libboard/octsimtest/source/mcp23017.c

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

firmware/libboard/owhw/include/board.h

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

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

firmware/libboard/owhw/source/owhw.c

@@ -1,28 +1,55 @@
-/* Card simulator specific functions */
+/* Card simulator specific functions
-/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
  *
- *  This program is free software; you can redistribute it and/or modify
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- *  it under the terms of the GNU General Public License as published by
+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ * This program is free software; you can redistribute it and/or modify
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * it under the terms of the GNU General Public License as published by
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * the Free Software Foundation; either version 2 of the License, or
- *  GNU General Public License for more details.
+ * (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
+ * This program is distributed in the hope that it will be useful,
- *  along with this program; if not, write to the Free Software
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
  */
 
 #include "chip.h"
 #include "board.h"
 #include "utils.h"
+#include "usb_buf.h"
 
 static const Pin pins_cardsim[] = PINS_CARDSIM;
 
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\n\r");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	default:
+		printf("Unknown command '%c'\n\r", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+#endif
+}
+
 void cardsim_set_simpres(uint8_t slot, int present)
 {
 	if (slot > 1)
@@ -36,5 +63,18 @@ void cardsim_set_simpres(uint8_t slot, int present)
 
 void cardsim_gpio_init(void)
 {
-	PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim));
+	PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));
+}
+
+int board_override_enter_dfu(void)
+{
+	const Pin bl_pin = PIN_BOOTLOADER;
+
+	PIO_Configure(&bl_pin, 1);
+
+	if (PIO_Get(&bl_pin) == 0) { // signal low
+		return 0; // do not override enter DFU
+	} else {
+		return 1; // override enter DFU
+	}
 }

firmware/libboard/owhw/source/sim_switch.c

@@ -1,7 +1,24 @@
-/* Code to switch between local (physical) and remote (emulated) SIM */
+/* Code to switch between local (physical) and remote (emulated) SIM
-
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include "trace.h"
+#include "led.h"
 #include "sim_switch.h"
 
 #ifdef PIN_SIM_SWITCH1
@@ -16,6 +33,7 @@ static int initialized = 0;
 int sim_switch_use_physical(unsigned int nr, int physical)
 {
 	const Pin *pin;
+	enum led led;
 
 	if (!initialized) {
 		TRACE_ERROR("Somebody forgot to call sim_switch_init()\r\n");
@@ -29,11 +47,13 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 #ifdef PIN_SIM_SWITCH1
 	case 0:
 		pin = &pin_conn_usim1;
+		led = LED_USIM1;
 		break;
 #endif
 #ifdef PIN_SIM_SWITCH2
 	case 1:
 		pin = &pin_conn_usim2;
+		led = LED_USIM2;
 		break;
 #endif
 	default:
@@ -44,9 +64,11 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 	if (physical) {
 		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
 		PIO_Clear(pin);
+		led_blink(led, BLINK_ALWAYS_ON);
 	} else {
 		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
 		PIO_Set(pin);
+		led_blink(led, BLINK_ALWAYS_OFF);
 	}
 
 	return 0;
@@ -63,5 +85,6 @@ int sim_switch_init(void)
 	PIO_Configure(&pin_conn_usim2, 1);
 	num_switch++;
 #endif
+	initialized = 1;
 	return num_switch;
 }

firmware/libboard/qmod/include/board.h

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

firmware/libboard/qmod/include/card_pres.h

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

firmware/libboard/qmod/include/i2c.h

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

firmware/libboard/qmod/include/wwan_led.h

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

firmware/libboard/qmod/include/wwan_perst.h

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

firmware/libboard/qmod/product_string.txt

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

firmware/libboard/qmod/source/board_qmod.c

@@ -1,16 +1,34 @@
-/* Quad-modem speciic application code */
+/* sysmocom quad-modem sysmoQMOD application code
-/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
+ *
-
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
+#include "led.h"
 #include "wwan_led.h"
 #include "wwan_perst.h"
 #include "sim_switch.h"
 #include "boardver_adc.h"
 #include "card_pres.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 #include "usb_buf.h"
+#include "i2c.h"
 
 static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
 static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
@@ -29,6 +47,7 @@ static int qmod_sam3_is_12(void)
 		return 0;
 }
 
+#if (ALLOW_PEER_ERASE > 0)
 const unsigned char __eeprom_bin[256] = {
 	USB_VENDOR_OPENMOKO & 0xff,
 	USB_VENDOR_OPENMOKO >> 8,
@@ -52,11 +71,8 @@ const unsigned char __eeprom_bin[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
 };
 
-#include "i2c.h"
 static int write_hub_eeprom(void)
 {
-	const unsigned int __eeprom_bin_len = 256;
-
 	int i;
 
 	/* wait */
@@ -64,22 +80,25 @@ static int write_hub_eeprom(void)
 
 	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		/* if the result was negative, repeat that write */
+		if (rc < 0) {
-		if (rc < 0)
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
-			i--;
+				i, __eeprom_bin[i]);
+			return 1;
+		}
 	}
 
 	/* then pursue re-reading it again and again */
 	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_INFO("0x%02x: %02x\n\r", i, byte);
+		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
 			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
 					i, __eeprom_bin[i], byte);
 	}
+	TRACE_INFO("EEPROM written\n\r");
 
 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -87,6 +106,29 @@ static int write_hub_eeprom(void)
 	return 0;
 }
 
+static int erase_hub_eeprom(void)
+{
+	int i;
+
+	/* wait */
+	mdelay(100);
+
+	TRACE_INFO("Erasing EEPROM...\n\r");
+	/* write the EEPROM once */
+	for (i = 0; i < 256; i++) {
+		int rc = eeprom_write_byte(0x50, i, 0xff);
+		if (rc < 0) {
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
+				i, __eeprom_bin[i]);
+			return 1;
+		}
+	}
+	TRACE_INFO("EEPROM erased\n\r");
+
+	return 0;
+}
+#endif /* ALLOW_PEER_ERASE */
+
 static void board_exec_dbg_cmd_st12only(int ch)
 {
 	uint32_t addr, val;
@@ -96,9 +138,14 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		return;
 
 	switch (ch) {
+#if (ALLOW_PEER_ERASE > 0)
 	case 'E':
 		write_hub_eeprom();
 		break;
+	case 'e':
+		erase_hub_eeprom();
+		break;
+#endif /* ALLOW_PEER_ERASE */
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -107,6 +154,7 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
+#if (ALLOW_PEER_ERASE > 0)
 	case 'H':
 		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
@@ -123,13 +171,14 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		UART_GetIntegerMinMax(&addr, 0, 255);
 		printf("Please enter EEPROM value:\n\r");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
+#endif /* ALLOW_PEER_ERASE */
 	case 'r':
 		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
@@ -140,32 +189,70 @@ 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);
@@ -174,14 +261,24 @@ void board_exec_dbg_cmd(int ch)
 		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
+#if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
 		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
-	case 'y':
+	case 'a':
-		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
+		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
-		PIO_Set(&pin_peer_erase);
+		allow_erase = true;
 		break;
+	case 'y':
+		if (allow_erase) {
+			printf("Setting SIMTRACExx_ERASE (active)\n\r");
+			PIO_Set(&pin_peer_erase);
+		} else {
+			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
+		}
+		break;
+#endif /* ALLOW_PEER_ERASE */
 	case '1':
 		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
@@ -196,6 +293,9 @@ 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);
@@ -203,6 +303,13 @@ void board_exec_dbg_cmd(int ch)
 			board_exec_dbg_cmd_st12only(ch);
 		break;
 	}
+
+#if (ALLOW_PEER_ERASE > 0)
+	// set protection back so it can only run for one command
+	if ('a' != ch) {
+		allow_erase = false;
+	}
+#endif /* ALLOW_PEER_ERASE */
 }
 
 void board_main_top(void)
@@ -235,11 +342,13 @@ 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 */
@@ -249,3 +358,51 @@ void board_main_top(void)
 	card_present_init();
 #endif
 }
+
+static int uart_has_loopback_jumper(void)
+{
+	unsigned int i;
+	const Pin uart_loopback_pins[] = {
+		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
+		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+	};
+
+	/* Configure UART pins as I/O */
+	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
+
+	/* Send pattern over UART TX and check if it is received on RX
+	 * If the loop doesn't get interrupted, RxD always follows TxD and thus a
+	 * loopback jumper has been placed on RxD/TxD, and we will boot
+	 * into DFU unconditionally
+	 */
+	int has_loopback_jumper = 1;
+	for (i = 0; i < 10; i++) {
+		/* Set TxD high; abort if RxD doesn't go high either */
+		PIO_Set(&uart_loopback_pins[1]);
+		if (!PIO_Get(&uart_loopback_pins[0])) {
+			has_loopback_jumper = 0;
+			break;
+		}
+		/* Set TxD low, abort if RxD doesn't go low either */
+		PIO_Clear(&uart_loopback_pins[1]);
+		if (PIO_Get(&uart_loopback_pins[0])) {
+			has_loopback_jumper = 0;
+			break;
+		}
+	}
+
+	/* Put pins back to UART mode */
+	const Pin uart_pins[] = {PINS_UART};
+	PIO_Configure(uart_pins, PIO_LISTSIZE(uart_pins));
+
+	return has_loopback_jumper;
+}
+
+int board_override_enter_dfu(void)
+{
+	/* If the loopback jumper is set, we enter DFU mode */
+	if (uart_has_loopback_jumper())
+		return 1;
+
+	return 0;
+}

firmware/libboard/qmod/source/card_pres.c

@@ -1,3 +1,21 @@
+/* card presence utilities
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include <osmocom/core/timer.h>
 #include "board.h"
 #include "utils.h"
@@ -17,9 +35,9 @@ int is_card_present(int port)
 	const Pin *pin;
 	int present;
 
-	if (port < 1 || port > NUM_CARDPRES)
+	if (port < 0 || port >= NUM_CARDPRES)
 		return -1;
-	pin = &pin_cardpres[port-1];
+	pin = &pin_cardpres[port];
 
 	/* Card present signals are low-active, as we have a switch
 	 * against GND and an internal-pull-up in the SAM3 */
@@ -32,12 +50,12 @@ static void cardpres_tmr_cb(void *data)
 {
 	unsigned int i;
 
-	for (i = 1; i <= ARRAY_SIZE(pin_cardpres); i++) {
+	for (i = 0; i < ARRAY_SIZE(pin_cardpres); i++) {
 		int state = is_card_present(i);
-		if (state != last_state[i-1]) {
+		if (state != last_state[i]) {
-			TRACE_INFO("Card Detect %d Status %d -> %d\r\n", i, last_state[i], state);
+			TRACE_INFO("%u: Card Detect Status %d -> %d\r\n", i, last_state[i], state);
 			/* FIXME: report to USB host */
-			last_state[i-1] = state;
+			last_state[i] = state;
 		}
 	}
 

firmware/libboard/qmod/source/i2c.c

@@ -1,3 +1,19 @@
+/* I2C EEPROM memory read and write utilities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #include "board.h"
 #include <stdbool.h>
 
@@ -169,6 +185,8 @@ int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
 	nack = i2c_write_byte(false, true, byte);
 	if (nack)
 		goto out_stop;
+	/* Wait tWR time to ensure EEPROM is writing correctly (tWR = 5 ms for AT24C02) */
+	mdelay(5);
 
 out_stop:
 	i2c_stop_cond();

firmware/libboard/qmod/source/sim_switch.c

@@ -0,0 +1,90 @@
+/* Code to switch between local (physical) and remote (emulated) SIM
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
+#include "board.h"
+#include "trace.h"
+#include "led.h"
+#include "sim_switch.h"
+
+#ifdef PIN_SIM_SWITCH1
+static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+#ifdef PIN_SIM_SWITCH2
+static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+#endif
+
+static int initialized = 0;
+
+int sim_switch_use_physical(unsigned int nr, int physical)
+{
+	const Pin *pin;
+	enum led led;
+
+	if (!initialized) {
+		TRACE_ERROR("Somebody forgot to call sim_switch_init()\r\n");
+		sim_switch_init();
+	}
+
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
+		   physical ? "physical" : "virtual");
+
+	switch (nr) {
+#ifdef PIN_SIM_SWITCH1
+	case 0:
+		pin = &pin_conn_usim1;
+		led = LED_USIM1;
+		break;
+#endif
+#ifdef PIN_SIM_SWITCH2
+	case 1:
+		pin = &pin_conn_usim2;
+		led = LED_USIM2;
+		break;
+#endif
+	default:
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
+		return -1;
+	}
+
+	if (physical) {
+		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
+		PIO_Clear(pin);
+		led_blink(led, BLINK_ALWAYS_ON);
+	} else {
+		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
+		PIO_Set(pin);
+		led_blink(led, BLINK_ALWAYS_OFF);
+	}
+
+	return 0;
+}
+
+int sim_switch_init(void)
+{
+	int num_switch = 0;
+#ifdef PIN_SIM_SWITCH1
+	PIO_Configure(&pin_conn_usim1, 1);
+	num_switch++;
+#endif
+#ifdef PIN_SIM_SWITCH2
+	PIO_Configure(&pin_conn_usim2, 1);
+	num_switch++;
+#endif
+	initialized = 1;
+	return num_switch;
+}

firmware/libboard/qmod/source/wwan_led.c

@@ -1,11 +1,24 @@
 /* Code to read/track the status of the WWAN LEDs of attached modems
  *
- * Depending on the board this is running on,  it might be possible
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
+/* Depending on the board this is running on,  it might be possible
  * for the controller to read the status of the WWAN LED output lines of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_WWAN1 and/or PIN_WWAN2 defines in its board.h file.
  */
-
 #include "board.h"
 #include "wwan_led.h"
 
@@ -14,9 +27,9 @@ static const Pin pin_wwan1 = PIN_WWAN1;
 
 static void wwan1_irqhandler(const Pin *pPin)
 {
-	int active = wwan_led_active(1);
+	int active = wwan_led_active(0);
 
-	TRACE_INFO("WWAN1 LED %u\r\n", active);
+	TRACE_INFO("0: WWAN LED %u\r\n", active);
 
 	/* TODO: notify host via USB */
 }
@@ -27,8 +40,8 @@ static const Pin pin_wwan2 = PIN_WWAN2;
 
 static void wwan2_irqhandler(const Pin *pPin)
 {
-	int active = wwan_led_active(2);
+	int active = wwan_led_active(1);
-	TRACE_INFO("WWAN2 LED %u\r\n", active);
+	TRACE_INFO("1: WWAN LED %u\r\n", active);
 
 	/* TODO: notify host via USB */
 }
@@ -42,12 +55,12 @@ int wwan_led_active(int wwan)
 
 	switch (wwan) {
 #ifdef PIN_WWAN1
-	case 1:
+	case 0:
 		pin = &pin_wwan1;
 		break;
 #endif
 #ifdef PIN_WWAN2
-	case 2:
+	case 1:
 		pin = &pin_wwan2;
 		break;
 #endif

firmware/libboard/qmod/source/wwan_perst.c

@@ -1,29 +1,45 @@
 /* Code to control the PERST lines of attached modems
  *
- * Depending on the board this is running on,  it might be possible
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
+/* Depending on the board this is running on,  it might be possible
  * for the controller to set the status of the PERST input line of
  * the cellular modem.  If the board supports this, it sets the
  * PIN_PERST1 and/or PIN_PERST2 defines in its board.h file.
  */
-
 #include "board.h"
 #include "trace.h"
 #include "wwan_perst.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/timer.h>
 
 struct wwan_perst {
+	uint8_t idx;
 	const Pin pin;
 	struct osmo_timer_list timer;
 };
 
 #ifdef PIN_PERST1
 static struct wwan_perst perst1 = {
+	.idx = 0,
 	.pin = PIN_PERST1,
 };
 #endif
 
 #ifdef PIN_PERST2
 static struct wwan_perst perst2 = {
+	.idx = 1,
 	.pin = PIN_PERST2,
 };
 #endif
@@ -34,7 +50,7 @@ static void perst_tmr_cb(void *data)
 {
 	struct wwan_perst *perst = data;
 	/* release the (low-active) reset */
-	TRACE_INFO("De-asserting modem reset\r\n");
+	TRACE_INFO("%u: De-asserting modem reset\r\n", perst->idx);
 	PIO_Clear(&perst->pin);
 }
 
@@ -106,5 +122,6 @@ int wwan_perst_init(void)
 	perst2.timer.data = (void *) &perst2;
 	num_perst++;
 #endif
+	initialized = 1;
 	return num_perst;
 }

firmware/libboard/sam3p256/include/board.h

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

firmware/libboard/sam3p256/source/board_sam3p256.c

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

firmware/libboard/simtrace/include/board.h

@@ -1,87 +1,166 @@
+/* SIMtrace with SAM3S board definition
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+ */
 #pragma once
 #include "board_common.h"
+#include "simtrace_usb.h"
 
-/** Name of the board */
+/* Name of the board */
 #define BOARD_NAME "SAM3S-SIMTRACE"
-/** Board definition */
+/* Board definition */
 #define simtrace
 
+/** oscillator used as main clock source (in Hz) */
 #define BOARD_MAINOSC 18432000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58982400 // 18.432 * 16 / 5
 
-/** Phone (SIM card emulator)/CCID Reader/MITM configuration    **/
+/** MCU pin connected to red LED */
-/*  Normally the communication lines between phone and SIM card are disconnected    */
+#define PIO_LED_RED     PIO_PA17
-// Disconnect SIM card I/O, VPP line from the phone lines
+/** MCU pin connected to green LED */
-// FIXME: Per default pins are input, therefore high-impedance, therefore they don not activate the bus switch, right?
+#define PIO_LED_GREEN   PIO_PA18
-#define PIN_SC_SW_DEFAULT               {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** red LED pin definition */
-// Disconnect SIM card RST, CLK line from the phone lines
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PIN_IO_SW_DEFAULT               {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
-#define PINS_BUS_DEFAULT                PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+#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}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+/* Card presence pin */
+#define SW_SIM                  PIO_PA8
+/* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA4B_TCLK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
+
+/** Phone connection **/
+/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
+#define PIN_USIM1_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Phone CLK clock input (CLK_PHONE in schematic) */
+#define PIN_USIM1_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
+/* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
+#define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
+#define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+
+/** Default pin configuration **/
+/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
 
 /** Sniffer configuration **/
-// Connect VPP, CLK and RST lines from smartcard to the phone
+/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
 #define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
 #define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
 #define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
+/* Card RST reset signal input (use as input since the phone will drive it) */
+#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+/* Pins used to sniff phone-card communication */
+#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_SNIFF     {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_SNIFF      {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Use phone VCC to power card */
+#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
 
-#define PINS_SIM_SNIFF_SIM      PIN_PHONE_IO,  PIN_PHONE_CLK
+/** CCID configuration */
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* ISO7816-communication related pins */
+#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
 
-#define SIM_PWEN_PIN            {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** External SPI flash interface   **/
+/* SPI MISO pin definition */
+#define PIN_SPI_MISO  {PIO_PA12A_MISO, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
+/* SPI MOSI pin definition */
+#define PIN_SPI_MOSI  {PIO_PA13A_MOSI, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI SCK pin definition */
+#define PIN_SPI_SCK   {PIO_PA14A_SPCK, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI pins definition. Contains MISO, MOSI & SCK */
+#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SCK
+/* SPI chip select 0 pin definition */
+#define PIN_SPI_NPCS0 {PIO_PA11A_NPCS0, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* SPI flash write protect pin (active low, pulled low) */
+#define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 
-#define PWR_PINS                                                         \
+/** Pin configuration to control USB pull-up on D+
-    /* Enable power converter 4.5-6V to 3.3V; low: off */               \
+ *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
-    {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT},               \
+ */
-    /* Enable second power converter: VCC_PHONE to VCC_SIM; high: on */ \
+#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-    {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-#define SW_SIM      PIO_PA8
-#define SMARTCARD_CONNECT_PIN {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
-//#define SMARTCARD_CONNECT_PIN {SW_SIM, PIOB, ID_PIOB, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_IT_EDGE}
-
-/// PIN used for resetting the smartcard
-// FIXME: Card is resetted with pin set to 0 --> PIO_OUTPUT_1 as default is right?
-#define PIN_ISO7816_RSTMC       {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-/// Pins used for connect the smartcard
-#define PIN_SIM_IO_INPUT    {PIO_PA1, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_SIM_IO          {PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PIN_SIM_CLK         {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_SIM_CLK_INPUT   {PIO_PA4, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-//#define PINS_ISO7816            PIN_USART1_TXD, PIN_USART1_SCK, PIN_ISO7816_RSTMC
-#define PINS_ISO7816        PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
-
-#define PINS_TC             PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
-
-#define VCC_PHONE                   {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_ISO7816_RST_PHONE       {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
-#define PIN_PHONE_IO_INPUT          {PIO_PA21, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_PHONE_IO                {PIO_PA22, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PIN_PHONE_CLK               {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}     // External Clock Input on PA28
-//#define PIN_PHONE_CLK               {PIO_PA23A_SCK1, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}     // External Clock Input on PA28
-#define PIN_PHONE_CLK_INPUT         {PIO_PA29, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PINS_ISO7816_PHONE          PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, VCC_PHONE, PIN_PHONE_IO_INPUT, PIN_ISO7816_RST_PHONE
-//, VCC_PHONE
-
-
-//**     SPI interface   **/
-/// SPI MISO pin definition (PA12).
-#define PIN_SPI_MISO   {1 << 12, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
-/// SPI MOSI pin definition (PA13).
-#define PIN_SPI_MOSI   {1 << 13, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/// SPI SPCK pin definition (PA14).
-#define PIN_SPI_SPCK   {1 << 14, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/// SPI pins definition. Contains MISO, MOSI & SPCK (PA12, PA13 & PA14).
-#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SPCK
-/// SPI chip select 0 pin definition (PA11).
-#define PIN_SPI_NPCS0  {1 << 11, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 
+/** USB definitions */
+/* OpenMoko SIMtrace 2 USB vendor ID */
+#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
+/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
+/* USB release number (bcdDevice, shown as 0.00) */
+#define BOARD_USB_RELEASE	0x000
+/* Indicate SIMtrace is bus power in USB attributes */
 #define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
 
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
+/** Supported modes */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
+/* SIMtrace board supports sniffer mode */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
+#ifdef APPLICATION_trace
-#define BOARD_USB_RELEASE	0x000
-
 #define HAVE_SNIFFER
-#define HAVE_CCID
+#endif
+/* SIMtrace board supports CCID mode */
+//#define HAVE_CCID
+/* SIMtrace board supports card emulation mode */
+#ifdef APPLICATION_cardem
 #define HAVE_CARDEM
-#define HAVE_MITM
+#endif
+/* SIMtrace board supports man-in-the-middle mode */
+//#define HAVE_MITM

firmware/libboard/simtrace/product_string.txt

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