Build only 'reasonable' combinations of APP/MEMORY

There's no point in building a DFU loeader that is to be flashed
via DFU - nor is there really any need for regular cardem/trace
that can be flahsed directly without DFU.  If anyone needs those,
they can still build them - but let's not confuse the average other
user.

Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18
Closes: OS#4087

.gitignore

@@ -7,11 +7,18 @@ cscope.out
 */__pycache__
 *.E
 *.pyc
-sam3s_example/mains/zwizwa_ccid.c
-Baselibc
-venv
 tags
 *.hobj
 *.o
+*.a
+*.lst
+*.map
+*.elf
+*.size
+*.bin
+*.p
+host/simtrace2-list
 host/simtrace2-remsim
 host/simtrace2-remsim-usb2udp
+usb_strings_generated.h
+firmware/usbstring/usbstring

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "usb_application/pysim"]
-	path = usb_application/pysim
-	url = git://git.osmocom.org/pysim

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

@@ -1,112 +1,39 @@
-# SIMtrace v2.0
+SIMtrace v2.0
-The SIMtrace software together with the corresponding hardware provides a means to trace the communication between a SIM card and a mobile phone, and intercept it starting with SIMtrace software version 2.0 (together with SIMtrace board version 1.5).
+=============
-Furthermore, it provides a SIM card emulation and CCID reader mode.
 
-## How to compile
+This is the repository for the next-generation SIMtrace devices,
-A Makefile is provided. It created an image under bin/project-flash.bin, which can directly be flashed on the board (see section "How to flash").
+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.
 
-The level of debug messages can be altered at compile time:
+This is under heavy development, and right now it is not surprising if
-```
+things still break on a daily basis.
-$ make TRACE_LEVEL=4
-```
-Accepted values: 0 (NO_TRACE) to 5 (DEBUG)
 
-## How to flash
+NOTE: Nothing in this repository applies to the SIMtrace v1.x hardware
-For flashing the firmware, there are at least two options.
+or its associated firmware.  SIMtrace v1.x is based on a different CPU /
-The first one is using openocd and a JTAG key.
+microcontroller architecture and uses a completely different software
-For this option, a JTAG connector has to be soldered onto the board, which is not attached per default.
+stack and host software.
 
-The Makefile already provides an option for that:
+Supported Hardware
-```
+------------------
-$ make program
-```
-This command will call the following command:
-```
-$ openocd -f openocd/openocd.cfg -c "init" -c "halt" -c "flash write_bank 0 ./bin/project-flash.bin 0" -c "reset" -c "shutdown"
-```
 
-The second option is using rumba for flashing. No further hardware has to be provided for this option.
+At this point, the primary development target is still the OWHW + sysmoQMOD
-The software can be obtained with the following shell command:
+device, but we expect to add support for a SAM3 based SIMtrace hardware
-```
+board soon.
-$ git clone git://git.osmocom.org/osmo-sdr.git
-```
 
-Flashing the compiled firmware can be done with the following command:
+The goal is to support the following devices:
-```
-$ $OSMO_SDR_DIR/utils/rumba /dev/ttyACM0 flashmcu $FIRMWARE_DIR/bin/project-flash.bin
-```
 
-## How to set udev rules
+* Osmocom SIMtrace 1.x with SAM3 controller
-The next step is defining the udev rules for simtrace.
+** this is open hardware and schematics / PCB design is published
-Open the file /etc/udev/rules.d/90-simtrace.rules and enter those four lines:
+* 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
-# Temporary VID and PID
+---------------
-SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6004", MODE="666"
-# Future SIMtrace VID and PID
-SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0762)", MODE="666"
-```
 
-After reloading the udev rules, SIMtrace should be recognized by the operating system.
+This repository contains several directory
 
-## How to use
+* firmware - the firmware to run on the actual devices
-
+* hardware - some information related to the hardware
-After flashing the firmware and defining the udev rules, the python program simtrace.py can be used in order to command the board.
+* host - Programs to use on the USB host to interface with the hardware
-First, the configuration has to be set using the -C option, which has to be passed a number determining the mode:
-1: Sniffer mode
-2: CCID reader mode
-3: Mobile phone emulation mode
-4: MITM mode
-
-For example, setting the device into MITM mode can be achieved with the following command:
-```
-$ simtrace.py -C4
-```
-
-After setting the configuration, one of the following functionalities can be started:
-```
-  -s, --sniff           Sniff communication!
-  -S, --select_file     Transmit SELECT cmd!
-  -p, --phone           Emulates simcard
-  -m, --mitm            Intercept communication (MITM)
-```
-
-For example, in order to use simtrace in sniffer mode, the following command can be executed:
-```
-$ simtrace.py -C1 -s
-```
-For more information, execute the following command:
-```
-$ simtrace.py -h
-```
-
-
-## Logging
-The Makefile furthermore provides an easy option for reading the log messages.
-SIMtrace sends out log messages over the serial interface, using a connector with a 2.5mm jack.
-Using a serial to USB converter, the log messages can be read using the following command:
-
-```
-$ make log SERIAL=/dev/ttyUSB*
-```
-
-If no SERIAL is defined, /dev/ttyUSB0 is taken by default.
-
-
-## Known issues
-* If there is an error, it might result from a missing instruction byte in the list of instructions that expect data from the simcard.
-It can be updated in the file in apdu_split.py
-Especially, if the sniffer mode works well, but the mitm mode fails, that's a good place to start looking.
-The array is of the following form:
-`INS_data_expected = [0xC0, 0xB0, 0x12]`
-
-* For interacting with the SIM card (CCID reader and MITM mode), pcscd has to be
-started on the computer.
-
-* The maximum operating frequency of the device and hardware is not determined yet.
-The function for changing the FIDI is not tested yet because no device could be obtained, which would change the FIDI in the middle of the communication.
-Most devices stick with the default FIDI.
-
-* The software assumes a master-slave-protocol: The master sends a command, the slave answers this.
-If this premise is not met, the software will not operate properly.
-This should be taken into account when programming the Mobile phone emulator or MITM mode.

contrib/jenkins.sh

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

debian/changelog

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

firmware/Makefile

@@ -28,55 +28,43 @@
 
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 
+GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
 
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-CHIP  = sam3s2
+CHIP  ?= sam3s4
-BOARD = simtrace
+BOARD ?= qmod
+APP ?= dfu
 
 # Defines which are the available memory targets for the SAM3S-EK board.
-MEMORIES = flash
+ifeq ($(APP), dfu)
+MEMORIES ?= flash
+else
+MEMORIES ?= dfu
+endif
 
-# Trace level used for compilation
+# Output directories and filename
-# (can be overriden by adding TRACE_LEVEL=#number to the command-line)
+OUTPUT = $(BOARD)-$(APP)
-# TRACE_LEVEL_DEBUG      5
-# TRACE_LEVEL_INFO       4
-# TRACE_LEVEL_WARNING    3
-# TRACE_LEVEL_ERROR      2
-# TRACE_LEVEL_FATAL      1
-# TRACE_LEVEL_NO_TRACE   0
-TRACE_LEVEL = 4
-#FIXME: Remove this variable
-NOAUTOCALLBACK=no
-
-DEBUG_PHONE_SNIFF=0
-
-#CFLAGS+=-DUSB_NO_DEBUG=1
-
-# Optimization level, put in comment for debugging
-OPTIMIZATION = -O0
-
-# Output file basename
-OUTPUT = project
-
-# Output directories
 BIN = bin
-OBJ = obj
+OBJ = obj/$(BOARD)
 
 #-------------------------------------------------------------------------------
 #		Tools
 #-------------------------------------------------------------------------------
 
-AT91LIB_USB_COMMON_CORE_PATH = atmel_softpack_libraries/usb/common/core
+AT91LIB = ./atmel_softpack_libraries
-AT91LIB_USB_CORE_PATH = atmel_softpack_libraries/usb/device/core
+
+AT91LIB_USB_COMMON_CORE_PATH = $(AT91LIB)/usb/common/core
+AT91LIB_USB_CORE_PATH = $(AT91LIB)/usb/device/core
+AT91LIB_USB_DFU_PATH = $(AT91LIB)/usb/device/dfu
 
 # Tool suffix when cross-compiling
 CROSS_COMPILE = arm-none-eabi-
 
-LIBS = -Wl,--start-group -lgcc -lc -Wl,--end-group
+LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib
 
 # Compilation tools
 CC = $(CROSS_COMPILE)gcc
@@ -88,30 +76,82 @@ GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
 TOP=..
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
+
+#-------------------------------------------------------------------------------
+#		Files
+#-------------------------------------------------------------------------------
+
+# Directories where source files can be found
+
+USB_PATHS = $(AT91LIB_USB_CORE_PATH) $(AT91LIB_USB_DFU_PATH) $(AT91LIB_USB_COMMON_CORE_PATH)
+
+VPATH += $(USB_PATHS)
+VPATH += $(AT91LIB)/libchip_sam3s/source/ $(AT91LIB)/libchip_sam3s/cmsis
+VPATH += libboard/common/source libboard/$(BOARD)/source
+VPATH += libcommon/source
+VPATH += libosmocore/source 
+VPATH += apps/$(APP)
+
+# Objects built from C source files
+C_OSMOCORE = $(notdir $(wildcard libosmocore/source/*.c))
+C_LIBCHIP  = $(notdir $(wildcard $(AT91LIB)/libchip_sam3s/source/*.c) $(wildcard $(AT91LIB)/libchip_sam3s/cmsis/*.c))
+
+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_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))
+C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
+
+C_APPLEVEL = $(notdir $(wildcard apps/$(APP)/*.c))
+
+C_FILES  = $(C_OSMOCORE) $(C_LIBCHIP) $(C_LIBUSB) $(C_LIBCOMMON) $(C_BOARD) $(C_APPLEVEL)
+
+-include apps/$(APP)/Makefile
+
+C_OBJECTS  = $(C_FILES:%.c=%.o)
+
+# Trace level used for compilation
+# (can be overriden by adding TRACE_LEVEL=#number to the command-line)
+# TRACE_LEVEL_DEBUG      5
+# TRACE_LEVEL_INFO       4
+# TRACE_LEVEL_WARNING    3
+# TRACE_LEVEL_ERROR      2
+# TRACE_LEVEL_FATAL      1
+# TRACE_LEVEL_NO_TRACE   0
+TRACE_LEVEL ?= 4
+
+# 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 = -Iatmel_softpack_libraries/usb/include
+INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
 
-INCLUDES  = -Iinclude_board -Iinclude_sam3s -Iinclude -Isrc_simtrace
+INCLUDES = $(INCLUDES_USB)
+INCLUDES += -I$(AT91LIB)/libchip_sam3s -I$(AT91LIB)/libchip_sam3s/include
+INCLUDES += -I$(AT91LIB)/libchip_sam3s/cmsis
+INCLUDES += -Ilibboard/common/include -Ilibboard/$(BOARD)/include
+INCLUDES += -Ilibcommon/include
+INCLUDES += -Ilibosmocore/include
+INCLUDES += -Isrc_simtrace -Iinclude
+INCLUDES += -Iapps/$(APP)
 
-# FIXME: This must be made configurable!
+CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
-#INCLUDES += -Iinclude_board/simtrace
-INCLUDES += -Iinclude_board/owhw
-
-INCLUDES += -Icmsis
-INCLUDES += $(INCLUDES_USB)
-
-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
+CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
 CFLAGS += -Wunreachable-code
 #CFLAGS += -Wcast-align
 #CFLAGS += -std=c11
@@ -120,67 +160,71 @@ CFLAGS += -Wmissing-noreturn
 CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable
 CFLAGS += -Wno-suggest-attribute=noreturn
 
-# To reduce application size use only integer printf function.
-CFLAGS += -Dprintf=iprintf
-
 # -mlong-calls  -Wall
 #CFLAGS += -save-temps -fverbose-asm
 #CFLAGS += -Wa,-a,-ad
 CFLAGS += -D__ARM
 CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
-CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDEBUG_PHONE_SNIFF=$(DEBUG_PHONE_SNIFF)
+CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
+CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
 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)
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
 
-#-------------------------------------------------------------------------------
+# Append BIN directories to output filename
-#		Files
-#-------------------------------------------------------------------------------
-
-# Directories where source files can be found
-
-USB_PATHS = $(AT91LIB_USB_CORE_PATH) $(AT91LIB_USB_COMMON_CORE_PATH)
-VPATH += src_board src_sam3s cmsis $(USB_PATHS) src_simtrace
-
-# Objects built from C source files
-C_CMSIS    = core_cm3.o
-C_LOWLEVEL = board_cstartup_gnu.o board_lowlevel.o syscalls.o exceptions.o
-C_LIBLEVEL = spi.o pio.o pmc.o usart.o pio_it.o pio_capture.o uart_console.o iso7816_4.o wdt.o led.o tc.o
-C_CCID = cciddriver.o USBD.o USBDDriver.o USBD_HAL.o USBRequests.o USBDCallbacks.o USBDescriptors.o USBDDriverCallbacks.o
-C_SIMTRACE = simtrace_iso7816.o usb.o ccid.o sniffer.o mitm.o ringbuffer.o host_communication.o iso7816_fidi.o tc_etu.o req_ctx.o card_emu.o mode_cardemu.o
-C_APPLEVEL = main.o
-C_OBJECTS  = $(C_CMSIS) $(C_LOWLEVEL) $(C_LIBLEVEL) $(C_APPLEVEL) $(C_CCID) $(C_SIMTRACE)
-
-# Append OBJ and BIN directories to output filename
 OUTPUT := $(BIN)/$(OUTPUT)
 
 #-------------------------------------------------------------------------------
 #		Rules
 #-------------------------------------------------------------------------------
 
-all: $(BIN) $(OBJ) $(MEMORIES)
+all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
+
+combined: $(OUTPUT)-combined.bin
+
+$(BIN)/$(BOARD)-dfu-flash-padded.bin: $(BIN)/$(BOARD)-dfu-flash.bin
+	dd if=/dev/zero bs=16384 count=1 of=$@
+	dd if=$< conv=notrunc of=$@
+
+$(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 $@
+
+.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
 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"$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf
 	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
 	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin
 	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	@$(CC) $(CFLAGS) -D$(1) -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$< 
+	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	@$(CC) $(ASFLAGS) -D$(1) -c -o $$@ $$<
+	@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
 
 debug_$(1): $(1)
 	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
@@ -193,11 +237,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 -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst
+	-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`
 
-rmbak: 
+install:
-	-rm *~ $(BIN)/*~
+	mkdir -p $(DESTDIR)/usr/share/simtrace2
+	cp $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(DESTDIR)/usr/share/simtrace2

firmware/README.txt

@@ -0,0 +1,87 @@
+This is the source code for SIMtrace 2 firmwares.
+
+= Hardware
+
+== Micro-Controller
+
+The firmware is for Microchip (formerly Atmel) ATSAM3S4B micro-controllers (MCU).
+Product page:  https://www.microchip.com/wwwproducts/en/ATSAM3S4B
+Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6500-32-bit-Cortex-M3-Microcontroller-SAM3S4-SAM3S2-SAM3S1_Datasheet.pdf
+
+Note: The SAM3S is now not recommended for new designs.
+It can be replaced by the pin-compatible SAM4S.
+The MCU can be specified using the environment variable `CHIP` (set to `sam3s4` per default) for future MCU support.
+
+== Boards
+
+The SIMtrace 2 firmware supports multiple boards.
+A board defines a given circuit board.
+While compiling the firmware, set the target board using the `BOARD` environment variable (set to `qmod` per default).
+The supported boards correspond to sub-folders under `libboard`.
+
+Current boards supported are:
+
+* `simtrace`: The good old Osmocom SIMtrace PCB with SAM3 instead of SAM7, open hardware.
+* `qmod`: A sysmocom-proprietary quad mPCIe carrier board, publicly available
+* `owhw`: An undisclosed sysmocom-internal board, not publicly available
+* `octsimtest`: A sysmocom-proprietary production testing board, not publicly available
+
+= Firmware
+
+== 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:
+
+* flash: Run natively from start of flash memory
+* dfu: Run after a DFU bootloader from an offset after the first 16k of flash (the first 16k are reserved for the bootloader)
+* ram: Run from within the RAM of the chip, downloaded via JTAG/SWD
+
+== Building
+
+A given firmware build is made for a specific combination of an application `APP` running in a certain memory `MEM` on a given board `BOARD`.
+When building using `make`, set the target application using the `APP` environment variable and target board using the `BOARD`  environment variable, e.g.:
+
+* 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)
+
+The qmod specific option `ALLOW_PEER_ERASE` controls if the UART debug command to assert the peer SAM3S ERASE line is present in the code.
+Per default this is set to 0 to prevent accidentally erasing all firmware, including the DFU bootloader, which would then need to be flashed using SAM-BA or JTAG/SWD.
+Setting `ALLOW_PEER_ERASE` to 1 enables back the debug command and should be used only for debugging or development purposes.
+
+= Flashing
+
+To flash a firmware image follow the instructions provided in the [wiki](https://projects.osmocom.org/projects/simtrace2/wiki/).

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

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

firmware/apps/cardem/main.c

@@ -0,0 +1,255 @@
+/* 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
+ *------------------------------------------------------------------------------*/
+
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include <osmocom/core/timer.h>
+
+unsigned int g_unique_id[4];
+
+/*------------------------------------------------------------------------------
+ *         Internal variables
+ *------------------------------------------------------------------------------*/
+typedef struct {
+	/* static initialization, called whether or not the usb config is active */
+	void (*configure) (void);
+	/* initialization function after the config was selected */
+	void (*init) (void);
+	/* de-initialization before selecting new config */
+	void (*exit) (void);
+	/* main loop content for given configuration */
+	void (*run) (void);
+	/* Interrupt handler for USART1 */
+	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,
+	},
+#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);
+	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)
+{
+	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();
+	/* We must echo the character to make python fdexpect happy, which we use in factory testing */
+	fputc(ch, stdout);
+	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;
+
+	led_init();
+	led_blink(LED_RED, BLINK_3O_5F);
+
+	/* Enable watchdog for 2000ms, with no window */
+	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+
+	PIO_InitializeInterrupts(0);
+
+	EEFC_ReadUniqueID(g_unique_id);
+
+		printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"SIMtrace2 firmware " GIT_VERSION "\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
+		"=============================================================================\n\r");
+
+#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]);
+	uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+	static const char* reset_causes[] = {
+		"general reset (first power-up reset)",
+		"backup reset (return from backup mode)",
+		"watchdog reset (watchdog fault occurred)",
+		"software reset (processor reset required by the software)",
+		"user reset (NRST pin detected low)",
+	};
+	if (reset_cause < ARRAY_SIZE(reset_causes)) {
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+	} else {
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	}
+#endif
+
+	board_main_top();
+
+	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 < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+	     ++i) {
+		if (config_func_ptrs[i].configure)
+			config_func_ptrs[i].configure();
+	}
+
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	if (config_func_ptrs[simtrace_config].init) {
+		config_func_ptrs[simtrace_config].init();
+	}
+	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);
+			if (config_func_ptrs[last_simtrace_config].exit) {
+				config_func_ptrs[last_simtrace_config].exit();
+			}
+			if (config_func_ptrs[simtrace_config].init) {
+				config_func_ptrs[simtrace_config].init();
+			}
+			last_simtrace_config = simtrace_config;
+		} else {
+			if (config_func_ptrs[simtrace_config].run) {
+				config_func_ptrs[simtrace_config].run();
+			}
+		}
+	}
+}

firmware/apps/cardem/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/dfu/Makefile

@@ -0,0 +1,12 @@
+
+C_FILES += $(C_LIBUSB_DFU)
+
+# Trace level used for compilation
+# (can be overriden by adding TRACE_LEVEL=#number to the command-line)
+# TRACE_LEVEL_DEBUG      5
+# TRACE_LEVEL_INFO       4
+# TRACE_LEVEL_WARNING    3
+# TRACE_LEVEL_ERROR      2
+# TRACE_LEVEL_FATAL      1
+# TRACE_LEVEL_NO_TRACE   0
+TRACE_LEVEL ?= 3

firmware/apps/dfu/main.c

@@ -0,0 +1,358 @@
+/* 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>
+
+#define ALTIF_RAM 0
+#define ALTIF_FLASH 1
+
+unsigned int g_unique_id[4];
+/* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */
+static bool watchdog_configured = false;
+
+/* There is not enough space in the 16 KiB DFU bootloader to include led.h functions */
+#ifdef PINS_LEDS
+/** LED pin configurations */
+static const Pin pinsLeds[] = { PINS_LEDS } ;
+#endif
+
+/*----------------------------------------------------------------------------
+ *       Callbacks
+ *----------------------------------------------------------------------------*/
+
+#define RAM_ADDR(offset) (IRAM_ADDR + BOARD_DFU_RAM_SIZE + offset)
+#define FLASH_ADDR(offset) (IFLASH_ADDR + BOARD_DFU_BOOT_SIZE + offset)
+
+#define IFLASH_END	((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
+#define IRAM_END	((uint8_t *)IRAM_ADDR + IRAM_SIZE)
+
+/* 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 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);
+	}
+
+#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 || addr + len >= IRAM_ADDR + IRAM_SIZE || addr + len >= stack_addr) {
+			g_dfu->state = DFU_STATE_dfuERROR;
+			g_dfu->status = DFU_STATUS_errADDRESS;
+			rc = DFU_RET_STALL;
+			break;
+		}
+		memcpy((void *)addr, data, len);
+		rc = DFU_RET_ZLP;
+		break;
+	case ALTIF_FLASH:
+		addr = FLASH_ADDR(offset);
+		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) {
+			g_dfu->state = DFU_STATE_dfuERROR;
+			g_dfu->status = DFU_STATUS_errADDRESS;
+			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) {
+			TRACE_ERROR("DFU download flash erase failed\n\r");
+			rc = DFU_RET_STALL;
+			break;
+		}
+		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:
+		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
+		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
+ * starting from 'offset' of the firmware * associated with partition
+ * 'altif' */
+int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
+			 uint8_t *data, unsigned int req_len)
+{
+	uint32_t addr;
+
+	printf("upload(altif=%u, offset=%u, len=%u)", altif, offset, req_len);
+
+	switch (altif) {
+	case ALTIF_RAM:
+		addr = RAM_ADDR(offset);
+		if (addr > IRAM_ADDR + IRAM_SIZE) {
+			g_dfu->state = DFU_STATE_dfuERROR;
+			g_dfu->status = DFU_STATUS_errADDRESS;
+			return -1;
+		}
+		if ((uint8_t *)addr + req_len > IRAM_END)
+			req_len = IRAM_END - (uint8_t *)addr;
+		memcpy(data, (void *)addr, req_len);
+		break;
+	case ALTIF_FLASH:
+		addr = FLASH_ADDR(offset);
+		if (addr > IFLASH_ADDR + IFLASH_SIZE) {
+			g_dfu->state = DFU_STATE_dfuERROR;
+			g_dfu->status = DFU_STATUS_errADDRESS;
+			return -1;
+		}
+		if ((uint8_t *)addr + req_len > IFLASH_END)
+			req_len = IFLASH_END - (uint8_t *)addr;
+		memcpy(data, (void *)addr, req_len);
+		break;
+	default:
+		TRACE_ERROR("DFU upload for unknown AltIf %d\n\r", altif);
+		/* FIXME: set error codes */
+		return -1;
+	}
+	printf("=%u\n\r", req_len);
+	return req_len;
+}
+
+/* can be overridden by board specific code, e.g. by pushbutton */
+WEAK int board_override_enter_dfu(void)
+{
+	return 0;
+}
+
+/* using this function we can determine if we should enter DFU mode
+ * during boot, or if we should proceed towards the application/runtime */
+int USBDFU_OverrideEnterDFU(void)
+{
+	uint32_t *app_part = (uint32_t *)FLASH_ADDR(0);
+	/* at the first call we are before the text segment has been relocated,
+	 * so g_dfu is not initialized yet */
+	g_dfu = &_g_dfu;
+	if (USB_DFU_MAGIC == g_dfu->magic) {
+		return 1;
+	}
+
+	/* If the loopback jumper is set, we enter DFU mode */
+	if (board_override_enter_dfu()) {
+		return 2;
+	}
+
+	/* if the first word of the application partition doesn't look
+	 * like a stack pointer (i.e. point to RAM), enter DFU mode */
+	if ((app_part[0] < IRAM_ADDR) || ((uint8_t *)app_part[0] > IRAM_END)) {
+		return 3;
+	}
+
+	/* if the second word of the application partition doesn't look
+	 * like a function from flash (reset vector), enter DFU mode */
+	if (((uint32_t *)app_part[1] < app_part) ||
+	    ((uint8_t *)app_part[1] > IFLASH_END)) {
+		return 4;
+	}
+
+	return 0;
+}
+
+/* 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;
+	unsigned int i = 0;
+	uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+
+	/* Enable watchdog for 2000ms, with no window */
+	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+	watchdog_configured = true;
+
+#ifdef PINS_LEDS
+	/* Configure LED */
+	PIO_Configure(pinsLeds, sizeof(pinsLeds));
+	PIO_Set(&pinsLeds[LED_NUM_RED]);
+	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
+#endif
+
+	PIO_InitializeInterrupts(0);
+
+	EEFC_ReadUniqueID(g_unique_id);
+
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"DFU bootloader %s for board %s\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
+		"=============================================================================\n\r",
+		manifest_revision, manifest_board);
+
+	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%lx\n\r", reset_cause);
+
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	/* Find out why we are in the DFU bootloader, and not the main application */
+	TRACE_INFO("DFU bootloader start reason: ");
+	switch (USBDFU_OverrideEnterDFU()) {
+	case 0:
+		/* 0 normally means that there is no override, but we are in the bootloader,
+		 * thus the first check in board_cstartup_gnu did return something else than 0.
+		 * this can only be g_dfu->magic which is erased when the segment are
+		 * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU.
+		 * no static variable can be used to store this case since this will also be overwritten
+		 */
+	case 1:
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
+		break;
+	case 2:
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
+		break;
+	case 3:
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
+		break;
+	case 4: // the is no reason
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
+		break;
+	default:
+		TRACE_INFO_WP("unknown\n\r");
+		break;
+	}
+#endif
+
+	/* clear g_dfu on power-up reset */
+	if (reset_cause == 0)
+		memset(g_dfu, 0, sizeof(*g_dfu));
+
+	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) {
+		WDT_Restart(WDT);
+		check_exec_dbg_cmd();
+#if 1
+		if (i >= MAX_USB_ITER * 3) {
+			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
+			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
+			USBD_Disconnect();
+			NVIC_SystemReset();
+		}
+#endif
+		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);
+#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
+		const char rotor[] = { '-', '\\', '|', '/' };
+		putchar('\b');
+		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+#endif
+		check_exec_dbg_cmd();
+#if 0
+		osmo_timers_prepare();
+		osmo_timers_update();
+#endif
+
+		if (USBD_GetState() < USBD_STATE_CONFIGURED) {
+
+			if (isUsbConnected) {
+				isUsbConnected = 0;
+			}
+		} else if (isUsbConnected == 0) {
+			TRACE_INFO("USB is now configured\n\r");
+
+			isUsbConnected = 1;
+		}
+	}
+}

firmware/apps/dfu/usb_strings.txt

@@ -0,0 +1,5 @@
+sysmocom - s.f.m.c. GmbH
+PRODUCT_STRING
+DFU (Device Firmware Upgrade)
+RAM
+Flash (Application 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 tc_etu.c usb.c

firmware/apps/trace/main.c

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

firmware/apps/trace/usb_strings.txt

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

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

firmware/apps/triple_play/main.c

@@ -1,14 +1,32 @@
-// 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
  *------------------------------------------------------------------------------*/
 
-#define TRACE_LEVEL 5
-
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
 #include "req_ctx.h"
+#include <osmocom/core/timer.h>
+
+unsigned int g_unique_id[4];
 
 /*------------------------------------------------------------------------------
  *         Internal variables
@@ -22,6 +40,10 @@ typedef struct {
 	void (*exit) (void);
 	/* main loop content for given configuration */
 	void (*run) (void);
+	/* Interrupt handler for USART1 */
+	void (*usart0_irq) (void);
+	/* Interrupt handler for USART1 */
+	void (*usart1_irq) (void);
 } conf_func;
 
 static const conf_func config_func_ptrs[] = {
@@ -48,6 +70,8 @@ static const conf_func config_func_ptrs[] = {
 		.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
@@ -81,6 +105,29 @@ void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
 	simtrace_config = cfgnum;
 }
 
+void USART1_IrqHandler(void)
+{
+	config_func_ptrs[simtrace_config].usart1_irq();
+}
+
+void USART0_IrqHandler(void)
+{
+	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
  *------------------------------------------------------------------------------*/
@@ -102,39 +149,56 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	SIMtrace_USB_Initialize();
+	EEFC_ReadUniqueID(g_unique_id);
 
-        printf("\r\n\r\n"
+		printf("\r\n\r\n"
 		"=============================================================================\r\n"
-		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\r\n"
+		"SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
 		"=============================================================================\r\n");
 
-	TRACE_INFO("USB init...\n\r");
+	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");
+	SIMtrace_USB_Initialize();
+
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
+		check_exec_dbg_cmd();
+#if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\n");
+				    "not be configured)\r\n");
+			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
+#endif
 		i++;
 	}
 
-	TRACE_DEBUG("calling configure of all configurations...\n\r");
+	TRACE_INFO("calling configure of all configurations...\r\n");
 	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
 	     ++i) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}
 
-	TRACE_DEBUG("calling init of config %u...\n\r", simtrace_config);
+	TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
 	config_func_ptrs[simtrace_config].init();
 	last_simtrace_config = simtrace_config;
 
-	TRACE_DEBUG("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
+#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) {
 
@@ -142,7 +206,7 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\n\r");
+			TRACE_INFO("USB is now configured\r\n");
 			LED_Set(LED_NUM_GREEN);
 			LED_Clear(LED_NUM_RED);
 

firmware/atmel_softpack_libraries/libchip_sam3s/chip.h

@@ -52,5 +52,8 @@
 
 #include "trace.h"
 #include "wdt.h"
+#include "unique_id.h"
+#include "efc.h"
+#include "flashd.h"
 
 #endif /* _LIB_SAM3S_ */

firmware/atmel_softpack_libraries/libchip_sam3s/include/efc.h

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

firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h

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

firmware/atmel_softpack_libraries/libchip_sam3s/include/unique_id.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void EEFC_ReadUniqueID(unsigned int *pdwUniqueID);

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c

@@ -1,384 +1,507 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         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
+/**
- * This file contains the default exception handlers.
+ * \file
- *
+ * This file contains the default exception handlers.
- * \note
+ *
- * The exception handler has weak aliases.
+ * \note
- * As they are weak aliases, any function with the same name will override
+ * The exception handler has weak aliases.
- * this definition.
+ * As they are weak aliases, any function with the same name will override
- */
+ * this definition.
-
+ */
-/*----------------------------------------------------------------------------
+
- *        Headers
+/*----------------------------------------------------------------------------
- *----------------------------------------------------------------------------*/
+ *        Headers
-
+ *----------------------------------------------------------------------------*/
-#include "chip.h"
+
-
+#include "chip.h"
-/*----------------------------------------------------------------------------
+#define printf printf_sync
- *        Exported functions
+
- *----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------
-
+ *        Exported functions
-/**
+ *----------------------------------------------------------------------------*/
- * \brief Default interrupt handler for not used irq.
+
- */
+/**
-void IrqHandlerNotUsed( void )
+ * \brief Default interrupt handler for not used irq.
-{
+ */
-    while ( 1 ) ;
+void IrqHandlerNotUsed( void )
-}
+{
-
+    printf("NotUsed\r\n");
-/**
+    while ( 1 ) ;
- * \brief Default NMI interrupt handler.
+}
- */
+
-WEAK void NMI_Handler( void )
+/**
-{
+ * \brief Default NMI interrupt handler.
-    while ( 1 ) ;
+ */
-}
+WEAK void NMI_Handler( void )
-
+{
-/**
+    printf("NMI\r\n");
- * \brief Default HardFault interrupt handler.
+    while ( 1 ) ;
- */
+}
-WEAK void HardFault_Handler( void )
+
-{
+/**
-    while ( 1 ) ;
+ * \brief Default HardFault interrupt handler.
-}
+ */
-
+struct hardfault_args {
-/**
+	unsigned long r0;
- * \brief Default MemManage interrupt handler.
+	unsigned long r1;
- */
+	unsigned long r2;
-WEAK void MemManage_Handler( void )
+	unsigned long r3;
-{
+	unsigned long r12;
-    while ( 1 ) ;
+	unsigned long lr;
-}
+	unsigned long pc;
-
+	unsigned long psr;
-/**
+};
- * \brief Default BusFault interrupt handler.
+
- */
+void hard_fault_handler_c(struct hardfault_args *args)
-WEAK void BusFault_Handler( void )
+{
-{
+    printf("\r\nHardFault\r\n");
-    while ( 1 ) ;
+    printf("R0=%08x, R1=%08x, R2=%08x, R3=%08x, R12=%08x\r\n",
-}
+	   args->r0, args->r1, args->r2, args->r3, args->r12);
-
+    printf("LR[R14]=%08x, PC[R15]=%08x, PSR=%08x\r\n",
-/**
+	   args->lr, args->pc, args->psr);
- * \brief Default UsageFault interrupt handler.
+    printf("BFAR=%08x, CFSR=%08x, HFSR=%08x\r\n",
- */
+	   SCB->BFAR, SCB->CFSR, SCB->HFSR);
-WEAK void UsageFault_Handler( void )
+    printf("DFSR=%08x, AFSR=%08x, SHCSR=%08x\r\n",
-{
+	   SCB->DFSR, SCB->CFSR, SCB->SHCSR);
-    while ( 1 ) ;
+
-}
+    if (SCB->HFSR & 0x40000000)
-
+	    printf("FORCED ");
-/**
+    if (SCB->HFSR & 0x00000002)
- * \brief Default SVC interrupt handler.
+	    printf("VECTTBL ");
- */
+
-WEAK void SVC_Handler( void )
+    uint32_t ufsr = SCB->CFSR >> 16;
-{
+    if (ufsr & 0x0200)
-    while ( 1 ) ;
+	    printf("DIVBYZERO ");
-}
+    if (ufsr & 0x0100)
-
+	    printf("UNALIGNED ");
-/**
+    if (ufsr & 0x0008)
- * \brief Default DebugMon interrupt handler.
+	    printf("NOCP ");
- */
+    if (ufsr & 0x0004)
-WEAK void DebugMon_Handler( void )
+	    printf("INVPC ");
-{
+    if (ufsr & 0x0002)
-    while ( 1 ) ;
+	    printf("INVSTATE ");
-}
+    if (ufsr & 0x0001)
-
+	    printf("UNDEFINSTR ");
-/**
+
- * \brief Default PendSV interrupt handler.
+    uint32_t bfsr = (SCB->CFSR >> 8) & 0xff;
- */
+    if (bfsr & 0x80)
-WEAK void PendSV_Handler( void )
+	    printf("BFARVALID ");
-{
+    if (bfsr & 0x10)
-    while ( 1 ) ;
+	    printf("STKERR ");
-}
+    if (bfsr & 0x08)
-
+	    printf("UNSTKERR ");
-/**
+    if (bfsr & 0x04)
- * \brief Default SysTick interrupt handler.
+	    printf("IMPRECISERR ");
- */
+    if (bfsr & 0x02)
-WEAK void SysTick_Handler( void )
+	    printf("PRECISERR ");
-{
+    if (bfsr & 0x01)
-    while ( 1 ) ;
+	    printf("IBUSERR ");
-}
+
-
+    uint32_t mmfsr = (SCB->CFSR & 0xff);
-/**
+    if (mmfsr & 0x80)
- * \brief Default interrupt handler for Supply Controller.
+	    printf("MMARVALID ");
- */
+    if (mmfsr & 0x10)
-WEAK void SUPC_IrqHandler( void )
+	    printf("MSTKERR ");
-{
+    if (mmfsr & 0x08)
-    while ( 1 ) ;
+	    printf("MUNSTKERR ");
-}
+    if (mmfsr & 0x02)
-
+	    printf("DACCVIOL ");
-/**
+    if (mmfsr & 0x01)
- * \brief Default interrupt handler for Reset Controller.
+	    printf("IACCVIOL ");
- */
+
-WEAK void RSTC_IrqHandler( void )
+    while ( 1 ) ;
-{
+}
-    while ( 1 ) ;
+
-}
+__attribute__((naked))
-
+WEAK void HardFault_Handler( void )
-/**
+{
- * \brief Default interrupt handler for Real Time Clock.
+	__asm volatile(
- */
+		".syntax unified	\n"
-WEAK void RTC_IrqHandler( void )
+		" tst lr, #4		\n"
-{
+		" ite eq		\n"
-    while ( 1 ) ;
+		" mrseq r0, msp		\n"
-}
+		" mrsne r0, psp		\n"
-
+		//" ldr r1, [r0, #24] 	\n"
-/**
+		" b hard_fault_handler_c\n"
- * \brief Default interrupt handler for Real Time Timer.
+		".syntax divided	\n");
- */
+}
-WEAK void RTT_IrqHandler( void )
+
-{
+/**
-    while ( 1 ) ;
+ * \brief Default MemManage interrupt handler.
-}
+ */
-
+WEAK void MemManage_Handler( void )
-/**
+{
- * \brief Default interrupt handler for Watchdog Timer.
+    printf("MemManage\r\n");
- */
+    while ( 1 ) ;
-WEAK void WDT_IrqHandler( void )
+}
-{
+
-    while ( 1 ) ;
+/**
-}
+ * \brief Default BusFault interrupt handler.
-
+ */
-/**
+WEAK void BusFault_Handler( void )
- * \brief Default interrupt handler for PMC.
+{
- */
+    printf("BusFault\r\n");
-WEAK void PMC_IrqHandler( void )
+    while ( 1 ) ;
-{
+}
-    while ( 1 ) ;
+
-}
+/**
-
+ * \brief Default UsageFault interrupt handler.
-/**
+ */
- * \brief Default interrupt handler for EEFC.
+WEAK void UsageFault_Handler( void )
- */
+{
-WEAK void EEFC_IrqHandler( void )
+    printf("UsageFault\r\n");
-{
+    while ( 1 ) ;
-    while ( 1 ) ;
+}
-}
+
-
+/**
-/**
+ * \brief Default SVC interrupt handler.
- * \brief Default interrupt handler for UART0.
+ */
- */
+WEAK void SVC_Handler( void )
-WEAK void UART0_IrqHandler( void )
+{
-{
+    printf("SVC\r\n");
-    while ( 1 ) ;
+    while ( 1 ) ;
-}
+}
-
+
-/**
+/**
- * \brief Default interrupt handler for UART1.
+ * \brief Default DebugMon interrupt handler.
- */
+ */
-WEAK void UART1_IrqHandler( void )
+WEAK void DebugMon_Handler( void )
-{
+{
-    while ( 1 ) ;
+    printf("DebugMon\r\n");
-}
+    while ( 1 ) ;
-
+}
-/**
+
- * \brief Default interrupt handler for SMC.
+/**
- */
+ * \brief Default PendSV interrupt handler.
-WEAK void SMC_IrqHandler( void )
+ */
-{
+WEAK void PendSV_Handler( void )
-    while ( 1 ) ;
+{
-}
+    printf("PendSV\r\n");
-
+    while ( 1 ) ;
-/**
+}
- * \brief Default interrupt handler for PIOA Controller.
+
- */
+/**
-WEAK void PIOA_IrqHandler( void )
+ * \brief Default SysTick interrupt handler.
-{
+ */
-    while ( 1 ) ;
+WEAK void SysTick_Handler( void )
-}
+{
-
+    printf("SysTick\r\n");
-/**
+    while ( 1 ) ;
- * \brief Default interrupt handler for PIOB Controller.
+}
- */
+
-WEAK void PIOB_IrqHandler( void )
+/**
-{
+ * \brief Default interrupt handler for Supply Controller.
-    while ( 1 ) ;
+ */
-}
+WEAK void SUPC_IrqHandler( void )
-
+{
-/**
+    printf("SUPC\r\n");
- * \brief Default interrupt handler for PIOC Controller.
+    while ( 1 ) ;
- */
+}
-WEAK void PIOC_IrqHandler( void )
+
-{
+/**
-    while ( 1 ) ;
+ * \brief Default interrupt handler for Reset Controller.
-}
+ */
-
+WEAK void RSTC_IrqHandler( void )
-/**
+{
- * \brief Default interrupt handler for USART0.
+    printf("RSTC\r\n");
- */
+    while ( 1 ) ;
-WEAK void USART0_IrqHandler( void )
+}
-{
+
-    while ( 1 ) ;
+/**
-}
+ * \brief Default interrupt handler for Real Time Clock.
-
+ */
-/**
+WEAK void RTC_IrqHandler( void )
- * \brief Default interrupt handler for USART1.
+{
- */
+    printf("RTC\r\n");
-WEAK void USART1_IrqHandler( void )
+    while ( 1 ) ;
-{
+}
-    while ( 1 ) ;
+
-}
+/**
-
+ * \brief Default interrupt handler for Real Time Timer.
-/**
+ */
- * \brief Default interrupt handler for MCI.
+WEAK void RTT_IrqHandler( void )
- */
+{
-WEAK void MCI_IrqHandler( void )
+    printf("RTT\r\n");
-{
+    while ( 1 ) ;
-    while ( 1 ) ;
+}
-}
+
-
+/**
-/**
+ * \brief Default interrupt handler for Watchdog Timer.
- * \brief Default interrupt handler for TWI0.
+ */
- */
+WEAK void WDT_IrqHandler( void )
-WEAK void TWI0_IrqHandler( void )
+{
-{
+    printf("WDT\r\n");
-    while ( 1 ) ;
+    while ( 1 ) ;
-}
+}
-
+
-/**
+/**
- * \brief Default interrupt handler for TWI1.
+ * \brief Default interrupt handler for PMC.
- */
+ */
-WEAK void TWI1_IrqHandler( void )
+WEAK void PMC_IrqHandler( void )
-{
+{
-    while ( 1 ) ;
+    printf("PMC\r\n");
-}
+    while ( 1 ) ;
-
+}
-/**
+
- * \brief Default interrupt handler for SPI.
+/**
- */
+ * \brief Default interrupt handler for EEFC.
-WEAK void SPI_IrqHandler( void )
+ */
-{
+WEAK void EEFC_IrqHandler( void )
-    while ( 1 ) ;
+{
-}
+    printf("EEFC\r\n");
-
+    while ( 1 ) ;
-/**
+}
- * \brief Default interrupt handler for SSC.
+
- */
+/**
-WEAK void SSC_IrqHandler( void )
+ * \brief Default interrupt handler for UART0.
-{
+ */
-    while ( 1 ) ;
+WEAK void UART0_IrqHandler( void )
-}
+{
-
+    printf("UART0\r\n");
-/**
+    while ( 1 ) ;
- * \brief Default interrupt handler for TC0.
+}
- */
+
-WEAK void TC0_IrqHandler( void )
+/**
-{
+ * \brief Default interrupt handler for UART1.
-    while ( 1 ) ;
+ */
-}
+WEAK void UART1_IrqHandler( void )
-
+{
-/**
+    printf("UART1\r\n");
- * \brief Default interrupt handler for TC1.
+    while ( 1 ) ;
- */
+}
-WEAK void TC1_IrqHandler( void )
+
-{
+/**
-    while ( 1 ) ;
+ * \brief Default interrupt handler for SMC.
-}
+ */
-
+WEAK void SMC_IrqHandler( void )
-/**
+{
- * \brief Default interrupt handler for TC2.
+    printf("SMC\r\n");
- */
+    while ( 1 ) ;
-WEAK void TC2_IrqHandler( void )
+}
-{
+
-    while ( 1 ) ;
+/**
-}
+ * \brief Default interrupt handler for PIOA Controller.
-
+ */
-/**
+WEAK void PIOA_IrqHandler( void )
- * \brief Default SUPC interrupt handler for TC3.
+{
- */
+    printf("PIOA\r\n");
-WEAK void TC3_IrqHandler( void )
+    while ( 1 ) ;
-{
+}
-    while ( 1 ) ;
+
-}
+/**
-
+ * \brief Default interrupt handler for PIOB Controller.
-/**
+ */
- * \brief Default SUPC interrupt handler for TC4.
+WEAK void PIOB_IrqHandler( void )
- */
+{
-WEAK void TC4_IrqHandler( void )
+    printf("PIOB\r\n");
-{
+    while ( 1 ) ;
-    while ( 1 ) ;
+}
-}
+
-
+/**
-/**
+ * \brief Default interrupt handler for PIOC Controller.
- * \brief Default SUPC interrupt handler for TC5.
+ */
- */
+WEAK void PIOC_IrqHandler( void )
-WEAK void TC5_IrqHandler( void )
+{
-{
+    printf("PIOC\r\n");
-    while ( 1 ) ;
+    while ( 1 ) ;
-}
+}
-
+
-/**
+/**
- * \brief Default SUPC interrupt handler for ADC.
+ * \brief Default interrupt handler for USART0.
- */
+ */
-WEAK void ADC_IrqHandler( void )
+WEAK void USART0_IrqHandler( void )
-{
+{
-    while ( 1 ) ;
+    printf("USART0\r\n");
-}
+    while ( 1 ) ;
-
+}
-/**
+
- * \brief Default SUPC interrupt handler for DAC.
+/**
- */
+ * \brief Default interrupt handler for USART1.
-WEAK void DAC_IrqHandler( void )
+ */
-{
+WEAK void USART1_IrqHandler( void )
-    while ( 1 ) ;
+{
-}
+    printf("USART1\r\n");
-
+    while ( 1 ) ;
-/**
+}
- * \brief Default SUPC interrupt handler for PWM.
+
- */
+/**
-WEAK void PWM_IrqHandler( void )
+ * \brief Default interrupt handler for MCI.
-{
+ */
-    while ( 1 ) ;
+WEAK void MCI_IrqHandler( void )
-}
+{
-
+    printf("MCI\r\n");
-/**
+    while ( 1 ) ;
- * \brief Default SUPC interrupt handler for CRCCU.
+}
- */
+
-WEAK void CRCCU_IrqHandler( void )
+/**
-{
+ * \brief Default interrupt handler for TWI0.
-    while ( 1 ) ;
+ */
-}
+WEAK void TWI0_IrqHandler( void )
-
+{
-/**
+    printf("TWI0\r\n");
- * \brief Default SUPC interrupt handler for ACC.
+    while ( 1 ) ;
- */
+}
-WEAK void ACC_IrqHandler( void )
+
-{
+/**
-    while ( 1 ) ;
+ * \brief Default interrupt handler for TWI1.
-}
+ */
-
+WEAK void TWI1_IrqHandler( void )
-/**
+{
- * \brief Default SUPC interrupt handler for USBD.
+    printf("TWI1\r\n");
- */
+    while ( 1 ) ;
-WEAK void USBD_IrqHandler( void )
+}
-{
+
-    while ( 1 ) ;
+/**
-}
+ * \brief Default interrupt handler for SPI.
+ */
+WEAK void SPI_IrqHandler( void )
+{
+    printf("SPI\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default interrupt handler for SSC.
+ */
+WEAK void SSC_IrqHandler( void )
+{
+    printf("SSC\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default interrupt handler for TC0.
+ */
+WEAK void TC0_IrqHandler( void )
+{
+    printf("TC0\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default interrupt handler for TC1.
+ */
+WEAK void TC1_IrqHandler( void )
+{
+    printf("TC1\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default interrupt handler for TC2.
+ */
+WEAK void TC2_IrqHandler( void )
+{
+    printf("TC2\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for TC3.
+ */
+WEAK void TC3_IrqHandler( void )
+{
+    printf("TC3\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for TC4.
+ */
+WEAK void TC4_IrqHandler( void )
+{
+    printf("TC4\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for TC5.
+ */
+WEAK void TC5_IrqHandler( void )
+{
+    printf("TC5\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for ADC.
+ */
+WEAK void ADC_IrqHandler( void )
+{
+    printf("ADC\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for DAC.
+ */
+WEAK void DAC_IrqHandler( void )
+{
+    printf("DAC\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for PWM.
+ */
+WEAK void PWM_IrqHandler( void )
+{
+    printf("PWM\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for CRCCU.
+ */
+WEAK void CRCCU_IrqHandler( void )
+{
+    printf("CRCCU\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for ACC.
+ */
+WEAK void ACC_IrqHandler( void )
+{
+    printf("ACC\r\n");
+    while ( 1 ) ;
+}
+
+/**
+ * \brief Default SUPC interrupt handler for USBD.
+ */
+WEAK void USBD_IrqHandler( void )
+{
+    printf("USBD\r\n");
+    while ( 1 ) ;
+}

firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c

@@ -0,0 +1,517 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/** \addtogroup flashd_module Flash Memory Interface
+ * The flash driver manages the programming, erasing, locking and unlocking sequences
+ * with dedicated commands.
+ *
+ * To implement flash programing operation, the user has to follow these few steps :
+ * <ul>
+ * <li>Configue flash wait states to initializes the flash. </li>
+ * <li>Checks whether a region to be programmed is locked. </li>
+ * <li>Unlocks the user region to be programmed if the region have locked before.</li>
+ * <li>Erases the user page before program (optional).</li>
+ * <li>Writes the user page from the page buffer.</li>
+ * <li>Locks the region of programmed area if any.</li>
+ * </ul>
+ *
+ * Writing 8-bit and 16-bit data is not allowed and may lead to unpredictable data corruption.
+ * A check of this validity and padding for 32-bit alignment should be done in write algorithm.
+
+ * Lock/unlock range associated with the user address range is automatically translated.
+ *
+ * This security bit can be enabled through the command "Set General Purpose NVM Bit 0".
+ *
+ * A 128-bit factory programmed unique ID could be read to serve several purposes.
+ *
+ * The driver accesses the flash memory by calling the lowlevel module provided in \ref efc_module.
+ * For more accurate information, please look at the EEFC section of the Datasheet.
+ *
+ * Related files :\n
+ * \ref flashd.c\n
+ * \ref flashd.h.\n
+ * \ref efc.c\n
+ * \ref efc.h.\n
+*/
+/*@{*/
+/*@}*/
+
+
+/**
+ * \file
+ *
+ * The flash driver provides the unified interface for flash program operations.
+ *
+ */
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+#include "chip.h"
+#include "flashd.h"
+#include "efc.h"
+
+#include <string.h>
+#include <assert.h>
+
+/*----------------------------------------------------------------------------
+ *        Local variables
+ *----------------------------------------------------------------------------*/
+
+//static NO_INIT uint8_t _aucPageBuffer[IFLASH_PAGE_SIZE] ;
+static NO_INIT uint32_t _adwPageBuffer[IFLASH_PAGE_SIZE/4] ;
+static uint8_t* _aucPageBuffer = (uint8_t*)_adwPageBuffer;
+static NO_INIT uint32_t _dwUseIAP ;
+
+/*----------------------------------------------------------------------------
+ *        Local macros
+ *----------------------------------------------------------------------------*/
+
+#define min( a, b ) (((a) < (b)) ? (a) : (b))
+
+/*----------------------------------------------------------------------------
+ *        Local functions
+ *----------------------------------------------------------------------------*/
+
+
+/**
+ * \brief Computes the lock range associated with the given address range.
+ *
+ * \param dwStart  Start address of lock range.
+ * \param dwEnd  End address of lock range.
+ * \param pdwActualStart  Actual start address of lock range.
+ * \param pdwActualEnd  Actual end address of lock range.
+ */
+static void ComputeLockRange( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd )
+{
+    Efc* pStartEfc ;
+    Efc* pEndEfc ;
+    uint16_t wStartPage ;
+    uint16_t wEndPage ;
+    uint16_t wNumPagesInRegion ;
+    uint16_t wActualStartPage ;
+    uint16_t wActualEndPage ;
+
+    // Convert start and end address in page numbers
+    EFC_TranslateAddress( &pStartEfc, dwStart, &wStartPage, 0 ) ;
+    EFC_TranslateAddress( &pEndEfc, dwEnd, &wEndPage, 0 ) ;
+
+    // Find out the first page of the first region to lock
+    wNumPagesInRegion = IFLASH_LOCK_REGION_SIZE / IFLASH_PAGE_SIZE ;
+    wActualStartPage = wStartPage - (wStartPage % wNumPagesInRegion) ;
+    wActualEndPage = wEndPage ;
+
+    if ( (wEndPage % wNumPagesInRegion) != 0 )
+    {
+        wActualEndPage += wNumPagesInRegion - (wEndPage % wNumPagesInRegion) ;
+    }
+    // Store actual page numbers
+    EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ;
+    EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ;
+    TRACE_DEBUG( "Actual lock range is 0x%06X - 0x%06X\n\r", *pdwActualStart, *pdwActualEnd ) ;
+}
+
+
+/*----------------------------------------------------------------------------
+ *        Exported functions
+ *----------------------------------------------------------------------------*/
+
+/**
+ * \brief Initializes the flash driver.
+ *
+ * \param mck  Master clock frequency in Hz.
+ */
+
+extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP )
+{
+    EFC_DisableFrdyIt( EFC ) ;
+#if 1
+    /* See Revision A errata 46.1.1.3 */
+    EFC_SetWaitState(EFC, 6);
+#else
+    if ( (dwMCk/1000000) >= 64 )
+	{
+        EFC_SetWaitState( EFC, 2 ) ;
+    }
+    else
+	{
+	    if ( (dwMCk/1000000) >= 50 )
+	    {
+            EFC_SetWaitState( EFC, 1 ) ;
+        }
+        else
+	    {
+            EFC_SetWaitState( EFC, 0 ) ;
+        }
+	}
+#endif
+    _dwUseIAP=dwUseIAP ;
+}
+
+/**
+ * \brief Erases the entire flash.
+ *
+ * \param address  Flash start address.
+ * \return 0 if successful; otherwise returns an error code.
+ */
+extern uint32_t FLASHD_Erase( uint32_t dwAddress )
+{
+    Efc* pEfc ;
+    uint16_t wPage ;
+    uint16_t wOffset ;
+    uint32_t dwError ;
+
+    assert( (dwAddress >=IFLASH_ADDR) || (dwAddress <= (IFLASH_ADDR + IFLASH_SIZE)) ) ;
+
+    // Translate write address
+    EFC_TranslateAddress( &pEfc, dwAddress, &wPage, &wOffset ) ;
+    dwError = EFC_PerformCommand( pEfc, EFC_FCMD_EA, 0, _dwUseIAP ) ;
+	
+    return dwError ;
+}
+
+/**
+ * \brief Writes a data buffer in the internal flash
+ *
+ * \note This function works in polling mode, and thus only returns when the
+ * data has been effectively written.
+ * \param address  Write address.
+ * \param pBuffer  Data buffer.
+ * \param size  Size of data buffer in bytes.
+ * \return 0 if successful, otherwise returns an error code.
+ */
+extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize )
+{
+    Efc* pEfc ;
+    uint16_t page ;
+    uint16_t offset ;
+    uint32_t writeSize ;
+    uint32_t pageAddress ;
+    uint16_t padding ;
+    uint32_t dwError ;
+    uint32_t sizeTmp ;
+    uint32_t *pAlignedDestination ;
+    uint32_t *pAlignedSource ;
+
+    assert( pvBuffer ) ;
+    assert( dwAddress >=IFLASH_ADDR ) ;
+    assert( (dwAddress + dwSize) <= (IFLASH_ADDR + IFLASH_SIZE) ) ;
+
+    /* Translate write address */
+    EFC_TranslateAddress( &pEfc, dwAddress, &page, &offset ) ;
+
+    /* Write all pages */
+    while ( dwSize > 0 )
+    {
+        /* Copy data in temporary buffer to avoid alignment problems */
+        writeSize = min((uint32_t)IFLASH_PAGE_SIZE - offset, dwSize ) ;
+        EFC_ComputeAddress(pEfc, page, 0, &pageAddress ) ;
+        padding = IFLASH_PAGE_SIZE - offset - writeSize ;
+
+        /* Pre-buffer data */
+        memcpy( _aucPageBuffer, (void *) pageAddress, offset);
+
+        /* Buffer data */
+        memcpy( _aucPageBuffer + offset, pvBuffer, writeSize);
+
+        /* Post-buffer data */
+        memcpy( _aucPageBuffer + offset + writeSize, (void *) (pageAddress + offset + writeSize), padding);
+
+        /* Write page
+         * Writing 8-bit and 16-bit data is not allowed and may lead to unpredictable data corruption
+         */
+        pAlignedDestination = (uint32_t*)pageAddress ;
+        pAlignedSource = (uint32_t*)_adwPageBuffer ;
+        sizeTmp = IFLASH_PAGE_SIZE ;
+
+        while ( sizeTmp >= 4 )
+        {
+            *pAlignedDestination++ = *pAlignedSource++;
+            sizeTmp -= 4;
+        }
+
+        /* Send writing command */
+        dwError = EFC_PerformCommand( pEfc, EFC_FCMD_EWP, page, _dwUseIAP ) ;
+        if ( dwError )
+        {
+            return dwError ;
+        }
+
+        /* Progression */
+        dwAddress += IFLASH_PAGE_SIZE ;
+        pvBuffer = (void *)((uint32_t) pvBuffer + writeSize) ;
+        dwSize -= writeSize ;
+        page++;
+        offset = 0;
+    }
+
+    return 0 ;
+}
+/**
+ * \brief Locks all the regions in the given address range. The actual lock range is
+ * reported through two output parameters.
+ *
+ * \param start  Start address of lock range.
+ * \param end    End address of lock range.
+ * \param pActualStart  Start address of the actual lock range (optional).
+ * \param pActualEnd  End address of the actual lock range (optional).
+ * \return 0 if successful, otherwise returns an error code.
+ */
+extern uint32_t FLASHD_Lock( uint32_t start, uint32_t end, uint32_t *pActualStart, uint32_t *pActualEnd )
+{
+    Efc *pEfc ;
+    uint32_t actualStart, actualEnd ;
+    uint16_t startPage, endPage ;
+    uint32_t dwError ;
+    uint16_t numPagesInRegion = IFLASH_LOCK_REGION_SIZE / IFLASH_PAGE_SIZE;
+
+    /* Compute actual lock range and store it */
+    ComputeLockRange( start, end, &actualStart, &actualEnd ) ;
+    if ( pActualStart != NULL )
+    {
+        *pActualStart = actualStart ;
+    }
+    if ( pActualEnd != NULL )
+    {
+        *pActualEnd = actualEnd;
+    }
+
+    /* Compute page numbers */
+    EFC_TranslateAddress( &pEfc, actualStart, &startPage, 0 ) ;
+    EFC_TranslateAddress( 0, actualEnd, &endPage, 0 ) ;
+
+    /* Lock all pages */
+    while ( startPage < endPage )
+    {
+        dwError = EFC_PerformCommand( pEfc, EFC_FCMD_SLB, startPage, _dwUseIAP ) ;
+        if ( dwError )
+        {
+            return dwError ;
+        }
+        startPage += numPagesInRegion;
+    }
+
+    return 0 ;
+}
+
+/**
+ * \brief Unlocks all the regions in the given address range. The actual unlock range is
+ * reported through two output parameters.
+ * \param start  Start address of unlock range.
+ * \param end  End address of unlock range.
+ * \param pActualStart  Start address of the actual unlock range (optional).
+ * \param pActualEnd  End address of the actual unlock range (optional).
+ * \return 0 if successful, otherwise returns an error code.
+ */
+extern uint32_t FLASHD_Unlock( uint32_t start, uint32_t end, uint32_t *pActualStart, uint32_t *pActualEnd )
+{
+    Efc* pEfc ;
+    uint32_t actualStart, actualEnd ;
+    uint16_t startPage, endPage ;
+    uint32_t dwError ;
+    uint16_t numPagesInRegion = IFLASH_LOCK_REGION_SIZE / IFLASH_PAGE_SIZE;
+
+    // Compute actual unlock range and store it
+    ComputeLockRange(start, end, &actualStart, &actualEnd);
+    if ( pActualStart != NULL )
+    {
+        *pActualStart = actualStart ;
+    }
+    if ( pActualEnd != NULL )
+    {
+        *pActualEnd = actualEnd ;
+    }
+
+    // Compute page numbers
+    EFC_TranslateAddress( &pEfc, actualStart, &startPage, 0 ) ;
+    EFC_TranslateAddress( 0, actualEnd, &endPage, 0 ) ;
+
+    // Unlock all pages
+    while ( startPage < endPage )
+    {
+        dwError = EFC_PerformCommand( pEfc, EFC_FCMD_CLB, startPage, _dwUseIAP ) ;
+        if ( dwError )
+        {
+            return dwError ;
+        }
+        startPage += numPagesInRegion ;
+    }
+    return 0 ;
+}
+
+/**
+ * \brief Returns the number of locked regions inside the given address range.
+ *
+ * \param start  Start address of range
+ * \param end    End address of range.
+ */
+extern uint32_t FLASHD_IsLocked( uint32_t start, uint32_t end )
+{
+    Efc *pEfc ;
+    uint16_t startPage, endPage ;
+    uint8_t startRegion, endRegion ;
+    uint32_t numPagesInRegion ;
+    uint32_t status ;
+    uint32_t dwError ;
+    uint32_t numLockedRegions = 0 ;
+
+    assert( end >= start ) ;
+    assert( (start >=IFLASH_ADDR) && (end <= IFLASH_ADDR + IFLASH_SIZE) ) ;
+
+    // Compute page numbers
+    EFC_TranslateAddress( &pEfc, start, &startPage, 0 ) ;
+    EFC_TranslateAddress( 0, end, &endPage, 0 ) ;
+
+    // Compute region numbers
+    numPagesInRegion = IFLASH_LOCK_REGION_SIZE / IFLASH_PAGE_SIZE ;
+    startRegion = startPage / numPagesInRegion ;
+    endRegion = endPage / numPagesInRegion ;
+    if ((endPage % numPagesInRegion) != 0)
+    {
+        endRegion++ ;
+    }
+
+    // Retrieve lock status
+    dwError = EFC_PerformCommand( pEfc, EFC_FCMD_GLB, 0, _dwUseIAP ) ;
+    assert( !dwError ) ;
+    status = EFC_GetResult( pEfc ) ;
+
+    // Check status of each involved region
+    while ( startRegion < endRegion )
+    {
+        if ( (status & (1 << startRegion)) != 0 )
+        {
+            numLockedRegions++ ;
+        }
+        startRegion++ ;
+    }
+
+    return numLockedRegions ;
+}
+
+/**
+ * \brief Check if the given GPNVM bit is set or not.
+ *
+ * \param gpnvm  GPNVM bit index.
+ * \returns 1 if the given GPNVM bit is currently set; otherwise returns 0.
+ */
+extern uint32_t FLASHD_IsGPNVMSet( uint8_t ucGPNVM )
+{
+    uint32_t dwError ;
+    uint32_t dwStatus ;
+
+    assert( ucGPNVM < 2 ) ;
+
+    /* Get GPNVMs status */
+    dwError = EFC_PerformCommand( EFC, EFC_FCMD_GFB, 0, _dwUseIAP ) ;
+    assert( !dwError ) ;
+    dwStatus = EFC_GetResult( EFC ) ;
+
+    /* Check if GPNVM is set */
+    if ( (dwStatus & (1 << ucGPNVM)) != 0 )
+    {
+        return 1 ;
+    }
+    else
+    {
+        return 0 ;
+    }
+}
+
+/**
+ * \brief Sets the selected GPNVM bit.
+ *
+ * \param gpnvm  GPNVM bit index.
+ * \returns 0 if successful; otherwise returns an error code.
+ */
+extern uint32_t FLASHD_SetGPNVM( uint8_t ucGPNVM )
+{
+    assert( ucGPNVM < 2 ) ;
+
+    if ( !FLASHD_IsGPNVMSet( ucGPNVM ) )
+    {
+        return EFC_PerformCommand( EFC, EFC_FCMD_SFB, ucGPNVM, _dwUseIAP ) ;
+    }
+    else
+    {
+        return 0 ;
+    }
+}
+
+/**
+ * \brief Clears the selected GPNVM bit.
+ *
+ * \param gpnvm  GPNVM bit index.
+ * \returns 0 if successful; otherwise returns an error code.
+ */
+extern uint32_t FLASHD_ClearGPNVM( uint8_t ucGPNVM )
+{
+    assert( ucGPNVM < 2 ) ;
+
+    if ( FLASHD_IsGPNVMSet( ucGPNVM ) )
+    {
+        return EFC_PerformCommand( EFC, EFC_FCMD_CFB, ucGPNVM, _dwUseIAP ) ;
+    }
+    else
+    {
+        return 0 ;
+    }
+}
+/**
+ * \brief Read the unique ID.
+ *
+ * \param uniqueID pointer on a 4bytes char containing the unique ID value.
+ * \returns 0 if successful; otherwise returns an error code.
+ */
+extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID )
+{
+    uint32_t dwError ;
+
+    assert( pdwUniqueID != NULL ) ;
+
+    pdwUniqueID[0] = 0 ;
+    pdwUniqueID[1] = 0 ;
+    pdwUniqueID[2] = 0 ;
+    pdwUniqueID[3] = 0 ;
+
+    EFC_StartCommand( EFC, EFC_FCMD_STUI, 0 ) ;
+
+    pdwUniqueID[0] = *(uint32_t*) IFLASH_ADDR;
+    pdwUniqueID[1] = *(uint32_t*)(IFLASH_ADDR + 4) ;
+    pdwUniqueID[2] = *(uint32_t*)(IFLASH_ADDR + 8) ;
+    pdwUniqueID[3] = *(uint32_t*)(IFLASH_ADDR + 12) ;
+
+    dwError = EFC_PerformCommand( EFC, EFC_FCMD_SPUI, 0, _dwUseIAP ) ;
+    if ( dwError )
+    {
+        return dwError ;
+    }
+
+    return 0 ;
+}

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,315 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         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 ) ;
-}
+}
-
+
-/**
+/**
- * Configures a PIO or a group of PIO to generate an interrupt on status
+ * 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
+ * change. The provided interrupt handler will be called with the triggering
- * pin as its parameter (enabling different pin instances to share the same
+ * pin as its parameter (enabling different pin instances to share the same
- * handler).
+ * handler).
- * \param pPin  Pointer to a Pin instance.
+ * \param pPin  Pointer to a Pin instance.
- * \param handler  Interrupt handler function pointer.
+ * \param handler  Interrupt handler function pointer.
- */
+ */
-extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
+extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
-{
+{
-    Pio* pio ;
+    Pio* pio ;
-    InterruptSource* pSource ;
+    InterruptSource* pSource ;
-
+
-    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
-
+
-    assert( pPin ) ;
+    assert( pPin ) ;
-    pio = pPin->pio ;
+    pio = pPin->pio ;
-    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
+    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
-
+
-    /* Define new source */
+    /* Define new source */
-    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
-
+
-    pSource = &(_aIntSources[_dwNumSources]) ;
+    pSource = &(_aIntSources[_dwNumSources]) ;
-    pSource->pPin = pPin ;
+    pSource->pPin = pPin ;
-    pSource->handler = handler ;
+    pSource->handler = handler ;
-    _dwNumSources++ ;
+    _dwNumSources++ ;
-
+
-    /* PIO3 with additional interrupt support
+    /* PIO3 with additional interrupt support
-     * Configure additional interrupt mode registers */
+     * Configure additional interrupt mode registers */
-    if ( pPin->attribute & PIO_IT_AIME )
+    if ( pPin->attribute & PIO_IT_AIME )
-    {
+    {
-        // enable additional interrupt mode
+        // enable additional interrupt mode
-        pio->PIO_AIMER       = pPin->mask ;
+        pio->PIO_AIMER       = pPin->mask ;
-
+
-        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
+        // if bit field of selected pin is 1, set as Rising Edge/High level detection event
-        if ( pPin->attribute & PIO_IT_RE_OR_HL )
+        if ( pPin->attribute & PIO_IT_RE_OR_HL )
-        {
+        {
-            pio->PIO_REHLSR    = pPin->mask ;
+            pio->PIO_REHLSR    = pPin->mask ;
-        }
+        }
-        else
+        else
-        {
+        {
-            pio->PIO_FELLSR     = pPin->mask;
+            pio->PIO_FELLSR     = pPin->mask;
-        }
+        }
-
+
-        /* if bit field of selected pin is 1, set as edge detection source */
+        /* if bit field of selected pin is 1, set as edge detection source */
-        if (pPin->attribute & PIO_IT_EDGE)
+        if (pPin->attribute & PIO_IT_EDGE)
-            pio->PIO_ESR     = pPin->mask;
+            pio->PIO_ESR     = pPin->mask;
-        else
+        else
-            pio->PIO_LSR     = pPin->mask;
+            pio->PIO_LSR     = pPin->mask;
-    }
+    }
-    else
+    else
-    {
+    {
-        /* disable additional interrupt mode */
+        /* disable additional interrupt mode */
-        pio->PIO_AIMDR       = pPin->mask;
+        pio->PIO_AIMDR       = pPin->mask;
-    }
+    }
-}
+}
-
+
-/**
+/**
- * Enables the given interrupt source if it has been configured. The status
+ * Enables the given interrupt source if it has been configured. The status
- * register of the corresponding PIO controller is cleared prior to enabling
+ * register of the corresponding PIO controller is cleared prior to enabling
- * the interrupt.
+ * the interrupt.
- * \param pPin  Interrupt source to enable.
+ * \param pPin  Interrupt source to enable.
- */
+ */
-extern void PIO_EnableIt( const Pin *pPin )
+extern void PIO_EnableIt( const Pin *pPin )
-{
+{
-    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
-
+
-    assert( pPin != NULL ) ;
+    assert( pPin != NULL ) ;
-
+
-#ifndef NOASSERT
+#ifndef NOASSERT
-    uint32_t i = 0;
+    uint32_t i = 0;
-    uint32_t dwFound = 0;
+    uint32_t dwFound = 0;
-
+
-    while ( (i < _dwNumSources) && !dwFound )
+    while ( (i < _dwNumSources) && !dwFound )
-    {
+    {
-        if ( _aIntSources[i].pPin == pPin )
+        if ( _aIntSources[i].pPin == pPin )
-        {
+        {
-            dwFound = 1 ;
+            dwFound = 1 ;
-        }
+        }
-        i++ ;
+        i++ ;
-    }
+    }
-    assert( dwFound != 0 ) ;
+    assert( dwFound != 0 ) ;
-#endif
+#endif
-
+
-    pPin->pio->PIO_ISR;
+    pPin->pio->PIO_ISR;
-    pPin->pio->PIO_IER = pPin->mask ;
+    pPin->pio->PIO_IER = pPin->mask ;
-}
+}
-
+
-/**
+/**
- * Disables a given interrupt source, with no added side effects.
+ * Disables a given interrupt source, with no added side effects.
- *
+ *
- * \param pPin  Interrupt source to disable.
+ * \param pPin  Interrupt source to disable.
- */
+ */
-extern void PIO_DisableIt( const Pin *pPin )
+extern void PIO_DisableIt( const Pin *pPin )
-{
+{
-    assert( pPin != NULL ) ;
+    assert( pPin != NULL ) ;
-
+
-    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
-
+
-    pPin->pio->PIO_IDR = pPin->mask;
+    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

@@ -0,0 +1,43 @@
+#include "chip.h"
+
+#define EFC_FCMD_STUI	0x0E
+#define EFC_FCMD_SPUI	0x0F
+
+__attribute__ ((section(".ramfunc")))
+void EEFC_ReadUniqueID(unsigned int *pdwUniqueID)
+{
+	unsigned int status;
+
+	/* Errata / Workaround: Set bit 16 of EEFC Flash Mode Register
+	 * to 1 */
+	EFC->EEFC_FMR |= (1 << 16);
+
+	/* Send the Start Read unique Identifier command (STUI) by
+	 * writing the Flash Command Register with the STUI command. */
+	EFC->EEFC_FCR = (0x5A << 24) | EFC_FCMD_STUI;
+
+	/* Wait for the FRDY bit to fall */
+	do {
+		status = EFC->EEFC_FSR;
+	} while ((status & EEFC_FSR_FRDY) == EEFC_FSR_FRDY);
+
+	/* The Unique Identifier is located in the first 128 bits of the
+	 * Flash memory mapping. So, at the address 0x400000-0x400003.
+	 * */
+	pdwUniqueID[0] = *(uint32_t *) IFLASH_ADDR;
+	pdwUniqueID[1] = *(uint32_t *) (IFLASH_ADDR + 4);
+	pdwUniqueID[2] = *(uint32_t *) (IFLASH_ADDR + 8);
+	pdwUniqueID[3] = *(uint32_t *) (IFLASH_ADDR + 12);
+
+	/* To stop the Unique Identifier mode, the user needs to send
+	 * the Stop Read unique Identifier command (SPUI) by writing the
+	 * Flash Command Register with the SPUI command. */
+	EFC->EEFC_FCR = (0x5A << 24) | EFC_FCMD_SPUI;
+
+	/* When the Stop read Unique Unique Identifier command (SPUI)
+	 * has been performed, the FRDY bit in the Flash Programming
+	 * Status Register (EEFC_FSR) rises. */
+	do {
+		status = EFC->EEFC_FSR;
+	} while ((status & EEFC_FSR_FRDY) != EEFC_FSR_FRDY);
+}

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/common/dfu/usb_dfu.h

@@ -0,0 +1,81 @@
+#ifndef _USB_DFU_H
+#define _USB_DFU_H
+/* USB Device Firmware Update Implementation for OpenPCD
+ * (C) 2006 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * Protocol definitions for USB DFU
+ *
+ * This ought to be compliant to the USB DFU Spec 1.0 as available from
+ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf
+ *
+ */
+
+#include <stdint.h>
+
+#include <usb/include/USBRequests.h>
+
+#define USB_DT_DFU			0x21
+
+struct usb_dfu_func_descriptor {
+	uint8_t		bLength;
+	uint8_t		bDescriptorType;
+	uint8_t		bmAttributes;
+#define USB_DFU_CAN_DOWNLOAD	(1 << 0)
+#define USB_DFU_CAN_UPLOAD	(1 << 1)
+#define USB_DFU_MANIFEST_TOL	(1 << 2)
+#define USB_DFU_WILL_DETACH	(1 << 3)
+	uint16_t		wDetachTimeOut;
+	uint16_t		wTransferSize;
+	uint16_t		bcdDFUVersion;
+} __attribute__ ((packed));
+
+#define USB_DT_DFU_SIZE			9
+
+/* DFU class-specific requests (Section 3, DFU Rev 1.1) */
+#define USB_REQ_DFU_DETACH	0x00
+#define USB_REQ_DFU_DNLOAD	0x01
+#define USB_REQ_DFU_UPLOAD	0x02
+#define USB_REQ_DFU_GETSTATUS	0x03
+#define USB_REQ_DFU_CLRSTATUS	0x04
+#define USB_REQ_DFU_GETSTATE	0x05
+#define USB_REQ_DFU_ABORT	0x06
+
+struct dfu_status {
+	uint8_t bStatus;
+	uint8_t bwPollTimeout[3];
+	uint8_t bState;
+	uint8_t iString;
+} __attribute__((packed));
+
+#define DFU_STATUS_OK			0x00
+#define DFU_STATUS_errTARGET		0x01
+#define DFU_STATUS_errFILE		0x02
+#define DFU_STATUS_errWRITE		0x03
+#define DFU_STATUS_errERASE		0x04
+#define DFU_STATUS_errCHECK_ERASED	0x05
+#define DFU_STATUS_errPROG		0x06
+#define DFU_STATUS_errVERIFY		0x07
+#define DFU_STATUS_errADDRESS		0x08
+#define DFU_STATUS_errNOTDONE		0x09
+#define DFU_STATUS_errFIRMWARE		0x0a
+#define DFU_STATUS_errVENDOR		0x0b
+#define DFU_STATUS_errUSBR		0x0c
+#define DFU_STATUS_errPOR		0x0d
+#define DFU_STATUS_errUNKNOWN		0x0e
+#define DFU_STATUS_errSTALLEDPKT	0x0f
+
+enum dfu_state {
+	DFU_STATE_appIDLE		= 0,
+	DFU_STATE_appDETACH		= 1,
+	DFU_STATE_dfuIDLE		= 2,
+	DFU_STATE_dfuDNLOAD_SYNC	= 3,
+	DFU_STATE_dfuDNBUSY		= 4,
+	DFU_STATE_dfuDNLOAD_IDLE	= 5,
+	DFU_STATE_dfuMANIFEST_SYNC	= 6,
+	DFU_STATE_dfuMANIFEST		= 7,
+	DFU_STATE_dfuMANIFEST_WAIT_RST	= 8,
+	DFU_STATE_dfuUPLOAD_IDLE	= 9,
+	DFU_STATE_dfuERROR		= 10,
+};
+
+#endif /* _USB_DFU_H */

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

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

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

@@ -2,6 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2008, Atmel Corporation
+ * Copyright (c) 2018, Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -250,7 +251,7 @@ static void GetDescriptor(
     switch (type) {
 
         case USBGenericDescriptor_DEVICE:
-            TRACE_INFO_WP("Dev ");
+            TRACE_DEBUG_WP("Dev ");
 
             /* Adjust length and send descriptor */
 
@@ -262,7 +263,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_CONFIGURATION:
-            TRACE_INFO_WP("Cfg ");
+            TRACE_DEBUG_WP("Cfg ");
 
             /* Adjust length and send descriptor */
 
@@ -279,7 +280,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_DEVICEQUALIFIER:
-            TRACE_INFO_WP("Qua ");
+            TRACE_DEBUG_WP("Qua ");
 
             /* Check if descriptor exists */
 
@@ -300,7 +301,7 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_OTHERSPEEDCONFIGURATION:
-            TRACE_INFO_WP("OSC ");
+            TRACE_DEBUG_WP("OSC ");
 
             /* Check if descriptor exists */
 
@@ -326,13 +327,18 @@ static void GetDescriptor(
             break;
 
         case USBGenericDescriptor_STRING:
-            TRACE_INFO_WP("Str%d ", indexRDesc);
+            TRACE_DEBUG_WP("Str%d ", indexRDesc);
 
             /* Check if descriptor exists */
 
             if (indexRDesc >= numStrings) {
-
+                /* 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.c

@@ -0,0 +1,49 @@
+
+#include <usb/include/USBDescriptors.h>
+#include <usb/device/dfu/dfu.h>
+
+
+/* String 1 "SimTrace DFU Interface - Application Partition" */
+const struct USBStringDescriptor USBDFU_string1 = {
+	.hdr = {
+		.bLength = sizeof(USBGenericDescriptor) + 46 * sizeof(unsigned short),
+		.bDescriptorType = USBGenericDescriptor_STRING,
+	},
+	.wData = {	0x0053, 0x0069, 0x006d, 0x0054, 0x0072, 0x0061,
+			0x0063, 0x0065, 0x0020, 0x0044, 0x0046, 0x0055,
+			0x0020, 0x0049, 0x006e, 0x0074, 0x0065, 0x0072,
+			0x0066, 0x0061, 0x0063, 0x0065, 0x0020, 0x002d,
+			0x0020, 0x0041, 0x0070, 0x0070, 0x006c, 0x0069,
+			0x0063, 0x0061, 0x0074, 0x0069, 0x006f, 0x006e,
+			0x0020, 0x0050, 0x0061, 0x0072, 0x0074, 0x0069,
+			0x0074, 0x0069, 0x006f, 0x006e, },
+};
+
+/* String 2 "SimTrace DFU Interface - Bootloader Partition" */
+const struct USBStringDescriptor USBDFU_string2 = {
+	.hdr = {
+		.bLength = sizeof(USBGenericDescriptor) + 45 * sizeof(unsigned short),
+		.bDescriptorType = USBGenericDescriptor_STRING,
+	},
+	.wData = {	0x0053, 0x0069, 0x006d, 0x0054, 0x0072, 0x0061,
+			0x0063, 0x0065, 0x0020, 0x0044, 0x0046, 0x0055,
+			0x0020, 0x0049, 0x006e, 0x0074, 0x0065, 0x0072,
+			0x0066, 0x0061, 0x0063, 0x0065, 0x0020, 0x002d,
+			0x0020, 0x0042, 0x006f, 0x006f, 0x0074, 0x006c,
+			0x006f, 0x0061, 0x0064, 0x0065, 0x0072, 0x0020,
+			0x0050, 0x0061, 0x0072, 0x0074, 0x0069, 0x0074,
+			0x0069, 0x006f, 0x006e, },
+};
+
+/* String 3 "SimTrace DFU Interface - RAM" */
+const struct USBStringDescriptor USBDFU_string3 = {
+	.hdr = {
+		.bLength = sizeof(USBGenericDescriptor) + 28 * sizeof(unsigned short),
+		.bDescriptorType = USBGenericDescriptor_STRING,
+	},
+	.wData = {	0x0053, 0x0069, 0x006d, 0x0054, 0x0072, 0x0061,
+			0x0063, 0x0065, 0x0020, 0x0044, 0x0046, 0x0055,
+			0x0020, 0x0049, 0x006e, 0x0074, 0x0065, 0x0072,
+			0x0066, 0x0061, 0x0063, 0x0065, 0x0020, 0x002d,
+			0x0020, 0x0052, 0x0041, 0x004d, },
+};

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

@@ -0,0 +1,132 @@
+#ifndef _USB_DEV_DFU_H
+#define _USB_DEV_DFU_H
+
+#include <stdint.h>
+#include <board.h>
+#include <usb/include/USBDescriptors.h>
+#include <usb/include/USBDDriver.h>
+
+#if 0
+/* This is valid for CCID */
+#define CONFIG_DFU_NUM_APP_IF	1
+#define CONFIG_DFU_NUM_APP_STR	4
+#else
+/* This is valid for CDC-Serial */
+#define CONFIG_DFU_NUM_APP_IF	2
+#define CONFIG_DFU_NUM_APP_STR	2
+#endif
+
+struct USBStringDescriptor {
+	USBGenericDescriptor hdr;
+	unsigned short wData[];
+} __attribute__((packed));
+
+
+#ifdef BOARD_USB_DFU
+
+#include <usb/common/dfu/usb_dfu.h>
+
+/* for board-specific config */
+#include <board.h>
+
+struct dfu_desc {
+	USBConfigurationDescriptor ucfg;
+	USBInterfaceDescriptor uif[BOARD_DFU_NUM_IF];
+	struct usb_dfu_func_descriptor func_dfu;
+} __attribute__ ((packed));
+
+/* USB DFU functional descriptor */
+#define DFU_FUNC_DESC  {						\
+	.bLength		= USB_DT_DFU_SIZE,			\
+	.bDescriptorType	= USB_DT_DFU,				\
+	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \
+	.wDetachTimeOut		= 0xff00,				\
+	.wTransferSize		= BOARD_DFU_PAGE_SIZE,			\
+	.bcdDFUVersion		= 0x0100,				\
+}
+
+/* Number of DFU interface during runtime mode */
+#define DFURT_NUM_IF		1
+
+/* to be used by the runtime as part of its USB descriptor structure
+ * declaration */
+#define DFURT_IF_DESCRIPTOR_STRUCT		\
+	USBInterfaceDescriptor	dfu_rt;		\
+	struct usb_dfu_func_descriptor func_dfu;
+
+/* to be used by the runtime as part of its USB Dsecriptor structure
+ * definition */
+#define DFURT_IF_DESCRIPTOR(dfuIF, dfuSTR)					\
+	.dfu_rt = {								\
+		.bLength 		= sizeof(USBInterfaceDescriptor),	\
+		.bDescriptorType	= USBGenericDescriptor_INTERFACE,	\
+		.bInterfaceNumber	= dfuIF,				\
+		.bAlternateSetting	= 0,					\
+		.bNumEndpoints		= 0,					\
+		.bInterfaceClass	= 0xFE,					\
+		.bInterfaceSubClass	= 0x01,					\
+		.bInterfaceProtocol	= 0x01,					\
+		.iInterface		= dfuSTR,				\
+	},									\
+	.func_dfu = DFU_FUNC_DESC						\
+
+/* provided by dfu_desc.c */
+extern const struct dfu_desc dfu_cfg_descriptor;
+extern const USBDDriverDescriptors dfu_descriptors;
+
+#else /* BOARD_USB_DFU */
+
+/* no DFU bootloader is being used */
+#define DFURT_NUM_IF	0
+#define DFURT_IF_DESCRIPTOR_STRUCT
+#define DFURT_IF_DESCRIPTOR(a, b)
+
+#endif /* BOARD_USB_DFU */
+
+/* magic value we use during boot to detect if we should start in DFU
+ * mode or runtime mode */
+#define USB_DFU_MAGIC	0xDFDFDFDF
+
+/* The API between the core DFU handler and the board/soc specific code */
+
+struct dfudata {
+	uint32_t magic;
+	uint8_t status;
+	uint32_t state;
+	int past_manifest;
+	unsigned int total_bytes;
+};
+
+/* RAM address for this magic value above */
+extern struct dfudata _g_dfu;
+extern struct dfudata *g_dfu;
+
+void set_usb_serial_str(void);
+
+void DFURT_SwitchToDFU(void);
+
+/* call-backs from DFU USB function driver to the board/SOC */
+extern int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
+				uint8_t *data, unsigned int len);
+extern int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
+				uint8_t *data, unsigned int req_len);
+extern int USBDFU_OverrideEnterDFU(void);
+
+/* function to be called at end of EP0 handler during runtime */
+void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request);
+
+/* function to be called at end of EP0 handler during DFU mode */
+void USBDFU_DFU_RequestHandler(const USBGenericRequest *request);
+
+/* initialization of USB DFU driver (in DFU mode */
+void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors);
+
+/* USBD tells us to switch from DFU mode to application mode */
+void USBDFU_SwitchToApp(void);
+
+/* Return values to be used by USBDFU_handle_{dn,up}load */
+#define DFU_RET_NOTHING	0
+#define DFU_RET_ZLP	1
+#define DFU_RET_STALL	2
+
+#endif

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

@@ -0,0 +1,239 @@
+/* DFU related USB Descriptors */
+/* (C) 2006-2017 Harald Welte <hwelte@hmw-consulting.de> */
+
+#include <unistd.h>
+
+#include "board.h"
+#include "utils.h"
+
+#include <usb/include/USBDescriptors.h>
+
+#include <usb/include/USBDDriver.h>
+
+#include <usb/common/dfu/usb_dfu.h>
+#include <usb/device/dfu/dfu.h>
+
+#include "usb_strings_generated.h"
+
+enum {
+	STR_MANUF	= 1,
+	STR_PROD,
+	STR_CONFIG,
+	_STR_FIRST_ALT,
+	// serial string
+	STR_SERIAL	= (_STR_FIRST_ALT+BOARD_DFU_NUM_IF),
+	// version string (on additional interface)
+	VERSION_CONF_STR,
+	VERSION_STR,
+	// count
+	STRING_DESC_CNT,
+};
+
+/* USB string for the serial (using 128-bit device ID) */
+static unsigned char usb_string_serial[] = {
+	USBStringDescriptor_LENGTH(32),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('0'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('1'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('2'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('3'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('4'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('5'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('6'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('7'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('8'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('9'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('b'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('c'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('d'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('f'),
+};
+
+/* USB string for the version */
+static const unsigned char usb_string_version_conf[] = {
+	USBStringDescriptor_LENGTH(16),
+	USBGenericDescriptor_STRING,
+	USBStringDescriptor_UNICODE('f'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('m'),
+	USBStringDescriptor_UNICODE('w'),
+	USBStringDescriptor_UNICODE('a'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE(' '),
+	USBStringDescriptor_UNICODE('v'),
+	USBStringDescriptor_UNICODE('e'),
+	USBStringDescriptor_UNICODE('r'),
+	USBStringDescriptor_UNICODE('s'),
+	USBStringDescriptor_UNICODE('i'),
+	USBStringDescriptor_UNICODE('o'),
+	USBStringDescriptor_UNICODE('n'),
+};
+
+static const char git_version[] = GIT_VERSION;
+static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2];
+/** array of static (from usb_strings) and runtime (serial, version) USB strings */
+static const unsigned char *usb_strings_extended[STRING_DESC_CNT];
+
+static const USBDeviceDescriptor fsDevice = {
+	.bLength = 		sizeof(USBDeviceDescriptor),
+	.bDescriptorType = 	USBGenericDescriptor_DEVICE,
+	.bcdUSB = 		USBDeviceDescriptor_USB2_00,
+	.bDeviceClass =		0,
+	.bDeviceSubClass = 	0,
+	.bDeviceProtocol = 	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,
+	.iSerialNumber =	STR_SERIAL,
+	.bNumConfigurations =	2, // DFU + version configurations
+};
+
+/* Alternate Interface Descriptor, we use one per partition/memory type */
+#define DFU_IF(ALT)								\
+	{									\
+		.bLength =		sizeof(USBInterfaceDescriptor),		\
+		.bDescriptorType = 	USBGenericDescriptor_INTERFACE,		\
+		.bInterfaceNumber =	0,					\
+		.bAlternateSetting =	ALT,					\
+		.bNumEndpoints =	0,					\
+		.bInterfaceClass =	0xfe,					\
+		.bInterfaceSubClass =	1,					\
+		.iInterface =		(_STR_FIRST_ALT+ALT),			\
+		.bInterfaceProtocol =	2,					\
+	}
+
+/* overall descriptor for the DFU configuration, including all
+ * descriptors for alternate interfaces */
+const struct dfu_desc dfu_cfg_descriptor = {
+	.ucfg = {
+		.bLength =	   sizeof(USBConfigurationDescriptor),
+		.bDescriptorType = USBGenericDescriptor_CONFIGURATION,
+		.wTotalLength =	   sizeof(struct dfu_desc),
+		.bNumInterfaces =  1,
+		.bConfigurationValue = 1,
+		.iConfiguration =  STR_CONFIG,
+		.bmAttributes =	   BOARD_USB_BMATTRIBUTES,
+		.bMaxPower =	   100,
+	},
+	.uif[0] = DFU_IF(0),
+#if BOARD_DFU_NUM_IF > 1
+	.uif[1] = DFU_IF(1),
+#endif
+#if BOARD_DFU_NUM_IF > 2
+	.uif[2] = DFU_IF(2),
+#endif
+#if BOARD_DFU_NUM_IF > 3
+	.uif[3] = DFU_IF(3),
+#endif
+#if BOARD_DFU_NUM_IF > 4
+	.uif[4] = DFU_IF(4),
+#endif
+	.func_dfu = DFU_FUNC_DESC
+};
+
+void set_usb_serial_str(void)
+{
+	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];
+	}
+	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 = {
+	.pFsDevice = &fsDevice,
+	.pFsConfiguration = (const USBConfigurationDescriptor **)&conf_desc_arr,
+	/* DFU only supports FS for now */
+	.pFsQualifier = NULL,
+	.pFsOtherSpeed = NULL,
+	.pHsDevice = NULL,
+	.pHsConfiguration = NULL,
+	.pHsQualifier = NULL,
+	.pHsOtherSpeed = NULL,
+	.pStrings = usb_strings_extended,
+	.numStrings = ARRAY_SIZE(usb_strings_extended),
+};

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

@@ -0,0 +1,487 @@
+/* USB Device Firmware Update Implementation for OpenPCD, OpenPICC SIMtrace
+ * (C) 2006-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This ought to be compliant to the USB DFU Spec 1.0 as available from
+ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf
+ *
+ *  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 <unistd.h>
+
+#include <board.h>
+#include <core_cm3.h>
+
+#include "trace.h"
+
+#include <usb/include/USBDescriptors.h>
+#include <usb/include/USBRequests.h>
+#include <usb/include/USBD.h>
+#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
+ * by DFU code and Application code, across flash partitions */
+#define __dfudata __attribute__ ((section (".dfudata")))
+#define __dfufunc
+
+/// Standard device driver instance.
+static USBDDriver usbdDriver;
+static unsigned char if_altsettings[1];
+
+__dfudata struct dfudata _g_dfu = {
+  	.state = DFU_STATE_appIDLE,
+	.past_manifest = 0,
+	.total_bytes = 0,
+};
+struct dfudata *g_dfu = &_g_dfu;
+
+WEAK void dfu_drv_updstatus(void)
+{
+	TRACE_INFO("DFU: updstatus()\n\r");
+
+	/* we transition immediately from MANIFEST_SYNC to MANIFEST,
+	 * as the flash-writing is not asynchronous in this
+	 * implementation */
+	if (g_dfu->state == DFU_STATE_dfuMANIFEST_SYNC)
+		g_dfu->state = DFU_STATE_dfuMANIFEST;
+}
+
+static __dfufunc void handle_getstatus(void)
+{
+	/* has to be static as USBD_Write is async ? */
+	static struct dfu_status dstat;
+	static const uint8_t poll_timeout_10ms[] = { 10, 0, 0 };
+
+	dfu_drv_updstatus();
+
+	/* send status response */
+	dstat.bStatus = g_dfu->status;
+	dstat.bState = g_dfu->state;
+	dstat.iString = 0;
+	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
+
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
+
+	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
+}
+
+static void __dfufunc handle_getstate(void)
+{
+	uint8_t u8 = g_dfu->state;
+
+	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
+
+	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
+}
+
+static void TerminateCtrlInWithNull(void *pArg,
+                                    unsigned char status,
+                                    unsigned long int transferred,
+                                    unsigned long int remaining)
+{
+    USBD_Write(0, // Endpoint #0
+               0, // No data buffer
+               0, // No data buffer
+               (TransferCallback) 0,
+               (void *)  0);
+}
+
+static uint8_t dfu_buf[BOARD_DFU_PAGE_SIZE];
+
+/* download of a single page has completed */
+static void dnload_cb(void *arg, unsigned char status, unsigned long int transferred,
+		      unsigned long int remaining)
+{
+	int rc;
+
+	TRACE_DEBUG("COMPLETE\n\r");
+
+	if (status != USBD_STATUS_SUCCESS) {
+		TRACE_ERROR("USBD download callback status %d\n\r", status);
+		USBD_Stall(0);
+		return;
+	}
+
+	rc = USBDFU_handle_dnload(if_altsettings[0], g_dfu->total_bytes, dfu_buf, transferred);
+	switch (rc) {
+	case DFU_RET_ZLP:
+		g_dfu->total_bytes += transferred;
+		g_dfu->state = DFU_STATE_dfuDNLOAD_IDLE;
+		TerminateCtrlInWithNull(0,0,0,0);
+		break;
+	case DFU_RET_STALL:
+		g_dfu->state = DFU_STATE_dfuERROR;
+		USBD_Stall(0);
+		break;
+	case DFU_RET_NOTHING:
+		break;
+	}
+
+}
+
+static int handle_dnload(uint16_t val, uint16_t len, int first)
+{
+	int rc;
+
+	if (len > BOARD_DFU_PAGE_SIZE) {
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
+		g_dfu->state = DFU_STATE_dfuERROR;
+		g_dfu->status = DFU_STATUS_errADDRESS;
+		return DFU_RET_STALL;
+	}
+
+	if (len & 0x03) {
+		TRACE_ERROR("DFU length not four-byte-aligned\n\r");
+		g_dfu->state = DFU_STATE_dfuERROR;
+		g_dfu->status = DFU_STATUS_errADDRESS;
+		return DFU_RET_STALL;
+	}
+
+	if (first)
+		g_dfu->total_bytes = 0;
+
+	if (len == 0) {
+		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\n\r");
+		g_dfu->state = DFU_STATE_dfuMANIFEST_SYNC;
+		return DFU_RET_ZLP;
+	}
+
+	/* else: actually read data */
+	rc = USBD_Read(0, dfu_buf, len, &dnload_cb, 0);
+	if (rc == USBD_STATUS_SUCCESS)
+		return DFU_RET_NOTHING;
+	else
+		return DFU_RET_STALL;
+}
+
+/* upload of a single page has completed */
+static void upload_cb(void *arg, unsigned char status, unsigned long int transferred,
+		      unsigned long int remaining)
+{
+	int rc;
+
+	TRACE_DEBUG("COMPLETE\n\r");
+
+	if (status != USBD_STATUS_SUCCESS) {
+		TRACE_ERROR("USBD upload callback status %d\n\r", status);
+		USBD_Stall(0);
+		return;
+	}
+
+	g_dfu->total_bytes += transferred;
+}
+
+static int handle_upload(uint16_t val, uint16_t len, int first)
+{
+	int rc;
+
+	if (first)
+		g_dfu->total_bytes = 0;
+
+	if (len > BOARD_DFU_PAGE_SIZE) {
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
+		g_dfu->state = DFU_STATE_dfuERROR;
+		g_dfu->status = DFU_STATUS_errADDRESS;
+		return DFU_RET_STALL;
+	}
+
+	rc = USBDFU_handle_upload(if_altsettings[0], g_dfu->total_bytes, dfu_buf, len);
+	if (rc < 0) {
+		TRACE_ERROR("application handle_upload() returned %d\n\r", rc);
+		return DFU_RET_STALL;
+	}
+
+	if (USBD_Write(0, dfu_buf, rc, &upload_cb, 0) == USBD_STATUS_SUCCESS)
+		return rc;
+
+	return DFU_RET_STALL;
+}
+
+/* this function gets daisy-chained into processing EP0 requests */
+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 = DFU_RET_NOTHING;
+
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
+			USBGenericRequest_GetType(request),
+			USBGenericRequest_GetRecipient(request),
+			val, len);
+
+	/* check for GET_DESCRIPTOR on DFU */
+	if (USBGenericRequest_GetType(request) == USBGenericRequest_STANDARD &&
+	    USBGenericRequest_GetRecipient(request) == USBGenericRequest_DEVICE &&
+	    USBGenericRequest_GetRequest(request) == USBGenericRequest_GETDESCRIPTOR &&
+	    USBGetDescriptorRequest_GetDescriptorType(request) == USB_DT_DFU) {
+		uint16_t length = sizeof(struct usb_dfu_func_descriptor);
+		const USBDeviceDescriptor *pDevice;
+		int terminateWithNull;
+
+		if (USBD_IsHighSpeed())
+			pDevice = usbdDriver.pDescriptors->pHsDevice;
+		else
+			pDevice = usbdDriver.pDescriptors->pFsDevice;
+
+		terminateWithNull = ((length % pDevice->bMaxPacketSize0) == 0);
+		USBD_Write(0, &dfu_cfg_descriptor.func_dfu, length,
+			   terminateWithNull ? TerminateCtrlInWithNull : 0, 0);
+		return;
+	}
+
+	/* forward all non-DFU specific messages to core handler*/
+	if (USBGenericRequest_GetType(request) != USBGenericRequest_CLASS ||
+	    USBGenericRequest_GetRecipient(request) != USBGenericRequest_INTERFACE) {
+		TRACE_DEBUG("std_ho_usbd ");
+		USBDDriver_RequestHandler(&usbdDriver, request);
+		return;
+	}
+
+	switch (g_dfu->state) {
+	case DFU_STATE_appIDLE:
+	case DFU_STATE_appDETACH:
+		TRACE_ERROR("Invalid DFU State reached in DFU mode\r\n");
+		ret = DFU_RET_STALL;
+		break;
+	case DFU_STATE_dfuIDLE:
+		switch (req) {
+		case USB_REQ_DFU_DNLOAD:
+			if (len == 0) {
+				g_dfu->state = DFU_STATE_dfuERROR;
+				ret = DFU_RET_STALL;
+				goto out;
+			}
+			g_dfu->state = DFU_STATE_dfuDNLOAD_SYNC;
+			ret = handle_dnload(val, len, 1);
+			break;
+		case USB_REQ_DFU_UPLOAD:
+			g_dfu->state = DFU_STATE_dfuUPLOAD_IDLE;
+			handle_upload(val, len, 1);
+			break;
+		case USB_REQ_DFU_ABORT:
+			/* no zlp? */
+			ret = DFU_RET_ZLP;
+			break;
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			goto out;
+			break;
+		}
+		break;
+	case DFU_STATE_dfuDNLOAD_SYNC:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			/* FIXME: state transition depending on block completeness */
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			goto out;
+		}
+		break;
+	case DFU_STATE_dfuDNBUSY:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			/* FIXME: only accept getstatus if bwPollTimeout
+			 * has elapsed */
+			handle_getstatus();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			goto out;
+		}
+		break;
+	case DFU_STATE_dfuDNLOAD_IDLE:
+		switch (req) {
+		case USB_REQ_DFU_DNLOAD:
+			g_dfu->state = DFU_STATE_dfuDNLOAD_SYNC;
+			ret = handle_dnload(val, len, 0);
+			break;
+		case USB_REQ_DFU_ABORT:
+			g_dfu->state = DFU_STATE_dfuIDLE;
+			ret = DFU_RET_ZLP;
+			break;
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			break;
+		}
+		break;
+	case DFU_STATE_dfuMANIFEST_SYNC:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			break;
+		}
+		break;
+	case DFU_STATE_dfuMANIFEST:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			/* we don't want to change to WAIT_RST, as it
+			 * would mean that we can not support another
+			 * DFU transaction before doing the actual
+			 * reset.  Instead, we switch to idle and note
+			 * that we've already been through MANIFST in
+			 * the global variable 'past_manifest'.
+			 */
+			//g_dfu->state = DFU_STATE_dfuMANIFEST_WAIT_RST;
+			g_dfu->state = DFU_STATE_dfuIDLE;
+			g_dfu->past_manifest = 1;
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			break;
+		}
+		break;
+	case DFU_STATE_dfuMANIFEST_WAIT_RST:
+		/* we should never go here */
+		break;
+	case DFU_STATE_dfuUPLOAD_IDLE:
+		switch (req) {
+		case USB_REQ_DFU_UPLOAD:
+			/* state transition if less data then requested */
+			rc = handle_upload(val, len, 0);
+			if (rc >= 0 && rc < len)
+				g_dfu->state = DFU_STATE_dfuIDLE;
+			break;
+		case USB_REQ_DFU_ABORT:
+			g_dfu->state = DFU_STATE_dfuIDLE;
+			/* no zlp? */
+			ret = DFU_RET_ZLP;
+			break;
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			break;
+		}
+		break;
+	case DFU_STATE_dfuERROR:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		case USB_REQ_DFU_CLRSTATUS:
+			g_dfu->state = DFU_STATE_dfuIDLE;
+			g_dfu->status = DFU_STATUS_OK;
+			/* no zlp? */
+			ret = DFU_RET_ZLP;
+			break;
+		default:
+			g_dfu->state = DFU_STATE_dfuERROR;
+			ret = DFU_RET_STALL;
+			break;
+		}
+		break;
+	}
+
+out:
+	switch (ret) {
+	case DFU_RET_NOTHING:
+		break;
+	case DFU_RET_ZLP:
+		USBD_Write(0, 0, 0, 0, 0);
+		break;
+	case DFU_RET_STALL:
+		USBD_Stall(0);
+		break;
+	}
+}
+
+/* we assume the caller has enabled the required clock/PLL for USB */
+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();
+	//USBD_ConfigureSpeed(1);
+
+	NVIC_EnableIRQ(UDP_IRQn);
+}
+
+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();
+}
+
+/* A board can provide a function overriding this, enabling a
+ * board-specific 'boot into DFU' override, like a specific GPIO that
+ * needs to be pulled a certain way. */
+WEAK int USBDFU_OverrideEnterDFU(void)
+{
+	return 0;
+}
+
+void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
+{
+	USBDFU_DFU_RequestHandler(request);
+}

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

@@ -0,0 +1,218 @@
+/* DFU related functions that are active at runtime, i.e. during the
+ * normal operation of the device firmware, *not* during DFU update mode
+ * (C) 2006 Harald Welte <hwelte@hmw-consulting.de>
+ *
+ * This ought to be compliant to the USB DFU Spec 1.0 as available from
+ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf
+ *
+ *  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 <assert.h>
+#include <core_cm3.h>
+
+#include <usb/include/USBD.h>
+#include <usb/device/dfu/dfu.h>
+
+#include "trace.h"
+
+#include <usb/include/USBDescriptors.h>
+#include <usb/include/USBRequests.h>
+#include <usb/include/USBD.h>
+#include <usb/common/dfu/usb_dfu.h>
+#include <usb/device/dfu/dfu.h>
+
+struct dfudata *g_dfu = (struct dfudata *) IRAM_ADDR;
+
+/* FIXME: this was used for a special ELF section which then got called
+ * by DFU code and Application code, across flash partitions */
+#define __dfufunc
+
+static __dfufunc void handle_getstatus(void)
+{
+	/* has to be static as USBD_Write is async ? */
+	static struct dfu_status dstat;
+	static const uint8_t poll_timeout_10ms[] = { 10, 0, 0 };
+
+	/* send status response */
+	dstat.bStatus = g_dfu->status;
+	dstat.bState = g_dfu->state;
+	dstat.iString = 0;
+	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
+
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
+
+	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
+}
+
+static void __dfufunc handle_getstate(void)
+{
+	uint8_t u8 = g_dfu->state;
+
+	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
+
+	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
+}
+
+static const uint8_t *get_dfu_func_desc(void)
+{
+	USBDDriver *usbdDriver = USBD_GetDriver();
+	const USBConfigurationDescriptor *cfg_desc;
+	const USBGenericDescriptor *gen_desc;
+
+	if (USBD_IsHighSpeed())
+		cfg_desc = &usbdDriver->pDescriptors->pHsConfiguration[usbdDriver->cfgnum];
+	else
+		cfg_desc = usbdDriver->pDescriptors->pFsConfiguration[usbdDriver->cfgnum];
+
+	for (gen_desc = (const USBGenericDescriptor *) cfg_desc;
+	     (const uint8_t *) gen_desc < (const uint8_t *) cfg_desc + cfg_desc->wTotalLength;
+	     gen_desc = (const USBGenericDescriptor *) ((const uint8_t *)gen_desc + gen_desc->bLength)) {
+		if (gen_desc->bDescriptorType == USB_DT_DFU)
+			return (const uint8_t *) gen_desc;
+	}
+	return NULL;
+}
+
+static void TerminateCtrlInWithNull(void *pArg,
+                                    unsigned char status,
+                                    unsigned long int transferred,
+                                    unsigned long int remaining)
+{
+    USBD_Write(0, // Endpoint #0
+               0, // No data buffer
+               0, // No data buffer
+               (TransferCallback) 0,
+               (void *)  0);
+}
+
+/* this function gets daisy-chained into processing EP0 requests */
+void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
+{
+	USBDDriver *usbdDriver = USBD_GetDriver();
+	uint8_t req = USBGenericRequest_GetRequest(request);
+	uint16_t len = USBGenericRequest_GetLength(request);
+	uint16_t val = USBGenericRequest_GetValue(request);
+	int rc, ret = DFU_RET_NOTHING;
+
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
+			USBGenericRequest_GetType(request),
+			USBGenericRequest_GetRecipient(request),
+			val, len);
+
+	/* check for GET_DESCRIPTOR on DFU */
+	if (USBGenericRequest_GetType(request) == USBGenericRequest_STANDARD &&
+	    USBGenericRequest_GetRecipient(request) == USBGenericRequest_DEVICE &&
+	    USBGenericRequest_GetRequest(request) == USBGenericRequest_GETDESCRIPTOR &&
+	    USBGetDescriptorRequest_GetDescriptorType(request) == USB_DT_DFU) {
+		uint16_t length = sizeof(struct usb_dfu_func_descriptor);
+		const USBDeviceDescriptor *pDevice;
+		const uint8_t *dfu_func_desc = get_dfu_func_desc();
+		int terminateWithNull;
+
+		ASSERT(dfu_func_desc);
+
+		if (USBD_IsHighSpeed())
+			pDevice = usbdDriver->pDescriptors->pHsDevice;
+		else
+			pDevice = usbdDriver->pDescriptors->pFsDevice;
+
+		terminateWithNull = ((length % pDevice->bMaxPacketSize0) == 0);
+		USBD_Write(0, dfu_func_desc, length,
+			   terminateWithNull ? TerminateCtrlInWithNull : 0, 0);
+		return;
+	}
+
+	/* forward all non-DFU specific messages to core handler*/
+	if (USBGenericRequest_GetType(request) != USBGenericRequest_CLASS ||
+	    USBGenericRequest_GetRecipient(request) != USBGenericRequest_INTERFACE) {
+		TRACE_DEBUG("std_ho_usbd ");
+		USBDCallbacks_RequestReceived(request);
+		return;
+	}
+
+	switch (g_dfu->state) {
+	case DFU_STATE_appIDLE:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		case USB_REQ_DFU_DETACH:
+			/* we switch it DETACH state, send a ZLP and
+			 * return.  The next USB reset in this state
+			 * will then trigger DFURT_SwitchToDFU() below */
+			TRACE_DEBUG("\r\n====dfu_detach\n\r");
+			g_dfu->state = DFU_STATE_appDETACH;
+			ret = DFU_RET_ZLP;
+			goto out;
+			break;
+		default:
+			ret = DFU_RET_STALL;
+		}
+		break;
+	case DFU_STATE_appDETACH:
+		switch (req) {
+		case USB_REQ_DFU_GETSTATUS:
+			handle_getstatus();
+			break;
+		case USB_REQ_DFU_GETSTATE:
+			handle_getstate();
+			break;
+		default:
+			g_dfu->state = DFU_STATE_appIDLE;
+			ret = DFU_RET_STALL;
+			goto out;
+			break;
+		}
+		/* FIXME: implement timer to return to appIDLE */
+		break;
+	default:
+		TRACE_ERROR("Invalid DFU State reached in Runtime Mode\r\n");
+		ret = DFU_RET_STALL;
+		break;
+	}
+
+out:
+	switch (ret) {
+	case DFU_RET_NOTHING:
+		break;
+	case DFU_RET_ZLP:
+		USBD_Write(0, 0, 0, 0, 0);
+		break;
+	case DFU_RET_STALL:
+		USBD_Stall(0);
+		break;
+	}
+}
+
+void DFURT_SwitchToDFU(void)
+{
+	/* 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;
+
+	/* 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();
+}

firmware/include_board/board_common.h

@@ -1,110 +0,0 @@
-#ifndef _BOARD_
-#define _BOARD_
-
-/**     Headers     */
-#include "chip.h"
-/* We need this for a nop instruction in USB_HAL.c */
-#define __CC_ARM
-
-/**     Board       */
-#include "board_lowlevel.h"
-#include "uart_console.h"
-#include "iso7816_4.h"
-#include "led.h"
-#include "cciddriver.h"
-#include "usart.h"
-#include "USBD.h"
-
-#include "USBD_Config.h"
-#include "USBDDriver.h"
-
-/**     Highlevel   */
-#include "trace.h"
-#include "stdio.h"
-#include "stdlib.h"
-#include "string.h"
-#include "inttypes.h"
-
-#define MIN(a, b)       ((a < b) ? a : b)
-
-#ifdef __GNUC__ 
-#undef __GNUC__ 
-#endif
-
-/** Family definition (already defined) */
-#define sam3s
-/** Core definition */
-#define cortexm3
-
-#define BOARD_MAINOSC 18432000 
-#define BOARD_MCK     48000000
-
-#define LED_RED PIO_PA17
-#define LED_GREEN PIO_PA18
-
-#define PIN_LED_RED     {LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PIN_LED_GREEN   {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 */
-#define PIN_USART0_TXD    {PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-
-#define BOARD_PIN_USART_RXD     PIN_USART0_RXD
-#define BOARD_PIN_USART_TXD     PIN_USART0_TXD
-
-#define BOARD_ID_USART          ID_USART0
-#define BOARD_USART_BASE        USART0
-
-#define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-
-/** UART0 */
-/** Console baudrate always using 115200. */
-#define CONSOLE_BAUDRATE    230400
-/** Usart Hw interface used by the console (UART0). */
-#define CONSOLE_USART       UART0
-/** Usart Hw ID used by the console (UART0). */
-#define CONSOLE_ID          ID_UART0
-/** Pins description corresponding to Rxd,Txd, (UART pins) */
-#define CONSOLE_PINS        {PINS_UART}
-
-/// Smartcard detection pin
-// FIXME: add connect pin as iso pin...should it be periph b or interrupt oder input?
-#define BOARD_ISO7816_BASE_USART    USART0
-#define BOARD_ISO7816_ID_USART      ID_USART0
-
-#define USART_SIM       USART0
-#define ID_USART_SIM    ID_USART0
-#define USART_PHONE       USART1
-#define ID_USART_PHONE    ID_USART1
-
-#define SIM_PWEN        PIO_PA5
-#define VCC_FWD         PIO_PA26
-
-
-//**     USB **/
-// USB pull-up control pin definition (PA16).
-// Default: 1 (USB Pullup deactivated) 
-#define PIN_USB_PULLUP  {1 << 16, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-// Board has UDP controller
-#define BOARD_USB_UDP
-// D+ has external pull-up
-#define BOARD_USB_PULLUP_EXTERNAL
-
-#define BOARD_USB_NUMENDPOINTS      8
-
-// FIXME: in all other cases return 0?
-#define BOARD_USB_ENDPOINTS_MAXPACKETSIZE(i)    (((i == 4) || (i == 5))? 512 : 64)
-#define BOARD_USB_ENDPOINTS_BANKS(i)            (((i == 0) || (i == 3)) ? 1 : 2)
-
-/// USB attributes configuration descriptor (bus or self powered, remote wakeup)
-//#define BOARD_USB_BMATTRIBUTES                  USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP
-#define BOARD_USB_BMATTRIBUTES                  USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
-//#define BOARD_USB_BMATTRIBUTES                  USBConfigurationDescriptor_SELFPOWERED_RWAKEUP
-
-#endif

firmware/include_board/owhw/board.h

@@ -1,51 +0,0 @@
-#pragma once
-#include "board_common.h"
-
-/** Name of the board */
-#define BOARD_NAME "OWHW"
-/** Board definition */
-#define owhw
-
-/* USIM 2 interface (USART) */
-#define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_USIM2_IO		{PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PINS_ISO7816_USIM2	PIN_USIM2_CLK, PIN_USIM2_IO
-
-/* USIM 2 interface (TC) */
-#define PIN_USIM2_IO_TC		{PIO_PA1, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_USIM2_CLK_TC	{PIO_PA4, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PINS_TC_USIM2		PIN_USIM2_IO_TC, PIN_USIM2_CLK_TC
-
-/* USIM 1 interface (USART) */
-#define PIN_USIM1_IO		{PIO_PA22, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PIN_USIM1_CLK		{PIO_PA23, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-#define PINS_ISO7816_USIM1	PIN_USIM1_CLK, PIN_USIM1_IO
-
-/* USIM 1 interface (TC) */
-#define PIN_USIM1_IO_TC		{PIO_PA27, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_USIM1_CLK_TC	{PIO_PA29, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PINS_TC_USIM1		PIN_USIM1_IO_TC, PIN_USIM1_CLK_TC
-
-#define PIN_SET_USIM1_PRES	{PIO_PA12, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-#define PIN_USIM1_nRST		{PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_USIM1_VCC		{PIO_PB3, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
-
-#define PIN_SET_USIM2_PRES	{PIO_PA14, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-#define PIN_USIM2_nRST		{PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PIN_USIM2_VCC		{PIO_PB2, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
-
-#define PINS_USIM1		PINS_TC_USIM1, PINS_ISO7816_USIM1, PIN_USIM1_nRST, PIN_SET_USIM1_PRES
-#define PINS_USIM2		PINS_TC_USIM2, PINS_ISO7816_USIM2, PIN_USIM2_nRST, PIN_SET_USIM2_PRES
-
-#define PINS_CARDSIM		{ PIN_SET_USIM1_PRES, PIN_SET_USIM2_PRES }
-
-#define SIMTRACE_VENDOR_ID          0x1d50
-#define SIMTRACE_PRODUCT_ID         0x60e3	/* FIXME */
-#define USB_VENDOR_ID               SIMTRACE_VENDOR_ID
-#define USB_PRODUCT_ID              SIMTRACE_PRODUCT_ID
-
-#define CARDEMU_SECOND_UART
-/* Disable VCC/ADC detection, as OWHWv2 has no ADCVREF */
-//#define DETECT_VCC_BY_ADC
-
-#define HAVE_CARDEM

firmware/include_board/simtrace/board.h

@@ -1,83 +0,0 @@
-#pragma once
-#include "board_common.h"
-
-/** Name of the board */
-#define BOARD_NAME "SAM3S-SIMTRACE"
-/** Board definition */
-#define simtrace
-
-/** Phone (SIM card emulator)/CCID Reader/MITM configuration    **/
-/*  Normally the communication lines between phone and SIM card are disconnected    */
-// Disconnect SIM card I/O, VPP line from the phone lines
-// FIXME: Per default pins are input, therefore high-impedance, therefore they don not activate the bus switch, right?
-#define PIN_SC_SW_DEFAULT               {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-// Disconnect SIM card RST, CLK line from the phone lines
-#define PIN_IO_SW_DEFAULT               {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PINS_BUS_DEFAULT                PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
-
-/** Sniffer configuration **/
-// Connect VPP, CLK and RST lines from smartcard to the phone
-#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
-
-#define PINS_SIM_SNIFF_SIM      PIN_PHONE_IO,  PIN_PHONE_CLK
-
-#define SIM_PWEN_PIN            {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-#define PWR_PINS                                                         \
-    /* Enable power converter 4.5-6V to 3.3V; low: off */               \
-    {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT},               \
-    /* Enable second power converter: VCC_PHONE to VCC_SIM; high: on */ \
-    {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-#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}
-
-#define SIMTRACE_VENDOR_ID          0x1d50
-#define SIMTRACE_PRODUCT_ID         0x60e3
-#define USB_VENDOR_ID               SIMTRACE_VENDOR_ID
-#define USB_PRODUCT_ID              SIMTRACE_PRODUCT_ID
-
-#define HAVE_SNIFFER
-#define HAVE_CCID
-#define HAVE_CARDEM
-#define HAVE_MITM

firmware/libboard/common/include/board_common.h

@@ -0,0 +1,123 @@
+/* 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_
+
+/**     Headers     */
+#include "chip.h"
+/* We need this for a nop instruction in USB_HAL.c */
+#define __CC_ARM
+
+/**     Board       */
+#include "board_lowlevel.h"
+#include "uart_console.h"
+#include "iso7816_4.h"
+#include "led.h"
+#include "cciddriver.h"
+#include "usart.h"
+#include "USBD.h"
+
+#include "USBD_Config.h"
+#include "USBDDriver.h"
+
+/**     Highlevel   */
+#include "trace.h"
+#include "stdio.h"
+#include "stdlib.h"
+#include "string.h"
+#include "inttypes.h"
+#include "syscalls.h"
+
+#define MIN(a, b)       ((a < b) ? a : b)
+
+#ifdef __GNUC__ 
+#undef __GNUC__ 
+#endif
+
+/** Family definition (already defined) */
+#define sam3s
+/** Core definition */
+#define cortexm3
+
+/* LEDs are used to indicate the status
+ * the LED definition is board specific
+ * most boards have two LEDs, one green and one red
+ * 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)
+ */
+/** USART0 pin RX */
+#define PIN_USART0_RXD    {PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/** USART0 pin TX */
+#define PIN_USART0_TXD    {PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+
+#define BOARD_PIN_USART_RXD     PIN_USART0_RXD
+#define BOARD_PIN_USART_TXD     PIN_USART0_TXD
+
+#define BOARD_ID_USART          ID_USART0
+#define BOARD_USART_BASE        USART0
+
+#define PINS_UART  { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+
+/** UART0 */
+/** Console baud rate in bps */
+#define CONSOLE_BAUDRATE    921600
+/** UART peripheral used by the console (UART0). */
+#define CONSOLE_UART       UART0
+/** UART peripheral ID used by the console (UART0). */
+#define CONSOLE_ID          ID_UART0
+/** UART ISR used by the console (UART0). */
+#define CONSOLE_ISR         UART0_IrqHandler
+/** UART IRQ used by the console (UART0). */
+#define CONSOLE_IRQ         UART0_IRQn
+/** Pins description corresponding to Rxd,Txd, (UART pins) */
+#define CONSOLE_PINS        {PINS_UART}
+
+/// Smartcard detection pin
+// FIXME: add connect pin as iso pin...should it be periph b or interrupt oder input?
+#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
+/* Interrupt request ID of USART peripheral connected to the SIM card */
+#define IRQ_USART_SIM   USART0_IRQn
+/* USART peripheral connected to the phone */
+#define USART_PHONE     USART1
+/* ID of USART peripheral connected to the phone */
+#define ID_USART_PHONE  ID_USART1
+/* Interrupt request ID of USART peripheral connected to the phone */
+#define IRQ_USART_PHONE USART1_IRQn
+
+// Board has UDP controller
+#define BOARD_USB_UDP
+
+#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
+
+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

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

@@ -0,0 +1,44 @@
+/* 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 {
+	LED_RED,
+	LED_GREEN,
+	_NUM_LED
+};
+
+enum led_pattern {
+	BLINK_ALWAYS_OFF	= 0,
+	BLINK_ALWAYS_ON		= 1,
+	BLINK_3O_5F		= 2,
+	BLINK_3O_30F		= 3,
+	BLINK_3O_1F_3O_30F	= 4,
+	BLINK_3O_1F_3O_1F_3O_30F= 5,
+	BLINK_2O_F		= 6,
+	BLINK_200O_F		= 7,
+	BLINK_600O_F		= 8,
+	BLINK_CUSTOM		= 9,
+	BLINK_2F_O,
+	_NUM_LED_BLINK
+};
+
+void led_init(void);
+void led_fini(void);
+void led_stop(void);
+void led_start(void);
+
+void led_blink(enum led led, enum led_pattern blink);
+enum led_pattern led_get(enum led led);

firmware/libboard/common/include/manifest.h

@@ -0,0 +1,23 @@
+/* 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
+
+extern const char *manifest_application;
+extern const char *manifest_revision;
+extern const char *manifest_board;
+extern const char *manifest_environment;
+
+#endif /* !_MANIFEST_H */

firmware/libboard/common/include/sim_switch.h

@@ -0,0 +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 sim_switch_use_physical(unsigned int nr, int physical);
+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/sam3s1/flash.ld

@@ -0,0 +1,142 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal FLASH on the ATSAM3S1
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00010000 /* Flash, 64K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000 /* sram, 16K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        /* we must make sure the .dfudata is linked to start of RAM */
+        *(.dfudata .dfudata.*);
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

firmware/libboard/common/resources/sam3s1/sram.ld

@@ -0,0 +1,140 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the ATSAM3S1
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00010000 /* Flash, 64K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000 /* sram, 16K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > ram
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > ram
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

firmware/libboard/common/resources/sam3s1/sram_samba.lds

@@ -0,0 +1,91 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the AT91SAM3S1
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(entry)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x0800
+    sram (W!RX) : ORIGIN = 0x20000800, LENGTH = 0x00003800 /* sram, 16K - sizeof(romcodesram) */
+}
+
+/* Entry point */
+/*ENTRY (ResetException)*/
+
+SECTIONS
+{
+    /* startup code in the .isr_vector */
+    .text :
+    {
+        . = ALIGN(4);
+        _stext = .;
+        KEEP(*(.isr_vector .isr_vector.*))
+        *(.mailbox)
+        *(.text .text.*)
+        *(.rodata .rodata.*)
+        *(.glue_7)
+        *(.glue_7t)
+        *(.gcc_except_table)
+        *(.rodata .rodata*)
+        *(.gnu.linkonce.r.*)
+        . = ALIGN(4);
+        _etext = .;
+    } > sram
+
+    /* data */
+    .data :
+    {
+        . = ALIGN(4);
+        _sidata = .;
+        _sdata = .;
+
+        *(.data)
+        *(.data.*)
+        . = ALIGN(4);
+        _edata = .;
+    } > sram
+
+    .bss (NOLOAD) : {
+        _szero = .;
+        *(.bss)
+        . = ALIGN(4);
+        _ezero = .;
+    } >sram
+
+    /* Stack in SRAM */
+    _sstack = 0x20003FFC;
+}
+end = .;

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

@@ -0,0 +1,142 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal FLASH on the ATSAM3S2
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00020000 /* flash, 128K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* sram, 32K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        /* we must make sure the .dfudata is linked to start of RAM */
+        *(.dfudata .dfudata.*);
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

firmware/libboard/common/resources/sam3s2/sram.ld

@@ -0,0 +1,140 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the ATSAM3S2
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT ("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00020000 /* flash, 128K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* sram, 32K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > ram
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > ram
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

firmware/libboard/common/resources/sam3s2/sram_samba.lds

@@ -0,0 +1,91 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the AT91SAM3S2
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(entry)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x0800
+    sram (W!RX) : ORIGIN = 0x20000800, LENGTH = 0x00007800 /* sram, 32K - sizeof(romcodesram) */
+}
+
+/* Entry point */
+/*ENTRY (ResetException)*/
+
+SECTIONS
+{
+    /* startup code in the .isr_vector */
+    .text :
+    {
+        . = ALIGN(4);
+        _stext = .;
+        KEEP(*(.isr_vector .isr_vector.*))
+        *(.mailbox)
+        *(.text .text.*)
+        *(.rodata .rodata.*)
+        *(.glue_7)
+        *(.glue_7t)
+        *(.gcc_except_table)
+        *(.rodata .rodata*)
+        *(.gnu.linkonce.r.*)
+        . = ALIGN(4);
+        _etext = .;
+    } > sram
+
+    /* data */
+    .data :
+    {
+        . = ALIGN(4);
+        _sidata = .;
+        _sdata = .;
+
+        *(.data)
+        *(.data.*)
+        . = ALIGN(4);
+        _edata = .;
+    } > sram
+
+    .bss (NOLOAD) : {
+        _szero = .;
+        *(.bss)
+        . = ALIGN(4);
+        _ezero = .;
+    } >sram
+
+    /* Stack in SRAM */
+    _sstack = 0x20007FFC;
+}
+end = .;

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

@@ -0,0 +1,142 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal FLASH on the ATSAM3S4
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
+	rom (rx)  : ORIGIN = 0x00404000, LENGTH = 0x0003c000 /* flash, 256K */
+	/* reserve the first 32 (= 0x20) bytes for the _g_dfu struct */
+	ram (rwx) : ORIGIN = 0x20000020, LENGTH = 0x0000bfe0 /* sram, 48K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

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

@@ -1,143 +1,142 @@
-/* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
- *         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.
- * ----------------------------------------------------------------------------
+ * ----------------------------------------------------------------------------
- */
+ */
-
+
-/*------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------
- *      Linker script for running in internal FLASH on the ATSAM3S4
+ *      Linker script for running in internal FLASH on the ATSAM3S4
- *----------------------------------------------------------------------------*/
+ *----------------------------------------------------------------------------*/
-
+
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
+OUTPUT_ARCH(arm)
-SEARCH_DIR(.)
+SEARCH_DIR(.)
-ENTRY(main)
+
-
+/* Memory Spaces Definitions */
-/* Memory Spaces Definitions */
+MEMORY
-MEMORY
+{
-{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */
-        rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00020000 /* flash, 256K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* sram, 48K */
+}
-       /* rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */
+
-	/*ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */
+/* Section Definitions */ 
-}
+SECTIONS 
-
+{ 
-/* Section Definitions */ 
+    .text : 
-SECTIONS 
+    { 
-{ 
+        . = ALIGN(4);
-    .text : 
+        _sfixed = .;
-    { 
+        KEEP(*(.vectors .vectors.*))
-        . = ALIGN(4);
+        *(.text .text.* .gnu.linkonce.t.*) 	      
-        _sfixed = .;
+        *(.glue_7t) *(.glue_7)		                
-        KEEP(*(.vectors .vectors.*))
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
-        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
-        *(.glue_7t) *(.glue_7)		                
+
-        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        /* Support C constructors, and C destructors in both user code
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
+           and the C library. This also provides support for C++ code. */
-
+        . = ALIGN(4);
-        /* Support C constructors, and C destructors in both user code
+        KEEP(*(.init))
-           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
-        . = ALIGN(4);
+        __preinit_array_start = .;
-        KEEP(*(.init))
+        KEEP (*(.preinit_array))
-        . = ALIGN(4);
+        __preinit_array_end = .;
-        __preinit_array_start = .;
+
-        KEEP (*(.preinit_array))
+        . = ALIGN(4);
-        __preinit_array_end = .;
+        __init_array_start = .;
-
+        KEEP (*(SORT(.init_array.*)))
-        . = ALIGN(4);
+        KEEP (*(.init_array))
-        __init_array_start = .;
+        __init_array_end = .;
-        KEEP (*(SORT(.init_array.*)))
+
-        KEEP (*(.init_array))
+        . = ALIGN(0x4);
-        __init_array_end = .;
+        KEEP (*crtbegin.o(.ctors))
-
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-        . = ALIGN(0x4);
+        KEEP (*(SORT(.ctors.*)))
-        KEEP (*crtbegin.o(.ctors))
+        KEEP (*crtend.o(.ctors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+
-        KEEP (*(SORT(.ctors.*)))
+        . = ALIGN(4);
-        KEEP (*crtend.o(.ctors))
+        KEEP(*(.fini))
-
+
-        . = ALIGN(4);
+        . = ALIGN(4);
-        KEEP(*(.fini))
+        __fini_array_start = .;
-
+        KEEP (*(.fini_array))
-        . = ALIGN(4);
+        KEEP (*(SORT(.fini_array.*)))
-        __fini_array_start = .;
+        __fini_array_end = .;
-        KEEP (*(.fini_array))
+
-        KEEP (*(SORT(.fini_array.*)))
+        KEEP (*crtbegin.o(.dtors))
-        __fini_array_end = .;
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-
+        KEEP (*(SORT(.dtors.*)))
-        KEEP (*crtbegin.o(.dtors))
+        KEEP (*crtend.o(.dtors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+
-        KEEP (*(SORT(.dtors.*)))
+        . = ALIGN(4);
-        KEEP (*crtend.o(.dtors))
+        _efixed = .;            /* End of text section */
-
+    } > rom
-        . = ALIGN(4);
+
-        _efixed = .;            /* End of text section */
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
-    } > rom
+    PROVIDE_HIDDEN (__exidx_start = .);
-
+    .ARM.exidx :
-    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    {
-    PROVIDE_HIDDEN (__exidx_start = .);
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    .ARM.exidx :
+    } > rom
-    {
+    PROVIDE_HIDDEN (__exidx_end = .);
-      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+
-    } > rom
+    . = ALIGN(4); 
-    PROVIDE_HIDDEN (__exidx_end = .);
+    _etext = .;
-
+
-    . = ALIGN(4); 
+    .relocate : AT (_etext)
-    _etext = .;
+    {
-
+        . = ALIGN(4);
-    .relocate : AT (_etext)
+        _srelocate = .;
-    {
+        /* we must make sure the .dfudata is linked to start of RAM */
-        . = ALIGN(4);
+        *(.dfudata .dfudata.*);
-        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
-        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
-        *(.data .data.*);
+        . = ALIGN(4);
-        . = ALIGN(4);
+        _erelocate = .;
-        _erelocate = .;
+    } > ram
-    } > ram
+
-
+    /* .bss section which is used for uninitialized data */ 
-    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
-    .bss (NOLOAD) :
+    { 
-    { 
+        . = ALIGN(4);
-        . = ALIGN(4);
+        _sbss = . ;
-        _sbss = . ;
+        _szero = .;
-        _szero = .;
+        *(.bss .bss.*)
-        *(.bss .bss.*)
+        *(COMMON)
-        *(COMMON)
+        . = ALIGN(4);
-        . = ALIGN(4);
+        _ebss = . ;
-        _ebss = . ;
+        _ezero = .;
-        _ezero = .;
+    } > ram
-    } > ram
+
-
+    /* stack section */
-    /* stack section */
+    .stack (NOLOAD):
-    .stack (NOLOAD):
+    {
-    {
+        . = ALIGN(8);
-        . = ALIGN(8);
+        *(.stack .stack.*)
-        *(.stack .stack.*)
+    } > ram
-    } > ram
+
-
+    . = ALIGN(4); 
-    . = ALIGN(4); 
+    _end = . ; 
-    _end = . ; 
+}
-}

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

@@ -0,0 +1,140 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the ATSAM3S4
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+	rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */
+}
+
+/* Section Definitions */ 
+SECTIONS 
+{ 
+    .text : 
+    { 
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*) 	      
+        *(.glue_7t) *(.glue_7)		                
+        *(.rodata .rodata* .gnu.linkonce.r.*)		    	                  
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(0x4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > ram
+
+    . = ALIGN(4); 
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */ 
+    .bss (NOLOAD) :
+    { 
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack .stack.*)
+    } > ram
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > ram
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4); 
+    _end = . ; 
+}

firmware/libboard/common/resources/sam3s4/sram_samba.lds

@@ -0,0 +1,91 @@
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2009, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/*------------------------------------------------------------------------------
+ *      Linker script for running in internal SRAM on the AT91SAM3S4
+ *----------------------------------------------------------------------------*/
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(entry)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x01000
+    sram (W!RX) : ORIGIN = 0x20001000, LENGTH = 0x0000B000 /* sram, 48K - sizeof(romcodesram) */
+}
+
+/* Entry point */
+/*ENTRY (ResetException)*/
+
+SECTIONS
+{
+    /* startup code in the .isr_vector */
+    .text :
+    {
+        . = ALIGN(4);
+        _stext = .;
+        KEEP(*(.isr_vector .isr_vector.*))
+        *(.mailbox)
+        *(.text .text.*)
+        *(.rodata .rodata.*)
+        *(.glue_7)
+        *(.glue_7t)
+        *(.gcc_except_table)
+        *(.rodata .rodata*)
+        *(.gnu.linkonce.r.*)
+        . = ALIGN(4);
+        _etext = .;
+    } > sram
+
+    /* data */
+    .data :
+    {
+        . = ALIGN(4);
+        _sidata = .;
+        _sdata = .;
+
+        *(.data)
+        *(.data.*)
+        . = ALIGN(4);
+        _edata = .;
+    } > sram
+
+    .bss (NOLOAD) : {
+        _szero = .;
+        *(.bss)
+        . = ALIGN(4);
+        _ezero = .;
+    } >sram
+
+    /* Stack in SRAM */
+    _sstack = 0x2000BFFC;
+}
+end = .;

firmware/libboard/common/resources/sam3s_ek_flash.gdb

@@ -0,0 +1,31 @@
+#*******************************************************
+#
+#  Connect to J-Link and debug application in flash.
+#
+
+# define 'reset' command
+define reset
+
+# Connect to the J-Link gdb server
+target remote localhost:2331
+# Reset the chip to get to a known state
+monitor reset
+
+# Select flash device
+monitor flash device = AT91SAM3S4C
+# Enable flash download and flash breakpoints
+monitor flash download = 1
+# Load the program
+load
+
+# Reset peripheral  (RSTC_CR)
+set *0x400e1400 = 0xA5000004
+
+# Initializing PC and stack pointer
+mon reg sp=(0x400000)
+set *0x400004 = *0x400004 & 0xFFFFFFFE
+mon reg pc=(0x400004)
+info reg
+
+# end of 'reset' command
+end

firmware/libboard/common/resources/sam3s_ek_sram.gdb

@@ -0,0 +1,27 @@
+#*************************************************
+#
+#  Connect to J-Link and debug application in sram on SAM3S
+#
+# Note:
+#     First, users should modify Step1 and Step2 according to their project,
+#     then do Step3.
+
+# Step1: Connect to the J-Link gdb server
+define reset
+target remote localhost:2331
+monitor reset
+
+# Step2: Load file(eg. getting-started project)
+load
+
+# Step3: Reset peripheral  (RSTC_CR)
+set *0x400e1400 = 0xA5000004
+
+# Step4: Initializing PC and stack pointer
+# Modify pc value to even before writing pc register
+mon reg sp=(0x20000000)
+set *0x20000004 = *0x20000004 & 0xFFFFFFFE
+mon reg pc=(0x20000004)
+info reg
+
+end

firmware/libboard/common/resources/sam3s_vb_sram.gdb

@@ -0,0 +1,27 @@
+#*************************************************
+#
+#  Connect to J-Link and debug application in sram on SAM3S
+#
+# Note:
+#     First, users should modify Step1 and Step2 according to their project,
+#     then do Step3.
+
+# Step1: Connect to the J-Link gdb server
+define reset
+target remote localhost:2331
+monitor reset
+
+# Step2: Load file(eg. getting-started project)
+load
+
+# Step3: Reset peripheral  (RSTC_CR)
+set *0x400e1400 = 0xA5000004
+
+# Step4: Initializing PC and stack pointer
+# Modify pc value to even before writing pc register
+mon reg sp=(0x20000000)
+set *0x20000004 = *0x20000004 & 0xFFFFFFFE
+mon reg pc=(0x20000004)
+info reg
+
+end