Removed printfs from PIO Smartcard ISR

When SIM card gets inserted into the SIM card slot, pinSmartCard is
connected to GND; otherwise a pullup connects the pin to VCC.

.gitignore

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

.gitmodules

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

README.md

@@ -1,39 +1,112 @@
-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.
 
-This is the repository for the next-generation SIMtrace devices,
-providing abilities to trace the communication between (U)SIM card and
-phone, remote (U)SIM card forward, (U)SIM man-in-the-middle, and more.
+## How to compile
+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").
 
-This is under heavy development, and right now it is not surprising if
-things still break on a daily basis.
+The level of debug messages can be altered at compile time:
+```
+$ make TRACE_LEVEL=4
+```
+Accepted values: 0 (NO_TRACE) to 5 (DEBUG)
 
-NOTE: Nothing in this repository applies to the SIMtrace v1.x hardware
-or its associated firmware.  SIMtrace v1.x is based on a different CPU /
-microcontroller architecture and uses a completely different software
-stack and host software.
+## How to flash
+For flashing the firmware, there are at least two options.
+The first one is using openocd and a JTAG key.
+For this option, a JTAG connector has to be soldered onto the board, which is not attached per default.
 
-Supported Hardware
-------------------
+The Makefile already provides an option for that:
+```
+$ 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"
+```
 
-At this point, the primary development target is still the OWHW + sysmoQMOD
-device, but we expect to add support for a SAM3 based SIMtrace hardware
-board soon.
+The second option is using rumba for flashing. No further hardware has to be provided for this option.
+The software can be obtained with the following shell command:
+```
+$ git clone git://git.osmocom.org/osmo-sdr.git
+```
 
-The goal is to support the following devices:
+Flashing the compiled firmware can be done with the following command:
+```
+$ $OSMO_SDR_DIR/utils/rumba /dev/ttyACM0 flashmcu $FIRMWARE_DIR/bin/project-flash.bin
+```
 
-* Osmocom SIMtrace 1.x with SAM3 controller
-** this is open hardware and schematics / PCB design is published
-* sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
-** this is a proprietary device, publicly available from sysmocom
-* sysmocom OWHW (with 2 Modems and 1 SAM3 onboard)
-** this is not publicly available hardware, but still supported
+## How to set udev rules
+The next step is defining the udev rules for simtrace.
+Open the file /etc/udev/rules.d/90-simtrace.rules and enter those four lines:
 
-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"
+```
 
-This repository contains several directory
+After reloading the udev rules, SIMtrace should be recognized by the operating system.
 
-* firmware - the firmware to run on the actual devices
-* hardware - some information related to the hardware
-* host - Programs to use on the USB host to interface with the hardware
+## How to use
+
+After flashing the firmware and defining the udev rules, the python program simtrace.py can be used in order to command the board.
+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

@@ -1,57 +0,0 @@
-#!/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
-
-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"
-	make BOARD="$board" APP="$app" clean
-	echo "=============== $board / $app RES:$? =============="
-done
-
-echo
-echo "=============== FIRMWARE TESTS ==========="
-cd $TOPDIR/firmware/test
-make clean
-make
-./card_emu_test
-make clean
-
-echo
-echo "=============== HOST START  =============="
-cd $TOPDIR/host
-make clean
-make
-make clean
-
-osmo-clean-workspace.sh

firmware/Makefile

@@ -34,34 +34,49 @@
 
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-CHIP  ?= sam3s4
-BOARD ?= qmod
+CHIP  = sam3s2
+BOARD = simtrace
 
 # Defines which are the available memory targets for the SAM3S-EK board.
-MEMORIES ?= flash dfu
+MEMORIES = flash
+
+# 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 = 1
+#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
-APP ?= dfu
+OUTPUT = project
 
 # Output directories
-OUTPUT = $(BOARD)-$(APP)
 BIN = bin
-OBJ = obj/$(BOARD)
+OBJ = obj
 
 #-------------------------------------------------------------------------------
 #		Tools
 #-------------------------------------------------------------------------------
 
-AT91LIB = ./atmel_softpack_libraries
-
-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
+AT91LIB_USB_COMMON_CORE_PATH = atmel_softpack_libraries/usb/common/core
+AT91LIB_USB_CORE_PATH = atmel_softpack_libraries/usb/device/core
 
 # Tool suffix when cross-compiling
 CROSS_COMPILE = arm-none-eabi-
 
-LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib
+LIBS = -Wl,--start-group -lgcc -lc -Wl,--end-group
 
 # Compilation tools
 CC = $(CROSS_COMPILE)gcc
@@ -72,8 +87,42 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
 GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
-TOP=..
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
+# Flags
+INCLUDES_USB = -Iatmel_softpack_libraries/usb/include
+
+INCLUDES  = -Iinclude_board -Iinclude_sam3s -Iinclude -Isrc_simtrace
+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 += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
+CFLAGS += -Wsign-compare -Waggregate-return
+CFLAGS += -Wformat=0
+CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations
+CFLAGS += #-Wpacked
+CFLAGS += -Wredundant-decls -Wnested-externs -Winline #-Wlong-long
+CFLAGS += -Wunreachable-code
+CFLAGS += -Wcast-align
+CFLAGS += -std=c11
+CFLAGS += -Wmissing-noreturn
+#CFLAGS += -Wconversion
+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 += --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)
+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
 
 #-------------------------------------------------------------------------------
 #		Files
@@ -81,97 +130,17 @@ GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 
 # 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)
+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_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
-
-DEBUG_PHONE_SNIFF?=0
-
-#CFLAGS+=-DUSB_NO_DEBUG=1
-
-# Optimization level, put in comment for debugging
-OPTIMIZATION ?= -Os
-
-
-
-# Flags
-INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
-
-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)
-
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
-CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
-CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
-CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef
-CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-CFLAGS += -Waggregate-return #-Wsign-compare
-CFLAGS += -Wformat=0
-CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations
-CFLAGS += #-Wpacked
-CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
-CFLAGS += -Wunreachable-code
-#CFLAGS += -Wcast-align
-#CFLAGS += -std=c11
-CFLAGS += -Wmissing-noreturn
-#CFLAGS += -Wconversion
-CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable
-CFLAGS += -Wno-suggest-attribute=noreturn
-
-# -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 += -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
-
+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 phone.o mitm.o ringbuffer.o host_communication.o #iso7816_uart.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)
@@ -180,43 +149,28 @@ OUTPUT := $(BIN)/$(OUTPUT)
 #		Rules
 #-------------------------------------------------------------------------------
 
-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 $^ > $@
+all: $(BIN) $(OBJ) $(MEMORIES)
 
 $(BIN) $(OBJ):
-	mkdir -p $@
-
-usbstring/usbstring: usbstring/usbstring.c
-	gcc $^ -o $@
-
-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring
-	cat $< | usbstring/usbstring > $@
+	mkdir $@
 
 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"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
 	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
 	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
 	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
+	@$(CC) $(CFLAGS) -D$(1) -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$< 
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	@$(CC) $(ASFLAGS) -D$(1) -c -o $$@ $$<
 
 debug_$(1): $(1)
 	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
@@ -233,4 +187,7 @@ log:
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )
 
 clean:
-	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`
+	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst
+
+rmbak: 
+	-rm *~ $(BIN)/*~

firmware/README.txt

@@ -1,81 +0,0 @@
-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
-
-= 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.
-
-== 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)
-
-= Flashing
-
-To flash a firmware image follow the instructions provided in the [wiki](https://projects.osmocom.org/projects/simtrace2/wiki/).

firmware/TODO.txt

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

firmware/apps/cardem/Makefile

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

@@ -1,209 +0,0 @@
-// FIXME: Copyright license here
-/*------------------------------------------------------------------------------
- *          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);
-	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;
-
-	led_init();
-	led_blink(LED_RED, BLINK_3O_5F);
-
-	/* Enable watchdog for 500ms, with no window */
-	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
-
-	PIO_InitializeInterrupts(0);
-
-	EEFC_ReadUniqueID(g_unique_id);
-
-        printf("\n\r\n\r"
-		"=============================================================================\n\r"
-		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
-		"=============================================================================\n\r");
-
-	TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
-		   g_unique_id[0], g_unique_id[1],
-		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
-
-	board_main_top();
-
-	TRACE_INFO("USB init...\n\r");
-	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);
-	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/cardem/usb_strings.txt

@@ -1,10 +0,0 @@
-sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
-SIMtrace Sniffer
-SIMtrace CCID
-SIMtrace Phone
-SIMtrace MITM
-CardEmulator Modem 1
-CardEmulator Modem 2
-CardEmulator Modem 3
-CardEmulator Modem 4

firmware/apps/dfu/Makefile

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

@@ -1,295 +0,0 @@
-#include "board.h"
-#include "utils.h"
-#include "usb/device/dfu/dfu.h"
-#include "usb/common/dfu/usb_dfu.h"
-#include "manifest.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);
-	}
-
-	printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
-
-#ifdef PINS_LEDS
-	PIO_Clear(&pinsLeds[LED_NUM_RED]);
-#endif
-
-	switch (altif) {
-	case ALTIF_RAM:
-		addr = RAM_ADDR(offset);
-		if (addr < IRAM_ADDR || 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:
-		/* FIXME: set error codes */
-		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);
-
-	/* If the loopback jumper is set, we enter DFU mode */
-	if (board_override_enter_dfu())
-		return 1;
-
-	/* if the first word of the application partition doesn't look
-	 * like a stack pointer (i.e. point to RAM), enter DFU mode */
-	if ((app_part[0] < IRAM_ADDR) ||
-	    ((uint8_t *)app_part[0] > IRAM_END))
-		return 1;
-
-	/* if the second word of the application partition doesn't look
-	 * like a function from flash (reset vector), enter DFU mode */
-	if (((uint32_t *)app_part[1] < app_part) ||
-	    ((uint8_t *)app_part[1] > IFLASH_END))
-		return 1;
-
-	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
-
-	/* Enable watchdog for 500ms, with no window */
-	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(500) << 16) | WDT_GetPeriod(500));
-
-	PIO_InitializeInterrupts(0);
-
-	EEFC_ReadUniqueID(g_unique_id);
-
-        printf("\n\r\n\r"
-		"=============================================================================\n\r"
-		"DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\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%x\n\r", reset_cause);
-
-	/* 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 */
-	const Pin usb_dp_pullup = PIN_USB_PULLUP;
-	PIO_Configure(&usb_dp_pullup, 1);
-	PIO_Set(&usb_dp_pullup);
-	mdelay(15);
-	PIO_Clear(&usb_dp_pullup);
-	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");
-			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

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

firmware/apps/trace/Makefile

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

@@ -1,268 +0,0 @@
-/*
- * (C) 2010-2017 by Harald Welte <hwelte@sysmocom.de>
- * (C) 2018 by Kevin Redon <kredon@sysmocom.de>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-/*------------------------------------------------------------------------------
- *          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);
-	if (cfgnum >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-		TRACE_FATAL_WP("no functions defined for configuration %d\n\r", cfgnum);
-	}
-	simtrace_config = cfgnum;
-}
-
-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, green = activity */
-	led_init();
-	led_blink(LED_RED, BLINK_ALWAYS_ON);
-	led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
-
-	/* Enable watchdog for 2000 ms, with no window */
-	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (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%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
-		   g_unique_id[0], g_unique_id[1],
-		   g_unique_id[2], g_unique_id[3]);
-	TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
-	TRACE_INFO("USB configuration used: %d\n\r", simtrace_config);
-
-	board_main_top();
-
-	TRACE_INFO("USB init...\n\r");
-	SIMtrace_USB_Initialize();
-	TRACE_INFO_WP("USBD_Inited\n\r");
-
-	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
-		WDT_Restart(WDT);
-		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();
-		} else {
-			TRACE_WARNING("no configure function defined for configuration %d\n\r", i);
-		}
-	}
-
-	TRACE_INFO("cfg %d\n\r", simtrace_config);
-
-	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
-	if (simtrace_config >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-		TRACE_ERROR("no functions defined for configuration %d\n\r", simtrace_config);
-	} else {
-		if (config_func_ptrs[simtrace_config].init) {
-			config_func_ptrs[simtrace_config].init();
-		} else {
-			TRACE_ERROR("no init function defined for configuration %d\n\r", simtrace_config);
-		}
-	}
-	last_simtrace_config = simtrace_config;
-
-	TRACE_INFO("entering main loop...\n\r");
-	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 (last_simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-				if (config_func_ptrs[last_simtrace_config].exit) {
-					config_func_ptrs[last_simtrace_config].exit();
-				} else {
-					TRACE_WARNING("exit not defined for configuration %d\n\r", last_simtrace_config);
-				}
-			} else {
-				TRACE_ERROR("no functions defined for configuration %d\n\r", last_simtrace_config);
-			}
-			if (simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {
-				if (config_func_ptrs[simtrace_config].init) {
-					config_func_ptrs[simtrace_config].init();
-				} else {
-					 TRACE_WARNING("init not defined for configuration %d\n\r", simtrace_config);
-				}
-			} else {
-				TRACE_FATAL("no functions defined for configuration %d\n\r", simtrace_config);
-			}
-			last_simtrace_config = simtrace_config;
-		} else {
-			if (config_func_ptrs[simtrace_config].run) {
-				config_func_ptrs[simtrace_config].run();
-			} else {
-				TRACE_ERROR("run not defined for configuration %d\n\r", simtrace_config);
-			}
-		}
-	}
-}

firmware/apps/trace/usb_strings.txt

@@ -1,10 +0,0 @@
-sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
-SIMtrace Sniffer
-SIMtrace CCID
-SIMtrace Phone
-SIMtrace MITM
-CardEmulator Modem 1
-CardEmulator Modem 2
-CardEmulator Modem 3
-CardEmulator Modem 4

firmware/apps/triple_play/Makefile

@@ -1,3 +0,0 @@
-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,208 +0,0 @@
-// FIXME: Copyright license here
-/*------------------------------------------------------------------------------
- *          Headers
- *------------------------------------------------------------------------------*/
-
-#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
- *------------------------------------------------------------------------------*/
-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);
-	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
- *------------------------------------------------------------------------------*/
-#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_Configure(LED_NUM_RED);
-	LED_Configure(LED_NUM_GREEN);
-	LED_Set(LED_NUM_RED);
-
-	/* Disable watchdog */
-	WDT_Disable(WDT);
-
-	req_ctx_init();
-
-	PIO_InitializeInterrupts(0);
-
-	EEFC_ReadUniqueID(g_unique_id);
-
-        printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
-		"=============================================================================\r\n");
-
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
-		   g_unique_id[0], g_unique_id[1],
-		   g_unique_id[2], g_unique_id[3]);
-
-	board_main_top();
-
-	TRACE_INFO("USB init...\r\n");
-	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)\r\n");
-			USBD_Disconnect();
-			NVIC_SystemReset();
-		}
-#endif
-		i++;
-	}
-
-	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_INFO("calling init of config %u...\r\n", simtrace_config);
-	config_func_ptrs[simtrace_config].init();
-	last_simtrace_config = simtrace_config;
-
-	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) {
-
-			if (isUsbConnected) {
-				isUsbConnected = 0;
-			}
-		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
-			LED_Set(LED_NUM_GREEN);
-			LED_Clear(LED_NUM_RED);
-
-			isUsbConnected = 1;
-		}
-		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\r\n",
-				   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/atmel_softpack_libraries/libchip_sam3s/include/efc.h

@@ -1,113 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \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/unique_id.h

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

@@ -1,290 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/** \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/flashd.c

@@ -1,517 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/** \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/unique_id.c

@@ -1,43 +0,0 @@
-#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/usb/common/dfu/usb_dfu.h

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

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

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

@@ -1,132 +0,0 @@
-#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(const uint8_t *serial_usbstr);
-
-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

@@ -1,113 +0,0 @@
-/* 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>
-
-enum {
-	STR_MANUF	= 1,
-	STR_PROD,
-	STR_CONFIG,
-	_STR_FIRST_ALT,
-	STR_SERIAL	= (_STR_FIRST_ALT+BOARD_DFU_NUM_IF),
-};
-
-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,
-#ifdef BOARD_USB_SERIAL
-	.iSerialNumber =	STR_SERIAL,
-#else
-	.iSerialNumber =	0,
-#endif
-	.bNumConfigurations =	1,
-};
-
-/* 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
-};
-
-#include "usb_strings_generated.h"
-
-#if 0
-void set_usb_serial_str(const uint8_t *serial_usbstr)
-{
-	usb_strings[STR_SERIAL] = serial_usbstr;
-}
-#endif
-
-static const USBConfigurationDescriptor *conf_desc_arr[] = {
-	&dfu_cfg_descriptor.ucfg,
-};
-
-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,
-	.numStrings = ARRAY_SIZE(usb_strings),
-};

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

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

@@ -1,218 +0,0 @@
-/* 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 remoting the pull-up */
-	USBD_Disconnect();
-	__disable_irq();
-
-	/* reset the processor, we will start execution with the
-	 * ResetVector of the bootloader */
-	NVIC_SystemReset();
-}

firmware/flash.ld

@@ -1,142 +1,143 @@
-/* ----------------------------------------------------------------------------
- *         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
-{
-	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 */
-    } > 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 = . ; 
-}
+/* ----------------------------------------------------------------------------
+ *         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(.)
+ENTRY(main)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+        rom (rx)  : ORIGIN = 0x00400000, LENGTH = 0x00020000 /* flash, 256K */
+	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 
+{ 
+    .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/include_board/board.h

@@ -0,0 +1,190 @@
+#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 "simtrace.h"
+
+#define MIN(a, b)       ((a < b) ? a : b)
+
+#ifdef __GNUC__ 
+#undef __GNUC__ 
+#endif
+
+/** Name of the board */
+#define BOARD_NAME "SAM3S-SIMTRACE"
+/** Board definition */
+#define simtrace
+/** 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
+
+/** 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
+
+
+
+/** 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    115200
+/** 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
+
+#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}
+
+//**     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
+
+#define SIMTRACE_VENDOR_ID          0x16c0
+#define SIMTRACE_PRODUCT_ID         0x0762
+#define USB_VENDOR_ID               OPENPCD_VENDOR_ID
+#define USB_PRODUCT_ID              SIMTRACE_PRODUCT_ID
+
+
+#endif

firmware/include_board/led.h

@@ -1,79 +1,72 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
-*/
-
-/**
- * \file
- *
- * The flash driver provides the unified interface for flash program operations.
- *
- */
-
-#ifndef _FLASHD_
-#define _FLASHD_
-
-#include <stdint.h>
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-
-extern void FLASHD_Initialize( uint32_t dwMCk, uint32_t dwUseIAP ) ;
-
-extern uint32_t FLASHD_Erase( uint32_t dwAddress ) ;
-
-extern uint32_t FLASHD_Write( uint32_t dwAddress, const void *pvBuffer, uint32_t dwSize ) ;
-
-extern uint32_t FLASHD_Lock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
-extern uint32_t FLASHD_Unlock( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwActualStart, uint32_t *pdwActualEnd ) ;
-
-extern uint32_t FLASHD_IsLocked( uint32_t dwStart, uint32_t dwEnd ) ;
-
-extern uint32_t FLASHD_SetGPNVM( uint8_t gpnvm ) ;
-
-extern uint32_t FLASHD_ClearGPNVM( uint8_t gpnvm ) ;
-
-extern uint32_t FLASHD_IsGPNVMSet( uint8_t gpnvm ) ;
-
-#define FLASHD_IsSecurityBitSet() FLASHD_IsGPNVMSet( 0 )
-
-#define FLASHD_SetSecurityBit()   FLASHD_SetGPNVM( 0 )
-
-extern uint32_t FLASHD_ReadUniqueID( uint32_t* pdwUniqueID ) ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef _FLASHD_ */
-
+/* ----------------------------------------------------------------------------
+ *         ATMEL Microcontroller Software Support 
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2008, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ */
+
+/**
+ * \file
+ *
+ *  \section Purpose
+ * 
+ *  Small set of functions for simple and portable LED usage.
+ * 
+ *  \section Usage
+ * 
+ *  -# Configure one or more LEDs using LED_Configure and
+ *     LED_ConfigureAll.
+ *  -# Set, clear and toggle LEDs using LED_Set, LED_Clear and
+ *     LED_Toggle.
+ * 
+ *  LEDs are numbered starting from 0; the number of LEDs depend on the
+ *  board being used. All the functions defined here will compile properly
+ *  regardless of whether the LED is defined or not; they will simply
+ *  return 0 when a LED which does not exist is given as an argument.
+ *  Also, these functions take into account how each LED is connected on to
+ *  board; thus, \ref LED_Set might change the level on the corresponding pin
+ *  to 0 or 1, but it will always light the LED on; same thing for the other
+ *  methods.
+ */
+
+#ifndef _LED_
+#define _LED_
+
+#include <stdint.h>
+
+//------------------------------------------------------------------------------
+//         Global Functions
+//------------------------------------------------------------------------------
+
+extern uint32_t LED_Configure( uint32_t dwLed ) ;
+
+extern uint32_t LED_Set( uint32_t dwLed ) ;
+
+extern uint32_t LED_Clear( uint32_t dwLed ) ;
+
+extern uint32_t LED_Toggle( uint32_t dwLed ) ;
+
+#endif /* #ifndef LED_H */
+

firmware/include_board/syscalls.h

@@ -50,6 +50,8 @@
 
 extern caddr_t _sbrk ( int incr ) ;
 
+extern int link( char *old, char *new ) ;
+
 extern int _close( int file ) ;
 
 extern int _fstat( int file, struct stat *st ) ;
@@ -61,5 +63,3 @@ extern int _lseek( int file, int ptr, int dir ) ;
 extern int _read(int file, char *ptr, int len) ;
 
 extern int _write( int file, char *ptr, int len ) ;
-
-extern void mdelay(unsigned int msecs);

firmware/include_sam3s/chip.h

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

firmware/include_sam3s/trace.h

@@ -176,7 +176,7 @@ extern void TRACE_CONFIGURE( uint32_t dwBaudRate, uint32_t dwMCk ) ;
 
 /* Trace compilation depends on TRACE_LEVEL value */
 #if (TRACE_LEVEL >= TRACE_LEVEL_DEBUG)
-#define TRACE_DEBUG(...)      { printf("-D- " __VA_ARGS__); }
+#define TRACE_DEBUG(...)      { printf("-D- " __VA_ARGS__); printf("(%s func. %s)\n\r", __FILE__, __FUNCTION__); }
 #define TRACE_DEBUG_WP(...)   { printf(__VA_ARGS__); }
 #else
 #define TRACE_DEBUG(...)      { }

firmware/libboard/common/include/board_common.h

@@ -1,120 +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"
-#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
-
-#define BOARD_MCK     48000000
-
-#define PIO_LED_RED     PIO_PA17
-#define PIO_LED_GREEN   PIO_PA18
-
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-#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    115200
-/** 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
-
-#define SIM_PWEN        PIO_PA5
-#define VCC_FWD         PIO_PA26
-
-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-// Board has UDP controller
-#define BOARD_USB_UDP
-// D+ has external pull-up
-#define BOARD_USB_PULLUP_EXTERNAL
-
-#define BOARD_USB_DFU
-#define BOARD_DFU_BOOT_SIZE	(16 * 1024)
-#define BOARD_DFU_RAM_SIZE	(2 * 1024)
-#define BOARD_DFU_PAGE_SIZE	512
-#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/boardver_adc.h

@@ -1,4 +0,0 @@
-#pragma once
-
-uint32_t adc2uv(uint16_t adc);
-int get_board_version_adc(void);

firmware/libboard/common/include/led.h

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

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

@@ -1,4 +0,0 @@
-#pragma once
-
-int sim_switch_use_physical(unsigned int nr, int physical);
-int sim_switch_init(void);

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

@@ -1,142 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,140 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,142 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,140 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,142 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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/sram.ld

@@ -1,140 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      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

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

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

@@ -1,27 +0,0 @@
-#*************************************************
-#
-#  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/source/boardver_adc.c

@@ -1,82 +0,0 @@
-#include "board.h"
-#include "boardver_adc.h"
-
-#define UV_PER_LSB     ((3300 * 1000) / 4096)
-uint32_t adc2uv(uint16_t adc)
-{
-	uint32_t uv = (uint32_t) adc * UV_PER_LSB;
-	return uv;
-}
-
-/***********************************************************************
- * ADC for board version detection
- ***********************************************************************/
-
-#ifdef PIN_VERSION_DET
-
-static int adc_sam3s_reva_errata = 0;
-
-static const Pin pin_version_det = PIN_VERSION_DET;
-
-/* Warning: Don't call this while other code (like the SIM VCC voltage
- * reading) is running.  The idea is you call this once during board
- * startup and cache the result in a (global) variable if you need it
- * later throughout the code */
-int get_board_version_adc(void)
-{
-	uint32_t chip_arch = CHIPID->CHIPID_CIDR & CHIPID_CIDR_ARCH_Msk;
-	uint32_t chip_ver = CHIPID->CHIPID_CIDR & CHIPID_CIDR_VERSION_Msk;
-	uint16_t sample;
-	uint32_t uv;
-
-	PIO_Configure(&pin_version_det, 1);
-
-	PMC_EnablePeripheral(ID_ADC);
-
-	ADC->ADC_CR |= ADC_CR_SWRST;
-	if (chip_ver == 0 &&
-	    (chip_arch == CHIPID_CIDR_ARCH_SAM3SxA ||
-	     chip_arch == CHIPID_CIDR_ARCH_SAM3SxB ||
-	     chip_arch == CHIPID_CIDR_ARCH_SAM3SxC)) {
-		TRACE_INFO("Enabling Rev.A ADC Errata work-around\r\n");
-		adc_sam3s_reva_errata = 1;
-	}
-
-	if (adc_sam3s_reva_errata) {
-		/* Errata Work-Around to clear EOCx flags */
-		volatile uint32_t foo;
-		int i;
-		for (i = 0; i < 16; i++)
-			foo = ADC->ADC_CDR[i];
-	}
-
-	/* Initialize ADC for AD2, fADC=48/24=2MHz */
-	ADC->ADC_MR = ADC_MR_TRGEN_DIS | ADC_MR_LOWRES_BITS_12 |
-		      ADC_MR_SLEEP_NORMAL | ADC_MR_FWUP_OFF |
-		      ADC_MR_FREERUN_OFF | ADC_MR_PRESCAL(23) |
-		      ADC_MR_STARTUP_SUT8 | ADC_MR_SETTLING(3) |
-		      ADC_MR_ANACH_NONE | ADC_MR_TRACKTIM(4) |
-		      ADC_MR_TRANSFER(1) | ADC_MR_USEQ_NUM_ORDER;
-	/* enable AD2 channel only */
-	ADC->ADC_CHER = ADC_CHER_CH2;
-
-	/* Make sure we don't use interrupts as that's what the SIM card
-	 * VCC ADC code is using */
-	ADC->ADC_IER = 0;
-	NVIC_DisableIRQ(ADC_IRQn);
-
-	ADC->ADC_CR |= ADC_CR_START;
-
-	/* busy-wait, actually read the value */
-	do { } while (!(ADC->ADC_ISR & ADC_ISR_EOC2));
-	/* convert to voltage */
-	sample = ADC->ADC_CDR[2];
-	uv = adc2uv(sample);
-	TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv);
-
-	/* FIXME: convert to board version based on thresholds */
-
-	return 0;
-}
-
-#endif /* PIN_VERSION_DET */

firmware/libboard/common/source/led.c

@@ -1,265 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-#include <assert.h>
-
-#include <osmocom/core/timer.h>
-
-#include "board.h"
-#include "utils.h"
-#include "led.h"
-
-#ifdef PINS_LEDS
-static const Pin pinsLeds[] = { PINS_LEDS } ;
-
-static void led_set(enum led led, int on)
-{
-	ASSERT(led < PIO_LISTSIZE(pinsLeds));
-
-	if (on)
-        	PIO_Clear(&pinsLeds[led]);
-	else
-        	PIO_Set(&pinsLeds[led]);
-}
-
-/* LED blinking code */
-
-/* a single state in a sequence of blinking */
-struct blink_state {
-	/* duration of the state in ms */
-	uint16_t duration;
-	/* brightness of LED during the state */
-	uint8_t on;
-} __attribute__((packed));
-
-static const struct blink_state bs_off[] = {
-	{ 0, 0 }
-};
-
-static const struct blink_state bs_on[] = {
-	{ 0, 1 }
-};
-
-static const struct blink_state bs_3on_5off[] = {
-	{ 300, 1 }, { 500, 0 }
-};
-
-static const struct blink_state bs_3on_30off[] = {
-	{ 300, 1 }, { 3000, 0 }
-};
-
-static const struct blink_state bs_3on_1off_3on_30off[] = {
-	{ 300, 1 }, { 100, 0 }, { 300, 1 }, { 3000, 0 }
-};
-
-static const struct blink_state bs_3on_1off_3on_1off_3on_30off[] = {
-	{ 300, 1 }, { 100, 0 }, { 300, 1 }, { 100, 0 }, { 300, 1 }, { 3000, 0 }
-};
-static const struct blink_state bs_2on_off[] = {
-	{ 200, 1 }, { 0, 0 },
-};
-static const struct blink_state bs_200on_off[] = {
-	{ 20000, 1 }, { 0, 0 },
-};
-static const struct blink_state bs_600on_off[] = {
-	{ 60000, 1 }, { 0, 0 },
-};
-
-
-/* a blink pattern is an array of blink_states */
-struct blink_pattern {
-	const struct blink_state *states;
-	uint16_t size;
-};
-
-/* compiled-in default blinking patterns */
-static const struct blink_pattern patterns[] = {
-	[BLINK_ALWAYS_OFF] = {
-		.states = bs_off,
-		.size = ARRAY_SIZE(bs_off),
-	},
-	[BLINK_ALWAYS_ON] = {
-		.states = bs_on,
-		.size = ARRAY_SIZE(bs_on),
-	},
-	[BLINK_3O_5F] = {
-		.states = bs_3on_5off,
-		.size = ARRAY_SIZE(bs_3on_5off),
-	},
-	[BLINK_3O_30F] = {
-		.states = bs_3on_30off,
-		.size = ARRAY_SIZE(bs_3on_30off),
-	},
-	[BLINK_3O_1F_3O_30F] = {
-		.states = bs_3on_1off_3on_30off,
-		.size = ARRAY_SIZE(bs_3on_1off_3on_30off),
-	},
-	[BLINK_3O_1F_3O_1F_3O_30F] = {
-		.states = bs_3on_1off_3on_1off_3on_30off,
-		.size = ARRAY_SIZE(bs_3on_1off_3on_1off_3on_30off),
-	},
-	[BLINK_2O_F] = {
-		.states = bs_2on_off,
-		.size = ARRAY_SIZE(bs_2on_off),
-	},
-	[BLINK_200O_F] = {
-		.states = bs_200on_off,
-		.size = ARRAY_SIZE(bs_200on_off),
-	},
-	[BLINK_600O_F] = {
-		.states = bs_600on_off,
-		.size = ARRAY_SIZE(bs_600on_off),
-	},
-};
-
-struct led_state {
-	/* which led are we handling */
-	enum led led;
-
-	/* timer */
-	struct osmo_timer_list timer;
-
-	/* pointer and size of blink array */
-	const struct blink_pattern *pattern;
-
-	unsigned int cur_state;
-	unsigned int illuminated;
-
-	/* static allocated space for custom blinking pattern */
-	struct blink_pattern pattern_cust;
-	struct blink_state blink_cust[10];
-};
-
-static unsigned int cur_state_inc(struct led_state *ls)
-{
-	ls->cur_state = (ls->cur_state + 1) % ls->pattern->size;
-	return ls->cur_state;
-}
-
-static const struct blink_state *
-next_blink_state(struct led_state *ls)
-{
-	return &ls->pattern->states[cur_state_inc(ls)];
-}
-
-/* apply the next state to the LED */
-static void apply_blinkstate(struct led_state *ls,
-			     const struct blink_state *bs)
-{
-	led_set(ls->led, bs->on);
-	ls->illuminated = bs->on;
-
-	/* re-schedule the timer */
-	if (bs->duration) {
-		uint32_t us = bs->duration * 1000;
-		osmo_timer_schedule(&ls->timer, us / 1000000, us % 1000000);
-	}
-}
-
-static void blink_tmr_cb(void *data)
-{
-	struct led_state *ls = data;
-	const struct blink_state *next_bs = next_blink_state(ls);
-
-	/* apply the next state to the LED */
-	apply_blinkstate(ls, next_bs);
-}
-
-static struct led_state led_state[] = {
-	[LED_RED] = {
-		.led = LED_RED,
-		.timer.cb = blink_tmr_cb,
-		.timer.data = &led_state[LED_RED],
-	},
-	[LED_GREEN] = {
-		.led = LED_GREEN,
-		.timer.cb = blink_tmr_cb,
-		.timer.data = &led_state[LED_GREEN],
-	},
-};
-#endif /* PINS_LEDS */
-
-void led_blink(enum led led, enum led_pattern blink)
-{
-#ifdef PINS_LEDS
-	struct led_state *ls;
-
-	if (led >= ARRAY_SIZE(led_state))
-		return;
-	ls = &led_state[led];
-
-	/* stop previous blinking, if any */
-	osmo_timer_del(&ls->timer);
-	led_set(led, 0);
-	ls->illuminated = 0;
-	ls->pattern = NULL;
-	ls->cur_state = 0;
-
-	switch (blink) {
-	case BLINK_CUSTOM:
-		ls->pattern = &ls->pattern_cust;
-		break;
-	default:
-		if (blink >= ARRAY_SIZE(patterns))
-			return;
-		ls->pattern = &patterns[blink];
-		break;
-	}
-
-	if (ls->pattern && ls->pattern->size > 0)
-		apply_blinkstate(ls, &ls->pattern->states[0]);
-#endif
-}
-
-enum led_pattern led_get(enum led led)
-{
-#ifdef PINS_LEDS
-	struct led_state *ls;
-	unsigned int i;
-
-	if (led >= ARRAY_SIZE(led_state))
-		return -1;
-	ls = &led_state[led];
-
-	if (ls->pattern == &ls->pattern_cust)
-		return BLINK_CUSTOM;
-
-	for (i = 0; i < ARRAY_SIZE(patterns); i++) {
-		if (ls->pattern == &patterns[i])
-			return i;
-	}
-#endif
-	/* default case, shouldn't be reached */
-	return -1;
-}
-
-void led_start(void)
-{
-	led_set(LED_GREEN, led_state[LED_GREEN].illuminated);
-	led_set(LED_RED, led_state[LED_RED].illuminated);
-}
-
-void led_stop(void)
-{
-	led_set(LED_GREEN, 0);
-	led_set(LED_RED, 0);
-}
-
-void led_init(void)
-{
-#ifdef PINS_LEDS
-	PIO_Configure(pinsLeds, PIO_LISTSIZE(pinsLeds));
-	led_set(LED_GREEN, 0);
-	led_set(LED_RED, 0);
-#endif
-}
-
-void led_fini(void)
-{
-#ifdef PINS_LEDS
-	/* we don't actually need to do this, but just in case... */
-	osmo_timer_del(&led_state[LED_RED].timer);
-	osmo_timer_del(&led_state[LED_GREEN].timer);
-	led_set(LED_GREEN, 0);
-	led_set(LED_RED, 0);
-#endif
-}

firmware/libboard/common/source/manifest.c

@@ -1,7 +0,0 @@
-
-#include "manifest.h"
-
-const char *manifest_application = APPLICATION;
-const char *manifest_revision = GIT_VERSION;
-const char *manifest_board = BOARD;
-const char *manifest_environment = ENVIRONMENT;

firmware/libboard/common/source/sim_switch.c

@@ -1,74 +0,0 @@
-/* Code to switch between local (physical) and remote (emulated) SIM */
-
-#include "board.h"
-#include "trace.h"
-#include "led.h"
-#include "sim_switch.h"
-
-#ifdef PIN_SIM_SWITCH1
-static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-#endif
-#ifdef PIN_SIM_SWITCH2
-static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-#endif
-
-static int initialized = 0;
-
-int sim_switch_use_physical(unsigned int nr, int physical)
-{
-	const Pin *pin;
-	enum led led;
-
-	if (!initialized) {
-		TRACE_ERROR("Somebody forgot to call sim_switch_init()\r\n");
-		sim_switch_init();
-	}
-
-	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
-		   physical ? "physical" : "virtual");
-
-	switch (nr) {
-#ifdef PIN_SIM_SWITCH1
-	case 0:
-		pin = &pin_conn_usim1;
-		led = LED_USIM1;
-		break;
-#endif
-#ifdef PIN_SIM_SWITCH2
-	case 1:
-		pin = &pin_conn_usim2;
-		led = LED_USIM2;
-		break;
-#endif
-	default:
-		TRACE_ERROR("Invalid SIM%u\n\r", nr);
-		return -1;
-	}
-
-	if (physical) {
-		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
-		PIO_Clear(pin);
-		led_blink(led, BLINK_ALWAYS_ON);
-	} else {
-		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
-		PIO_Set(pin);
-		led_blink(led, BLINK_ALWAYS_OFF);
-	}
-
-	return 0;
-}
-
-int sim_switch_init(void)
-{
-	int num_switch = 0;
-#ifdef PIN_SIM_SWITCH1
-	PIO_Configure(&pin_conn_usim1, 1);
-	num_switch++;
-#endif
-#ifdef PIN_SIM_SWITCH2
-	PIO_Configure(&pin_conn_usim2, 1);
-	num_switch++;
-#endif
-	initialized = 1;
-	return num_switch;
-}

firmware/libboard/owhw/include/board.h

@@ -1,56 +0,0 @@
-#pragma once
-#include "board_common.h"
-#include "simtrace_usb.h"
-
-/** Name of the board */
-#define BOARD_NAME "OWHW"
-/** Board definition */
-#define owhw
-
-#define BOARD_MAINOSC 18432000
-
-/* 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 BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP
-
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_OWHW_SAM3
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_OWHW_SAM3_DFU
-#define BOARD_USB_RELEASE	0x010
-
-#define CARDEMU_SECOND_UART
-/* Disable VCC/ADC detection, as OWHWv2 has no ADCVREF */
-//#define DETECT_VCC_BY_ADC
-
-#define HAVE_CARDEM

firmware/libboard/owhw/source/owhw.c

@@ -1,40 +0,0 @@
-/* Card simulator specific functions */
-/* (C) 2015 by Harald Welte <hwelte@hmw-consulting.de>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  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 "chip.h"
-#include "board.h"
-#include "utils.h"
-
-static const Pin pins_cardsim[] = PINS_CARDSIM;
-
-void cardsim_set_simpres(uint8_t slot, int present)
-{
-	if (slot > 1)
-		return;
-
-	if (present)
-		PIO_Set(&pins_cardsim[slot]);
-	else
-		PIO_Clear(&pins_cardsim[slot]);
-}
-
-void cardsim_gpio_init(void)
-{
-	PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim));
-}

firmware/libboard/qmod/include/board.h

@@ -1,77 +0,0 @@
-#pragma once
-#include "board_common.h"
-#include "simtrace_usb.h"
-
-#define LED_USIM1	LED_GREEN
-#define LED_USIM2	LED_RED
-
-/** Name of the board */
-#define BOARD_NAME "QMOD"
-/** Board definition */
-#define qmod
-
-#define BOARD_MAINOSC 12000000
-
-/* 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_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_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
-#define PINS_USIM2		PINS_TC_USIM2, PINS_ISO7816_USIM2, PIN_USIM2_nRST
-
-/* from v3 and onwards only (!) */
-#define PIN_DET_USIM1_PRES	{PIO_PA12, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEGLITCH | PIO_IT_EDGE}
-#define PIN_DET_USIM2_PRES	{PIO_PA8, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEGLITCH | PIO_IT_EDGE}
-
-/* only in v2 and lower (!) */
-#define PIN_PRTPWR_OVERRIDE	{PIO_PA8, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-
-/* inputs reading the WWAN LED level */
-#define PIN_WWAN1		{PIO_PA15, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEGLITCH | PIO_IT_EDGE}
-#define PIN_WWAN2		{PIO_PA16, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEGLITCH | PIO_IT_EDGE}
-#define PINS_WWAN_IN		{ PIN_WWAN1, PIN_WWAN2 }
-
-/* outputs controlling RESET input of modems */
-#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
-#define PIN_PERST2		{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
-#define PINS_PERST		{ PIN_PERST1, PIN_PERST2 }
-
-#define PIN_VERSION_DET		{PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT}
-
-/* GPIO towards SPDT switches between real SIM and SAM3 */
-#define PIN_SIM_SWITCH1 {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-#define PIN_SIM_SWITCH2 {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP
-
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_QMOD_SAM3
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_QMOD_SAM3_DFU
-#define BOARD_USB_RELEASE	0x010
-
-#define CARDEMU_SECOND_UART
-#define DETECT_VCC_BY_ADC
-
-#define HAVE_CARDEM

firmware/libboard/qmod/include/card_pres.h

@@ -1,4 +0,0 @@
-#pragma once
-
-int is_card_present(int port);
-int card_present_init(void);

firmware/libboard/qmod/include/i2c.h

@@ -1,5 +0,0 @@
-#pragma once
-
-void i2c_pin_init(void);
-int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
-int eeprom_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/qmod/include/wwan_led.h

@@ -1,4 +0,0 @@
-#pragma once
-
-int wwan_led_active(int wwan);
-int wwan_led_init(void);

firmware/libboard/qmod/include/wwan_perst.h

@@ -1,5 +0,0 @@
-#pragma once
-
-int wwan_perst_set(int modem_nr, int active);
-int wwan_perst_do_reset_pulse(int modem_nr, unsigned int duration_ms);
-int wwan_perst_init(void);

firmware/libboard/qmod/source/board_qmod.c

@@ -1,287 +0,0 @@
-/* Quad-modem speciic application code */
-/* (C) 2016-2016 by Harald Welte <laforge@gnumonks.org> */
-
-#include "board.h"
-#include "simtrace.h"
-#include "utils.h"
-#include "wwan_led.h"
-#include "wwan_perst.h"
-#include "sim_switch.h"
-#include "boardver_adc.h"
-#include "card_pres.h"
-#include <osmocom/core/timer.h>
-#include "usb_buf.h"
-
-static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
-static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-static const Pin pin_1234_detect = {PIO_PA14, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP};
-static const Pin pin_peer_rst = {PIO_PA0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-static const Pin pin_peer_erase = {PIO_PA11, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-
-/* array of generated USB Strings */
-extern unsigned char *usb_strings[];
-
-static int qmod_sam3_is_12(void)
-{
-	if (PIO_Get(&pin_1234_detect) == 0)
-		return 1;
-	else
-		return 0;
-}
-
-const unsigned char __eeprom_bin[256] = {
-	USB_VENDOR_OPENMOKO & 0xff,
-	USB_VENDOR_OPENMOKO >> 8,
-	USB_PRODUCT_QMOD_HUB & 0xff,
-	USB_PRODUCT_QMOD_HUB >> 8,
-	                        0x00, 0x00, 0x9b, 0x20, 0x09, 0x00, 0x00, 0x00, 0x32, 0x32, 0x32, 0x32, /* 0x00 - 0x0f */
-	0x32, 0x04, 0x09, 0x18, 0x0d, 0x00, 0x73, 0x00, 0x79, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x6f, 0x00, /* 0x10 - 0x1f */
-	0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x2d, 0x00, 0x20, 0x00, 0x73, 0x00, 0x2e, 0x00, /* 0x20 - 0x2f */
-	0x66, 0x00, 0x2e, 0x00, 0x6d, 0x00, 0x2e, 0x00, 0x63, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x47, 0x00, /* 0x30 - 0x3f */
-	0x6d, 0x00, 0x62, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40 - 0x4f */
-	0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x75, 0x00, 0x61, 0x00, 0x64, 0x00, 0x20, 0x00, 0x6d, 0x00, /* 0x50 - 0x5f */
-	0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x76, 0x00, 0x32, 0x00, 0x00, 0x00, /* 0x60 - 0x6f */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70 - 0x7f */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 - 0x8f */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90 - 0x9f */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0 - 0xaf */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0 - 0xbf */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0 - 0xcf */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0 - 0xdf */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0 - 0xef */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
-};
-
-#include "i2c.h"
-static int write_hub_eeprom(void)
-{
-	const unsigned int __eeprom_bin_len = 256;
-
-	int i;
-
-	/* wait */
-	mdelay(100);
-
-	TRACE_INFO("Writing EEPROM...\n\r");
-	/* write the EEPROM once */
-	for (i = 0; i < 256; i++) {
-		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
-		/* if the result was negative, repeat that write */
-		if (rc < 0)
-			i--;
-	}
-
-	/* then pursue re-reading it again and again */
-	TRACE_INFO("Verifying EEPROM...\n\r");
-	for (i = 0; i < 256; i++) {
-		int byte = eeprom_read_byte(0x50, i);
-		TRACE_INFO("0x%02x: %02x\n\r", i, byte);
-		if (byte != __eeprom_bin[i])
-			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
-					i, __eeprom_bin[i], byte);
-	}
-
-	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
-	 * again powering us up */
-
-	return 0;
-}
-
-static void board_exec_dbg_cmd_st12only(int ch)
-{
-	uint32_t addr, val;
-
-	/* functions below only work on primary (ST12) */
-	if (!qmod_sam3_is_12())
-		return;
-
-	switch (ch) {
-	case 'E':
-		write_hub_eeprom();
-		break;
-	case 'O':
-		printf("Setting PRTPWR_OVERRIDE\n\r");
-		PIO_Set(&pin_hubpwr_override);
-		break;
-	case 'o':
-		printf("Clearing PRTPWR_OVERRIDE\n\r");
-		PIO_Clear(&pin_hubpwr_override);
-		break;
-	case 'H':
-		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
-		PIO_Clear(&pin_hub_rst);
-		break;
-	case 'h':
-		/* high level drives transistor -> HUB_RESET low */
-		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\n\r");
-		PIO_Set(&pin_hub_rst);
-		break;
-	case 'w':
-		if (PIO_GetOutputDataStatus(&pin_hub_rst) == 0)
-			printf("WARNING: attempting EEPROM access while HUB not in reset\n\r");
-		printf("Please enter EEPROM offset:\n\r");
-		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("Please enter EEPROM value:\n\r");
-		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr);
-		eeprom_write_byte(0x50, addr, val);
-		break;
-	case 'r':
-		printf("Please enter EEPROM offset:\n\r");
-		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
-		break;
-	default:
-		printf("Unknown command '%c'\n\r", ch);
-		break;
-	}
-}
-
-/* returns '1' in case we should break any endless loop */
-void board_exec_dbg_cmd(int ch)
-{
-	switch (ch) {
-	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
-		if (qmod_sam3_is_12()) {
-			printf("\tE\tprogram EEPROM\n\r");
-			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
-			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
-			printf("\tH\tRelease HUB RESET (high)\n\r");
-			printf("\th\tAssert HUB RESET (low)\n\r");
-			printf("\tw\tWrite single byte in EEPROM\n\r");
-			printf("\tr\tRead single byte from EEPROM\n\r");
-		}
-		printf("\tX\tRelease peer SAM3 from reset\n\r");
-		printf("\tx\tAssert peer SAM3 reset\n\r");
-		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
-		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
-		printf("\tU\tProceed to USB Initialization\n\r");
-		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
-		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
-		break;
-	case 'R':
-		printf("Asking NVIC to reset us\n\r");
-		USBD_Disconnect();
-		NVIC_SystemReset();
-		break;
-	case 'X':
-		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
-		PIO_Clear(&pin_peer_rst);
-		break;
-	case 'x':
-		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
-		PIO_Set(&pin_peer_rst);
-		break;
-	case 'Y':
-		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
-		PIO_Clear(&pin_peer_erase);
-		break;
-	case 'y':
-		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
-		PIO_Set(&pin_peer_erase);
-		break;
-	case '1':
-		printf("Resetting Modem 1 (of this SAM3)\n\r");
-		wwan_perst_do_reset_pulse(0, 300);
-		break;
-	case '2':
-		printf("Resetting Modem 2 (of this SAM3)\n\r");
-		wwan_perst_do_reset_pulse(1, 300);
-		break;
-	case '!':
-		sim_switch_use_physical(0, 0);
-		break;
-	case '@':
-		sim_switch_use_physical(0, 0);
-		break;
-	default:
-		if (!qmod_sam3_is_12())
-			printf("Unknown command '%c'\n\r", ch);
-		else
-			board_exec_dbg_cmd_st12only(ch);
-		break;
-	}
-}
-
-void board_main_top(void)
-{
-#ifndef APPLICATION_dfu
-	usb_buf_init();
-
-	wwan_led_init();
-	wwan_perst_init();
-	sim_switch_init();
-#endif
-
-	/* make sure we can detect whether running in ST12 or ST34 */
-	PIO_Configure(&pin_1234_detect, 1);
-
-	if (qmod_sam3_is_12()) {
-		/* set PIN_PRTPWR_OVERRIDE to output-low to avoid the internal
-		* pull-up on the input to keep SIMTRACE12 alive */
-		PIO_Configure(&pin_hubpwr_override, 1);
-		PIO_Configure(&pin_hub_rst, 1);
-	}
-	PIO_Configure(&pin_peer_rst, 1);
-	PIO_Configure(&pin_peer_erase, 1);
-
-#ifndef APPLICATION_dfu
-	i2c_pin_init();
-#endif
-
-	if (qmod_sam3_is_12()) {
-		TRACE_INFO("Detected Quad-Modem ST12\n\r");
-	} else {
-		TRACE_INFO("Detected Quad-Modem ST34\n\r");
-		/* make sure we use the second set of USB Strings
-		 * calling the interfaces "Modem 3" and "Modem 4" rather
-		 * than 1+2 */
-		usb_strings[7] = usb_strings[9];
-		usb_strings[8] = usb_strings[10];
-	}
-
-	/* Obtain the circuit board version (currently just prints voltage */
-	get_board_version_adc();
-#ifndef APPLICATION_dfu
-	/* Initialize checking for card insert/remove events */
-	card_present_init();
-#endif
-}
-
-static int uart_has_loopback_jumper(void)
-{
-	unsigned int i;
-	const Pin uart_loopback_pins[] = {
-		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
-		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-	};
-
-	/* Configure UART pins as I/O */
-	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
-
-	for (i = 0; i < 10; i++) {
-		/* Set TxD high; abort if RxD doesn't go high either */
-		PIO_Set(&uart_loopback_pins[1]);
-		if (!PIO_Get(&uart_loopback_pins[0]))
-			return 0;
-		/* Set TxD low, abort if RxD doesn't go low either */
-		PIO_Clear(&uart_loopback_pins[1]);
-		if (PIO_Get(&uart_loopback_pins[0]))
-			return 0;
-	}
-	/* if we reached here, RxD always follows TxD and thus a
-	 * loopback jumper has been placed on RxD/TxD, and we will boot
-	 * into DFU unconditionally */
-	return 1;
-}
-
-int board_override_enter_dfu(void)
-{
-	/* If the loopback jumper is set, we enter DFU mode */
-	if (uart_has_loopback_jumper())
-		return 1;
-
-	return 0;
-}

firmware/libboard/qmod/source/card_pres.c

@@ -1,58 +0,0 @@
-#include <osmocom/core/timer.h>
-#include "board.h"
-#include "utils.h"
-#include "card_pres.h"
-
-#define NUM_CARDPRES	2
-
-#define TIMER_INTERVAL_MS	500
-
-static const Pin pin_cardpres[NUM_CARDPRES] = { PIN_DET_USIM1_PRES, PIN_DET_USIM2_PRES };
-static int last_state[NUM_CARDPRES] = { -1, -1 };
-static struct osmo_timer_list cardpres_timer;
-
-/* Determine if a SIM card is present in the given slot */
-int is_card_present(int port)
-{
-	const Pin *pin;
-	int present;
-
-	if (port < 0 || port >= NUM_CARDPRES)
-		return -1;
-	pin = &pin_cardpres[port];
-
-	/* Card present signals are low-active, as we have a switch
-	 * against GND and an internal-pull-up in the SAM3 */
-	present = PIO_Get(pin) ? 0 : 1;
-
-	return present;
-}
-
-static void cardpres_tmr_cb(void *data)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(pin_cardpres); i++) {
-		int state = is_card_present(i);
-		if (state != last_state[i]) {
-			TRACE_INFO("%u: Card Detect Status %d -> %d\r\n", i, last_state[i], state);
-			/* FIXME: report to USB host */
-			last_state[i] = state;
-		}
-	}
-
-	osmo_timer_schedule(&cardpres_timer, 0, TIMER_INTERVAL_MS*1000);
-}
-
-int card_present_init(void)
-{
-	unsigned int i;
-
-	PIO_Configure(pin_cardpres, ARRAY_SIZE(pin_cardpres));
-
-	/* start timer */
-	cardpres_timer.cb = cardpres_tmr_cb;
-	osmo_timer_schedule(&cardpres_timer, 0, TIMER_INTERVAL_MS*1000);
-
-	return 2;
-}

firmware/libboard/qmod/source/i2c.c

@@ -1,207 +0,0 @@
-#include "board.h"
-#include <stdbool.h>
-
-/* Low-Level I2C Routines */
-
-static const Pin pin_sda = {PIO_PA30, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
-static const Pin pin_sda_in = {PIO_PA30, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT };
-static const Pin pin_scl = {PIO_PA31, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_OPENDRAIN };
-
-static void i2c_delay()
-{
-	volatile int v;
-	int i;
-
-	/* 100 cycles results in SCL peak length of 44us, so it's about
-	 * 440ns per cycle here */
-	for (i = 0; i < 14; i++) {
-		v = 0;
-	}
-}
-
-void i2c_pin_init(void)
-{
-	PIO_Configure(&pin_scl, PIO_LISTSIZE(pin_scl));
-	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
-}
-
-static void set_scl(void)
-{
-	PIO_Set(&pin_scl);
-	i2c_delay();
-}
-
-static void set_sda(void)
-{
-	PIO_Set(&pin_sda);
-	i2c_delay();
-}
-
-static void clear_scl(void)
-{
-	PIO_Clear(&pin_scl);
-	i2c_delay();
-}
-
-static void clear_sda(void)
-{
-	PIO_Clear(&pin_sda);
-	i2c_delay();
-}
-
-static bool read_sda(void)
-{
-	bool ret;
-
-	PIO_Configure(&pin_sda_in, PIO_LISTSIZE(pin_sda_in));
-	if (PIO_Get(&pin_sda_in))
-		ret = true;
-	else
-		ret = false;
-	PIO_Configure(&pin_sda, PIO_LISTSIZE(pin_sda));
-
-	return ret;
-}
-
-/* Core I2C Routines */
-
-static bool i2c_started = false;
-
-static void i2c_start_cond(void)
-{
-	if (i2c_started) {
-		set_sda();
-		set_scl();
-	}
-
-	clear_sda();
-	i2c_delay();
-	clear_scl();
-	i2c_started = true;
-}
-
-static void i2c_stop_cond(void)
-{
-	clear_sda();
-	set_scl();
-	set_sda();
-	i2c_delay();
-	i2c_started = false;
-}
-
-static void i2c_write_bit(bool bit)
-{
-	if (bit)
-		set_sda();
-	else
-		clear_sda();
-	i2c_delay(); // ?
-	set_scl();
-	clear_scl();
-}
-
-static bool i2c_read_bit(void)
-{
-	bool bit;
-
-	set_sda();
-	set_scl();
-	bit = read_sda();
-	clear_scl();
-
-	return bit;
-}
-
-bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte)
-{
-	uint8_t bit;
-	bool nack;
-
-	if (send_start)
-		i2c_start_cond();
-
-	for (bit = 0; bit < 8; bit++) {
-		i2c_write_bit((byte & 0x80) != 0);
-		byte <<= 1;
-	}
-
-	nack = i2c_read_bit();
-
-	if (send_stop)
-		i2c_stop_cond();
-
-	return nack;
-}
-
-uint8_t i2c_read_byte(bool nack, bool send_stop)
-{
-	uint8_t byte = 0;
-	uint8_t bit;
-
-	for (bit = 0; bit < 8; bit++) {
-		byte = (byte << 1) | i2c_read_bit();
-	}
-
-	i2c_write_bit(nack);
-
-	if (send_stop)
-		i2c_stop_cond();
-
-	return byte;
-}
-
-
-/* EEPROM related code */
-
-int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte)
-{
-	bool nack;
-
-	WDT_Restart(WDT);
-
-	/* Write slave address */
-	nack = i2c_write_byte(true, false, slave << 1);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, false, addr);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, true, byte);
-	if (nack)
-		goto out_stop;
-
-out_stop:
-	i2c_stop_cond();
-	if (nack)
-		return -1;
-	else
-		return 0;
-}
-
-int eeprom_read_byte(uint8_t slave, uint8_t addr)
-{
-	bool nack;
-
-	WDT_Restart(WDT);
-
-	/* dummy write cycle */
-	nack = i2c_write_byte(true, false, slave << 1);
-	if (nack)
-		goto out_stop;
-	nack = i2c_write_byte(false, false, addr);
-	if (nack)
-		goto out_stop;
-	/* Re-start with read */
-	nack = i2c_write_byte(true, false, (slave << 1) | 1);
-	if (nack)
-		goto out_stop;
-
-	return i2c_read_byte(true, true);
-
-out_stop:
-	i2c_stop_cond();
-	if (nack)
-		return -1;
-	else
-		return 0;
-}

firmware/libboard/qmod/source/wwan_led.c

@@ -1,80 +0,0 @@
-/* Code to read/track the status of the WWAN LEDs of attached modems
- *
- * Depending on the board this is running on,  it might be possible
- * for the controller to read the status of the WWAN LED output lines of
- * the cellular modem.  If the board supports this, it sets the
- * PIN_WWAN1 and/or PIN_WWAN2 defines in its board.h file.
- */
-
-#include "board.h"
-#include "wwan_led.h"
-
-#ifdef PIN_WWAN1
-static const Pin pin_wwan1 = PIN_WWAN1;
-
-static void wwan1_irqhandler(const Pin *pPin)
-{
-	int active = wwan_led_active(0);
-
-	TRACE_INFO("0: WWAN LED %u\r\n", active);
-
-	/* TODO: notify host via USB */
-}
-#endif
-
-#ifdef PIN_WWAN2
-static const Pin pin_wwan2 = PIN_WWAN2;
-
-static void wwan2_irqhandler(const Pin *pPin)
-{
-	int active = wwan_led_active(1);
-	TRACE_INFO("1: WWAN LED %u\r\n", active);
-
-	/* TODO: notify host via USB */
-}
-#endif
-
-/* determine if a tiven WWAN led is currently active or not */
-int wwan_led_active(int wwan)
-{
-	const Pin *pin;
-	int active;
-
-	switch (wwan) {
-#ifdef PIN_WWAN1
-	case 0:
-		pin = &pin_wwan1;
-		break;
-#endif
-#ifdef PIN_WWAN2
-	case 1:
-		pin = &pin_wwan2;
-		break;
-#endif
-	default:
-		return -1;
-	}
-
-	active = PIO_Get(pin) ? 0 : 1;
-	return active;
-}
-
-int wwan_led_init(void)
-{
-	int num_leds = 0;
-
-#ifdef PIN_WWAN1
-	PIO_Configure(&pin_wwan1, 1);
-	PIO_ConfigureIt(&pin_wwan1, wwan1_irqhandler);
-	PIO_EnableIt(&pin_wwan1);
-	num_leds++;
-#endif
-
-#ifdef PIN_WWAN2
-	PIO_Configure(&pin_wwan2, 1);
-	PIO_ConfigureIt(&pin_wwan2, wwan2_irqhandler);
-	PIO_EnableIt(&pin_wwan2);
-	num_leds++;
-#endif
-	return num_leds;
-}

firmware/libboard/qmod/source/wwan_perst.c

@@ -1,114 +0,0 @@
-/* Code to control the PERST lines of attached modems
- *
- * Depending on the board this is running on,  it might be possible
- * for the controller to set the status of the PERST input line of
- * the cellular modem.  If the board supports this, it sets the
- * PIN_PERST1 and/or PIN_PERST2 defines in its board.h file.
- */
-
-#include "board.h"
-#include "trace.h"
-#include "wwan_perst.h"
-#include <osmocom/core/timer.h>
-
-struct wwan_perst {
-	uint8_t idx;
-	const Pin pin;
-	struct osmo_timer_list timer;
-};
-
-#ifdef PIN_PERST1
-static struct wwan_perst perst1 = {
-	.idx = 0,
-	.pin = PIN_PERST1,
-};
-#endif
-
-#ifdef PIN_PERST2
-static struct wwan_perst perst2 = {
-	.idx = 1,
-	.pin = PIN_PERST2,
-};
-#endif
-
-static int initialized = 0;
-
-static void perst_tmr_cb(void *data)
-{
-	struct wwan_perst *perst = data;
-	/* release the (low-active) reset */
-	TRACE_INFO("%u: De-asserting modem reset\r\n", perst->idx);
-	PIO_Clear(&perst->pin);
-}
-
-static struct wwan_perst *get_perst_for_modem(int modem_nr)
-{
-	if (!initialized) {
-		TRACE_ERROR("Somebody forgot to call wwan_perst_init()\r\n");
-		wwan_perst_init();
-	}
-
-	switch (modem_nr) {
-#ifdef PIN_PERST1
-	case 0:
-		return &perst1;
-#endif
-#ifdef PIN_PERST2
-	case 1:
-		return &perst2;
-#endif
-	default:
-		return NULL;
-	}
-}
-
-int wwan_perst_do_reset_pulse(int modem_nr, unsigned int duration_ms)
-{
-	struct wwan_perst *perst = get_perst_for_modem(modem_nr);
-	if (!perst)
-		return -1;
-
-	TRACE_INFO("%u: Asserting modem reset\r\n", modem_nr);
-	PIO_Set(&perst->pin);
-	osmo_timer_schedule(&perst->timer, duration_ms/1000, (duration_ms%1000)*1000);
-
-	return 0;
-}
-
-int wwan_perst_set(int modem_nr, int active)
-{
-	struct wwan_perst *perst = get_perst_for_modem(modem_nr);
-	if (!perst)
-		return -1;
-
-	osmo_timer_del(&perst->timer);
-	if (active) {
-		TRACE_INFO("%u: Asserting modem reset\r\n", modem_nr);
-		PIO_Set(&perst->pin);
-	} else {
-		TRACE_INFO("%u: De-asserting modem reset\r\n", modem_nr);
-		PIO_Clear(&perst->pin);
-	}
-
-	return 0;
-}
-
-int wwan_perst_init(void)
-{
-	int num_perst = 0;
-#ifdef PIN_PERST1
-	PIO_Configure(&perst1.pin, 1);
-	perst1.timer.cb = perst_tmr_cb;
-	perst1.timer.data = (void *) &perst1;
-	num_perst++;
-#endif
-
-#ifdef PIN_PERST2
-	PIO_Configure(&perst2.pin, 1);
-	perst2.timer.cb = perst_tmr_cb;
-	perst2.timer.data = (void *) &perst2;
-	num_perst++;
-#endif
-	initialized = 1;
-	return num_perst;
-}

firmware/libboard/simtrace/include/board.h

@@ -1,121 +0,0 @@
-#pragma once
-#include "board_common.h"
-#include "simtrace_usb.h"
-
-/* Name of the board */
-#define BOARD_NAME "SAM3S-SIMTRACE"
-/* Board definition */
-#define simtrace
-
-/* Board main oscillator frequency (in Hz) */
-#define BOARD_MAINOSC 18432000
-
-/** Pin configuration **/
-/* Button to force bootloader start (shorted to ground when pressed */
-#define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Enable powering the SIM card */
-#define PWR_PINS                SIM_PWEN_PIN
-/* Card presence pin */
-#define SW_SIM                  PIO_PA8
-/* Pull card presence pin high (shorted to ground in card slot when card is present) */
-#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
-
-/** Smart card connection **/
-/* Card RST reset signal input (active low; RST_SIM in schematic) */
-#define PIN_SIM_RST            {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Card I/O data signal input/output (I/O_SIM in schematic) */
-#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Card CLK clock input (CLK_SIM in schematic) */
-#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
-#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
-#define PIN_SIM_CLK_INPUT      {PIO_PA4B_TCLK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/* Pins used to measure ETU timing (using timer counter) */ 
-#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
-
-/** Phone connection **/
-/* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
-#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-/* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
-/* Phone I/O data signal input/output (I/O_PHONE in schematic) */
-#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Phone CLK clock input (CLK_PHONE in schematic) */
-#define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used for phone USIM slot 1 communication */
-#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
-/* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
-#define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
-#define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-
-/** Default pin configuration **/
-/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
-#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
-#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
-#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
-
-/** Sniffer configuration **/
-/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
-#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
-#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
-#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
-/* Card RST reset signal input (use as input since the phone will drive it) */
-#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
-/* Pins used to sniff phone-card communication */
-#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
-/* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
-#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/* Use phone VCC to power card */
-#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
-
-/** CCID configuration */
-/* Card RST reset signal input (active low; RST_SIM in schematic) */
-#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/* ISO7816-communication related pins */
-#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
-
-/** External SPI flash interface   **/
-/* SPI MISO pin definition */
-#define PIN_SPI_MISO  {PIO_PA12A_MISO, PIOA, PIOA, PIO_PERIPH_A, PIO_PULLUP}
-/* SPI MOSI pin definition */
-#define PIN_SPI_MOSI  {PIO_PA13A_MOSI, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI SCK pin definition */
-#define PIN_SPI_SCK   {PIO_PA14A_SPCK, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI pins definition. Contains MISO, MOSI & SCK */
-#define PINS_SPI       PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SCK
-/* SPI chip select 0 pin definition */
-#define PIN_SPI_NPCS0 {PIO_PA11A_NPCS0, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* SPI flash write protect pin (active low, pulled low) */
-#define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
-/** USB definitions */
-/* OpenMoko SIMtrace 2 USB vendor ID */
-#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
-/* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
-/* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
-/* USB release number (bcdDevice, shown as 0.00) */
-#define BOARD_USB_RELEASE	0x000
-/* Indicate SIMtrace is bus power in USB attributes */
-#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
-
-/** Supported modes */
-/* SIMtrace board supports sniffer mode */
-#define HAVE_SNIFFER
-/* SIMtrace board supports CCID mode */
-//#define HAVE_CCID
-/* SIMtrace board supports card emulation mode */
-//#define HAVE_CARDEM
-/* SIMtrace board supports man-in-the-middle mode */
-//#define HAVE_MITM

firmware/libboard/simtrace/source/board_simtrace.c

@@ -1,52 +0,0 @@
-/* SIMtrace specific application code */
-/* (C) 2017 by Harald Welte <laforge@gnumonks.org> */
-
-#include "board.h"
-#include "simtrace.h"
-#include "utils.h"
-#include "sim_switch.h"
-#include <osmocom/core/timer.h>
-#include "usb_buf.h"
-
-void board_exec_dbg_cmd(int ch)
-{
-	switch (ch) {
-	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
-		break;
-	case 'R':
-		printf("Asking NVIC to reset us\n\r");
-		USBD_Disconnect();
-		NVIC_SystemReset();
-		break;
-	default:
-		printf("Unknown command '%c'\n\r", ch);
-		break;
-	}
-}
-
-void board_main_top(void)
-{
-#ifndef APPLICATION_dfu
-	usb_buf_init();
-
-	/* Initialize checking for card insert/remove events */
-	//card_present_init();
-#endif
-}
-
-int board_override_enter_dfu(void)
-{
-	const Pin bl_sw_pin = PIN_BOOTLOADER_SW;
-
-	PIO_Configure(&bl_sw_pin, 1);
-
-	/* Enter DFU bootloader in case the respective button is pressed */
-	if (PIO_Get(&bl_sw_pin) == 0) {
-		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
-		return 1;
-	} else
-		return 0;
-}

firmware/libcommon/include/assert.h

@@ -1,115 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support 
- * ----------------------------------------------------------------------------
- * Copyright (c) 2008, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-//------------------------------------------------------------------------------
-/// \unit
-///
-/// !Purpose
-///
-/// Definition of the ASSERT() and SANITY_CHECK() macros, which are used for
-/// runtime condition & parameter verifying.
-///
-/// !Usage
-///
-/// -# Use ASSERT() in your code to check the value of function parameters,
-///    return values, etc. *Warning:* the ASSERT() condition must not have
-///    any side-effect; otherwise, the program may not work properly
-///    anymore when assertions are disabled.
-/// -# Use SANITY_CHECK() to perform checks with a default error message
-///    (outputs the file and line number where the error occured). This 
-///    reduces memory overhead caused by assertion error strings.
-/// -# Initialize the dbgu to see failed assertions at run-time.
-/// -# Assertions can be entirely disabled by defining the NOASSERT symbol
-///    at compilation time.
-//------------------------------------------------------------------------------
-
-#ifndef ASSERT_H
-#define ASSERT_H
-
-//------------------------------------------------------------------------------
-//         Headers
-//------------------------------------------------------------------------------
-
-#include <stdio.h>
-#include "trace.h"
-
-#define assert ASSERT
-
-//------------------------------------------------------------------------------
-//         Definitions
-//------------------------------------------------------------------------------
-#if defined(NOASSERT)
-    #define ASSERT(...)
-    #define SANITY_CHECK(...)
-#else
-
-    #if (TRACE_LEVEL == 0)
-        /// Checks that the given condition is true, 
-        /// otherwise stops the program execution.
-        /// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
-            if (!(condition)) { \
-                while (1); \
-            } \
-        }
-
-        /// Performs the same duty as the ASSERT() macro
-        /// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, ...)
-
-    #else
-        /// Checks that the given condition is true, otherwise displays an error
-        /// message and stops the program execution.
-        /// \param condition  Condition to verify.
-        #define ASSERT(condition)  { \
-            if (!(condition)) { \
-                printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
-                while (1); \
-            } \
-        }
-        #define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
-    
-        /// Performs the same duty as the ASSERT() macro, except a default error
-        /// message is output if the condition is false.
-        /// \param condition  Condition to verify.
-        #define SANITY_CHECK(condition) ASSERT(condition, SANITY_ERROR, __FILE__, __LINE__)
-    #endif
-#endif
-
-
-
-
-
-
-
-
-
-
-#endif //#ifndef ASSERT_H
-

firmware/libcommon/include/card_emu.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-struct card_handle;
-
-enum card_io {
-	CARD_IO_VCC,
-	CARD_IO_RST,
-	CARD_IO_CLK,
-};
-
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan,
-				  uint8_t in_ep, uint8_t irq_ep);
-
-/* process a single byte received from the reader */
-void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte);
-
-/* transmit a single byte to the reader */
-int card_emu_tx_byte(struct card_handle *ch);
-
-/* hardware driver informs us that a card I/O signal has changed */
-void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active);
-
-/* User sets a new ATR to be returned during next card reset */
-int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len);
-
-struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch);
-void card_emu_have_new_uart_tx(struct card_handle *ch);
-void card_emu_report_status(struct card_handle *ch);
-
-#define ENABLE_TX	0x01
-#define ENABLE_RX	0x02
-
-int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
-int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte);
-void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
-void card_emu_uart_wait_tx_idle(uint8_t uart_chan);

firmware/libcommon/include/iso7816_fidi.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-/* Table 7 of ISO 7816-3:2006 */
-extern const uint16_t fi_table[];
-
-/* Table 8 from ISO 7816-3:2006 */
-extern const uint8_t di_table[];
-
-/* compute the F/D ratio based on Fi and Di values */
-int compute_fidi_ratio(uint8_t fi, uint8_t di);

firmware/libcommon/include/llist_irqsafe.h

@@ -1,41 +0,0 @@
-#pragma once
-
-#include <osmocom/core/linuxlist.h>
-#include "utils.h"
-
-static inline void llist_add_irqsafe(struct llist_head *_new,
-					  struct llist_head *head)
-{
-	unsigned long x;
-
-	local_irq_save(x);
-	llist_add(_new, head);
-	local_irq_restore(x);
-}
-
-static inline void llist_add_tail_irqsafe(struct llist_head *_new,
-					  struct llist_head *head)
-{
-	unsigned long x;
-
-	local_irq_save(x);
-	llist_add_tail(_new, head);
-	__enable_irq();
-}
-
-static inline struct llist_head *llist_head_dequeue_irqsafe(struct llist_head *head)
-{
-	struct llist_head *lh;
-	unsigned long x;
-
-	local_irq_save(x);
-	if (llist_empty(head)) {
-		lh = NULL;
-	} else {
-		lh = head->next;
-		llist_del(lh);
-	}
-	local_irq_restore(x);
-
-	return lh;
-}

firmware/libcommon/include/ringbuffer.h

@@ -1,23 +0,0 @@
-#ifndef SIMTRACE_RINGBUF_H
-#define SIMTRACE_RINGBUF_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <sys/types.h>
-
-#define RING_BUFLEN 512
-
-typedef struct ringbuf {
-	uint8_t buf[RING_BUFLEN];
-	size_t ird;
-	size_t iwr;
-} ringbuf;
-
-void rbuf_reset(volatile ringbuf * rb);
-uint8_t rbuf_read(volatile ringbuf * rb);
-uint8_t rbuf_peek(volatile ringbuf * rb);
-void rbuf_write(volatile ringbuf * rb, uint8_t item);
-bool rbuf_is_empty(volatile ringbuf * rb);
-bool rbuf_is_full(volatile ringbuf * rb);
-
-#endif /* end of include guard: SIMTRACE_RINGBUF_H */

firmware/libcommon/include/simtrace_prot.h

@@ -1,318 +0,0 @@
-/* SIMtrace2 USB protocol */
-
-/* (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-/***********************************************************************
- * COMMON HEADER
- ***********************************************************************/
-
-enum simtrace_msg_class {
-	SIMTRACE_MSGC_GENERIC = 0,
-	/* Card Emulation / Forwarding */
-	SIMTRACE_MSGC_CARDEM,
-	/* Modem Control (if modem is attached next to device) */
-	SIMTRACE_MSGC_MODEM,
-	/* Reader/phone-car/SIM communication sniff */
-	SIMTRACE_MSGC_SNIFF,
-
-	/* first vendor-specific request */
-	_SIMTRACE_MGSC_VENDOR_FIRST = 127,
-};
-
-enum simtrace_msg_type_generic {
-	/* Generic Error Message */
-	SIMTRACE_CMD_DO_ERROR	= 0,
-	/* Request/Response for simtrace_board_info */
-	SIMTRACE_CMD_BD_BOARD_INFO,
-};
-
-/* SIMTRACE_MSGC_CARDEM */
-enum simtrace_msg_type_cardem {
-	/* TPDU Data to be transmitted to phone */
-	SIMTRACE_MSGT_DT_CEMU_TX_DATA = 1,
-	/* Set the ATR to be returned at phone-SIM reset */
-	SIMTRACE_MSGT_DT_CEMU_SET_ATR,
-	/* Get Statistics Request / Response */
-	SIMTRACE_MSGT_BD_CEMU_STATS,
-	/* Get Status Request / Response */
-	SIMTRACE_MSGT_BD_CEMU_STATUS,
-	/* Request / Confirm emulated card insert */
-	SIMTRACE_MSGT_DT_CEMU_CARDINSERT,
-	/* TPDU Data received from phomne */
-	SIMTRACE_MSGT_DO_CEMU_RX_DATA,
-	/* Indicate PTS request from phone */
-	SIMTRACE_MSGT_DO_CEMU_PTS,
-};
-
-/* SIMTRACE_MSGC_MODEM */
-enum simtrace_msg_type_modem {
-	/* Modem Control: Reset an attached modem */
-	SIMTRACE_MSGT_DT_MODEM_RESET = 1,
-	/* Modem Control: Select local / remote SIM */
-	SIMTRACE_MSGT_DT_MODEM_SIM_SELECT,
-	/* Modem Control: Status (WWAN LED, SIM Presence) */
-	SIMTRACE_MSGT_BD_MODEM_STATUS,
-};
-
-/* SIMTRACE_MSGC_SNIFF */
-enum simtrace_msg_type_sniff {
-	/* Status change (card inserted, reset, ...) */
-	SIMTRACE_MSGT_SNIFF_CHANGE = 0,
-	/* Fi/Di baudrate change */
-	SIMTRACE_MSGT_SNIFF_FIDI,
-	/* ATR data */
-	SIMTRACE_MSGT_SNIFF_ATR,
-	/* PPS (request or response) data */
-	SIMTRACE_MSGT_SNIFF_PPS,
-	/* TPDU data */
-	SIMTRACE_MSGT_SNIFF_TPDU,
-};
-
-/* common message header */
-struct simtrace_msg_hdr {
-	uint8_t msg_class;	/* simtrace_msg_class */
-	uint8_t msg_type;	/* simtrace_msg_type_xxx */
-	uint8_t seq_nr;
-	uint8_t slot_nr;	/* SIM slot number */
-	uint16_t _reserved;
-	uint16_t msg_len;	/* length including header */
-	uint8_t payload[0];
-} __attribute__ ((packed));
-
-/***********************************************************************
- * Capabilities
- ***********************************************************************/
-
-/* generic capabilities */
-enum simtrace_capability_generic {
-	/* compatible with 5V SIM card interface */
-	SIMTRACE_CAP_VOLT_5V,
-	/* compatible with 3.3V SIM card interface */
-	SIMTRACE_CAP_VOLT_3V3,
-	/* compatible with 1.8V SIM card interface */
-	SIMTRACE_CAP_VOLT_1V8,
-	/* Has LED1 */
-	SIMTRACE_CAP_LED_1,
-	/* Has LED2 */
-	SIMTRACE_CAP_LED_2,
-	/* Has Single-Pole Dual-Throw (local/remote SIM) */
-	SIMTRACE_CAP_SPDT,
-	/* Has Bus-Switch (trace / MITM) */
-	SIMTRACE_CAP_BUS_SWITCH,
-	/* Can read VSIM via ADC */
-	SIMTRACE_CAP_VSIM_ADC,
-	/* Can read temperature via ADC */
-	SIMTRACE_CAP_TEMP_ADC,
-	/* Supports DFU for firmware update */
-	SIMTRACE_CAP_DFU,
-	/* Supports Ctrl EP command for erasing flash / return to SAM-BA */
-	SIMTRACE_CAP_ERASE_FLASH,
-	/* Can read the status of card insert contact */
-	SIMTRACE_CAP_READ_CARD_DET,
-	/* Can control the status of a simulated card insert */
-	SIMTRACE_CAP_ASSERT_CARD_DET,
-	/* Can toggle the hardware reset of an attached modem */
-	SIMTRACE_CAP_ASSERT_MODEM_RST,
-};
-
-/* vendor-specific capabilities of sysmocom devices */
-enum simtrace_capability_vendor {
-	/* Can erase a peer SAM3 controller */
-	SIMTRACE_CAP_SYSMO_QMOD_ERASE_PEER,
-	/* Can read/write an attached EEPROM */
-	SIMTRACE_CAP_SYSMO_QMOD_RW_EEPROM,
-	/* can reset an attached USB hub */
-	SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB,
-};
-
-/* SIMTRACE_CMD_BD_BOARD_INFO */
-struct simtrace_board_info {
-	struct {
-		char manufacturer[32];
-		char model[32];
-		char version[32];
-	} hardware;
-	struct {
-		/* who provided this software? */
-		char provider[32];
-		/* name of software image */
-		char name[32];
-		/* (git) version at build time */
-		char version[32];
-		/* built on which machine? */
-		char buildhost[32];
-		/* CRC-32 over software image */
-		uint32_t crc;
-	} software;
-	struct {
-		/* Maximum baud rate supported */
-		uint32_t max_baud_rate;
-	} speed;
-	/* number of bytes of generic capability bit-mask */
-	uint8_t cap_generic_bytes;
-	/* number of bytes of vendor capability bit-mask */
-	uint8_t cap_vendor_bytes;
-	uint8_t data[0];
-	/* cap_generic + cap_vendor */
-} __attribute__ ((packed));
-
-/***********************************************************************
- * CARD EMULATOR / FORWARDER
- ***********************************************************************/
-
-/* indicates a TPDU header is present in this message */
-#define CEMU_DATA_F_TPDU_HDR	0x00000001
-/* indicates last part of transmission in this direction */
-#define CEMU_DATA_F_FINAL	0x00000002
-/* incdicates a PB is present and we should continue with TX */
-#define CEMU_DATA_F_PB_AND_TX	0x00000004
-/* incdicates a PB is present and we should continue with RX */
-#define CEMU_DATA_F_PB_AND_RX	0x00000008
-
-/* CEMU_USB_MSGT_DT_CARDINSERT */
-struct cardemu_usb_msg_cardinsert {
-	uint8_t card_insert;
-} __attribute__ ((packed));
-
-/* CEMU_USB_MSGT_DT_SET_ATR */
-struct cardemu_usb_msg_set_atr {
-	uint8_t atr_len;
-	/* variable-length ATR data */
-	uint8_t atr[0];
-} __attribute__ ((packed));
-
-/* CEMU_USB_MSGT_DT_TX_DATA */
-struct cardemu_usb_msg_tx_data {
-	uint32_t flags;
-	uint16_t data_len;
-	/* variable-length TPDU data */
-	uint8_t data[0];
-} __attribute__ ((packed));
-
-/* CEMU_USB_MSGT_DO_RX_DATA */
-struct cardemu_usb_msg_rx_data {
-	uint32_t flags;
-	uint16_t data_len;
-	/* variable-length TPDU data */
-	uint8_t data[0];
-} __attribute__ ((packed));
-
-#define CEMU_STATUS_F_VCC_PRESENT	0x00000001
-#define CEMU_STATUS_F_CLK_ACTIVE	0x00000002
-#define CEMU_STATUS_F_RCEMU_ACTIVE	0x00000004
-#define CEMU_STATUS_F_CARD_INSERT	0x00000008
-#define CEMU_STATUS_F_RESET_ACTIVE	0x00000010
-
-/* CEMU_USB_MSGT_DO_STATUS */
-struct cardemu_usb_msg_status {
-	uint32_t flags;
-	/* phone-applied target voltage in mV */
-	uint16_t voltage_mv;
-	/* Fi/Di related information */
-	uint8_t fi;
-	uint8_t di;
-	uint8_t wi;
-	uint32_t waiting_time;
-} __attribute__ ((packed));
-
-/* CEMU_USB_MSGT_DO_PTS */
-struct cardemu_usb_msg_pts_info {
-	uint8_t pts_len;
-	/* PTS request as sent from reader */
-	uint8_t req[6];
-	/* PTS response as sent by card */
-	uint8_t resp[6];
-} __attribute__ ((packed));
-
-/* CEMU_USB_MSGT_DO_ERROR */
-struct cardemu_usb_msg_error {
-	uint8_t severity;
-	uint8_t subsystem;
-	uint16_t code;
-	uint8_t msg_len;
-	/* human-readable error message */
-	uint8_t msg[0];
-} __attribute__ ((packed));
-
-/***********************************************************************
- * MODEM CONTROL
- ***********************************************************************/
-
-/* SIMTRACE_MSGT_DT_MODEM_RESET */
-struct st_modem_reset {
-	/* 0: de-assert reset, 1: assert reset, 2: pulse reset */
-	uint8_t asserted;
-	/* if above is '2', duration of pulse in ms */
-	uint16_t pulse_duration_msec;
-} __attribute__((packed));
-
-/* SIMTRACE_MSGT_DT_MODEM_SIM_SELECT */
-struct st_modem_sim_select {
-	/* remote (1), local (0) */
-	uint8_t remote_sim;
-} __attribute__((packed));
-
-/* SIMTRACE_MSGT_BD_MODEM_STATUS */
-#define ST_MDM_STS_BIT_WWAN_LED		(1 << 0)
-#define ST_MDM_STS_BIT_CARD_INSERTED	(1 << 1)
-struct st_modem_status {
-	/* bit-field of supported status bits */
-	uint8_t supported_mask;
-	/* bit-field of current status bits */
-	uint8_t status_mask;
-	/* bit-field of changed status bits */
-	uint8_t changed_mask;
-} __attribute__((packed));
-
-/***********************************************************************
- * SNIFF
- ***********************************************************************/
-
-/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
-#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)
-#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)
-#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)
-#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)
-#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)
-
-/* SIMTRACE_MSGT_SNIFF_CHANGE */
-struct sniff_change {
-	/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
-	uint32_t flags;
-} __attribute__ ((packed));
-
-/* SIMTRACE_MSGT_SNIFF_FIDI */
-struct sniff_fidi {
-	/* Fi/Di values as encoded in TA1 */
-	uint8_t fidi;
-} __attribute__ ((packed));
-
-/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */
-struct sniff_data {
-	/* if the data is complete (an error might have occurred during transmission */
-	bool complete;
-	/* data length */
-	uint16_t length;
-	/* data */
-	uint8_t data[0];
-} __attribute__ ((packed));