cardem: ignore set ATR

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

Change-Id: Ibf7c6b83d2cf68172c7aa25116d838e24a95d5fe

Makefile

@@ -17,15 +17,10 @@ fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean
 fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem
 
 utils:
-	(cd host && \
-	 autoreconf -fi && \
-	 ./configure --prefix=/usr --disable-werror && \
-	 make)
+	make -C host
 
 clean: fw-clean
-	if [ -e host/Makefile ]; then \
-		make -C host clean; \
-	fi
+	make -C host clean
 
 install:
 	make -C firmware install

contrib/flash.py

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

contrib/jenkins.sh

@@ -21,9 +21,6 @@ mkdir "$deps" || true
 
 osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
 
-# verify only after building the dependency (to ensure we have most recent source of dependency)
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
-
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
@@ -53,34 +50,23 @@ make clean
 echo
 echo "=============== HOST START  =============="
 cd $TOPDIR/host
-autoreconf --install --force
-./configure --enable-sanitize --enable-werror
-$MAKE $PARALLEL_MAKE
-#$MAKE distcheck || cat-testlogs.sh
-make dist
-
-#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
-#	make -C "$base/doc/manuals" publish
-#fi
+make clean
+make
+make clean
 
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="
 
-	cat > "/build/known_hosts" <<EOF
+	cat > "$WORKSPACE/known_hosts" <<EOF
 [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
 [rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
 [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
 EOF
-	SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48"
-	rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/latest/
-	rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/
+	SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
+	rsync -avz --delete -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.bin binaries@rita.osmocom.org:web-files/simtrace2/firmware/
 fi
 
-echo
-echo "=============== HOST CLEAN  =============="
-$MAKE maintainer-clean
-
 echo
 echo "=============== FIRMWARE CLEAN  =============="
 cd $TOPDIR/firmware/

debian/changelog

@@ -1,9 +1,3 @@
-simtrace2 (0.5.2) UNRELEASED; urgency=medium
-
-  * adapt to host tools in autotools
-
- -- Harald Welte <lafore@gnumonks.org>  Thu, 28 Nov 2019 00:44:57 +0100
-
 simtrace2 (0.5.1) unstable; urgency=medium
 
   * Backwards-compatibility with older (released, non-master) libosmocore

debian/control

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

debian/libosmo-simtrace2-0.install

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

debian/libosmo-simtrace2-dev.install

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

debian/rules

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

firmware/Makefile

@@ -28,33 +28,22 @@
 
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
 
-# verbosity
-V ?= 0
-ifneq ("$(V)","0")
-SILENT :=
-else
-SILENT := @
-endif
-
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
 CHIP  ?= sam3s4
 BOARD ?= qmod
-APP ?= dfu
 
 # Defines which are the available memory targets for the SAM3S-EK board.
-ifeq ($(APP), dfu)
 MEMORIES ?= flash dfu
-else
-MEMORIES ?= dfu
-endif
 
-# Output directories and filename
+# Output file basename
+APP ?= dfu
+
+# Output directories
 OUTPUT = $(BOARD)-$(APP)
 BIN = bin
 OBJ = obj/$(BOARD)
@@ -84,6 +73,7 @@ GDB = $(CROSS_COMPILE)gdb
 NM = $(CROSS_COMPILE)nm
 
 TOP=..
+GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 
 #-------------------------------------------------------------------------------
 #		Files
@@ -107,8 +97,7 @@ C_LIBCHIP  = $(notdir $(wildcard $(AT91LIB)/libchip_sam3s/source/*.c) $(wildcard
 C_LIBUSB     = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c
 C_LIBUSB_RT  = dfu.c dfu_runtime.c
 C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c
-C_LIBCOMMON  = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c \
-	       main_common.c tc_etu.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))
@@ -131,15 +120,15 @@ C_OBJECTS  = $(C_FILES:%.c=%.o)
 # TRACE_LEVEL_NO_TRACE   0
 TRACE_LEVEL ?= 4
 
-# allow asserting the peer SAM3S ERASE signal to completely erase the flash
-# only applicable for qmod board
-ALLOW_PEER_ERASE?=0
+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)
 
@@ -172,17 +161,18 @@ CFLAGS += -Wno-suggest-attribute=noreturn
 # -mlong-calls  -Wall
 #CFLAGS += -save-temps -fverbose-asm
 #CFLAGS += -Wa,-a,-ad
-CFLAGS += -D__ARM -fno-builtin
+CFLAGS += -D__ARM
 CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
-CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
+CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDEBUG_PHONE_SNIFF=$(DEBUG_PHONE_SNIFF)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
 ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--print-memory-usage -Wl,--no-undefined $(LIB)
+LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB)
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
 
-# Append BIN directories to output filename
+
+# Append OBJ and BIN directories to output filename
 OUTPUT := $(BIN)/$(OUTPUT)
 
 #-------------------------------------------------------------------------------
@@ -206,11 +196,7 @@ $(BIN) $(OBJ):
 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@
 
-.PHONY: apps/$(APP)/usb_strings.txt.patched
-apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt
-	sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@
-
-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring
+apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring
 	cat $< | usbstring/usbstring > $@
 
 define RULES
@@ -218,22 +204,18 @@ C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
 ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
 
 $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	$(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
-	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf
-	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf
-	$(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
-	$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
-	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin
-	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin
-	$(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf
+	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.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 $$<]
-	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
+	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	$(SILENT)@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
 
 debug_$(1): $(1)
 	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
@@ -250,7 +232,6 @@ log:
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )
 
 clean:
-	-rm -f apps/$(APP)/usb_strings.txt.patched
 	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`
 
 install:

firmware/README.txt

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

firmware/apps/cardem/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c iso7816_fidi.c iso7816_3.c iso7816_4.c mode_cardemu.c simtrace_iso7816.c usb.c
+C_FILES += card_emu.c iso7816_3.c iso7816_4.c mode_cardemu.c simtrace_iso7816.c usb.c

firmware/apps/cardem/main.c

@@ -24,9 +24,10 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "main_common.h"
 #include <osmocom/core/timer.h>
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -39,7 +40,7 @@ typedef struct {
 	void (*exit) (void);
 	/* main loop content for given configuration */
 	void (*run) (void);
-	/* Interrupt handler for USART0 */
+	/* Interrupt handler for USART1 */
 	void (*usart0_irq) (void);
 	/* Interrupt handler for USART1 */
 	void (*usart1_irq) (void);
@@ -53,8 +54,6 @@ static const conf_func config_func_ptrs[] = {
 		.init = Sniffer_init,
 		.exit = Sniffer_exit,
 		.run = Sniffer_run,
-		.usart0_irq = Sniffer_usart0_irq,
-		.usart1_irq = Sniffer_usart1_irq,
 	},
 #endif
 #ifdef HAVE_CCID
@@ -156,7 +155,34 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	EEFC_ReadUniqueID(g_unique_id);
+
+		printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"SIMtrace2 firmware " GIT_VERSION "\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
+		"=============================================================================\n\r");
+
+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
+		   g_unique_id[0], g_unique_id[1],
+		   g_unique_id[2], g_unique_id[3]);
+	uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+	static const char* reset_causes[] = {
+		"general reset (first power-up reset)",
+		"backup reset (return from backup mode)",
+		"watchdog reset (watchdog fault occurred)",
+		"software reset (processor reset required by the software)",
+		"user reset (NRST pin detected low)",
+	};
+	if (reset_cause < ARRAY_SIZE(reset_causes)) {
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+	} else {
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	}
+#endif
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");
@@ -165,7 +191,7 @@ extern int main(void)
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
 		WDT_Restart(WDT);
 		check_exec_dbg_cmd();
-#if 1
+#if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
 				    "not be configured)\n\r");
@@ -177,7 +203,8 @@ extern int main(void)
 	}
 
 	TRACE_INFO("calling configure of all configurations...\n\r");
-	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
+	for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
+	     ++i) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}

firmware/apps/cardem/usb_strings.txt

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

firmware/apps/dfu/main.c

@@ -26,15 +26,8 @@
 
 #include <osmocom/core/timer.h>
 
-/* USB alternate interface index used to identify which partition to flash */
-/** USB alternate interface index indicating RAM partition */
 #define ALTIF_RAM 0
-/** USB alternate interface index indicating flash partition */
-#if defined(ENVIRONMENT_flash)
 #define ALTIF_FLASH 1
-#elif defined(ENVIRONMENT_dfu)
-#define ALTIF_FLASH 2
-#endif
 
 unsigned int g_unique_id[4];
 /* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */
@@ -51,18 +44,10 @@ static const Pin pinsLeds[] = { PINS_LEDS } ;
  *----------------------------------------------------------------------------*/
 
 #define RAM_ADDR(offset) (IRAM_ADDR + BOARD_DFU_RAM_SIZE + offset)
-#if defined(ENVIRONMENT_flash)
 #define FLASH_ADDR(offset) (IFLASH_ADDR + BOARD_DFU_BOOT_SIZE + offset)
-#elif defined(ENVIRONMENT_dfu)
-#define FLASH_ADDR(offset) (IFLASH_ADDR + offset)
-#endif
 
-#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE)
-#if defined(ENVIRONMENT_flash)
-#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE)
-#elif defined(ENVIRONMENT_dfu)
-#define IFLASH_END ((uint8_t *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE)
-#endif
+#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
@@ -105,11 +90,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		break;
 	case ALTIF_FLASH:
 		addr = FLASH_ADDR(offset);
-#if defined(ENVIRONMENT_flash)
 		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) {
-#elif defined(ENVIRONMENT_dfu)
-		if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-#endif
 			g_dfu->state = DFU_STATE_dfuERROR;
 			g_dfu->status = DFU_STATUS_errADDRESS;
 			rc = DFU_RET_STALL;
@@ -276,36 +257,23 @@ extern int main(void)
 		"=============================================================================\n\r",
 		manifest_revision, manifest_board);
 
-#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("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]);
-	static const char* reset_causes[] = {
-		"general reset (first power-up reset)",
-		"backup reset (return from backup mode)",
-		"watchdog reset (watchdog fault occurred)",
-		"software reset (processor reset required by the software)",
-		"user reset (NRST pin detected low)",
-	};
-	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
-	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
-	}
-#endif
+	TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause);
 
 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
 	/* Find out why we are in the DFU bootloader, and not the main application */
 	TRACE_INFO("DFU bootloader start reason: ");
 	switch (USBDFU_OverrideEnterDFU()) {
 	case 0:
-		if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-			TRACE_INFO_WP("unknown\n\r");
-		} else {
-			TRACE_INFO_WP("DFU is the main application\n\r");
-		}
-		break;
+		/* 0 normally means that there is no override, but we are in the bootloader,
+		 * thus the first check in board_cstartup_gnu did return something else than 0.
+		 * this can only be g_dfu->magic which is erased when the segment are
+		 * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU.
+		 * no static variable can be used to store this case since this will also be overwritten
+		 */
 	case 1:
 		TRACE_INFO_WP("DFU switch requested by main application\n\r");
 		break;
@@ -332,16 +300,17 @@ extern int main(void)
 
 	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
-	USBD_Disconnect();
 #ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
 	PIO_Configure(&usb_dp_pullup, 1);
 	PIO_Set(&usb_dp_pullup);
 #endif
-	mdelay(50);
+	USBD_HAL_Suspend();
+	mdelay(20);
 #ifdef PIN_USB_PULLUP
 	PIO_Clear(&usb_dp_pullup);
 #endif
+	USBD_HAL_Activate();
 
 	USBDFU_Initialize(&dfu_descriptors);
 
@@ -350,8 +319,8 @@ extern int main(void)
 		check_exec_dbg_cmd();
 #if 1
 		if (i >= MAX_USB_ITER * 3) {
-			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
-			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
+			TRACE_ERROR("Resetting board (USB could "
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}

firmware/apps/dfu/usb_strings.txt

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

firmware/apps/freq_ctr/Makefile

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

firmware/apps/freq_ctr/freq_ctr.c

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

firmware/apps/freq_ctr/main.c

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

firmware/apps/freq_ctr/usb_strings.txt

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

firmware/apps/gpio_test/Makefile

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

firmware/apps/gpio_test/gpio_test.c

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

firmware/apps/gpio_test/main.c

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

firmware/apps/gpio_test/usb_strings.txt

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

firmware/apps/trace/main.c

@@ -24,9 +24,10 @@
 #include "board.h"
 #include "simtrace.h"
 #include "utils.h"
-#include "main_common.h"
 #include "osmocom/core/timer.h"
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -157,7 +158,20 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	EEFC_ReadUniqueID(g_unique_id);
+
+		printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
+		"=============================================================================\n\r");
+
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
+		   g_unique_id[0], g_unique_id[1],
+		   g_unique_id[2], g_unique_id[3]);
+	TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+	TRACE_INFO("USB configuration used: %d\n\r", simtrace_config);
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\n\r");

firmware/apps/trace/usb_strings.txt

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

firmware/apps/triple_play/main.c

@@ -26,6 +26,8 @@
 #include "req_ctx.h"
 #include <osmocom/core/timer.h>
 
+unsigned int g_unique_id[4];
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -147,7 +149,17 @@ extern int main(void)
 
 	PIO_InitializeInterrupts(0);
 
-	print_banner();
+	EEFC_ReadUniqueID(g_unique_id);
+
+		printf("\r\n\r\n"
+		"=============================================================================\r\n"
+		"SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"
+		"=============================================================================\r\n");
+
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+		   g_unique_id[0], g_unique_id[1],
+		   g_unique_id[2], g_unique_id[3]);
+
 	board_main_top();
 
 	TRACE_INFO("USB init...\r\n");

firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c

@@ -211,16 +211,6 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
     NVIC_EnableIRQ( PIOC_IRQn ) ;
 }
 
-static InterruptSource *find_intsource4pin(const Pin *pPin)
-{
-    unsigned int i ;
-    for (i = 0; i < _dwNumSources; i++) {
-        if (_aIntSources[i].pPin == pPin)
-	    return &_aIntSources[i];
-    }
-    return NULL;
-}
-
 /**
  * Configures a PIO or a group of PIO to generate an interrupt on status
  * change. The provided interrupt handler will be called with the triggering
@@ -238,17 +228,15 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
 
     assert( pPin ) ;
     pio = pPin->pio ;
+    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
 
-    pSource = find_intsource4pin(pPin);
-    if (!pSource) {
-        /* Define new source */
-        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
-        assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
-        pSource = &(_aIntSources[_dwNumSources]) ;
-        pSource->pPin = pPin ;
-        _dwNumSources++ ;
-    }
+    /* Define new source */
+    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+
+    pSource = &(_aIntSources[_dwNumSources]) ;
+    pSource->pPin = pPin ;
     pSource->handler = handler ;
+    _dwNumSources++ ;
 
     /* PIO3 with additional interrupt support
      * Configure additional interrupt mode registers */

firmware/atmel_softpack_libraries/libchip_sam3s/source/unique_id.c

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

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

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

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

@@ -101,7 +101,7 @@ struct dfudata {
 extern struct dfudata _g_dfu;
 extern struct dfudata *g_dfu;
 
-void set_usb_serial_str(void);
+void set_usb_serial_str(const uint8_t *serial_usbstr);
 
 void DFURT_SwitchToDFU(void);
 
@@ -124,9 +124,6 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors);
 /* USBD tells us to switch from DFU mode to application mode */
 void USBDFU_SwitchToApp(void);
 
-/* USBD tells us to switch from to DFU mode */
-void USBDFU_SwitchToDFU(void);
-
 /* Return values to be used by USBDFU_handle_{dn,up}load */
 #define DFU_RET_NOTHING	0
 #define DFU_RET_ZLP	1

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

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

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

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

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

@@ -36,12 +36,7 @@
 #include <usb/common/dfu/usb_dfu.h>
 #include <usb/device/dfu/dfu.h>
 
-/** specific memory location shared across bootloader and application */
-#define __dfudata __attribute__ ((section (".dfudata")))
-/** structure containing the magic value to know if DFU or application should be started */
-__dfudata struct dfudata _g_dfu;
-/** variable to structure containing the magic value to know if DFU or application should be started */
-struct dfudata *g_dfu = &_g_dfu;
+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 */
@@ -68,7 +63,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -213,7 +208,7 @@ void DFURT_SwitchToDFU(void)
 	 * activate itself, rather than boot into the application */
 	g_dfu->magic = USB_DFU_MAGIC;
 
-	/* Disconnect the USB by removing the pull-up */
+	/* Disconnect the USB by remoting the pull-up */
 	USBD_Disconnect();
 	__disable_irq();
 

firmware/atmel_softpack_libraries/usb/include/USBD.h

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

firmware/libboard/common/include/board_common.h

@@ -56,12 +56,16 @@
 /** Core definition */
 #define cortexm3
 
-/* LEDs are used to indicate the status
- * the LED definition is board specific
- * most boards have two LEDs, one green and one red
- * the red LED indicates of the main firmware is ready (on) or if there is an error (blinking)
- * the green LED indicates if the firmware is idling (on) or if there is activity (blinking)
- */
+#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 */
@@ -108,17 +112,17 @@
 /* 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
+
 // Board has UDP controller
 #define BOARD_USB_UDP
 
 #define BOARD_USB_DFU
-
-
 #define BOARD_DFU_BOOT_SIZE	(16 * 1024)
 #define BOARD_DFU_RAM_SIZE	(2 * 1024)
 #define BOARD_DFU_PAGE_SIZE	512
-/** number of DFU interfaces (used to flash specific partitions) */
-#define BOARD_DFU_NUM_IF	3
+#define BOARD_DFU_NUM_IF	2
 
 extern void board_exec_dbg_cmd(int ch);
 extern void board_main_top(void);

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

@@ -39,9 +39,9 @@ SEARCH_DIR(.)
 MEMORY
 {
 	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
-	rom (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */
-	/* note: dfudata will be at the start */
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
+	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 */ 
@@ -111,8 +111,6 @@ SECTIONS
     {
         . = ALIGN(4);
         _srelocate = .;
-        /* we must make sure the .dfudata is linked to start of RAM */
-        *(.dfudata .dfudata.*);
         *(.ramfunc .ramfunc.*);
         *(.data .data.*);
         . = ALIGN(4);

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

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

firmware/libboard/common/source/board_cstartup_gnu.c

@@ -126,7 +126,7 @@ IntFunc exception_table[] = {
 	IrqHandlerNotUsed   /* 35 not used */
 };
 
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
 #include "usb/device/dfu/dfu.h"
 static void BootIntoApp(void)
 {
@@ -159,9 +159,8 @@ void ResetException( void )
 	LowLevelInit() ;
 
 
-#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash)
-	// boot application if there is not DFU override
-	if (!USBDFU_OverrideEnterDFU() && SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
+	if (!USBDFU_OverrideEnterDFU()) {
 		UART_Exit();
 		__disable_irq();
 		BootIntoApp();

firmware/libboard/common/source/board_lowlevel.c

@@ -127,9 +127,6 @@ extern WEAK void LowLevelInit( void )
 	SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM |
 	    	      SUPC_SMMR_SMRSTEN_ENABLE;
 
-	/* disable ERASE pin to prevent accidental flash erase */
-	MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12;
-
 	/* enable both LED and green LED */
 	PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN;
 	PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN;
@@ -218,8 +215,3 @@ void mdelay(unsigned int msecs)
 	do {
 	} while ((jiffies - jiffies_start) < msecs);
 }
-
-void abort() {
-	NVIC_SystemReset();
-	while(1) {};
-}

firmware/libboard/octsimtest/include/board.h

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

firmware/libboard/octsimtest/include/i2c.h

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

firmware/libboard/octsimtest/include/mcp23017.h

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

firmware/libboard/octsimtest/product_string.txt

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

firmware/libboard/octsimtest/source/board_octsimtest.c

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

firmware/libboard/octsimtest/source/i2c.c

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

firmware/libboard/octsimtest/source/mcp23017.c

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

firmware/libboard/owhw/include/board.h

@@ -31,24 +31,6 @@
 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
 #define BOARD_MCK 58982400 // 18.432 * 16 / 5
 
-/** MCU pin connected to red LED */
-#define PIO_LED_RED     PIO_PA17
-/** MCU pin connected to green LED */
-#define PIO_LED_GREEN   PIO_PA18
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
-
-/* pin connected to the SIMTRACE_BOOTLOADER signal. set high to force DFU bootloader start */
-#define PIN_BOOTLOADER		{PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
 #define PIN_USIM2_IO		{PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}

firmware/libboard/owhw/product_string.txt

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

firmware/libboard/owhw/source/owhw.c

@@ -1,7 +1,7 @@
 /* Card simulator specific functions
  *
  * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,16 +65,3 @@ void cardsim_gpio_init(void)
 {
 	PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));
 }
-
-int board_override_enter_dfu(void)
-{
-	const Pin bl_pin = PIN_BOOTLOADER;
-
-	PIO_Configure(&bl_pin, 1);
-
-	if (PIO_Get(&bl_pin) == 0) { // signal low
-		return 0; // do not override enter DFU
-	} else {
-		return 1; // override enter DFU
-	}
-}

firmware/libboard/qmod/include/board.h

@@ -20,6 +20,9 @@
 #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 */
@@ -30,25 +33,6 @@
 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
 #define BOARD_MCK 58000000 // 18.432 * 29 / 6
 
-/** MCU pin connected to red LED */
-#define PIO_LED_RED     PIO_PA17
-/** MCU pin connected to green LED */
-#define PIO_LED_GREEN   PIO_PA18
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
-/** the green LED is actually red and used as indication for USIM1 */
-#define LED_USIM1	LED_GREEN
-/** the green LED is actually red and used as indication for USIM2 */
-#define LED_USIM2	LED_RED
-
 /* USIM 2 interface (USART) */
 #define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
 #define PIN_USIM2_IO		{PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}

firmware/libboard/qmod/product_string.txt

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

firmware/libboard/qmod/source/board_qmod.c

@@ -1,7 +1,7 @@
 /* sysmocom quad-modem sysmoQMOD application code
  *
  * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
 #include "card_pres.h"
 #include <osmocom/core/timer.h>
 #include "usb_buf.h"
-#include "i2c.h"
 
 static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
 static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
@@ -47,7 +46,6 @@ static int qmod_sam3_is_12(void)
 		return 0;
 }
 
-#if (ALLOW_PEER_ERASE > 0)
 const unsigned char __eeprom_bin[256] = {
 	USB_VENDOR_OPENMOKO & 0xff,
 	USB_VENDOR_OPENMOKO >> 8,
@@ -71,6 +69,7 @@ const unsigned char __eeprom_bin[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
 };
 
+#include "i2c.h"
 static int write_hub_eeprom(void)
 {
 	int i;
@@ -127,7 +126,7 @@ static int erase_hub_eeprom(void)
 
 	return 0;
 }
-#endif /* ALLOW_PEER_ERASE */
+
 
 static void board_exec_dbg_cmd_st12only(int ch)
 {
@@ -138,14 +137,12 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		return;
 
 	switch (ch) {
-#if (ALLOW_PEER_ERASE > 0)
 	case 'E':
 		write_hub_eeprom();
 		break;
 	case 'e':
 		erase_hub_eeprom();
 		break;
-#endif /* ALLOW_PEER_ERASE */
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -154,7 +151,6 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
-#if (ALLOW_PEER_ERASE > 0)
 	case 'H':
 		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
@@ -174,7 +170,6 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
-#endif /* ALLOW_PEER_ERASE */
 	case 'r':
 		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
@@ -189,13 +184,6 @@ static void board_exec_dbg_cmd_st12only(int ch)
 /* returns '1' in case we should break any endless loop */
 void board_exec_dbg_cmd(int ch)
 {
-#if (ALLOW_PEER_ERASE > 0)
-	/* this variable controls if it is allowed to assert/release the ERASE line.
-	   this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE.
-	 */
-	static bool allow_erase = false;
-#endif /* ALLOW_PEER_ERASE */
-
 	switch (ch) {
 	case '?':
 		printf("\t?\thelp\n\r");
@@ -205,32 +193,22 @@ void board_exec_dbg_cmd(int ch)
 		printf("\tg\tswitch off LED 2\n\r");
 		printf("\tG\tswitch off LED 2\n\r");
 		if (qmod_sam3_is_12()) {
-#if (ALLOW_PEER_ERASE > 0)
 			printf("\tE\tprogram EEPROM\n\r");
 			printf("\te\tErase EEPROM\n\r");
-#endif /* ALLOW_PEER_ERASE */
 			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
 			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
-#if (ALLOW_PEER_ERASE > 0)
 			printf("\tH\tRelease HUB RESET (high)\n\r");
 			printf("\th\tAssert HUB RESET (low)\n\r");
 			printf("\tw\tWrite single byte in EEPROM\n\r");
-#endif /* ALLOW_PEER_ERASE */
 			printf("\tr\tRead single byte from EEPROM\n\r");
 		}
 		printf("\tX\tRelease peer SAM3 from reset\n\r");
 		printf("\tx\tAssert peer SAM3 reset\n\r");
-#if (ALLOW_PEER_ERASE > 0)
 		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
-		printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");
 		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
-#endif /* ALLOW_PEER_ERASE */
 		printf("\tU\tProceed to USB Initialization\n\r");
 		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
 		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
-		printf("\t!\tSwitch Channel A from physical -> remote\n\r");
-		printf("\t@\tSwitch Channel B from physical -> remote\n\r");
-		printf("\tt\t(pseudo)talloc report\n\r");
 		break;
 	case 'R':
 		printf("Asking NVIC to reset us\n\r");
@@ -261,24 +239,14 @@ void board_exec_dbg_cmd(int ch)
 		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
-#if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
 		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
-	case 'a':
-		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
-		allow_erase = true;
-		break;
 	case 'y':
-		if (allow_erase) {
-			printf("Setting SIMTRACExx_ERASE (active)\n\r");
-			PIO_Set(&pin_peer_erase);
-		} else {
-			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
-		}
+		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
+		PIO_Set(&pin_peer_erase);
 		break;
-#endif /* ALLOW_PEER_ERASE */
 	case '1':
 		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
@@ -293,9 +261,6 @@ void board_exec_dbg_cmd(int ch)
 	case '@':
 		sim_switch_use_physical(0, 0);
 		break;
-	case 't':
-		talloc_report(NULL, stdout);
-		break;
 	default:
 		if (!qmod_sam3_is_12())
 			printf("Unknown command '%c'\n\r", ch);
@@ -303,13 +268,6 @@ void board_exec_dbg_cmd(int ch)
 			board_exec_dbg_cmd_st12only(ch);
 		break;
 	}
-
-#if (ALLOW_PEER_ERASE > 0)
-	// set protection back so it can only run for one command
-	if ('a' != ch) {
-		allow_erase = false;
-	}
-#endif /* ALLOW_PEER_ERASE */
 }
 
 void board_main_top(void)
@@ -342,13 +300,11 @@ void board_main_top(void)
 		TRACE_INFO("Detected Quad-Modem ST12\n\r");
 	} else {
 		TRACE_INFO("Detected Quad-Modem ST34\n\r");
-#ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather
 		 * than 1+2 */
 		usb_strings[7] = usb_strings[9];
 		usb_strings[8] = usb_strings[10];
-#endif
 	}
 
 	/* Obtain the circuit board version (currently just prints voltage */

firmware/libboard/sam3p256/include/board.h

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

firmware/libboard/sam3p256/source/board_sam3p256.c

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

firmware/libboard/simtrace/include/board.h

@@ -31,26 +31,11 @@
 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
 #define BOARD_MCK 58982400 // 18.432 * 16 / 5
 
-/** MCU pin connected to red LED */
-#define PIO_LED_RED     PIO_PA17
-/** MCU pin connected to green LED */
-#define PIO_LED_GREEN   PIO_PA18
-/** red LED pin definition */
-#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** green LED pin definition */
-#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
-/** index for red LED in LEDs pin definition array */
-#define LED_NUM_RED     0
-/** index for green LED in LEDs pin definition array */
-#define LED_NUM_GREEN   1
-
 /** Pin configuration **/
 /* Button to force bootloader start (shorted to ground when pressed */
 #define PIN_BOOTLOADER_SW      {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
 /* Enable powering the card using the second 3.3 V output of the LDO (active high) */
-#define SIM_PWEN_PIN           {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define SIM_PWEN_PIN           {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /* Enable powering the SIM card */
 #define PWR_PINS                SIM_PWEN_PIN
 /* Card presence pin */
@@ -108,9 +93,9 @@
 /* Pins used to sniff phone-card communication */
 #define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
 /* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_SNIFF     {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
-#define PIN_VCC_FWD_SNIFF      {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /* Use phone VCC to power card */
 #define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
 
@@ -122,9 +107,9 @@
 
 /** card emulation configuration */
 /* Disable power converter 4.5-6V to 3.3V (active high) */
-#define PIN_SIM_PWEN_CARDEMU   {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define PIN_SIM_PWEN_CARDEMU   {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Disable power switch to forward VCC_PHONE to VCC_SIM (active high) */
-#define PIN_VCC_FWD_CARDEMU    {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define PIN_VCC_FWD_CARDEMU    {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Disable power to SIM */
 #define PINS_PWR_CARDEMU        PIN_SIM_PWEN_CARDEMU, PIN_VCC_FWD_CARDEMU
 

firmware/libboard/simtrace/product_string.txt

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

firmware/libcommon/include/card_emu.h

@@ -29,18 +29,8 @@ enum card_io {
 	CARD_IO_CLK,
 };
 
-/** initialise card slot
- *  @param[in] slot_num slot number (arbitrary number)
- *  @param[in] tc_chan timer counter channel (to measure the ETU)
- *  @param[in] uart_chan UART peripheral channel
- *  @param[in] in_ep USB IN end point number
- *  @param[in] irq_ep USB INTerrupt end point number
- *  @param[in] vcc_active initial VCC signal state (true = on)
- *  @param[in] in_reset initial RST signal state (true = reset asserted)
- *  @param[in] clocked initial CLK signat state (true = active)
- *  @return main card handle reference
- */
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked);
+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);
@@ -56,24 +46,22 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len);
 
 struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch);
 void card_emu_have_new_uart_tx(struct card_handle *ch);
-void card_emu_report_status(struct card_handle *ch, bool report_on_irq);
+void card_emu_report_status(struct card_handle *ch);
 
 /*! call when the waiting time has half-expired
  *  param[in] ch card for which the waiting time half expired
  */
-void card_emu_wt_halfed(void *ch);
+void card_emu_wt_halfed(struct card_handle *ch);
 /*! call when the waiting time has expired
  *  param[in] ch card for which the waiting time expired
  */
-void card_emu_wt_expired(void *ch);
+void card_emu_wt_expired(struct card_handle *ch);
 
 #define ENABLE_TX	0x01
 #define ENABLE_RX	0x02
 
 // the following functions are callbacks implement in mode_cardemu.c
 
-int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
-
 /*! update F and D on USART peripheral
  *  @param[in] usart USART peripheral to configure
  *  @param[in] f clock rate conversion integer F value
@@ -99,7 +87,3 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte);
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan);
 void card_emu_uart_interrupt(uint8_t uart_chan);
-
-struct cardemu_usb_msg_config;
-int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,
-			unsigned int scfg_len);

firmware/libcommon/include/main_common.h

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

firmware/libcommon/include/ringbuffer.h

@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#define RING_BUFLEN 1024
+#define RING_BUFLEN 512
 
 typedef struct ringbuf {
 	uint8_t buf[RING_BUFLEN];

firmware/libcommon/include/simtrace.h

@@ -1,7 +1,6 @@
 /* SIMtrace 2 mode definitions
  *
- * Copyright (c) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * (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
@@ -58,7 +57,6 @@ enum confNum {
 #ifdef HAVE_MITM
 	CFG_NUM_MITM,
 #endif
-	CFG_NUM_VERSION,
 	NUM_CONF
 };
 

firmware/libcommon/include/simtrace_prot.h

@@ -62,8 +62,6 @@ enum simtrace_msg_type_cardem {
 	SIMTRACE_MSGT_DO_CEMU_RX_DATA,
 	/* Indicate PTS request from phone */
 	SIMTRACE_MSGT_DO_CEMU_PTS,
-	/* Set configurable parameters */
-	SIMTRACE_MSGT_BD_CEMU_CONFIG,
 };
 
 /* SIMTRACE_MSGC_MODEM */
@@ -255,15 +253,6 @@ struct cardemu_usb_msg_error {
 	uint8_t msg[0];
 } __attribute__ ((packed));
 
-/* enable/disable the generation of DO_STATUS on IRQ endpoint */
-#define CEMU_FEAT_F_STATUS_IRQ	0x00000001
-
-/* SIMTRACE_MSGT_BD_CEMU_CONFIG */
-struct cardemu_usb_msg_config {
-	/* bit-mask of CEMU_FEAT_F flags */
-	uint32_t features;
-} __attribute__ ((packed));
-
 /***********************************************************************
  * MODEM CONTROL
  ***********************************************************************/

firmware/libcommon/include/simtrace_usb.h

@@ -64,4 +64,4 @@
 #define SIMTRACE_CARDEM_USB_EP_USIM2_INT		3
 
 /*! Maximum number of endpoints */
-#define BOARD_USB_NUMENDPOINTS		7 /* 0 (control) + 2 (interfaces) * 3 (endpoints) */
+#define BOARD_USB_NUMENDPOINTS		6

firmware/libcommon/include/talloc.h

@@ -17,7 +17,6 @@
 #pragma once
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <stdarg.h>
 
 /* minimalistic emulation of core talloc API functions used by msgb.c */
@@ -40,4 +39,3 @@ void *talloc_named_const(const void *context, size_t size, const char *name);
 void talloc_set_name_const(const void *ptr, const char *name);
 char *talloc_strdup(const void *t, const char *p);
 void *talloc_pool(const void *context, size_t size);
-void talloc_report(const void *ptr, FILE *f);

firmware/libcommon/include/tc_etu.h

@@ -7,3 +7,5 @@ void tc_etu_init(uint8_t chan_nr, void *handle);
 void tc_etu_enable(uint8_t chan_nr);
 void tc_etu_disable(uint8_t chan_nr);
 
+extern void tc_etu_wtime_half_expired(void *handle);
+extern void tc_etu_wtime_expired(void *handle);

firmware/libcommon/include/usb_buf.h

@@ -29,8 +29,6 @@ struct usb_buffered_ep {
 	volatile uint32_t in_progress;
 	/* Tx queue (IN) / Rx queue (OUT) */
 	struct llist_head queue;
-	/* current length of queue */
-	unsigned int queue_len;
 };
 
 struct msgb *usb_buf_alloc(uint8_t ep);

firmware/libcommon/source/card_emu.c

@@ -1,6 +1,6 @@
 /* ISO7816-3 state machine for the card side
  *
- * (C) 2010-2019 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org>
  * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,20 +27,14 @@
 #include "utils.h"
 #include "trace.h"
 #include "iso7816_3.h"
-#include "iso7816_fidi.h"
-#include "tc_etu.h"
 #include "card_emu.h"
 #include "simtrace_prot.h"
 #include "usb_buf.h"
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/msgb.h>
 
-
 #define NUM_SLOTS		2
 
-/* bit-mask of supported CEMU_FEAT_F_ flags */
-#define SUPPORTED_FEATURES	(CEMU_FEAT_F_STATUS_IRQ)
-
 #define	ISO7816_3_INIT_WTIME	9600
 #define ISO7816_3_DEFAULT_WI	10
 #define ISO7816_3_ATR_LEN_MAX	(1+32)	/* TS plus 32 chars */
@@ -59,15 +53,42 @@ enum iso7816_3_card_state {
 };
 
 const struct value_string iso7816_3_card_state_names[] = {
-	{ ISO_S_WAIT_POWER,	"WAIT_POWER" },
-	{ ISO_S_WAIT_CLK,	"WAIT_CLK" },
-	{ ISO_S_WAIT_RST,	"WAIT_RST" },
-	{ ISO_S_WAIT_ATR,	"WAIT_ATR" },
-	{ ISO_S_IN_ATR,		"IN_ATR" },
-	{ ISO_S_IN_PTS,		"IN_PTS" },
-	{ ISO_S_WAIT_TPDU,	"WAIT_TPDU" },
-	{ ISO_S_IN_TPDU,	"IN_TPDU" },
-	{ 0, NULL }
+	{
+		.value = ISO_S_WAIT_POWER,
+		.str = "WAIT_POWER",
+	},
+	{
+		.value = ISO_S_WAIT_CLK,
+		.str = "WAIT_CLK",
+	},
+	{
+		.value = ISO_S_WAIT_RST,
+		.str = "WAIT_RST",
+	},
+	{
+		.value = ISO_S_WAIT_ATR,
+		.str = "WAIT_ATR",
+	},
+	{
+		.value = ISO_S_IN_ATR,
+		.str = "IN_ATR",
+	},
+	{
+		.value = ISO_S_IN_PTS,
+		.str = "IN_PTS",
+	},
+	{
+		.value = ISO_S_WAIT_TPDU,
+		.str = "WAIT_TPDU",
+	},
+	{
+		.value = ISO_S_IN_TPDU,
+		.str = "IN_TPDU",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
 };
 
 
@@ -87,22 +108,6 @@ enum pts_state {
 	PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10,
 };
 
-const struct value_string pts_state_names[] = {
-	{ PTS_S_WAIT_REQ_PTSS,	"WAIT_REQ_PTSS" },
-	{ PTS_S_WAIT_REQ_PTS0,	"WAIT_REQ_PTS0" },
-	{ PTS_S_WAIT_REQ_PTS1,	"WAIT_REQ_PTS1" },
-	{ PTS_S_WAIT_REQ_PTS2,	"WAIT_REQ_PTS2" },
-	{ PTS_S_WAIT_REQ_PTS3,	"WAIT_REQ_PTS3" },
-	{ PTS_S_WAIT_REQ_PCK,	"WAIT_REQ_PCK" },
-	{ PTS_S_WAIT_RESP_PTSS,	"WAIT_RESP_PTSS" },
-	{ PTS_S_WAIT_RESP_PTS0,	"WAIT_RESP_PTS0" },
-	{ PTS_S_WAIT_RESP_PTS1,	"WAIT_RESP_PTS1" },
-	{ PTS_S_WAIT_RESP_PTS2,	"WAIT_RESP_PTS2" },
-	{ PTS_S_WAIT_RESP_PTS3,	"WAIT_RESP_PTS3" },
-	{ PTS_S_WAIT_RESP_PCK,	"WAIT_RESP_PCK" },
-	{ 0, NULL }
-};
-
 /* PTS field byte index */
 #define _PTSS	0
 #define _PTS0	1
@@ -124,15 +129,42 @@ enum tpdu_state {
 };
 
 const struct value_string tpdu_state_names[] = {
-	{ TPDU_S_WAIT_CLA,	"WAIT_CLA" },
-	{ TPDU_S_WAIT_INS,	"WAIT_INS" },
-	{ TPDU_S_WAIT_P1,	"WAIT_P1" },
-	{ TPDU_S_WAIT_P2,	"WAIT_P2" },
-	{ TPDU_S_WAIT_P3,	"WAIT_P3" },
-	{ TPDU_S_WAIT_PB,	"WAIT_PB" },
-	{ TPDU_S_WAIT_RX, 	"WAIT_RX" },
-	{ TPDU_S_WAIT_TX,	"WAIT_TX" },
-	{ 0, NULL }
+	{
+		.value = TPDU_S_WAIT_CLA,
+		.str = "WAIT_CLA",
+	},
+	{
+		.value = TPDU_S_WAIT_INS,
+		.str = "WAIT_INS",
+	},
+	{
+		.value = TPDU_S_WAIT_P1,
+		.str = "WAIT_P1",
+	},
+	{
+		.value = TPDU_S_WAIT_P2,
+		.str = "WAIT_P2",
+	},
+	{
+		.value = TPDU_S_WAIT_P3,
+		.str = "WAIT_P3",
+	},
+	{
+		.value = TPDU_S_WAIT_PB,
+		.str = "WAIT_PB",
+	},
+	{
+		.value = TPDU_S_WAIT_RX,
+		.str = "WAIT_RX",
+	},
+	{
+		.value = TPDU_S_WAIT_TX,
+		.str = "WAIT_TX",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
 };
 
 /* TPDU field byte index */
@@ -145,15 +177,12 @@ const struct value_string tpdu_state_names[] = {
 struct card_handle {
 	unsigned int num;
 
-	/* bit-mask of enabled optional features (CEMU_FEAT_F_*) */
-	uint32_t features;
-
 	enum iso7816_3_card_state state;
 
 	/* signal levels */
-	bool vcc_active;	/*< if VCC is active (true = active/ON) */
-	bool in_reset;	/*< if card is in reset (true = RST low/asserted, false = RST high/ released) */
-	bool clocked;	/*< if clock is active ( true = active, false = inactive) */
+	uint8_t vcc_active;	/* 1 = on, 0 = off */
+	uint8_t in_reset;	/* 1 = RST low, 0 = RST high */
+	uint8_t clocked;	/* 1 = active, 0 = inactive */
 
 	uint8_t tc_chan;	/* TC channel number */
 	uint8_t uart_chan;	/* UART channel */
@@ -237,29 +266,6 @@ struct card_handle {
 	} stats;
 };
 
-/* reset all the 'dynamic' state of the card handle to the initial/default values */
-static void card_handle_reset(struct card_handle *ch)
-{
-	struct msgb *msg;
-
-#ifndef BOARD_simtrace
-	tc_etu_disable(ch->tc_chan);
-#endif
-
-	/* release any buffers we may still own */
-	if (ch->uart_tx_msg) {
-		usb_buf_free(ch->uart_tx_msg);
-		ch->uart_tx_msg = NULL;
-	}
-	if (ch->uart_rx_msg) {
-		usb_buf_free(ch->uart_rx_msg);
-		ch->uart_rx_msg = NULL;
-	}
-	while ((msg = msgb_dequeue(&ch->uart_tx_queue))) {
-		usb_buf_free(msg);
-	}
-}
-
 struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch)
 {
 	return &ch->uart_tx_queue;
@@ -281,35 +287,12 @@ void usb_buf_upd_len_and_submit(struct msgb *msg)
 /* Allocate USB buffer and push + initialize simtrace_msg_hdr */
 struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 {
-	struct msgb *msg = NULL;
+	struct msgb *msg;
 	struct simtrace_msg_hdr *sh;
 
-	while (!msg) {
-		msg = usb_buf_alloc(ep); // try to allocate some memory
-		if (!msg) { // allocation failed, we might be out of memory
-			struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
-			if (!bep) {
-				TRACE_ERROR("ep %u: %s queue does not exist\n\r",
-				            ep, __func__);
-				return NULL;
-			}
-			if (llist_empty(&bep->queue)) {
-				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r",
-				            ep, __func__);
-				return NULL;
-			}
-			msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
-			if (!msg) {
-				TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
-				            ep, __func__);
-				return NULL;
-			}
-			usb_buf_free(msg);
-			msg = NULL;
-			TRACE_DEBUG("ep %u: %s queue msg dropped\n\r",
-			            ep, __func__);
-		}
-	}
+	msg = usb_buf_alloc(ep);
+	if (!msg)
+		return NULL;
 
 	msg->l1h = msgb_put(msg, sizeof(*sh));
 	sh = (struct simtrace_msg_hdr *) msg->l1h;
@@ -395,23 +378,6 @@ static void flush_pts(struct card_handle *ch)
 	usb_buf_upd_len_and_submit(msg);
 }
 
-static void emu_update_fidi(struct card_handle *ch)
-{
-	int rc;
-
-	rc = compute_fidi_ratio(ch->fi, ch->di);
-	if (rc > 0 && rc < 0x400) {
-		TRACE_INFO("%u: computed Fi(%u) Di(%u) ratio: %d\r\n",
-			    ch->num, ch->fi, ch->di, rc);
-		/* make sure UART uses new F/D ratio */
-		card_emu_uart_update_fidi(ch->uart_chan, rc);
-		/* notify ETU timer about this */
-		tc_etu_set_etu(ch->tc_chan, rc);
-	} else
-		TRACE_INFO("%u: computed FiDi ration %d unsupported\r\n",
-			   ch->num, rc);
-}
-
 /* Update the ISO 7816-3 TPDU receiver state */
 static void card_set_state(struct card_handle *ch,
 			   enum iso7816_3_card_state new_state)
@@ -429,22 +395,17 @@ static void card_set_state(struct card_handle *ch,
 	case ISO_S_WAIT_CLK:
 	case ISO_S_WAIT_RST:
 		card_emu_uart_enable(ch->uart_chan, 0); // disable Rx and Tx of UART
-#ifdef BOARD_simtrace
 		card_emu_uart_update_wt(ch->uart_chan, 0); // disable timeout
 		if (ISO_S_WAIT_POWER == new_state) {
 			card_emu_uart_io_set(ch->uart_chan, false); // pull I/O line low
 		} else {
 			card_emu_uart_io_set(ch->uart_chan, true); // pull I/O line high
 		}
-#endif
 		break;
 	case ISO_S_WAIT_ATR:
-
 		// reset the ETU-related values
 		ch->f = ISO7816_3_DEFAULT_FD;
 		ch->d = ISO7816_3_DEFAULT_DD;
-
-#ifdef BOARD_simtrace
 		card_emu_uart_update_fd(ch->uart_chan, ch->f, ch->d); // set baud rate
 
 		// reset values optionally specified in the ATR
@@ -457,37 +418,14 @@ static void card_set_state(struct card_handle *ch,
 		}
 		ch->wt = wt;
 		card_emu_uart_enable(ch->uart_chan, ENABLE_TX); // enable TX to be able to use the timeout
-		/* the ATR should only be sent 400 to 40k clock cycles after the RESET.
-		 * we use the UART timeout mechanism to wait this time.
-		 * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU.
-		 */
-		card_emu_uart_update_wt(ch->uart_chan, 2);
-#else
-		/* Reset to initial Fi / Di ratio */
-		ch->f = 1;
-		ch->d = 1;
-		emu_update_fidi(ch);
 		/* the ATR should only be sent 400 to 40k clock cycles after the RESET.
 		 * we use the tc_etu mechanism to wait this time.
 		 * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU.
 		 */
-		tc_etu_set_wtime(ch->tc_chan, 2);
-		/* enable the TC/ETU counter once reset has been released */
-		tc_etu_enable(ch->tc_chan);
-#endif
-
+		card_emu_uart_update_wt(ch->uart_chan, 2);
 		break;
 	case ISO_S_IN_ATR:
-#ifndef BOARD_simtrace
-		/* initialize to default WI, this will be overwritten if we
-		 * send TC2, and it will be programmed into hardware after
-		 * ATR is finished */
-		ch->wi = ISO7816_3_DEFAULT_WI;
-		/* update waiting time to initial waiting time */
-		ch->wt = ISO7816_3_INIT_WTIME;
-		/* set initial waiting time */
-		tc_etu_set_wtime(ch->tc_chan, ch->wt);
-#endif
+		// FIXME disable timeout while sending ATR
 		/* Set ATR sub-state to initial state */
 		ch->atr.idx = 0;
 		/* enable USART transmission to reader */
@@ -533,7 +471,6 @@ static int tx_byte_atr(struct card_handle *ch)
 		return 1;
 	} else { /* The ATR has been completely transmitted */
 		/* search for TC2 to updated WI */
-		ch->wi = ISO7816_3_DEFAULT_WI;
 		if (ch->atr.len >= 2 && ch->atr.atr[1] & 0xf0) { /* Y1 has some data */
 			uint8_t atr_td1 = 2;
 			if (ch->atr.atr[1] & 0x10) { /* TA1 is present */
@@ -562,15 +499,9 @@ static int tx_byte_atr(struct card_handle *ch)
 				}
 			}
 		}
-#ifdef BOARD_simtrace
 		/* FIXME update waiting time in case of card is specific mode */
 		/* reset PTS to initial state */
 		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
-#else
-		/* update waiting time (see ISO 7816-3 10.2) */
-		ch->wt = ch->wi * 960 * ch->fi;
-		tc_etu_set_wtime(ch->tc_chan, ch->wt);
-#endif
 		/* go to next state */
 		card_set_state(ch, ISO_S_WAIT_TPDU);
 		return 0;
@@ -587,9 +518,8 @@ static int tx_byte_atr(struct card_handle *ch)
 /* Update the PTS sub-state */
 static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss)
 {
-	TRACE_DEBUG("%u: 7816 PTS state %s -> %s\r\n", ch->num,
-		    get_value_string(pts_state_names, ch->pts.state),
-		    get_value_string(pts_state_names, new_ptss));
+	TRACE_DEBUG("%u: 7816 PTS state %u -> %u\r\n",
+		    ch->num, ch->pts.state, new_ptss);
 	ch->pts.state = new_ptss;
 }
 
@@ -668,12 +598,12 @@ static int process_byte_pts(struct card_handle *ch, uint8_t byte)
 			set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 			return ISO_S_WAIT_TPDU;
 		}
-		/* FIXME: check if proposal matches capabilities in ATR */
+		/* FIXME check if proposal matches capabilities in TA1 */
 		memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp));
 		break;
 	default:
-		TRACE_ERROR("%u: process_byte_pts() in invalid PTS state %s\r\n", ch->num,
-			    get_value_string(pts_state_names, ch->pts.state));
+		TRACE_ERROR("%u: process_byte_pts() in invalid state %u\r\n",
+			    ch->num, ch->pts.state);
 		break;
 	}
 	/* calculate the next state and set it */
@@ -729,8 +659,8 @@ static int tx_byte_pts(struct card_handle *ch)
 		byte = ch->pts.resp[_PCK];
 		break;
 	default:
-		TRACE_ERROR("%u: get_byte_pts() in invalid PTS state %s\r\n", ch->num,
-			    get_value_string(pts_state_names, ch->pts.state));
+		TRACE_ERROR("%u: get_byte_pts() in invalid state %u\r\n",
+			    ch->num, ch->pts.state);
 		return 0;
 	}
 
@@ -742,7 +672,6 @@ static int tx_byte_pts(struct card_handle *ch)
 	switch (ch->pts.state) {
 	case PTS_S_WAIT_RESP_PCK:
 		card_emu_uart_wait_tx_idle(ch->uart_chan);
-#ifdef BOARD_simtrace
 		card_emu_uart_update_fd(ch->uart_chan, ch->f, ch->d); // set selected baud rate
 		int32_t wt = iso7816_3_calculate_wt(ch->wi, ch->fi, ch->di, ch->f, ch->d); // get new waiting time
 		if (wt <= 0) {
@@ -752,10 +681,6 @@ static int tx_byte_pts(struct card_handle *ch)
 			ch->wt = wt;
 		}
 		// FIXME disable WT
-#else
-		/* update baud rate generator with Fi/Di */
-		emu_update_fidi(ch);
-#endif
 		/* Wait for the next TPDU */
 		card_set_state(ch, ISO_S_WAIT_TPDU);
 		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
@@ -957,8 +882,8 @@ process_byte_tpdu(struct card_handle *ch, uint8_t byte)
 		add_tpdu_byte(ch, byte);
 		break;
 	default:
-		TRACE_ERROR("%u: process_byte_tpdu() in invalid TPDU state %s\r\n", ch->num,
-			    get_value_string(tpdu_state_names, ch->tpdu.state));
+		TRACE_ERROR("%u: process_byte_tpdu() in invalid state %u\r\n",
+			    ch->num, ch->tpdu.state);
 	}
 
 	/* ensure we stay in TPDU ISO state */
@@ -1045,8 +970,6 @@ void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte)
 	switch (ch->state) {
 	case ISO_S_WAIT_TPDU:
 		if (byte == 0xff) {
-			/* reset PTS to initial state */
-			set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 			new_state = process_byte_pts(ch, byte);
 			ch->stats.pps++;
 			goto out_silent;
@@ -1059,8 +982,8 @@ void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte)
 		new_state = process_byte_pts(ch, byte);
 		goto out_silent;
 	default:
-		TRACE_ERROR("%u: Received UART char in invalid 7816 state %s\r\n", ch->num,
-			    get_value_string(iso7816_3_card_state_names, ch->state));
+		TRACE_ERROR("%u: Received UART char in invalid 7816 state "
+			    "%u\r\n", ch->num, ch->state);
 		break;
 	}
 
@@ -1113,16 +1036,13 @@ void card_emu_have_new_uart_tx(struct card_handle *ch)
 	}
 }
 
-void card_emu_report_status(struct card_handle *ch, bool report_on_irq)
+void card_emu_report_status(struct card_handle *ch)
 {
 	struct msgb *msg;
 	struct cardemu_usb_msg_status *sts;
-	uint8_t ep = ch->in_ep;
 
-	if (report_on_irq)
-		ep = ch->irq_ep;
-
-	msg = usb_buf_alloc_st(ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_STATUS);
+	msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM,
+				SIMTRACE_MSGT_BD_CEMU_STATUS);
 	if (!msg)
 		return;
 
@@ -1143,38 +1063,17 @@ void card_emu_report_status(struct card_handle *ch, bool report_on_irq)
 	usb_buf_upd_len_and_submit(msg);
 }
 
-static void card_emu_report_config(struct card_handle *ch)
-{
-	struct msgb *msg;
-	struct cardemu_usb_msg_config *cfg;
-	uint8_t ep = ch->in_ep;
-
-	msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);
-	if (!msg)
-		return;
-
-	cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));
-	cfg->features = ch->features;
-
-	usb_buf_upd_len_and_submit(msg);
-}
-
 /* 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)
 {
-	uint32_t chg_mask = 0;
-
 	switch (io) {
 	case CARD_IO_VCC:
 		if (active == 0 && ch->vcc_active == 1) {
 			TRACE_INFO("%u: VCC deactivated\r\n", ch->num);
-			card_handle_reset(ch);
 			card_set_state(ch, ISO_S_WAIT_POWER);
-			chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
 		} else if (active == 1 && ch->vcc_active == 0) {
 			TRACE_INFO("%u: VCC activated\r\n", ch->num);
 			card_set_state(ch, ISO_S_WAIT_CLK);
-			chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
 		}
 		ch->vcc_active = active;
 		break;
@@ -1183,10 +1082,8 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 			TRACE_INFO("%u: CLK activated\r\n", ch->num);
 			if (ch->state == ISO_S_WAIT_CLK)
 				card_set_state(ch, ISO_S_WAIT_RST);
-			chg_mask |= CEMU_STATUS_F_CLK_ACTIVE;
 		} else if (active == 0 && ch->clocked == 1) {
 			TRACE_INFO("%u: CLK deactivated\r\n", ch->num);
-			chg_mask |= CEMU_STATUS_F_CLK_ACTIVE;
 		}
 		ch->clocked = active;
 		break;
@@ -1197,39 +1094,15 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 				/* prepare to send the ATR */
 				card_set_state(ch, ISO_S_WAIT_ATR);
 			}
-			chg_mask |= CEMU_STATUS_F_RESET_ACTIVE;
 		} else if (active && !ch->in_reset) {
 			TRACE_INFO("%u: RST asserted\r\n", ch->num);
-			card_handle_reset(ch);
-			chg_mask |= CEMU_STATUS_F_RESET_ACTIVE;
-#ifdef BOARD_simtrace
 			card_set_state(ch, ISO_S_WAIT_RST);
-#endif
 		}
 		ch->in_reset = active;
 		break;
 	default:
 		break;
 	}
-
-	switch (ch->state) {
-	case ISO_S_WAIT_POWER:
-	case ISO_S_WAIT_CLK:
-	case ISO_S_WAIT_RST:
-		/* check end activation state (even if the reader does
-		 * not respect the activation sequence) */
-		if (ch->vcc_active && ch->clocked && !ch->in_reset) {
-			/* prepare to send the ATR */
-			card_set_state(ch, ISO_S_WAIT_ATR);
-		}
-		break;
-	default:
-		break;
-	}
-
-	/* notify the host about the state change */
-	if ((ch->features & CEMU_FEAT_F_STATUS_IRQ) && chg_mask)
-		card_emu_report_status(ch, true);
 }
 
 /* User sets a new ATR to be returned during next card reset */
@@ -1258,16 +1131,13 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len)
 	return 0;
 }
 
-/* hardware driver informs us that one (more) ETU has expired */
-void card_emu_wt_halfed(void *handle)
+void card_emu_wt_halfed(struct card_handle *ch)
 {
-	struct card_handle *ch = handle;
-	/* transmit NULL procedure byte well before waiting time expires */
 	switch (ch->state) {
 	case ISO_S_IN_TPDU:
 		switch (ch->tpdu.state) {
-		case TPDU_S_WAIT_PB:
 		case TPDU_S_WAIT_TX:
+		case TPDU_S_WAIT_PB:
 			putchar('N');
 			card_emu_uart_tx(ch->uart_chan, ISO7816_3_PB_NULL); // we are waiting for data from the user. send a procedure byte to ask the reader to wait more time
 			card_emu_uart_reset_wt(ch->uart_chan); // reset WT
@@ -1275,16 +1145,13 @@ void card_emu_wt_halfed(void *handle)
 		default:
 			break;
 		}
-		break;
 	default:
 		break;
 	}
 }
 
-/* hardware driver informs us that one (more) ETU has expired */
-void card_emu_wt_expired(void *handle)
+void card_emu_wt_expired(struct card_handle *ch)
 {
-	struct card_handle *ch = handle;
 	switch (ch->state) {
 	case ISO_S_WAIT_ATR:
 		/* ISO 7816-3 6.2.1 time tc has passed, we can now send the ATR */
@@ -1297,40 +1164,13 @@ void card_emu_wt_expired(void *handle)
 	}
 }
 
-/* reasonable ATR offering all protocols and voltages
- * smartphones might not care, but other readers do
-
-TS = 0x3B	Direct Convention
-T0 = 0x80	Y(1): b1000, K: 0 (historical bytes)
-TD(1) = 0x80	Y(i+1) = b1000, Protocol T=0
-----
-TD(2) = 0x81	Y(i+1) = b1000, Protocol T=1
-----
-TD(3) = 0x1F	Y(i+1) = b0001, Protocol T=15
-----
-TA(4) = 0xC7	Clock stop: no preference - Class accepted by the card: (3G) A 5V B 3V C 1.8V
-----
-Historical bytes
-TCK = 0x59 	correct checksum
-
- * */
-static const uint8_t default_atr[] = { 0x3B, 0x80, 0x80, 0x81 , 0x1F, 0xC7, 0x59};
+/* shortest ATR possible (uses default speed and no options) */
+static const uint8_t default_atr[] = { 0x3B, 0x00 };
 
 static struct card_handle card_handles[NUM_SLOTS];
 
-int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,
-			unsigned int scfg_len)
-{
-	if (scfg_len >= sizeof(uint32_t))
-		ch->features = (scfg->features & SUPPORTED_FEATURES);
-
-	/* send back a report of our current configuration */
-	card_emu_report_config(ch);
-
-	return 0;
-}
-
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked)
+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)
 {
 	struct card_handle *ch;
 
@@ -1348,9 +1188,9 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 	ch->irq_ep = irq_ep;
 	ch->in_ep = in_ep;
 	ch->state = ISO_S_WAIT_POWER;
-	ch->vcc_active = vcc_active;
-	ch->in_reset = in_reset;
-	ch->clocked = clocked;
+	ch->vcc_active = 0;
+	ch->in_reset = 1;
+	ch->clocked = 0;
 
 	ch->fi = ISO7816_3_DEFAULT_FI;
 	ch->di = ISO7816_3_DEFAULT_DI;
@@ -1367,11 +1207,5 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 	ch->pts.state = PTS_S_WAIT_REQ_PTSS;
 	ch->tpdu.state = TPDU_S_WAIT_CLA;
 
-	card_handle_reset(ch);
-#ifndef BOARD_simtrace
-	/* simtrace uses uart timer instead */
-	tc_etu_init(ch->tc_chan, ch);
-#endif
-
 	return ch;
 }

firmware/libcommon/source/cciddriver.c

@@ -428,7 +428,7 @@ static void PCtoRDRXfrBlock( void )
 	uint16_t msglen = 0;
 	uint32_t ret;
 
-	TRACE_DEBUG("PCtoRDRXfrBlock\n\r");
+	TRACE_DEBUG("PCtoRDRXfrBlock\n");
 
 	// Check the block length
 	if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {
@@ -921,7 +921,7 @@ void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
 void CCID_SmartCardRequest( void )
 {
 	unsigned char bStatus;
-	TRACE_DEBUG("CCID_req\n\r");
+	TRACE_DEBUG("CCID_req\n");
 
 	do {
 

firmware/libcommon/source/host_communication.c

@@ -27,36 +27,27 @@
  * USBD Integration API
  ***********************************************************************/
 
-/* call-back after (successful?) transfer of a write buffer on IN EP */
+/* call-back after (successful?) transfer of a buffer */
 static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 			 uint32_t remaining)
 {
 	struct msgb *msg = (struct msgb *) arg;
 	struct usb_buffered_ep *bep = msg->dst;
-	uint16_t ep_size = USBD_GetEndpointSize(bep->ep);
 	unsigned long x;
 
 	TRACE_DEBUG("%s (EP=0x%02x)\r\n", __func__, bep->ep);
 
-	if (((msgb_length(msg) % ep_size) == 0) && (transferred == ep_size)) {
-		/* terminate with ZLP; pass in 'msg' again as 'arg' so we get
-		 * called the second time and proceed with usb_buf_free below */
-		USBD_Write(bep->ep, 0, 0, (TransferCallback) &usb_write_cb, msg);
-		return;
-	}
-
 	local_irq_save(x);
 	bep->in_progress--;
 	local_irq_restore(x);
-	TRACE_DEBUG("%u: in_progress=%lu\r\n", bep->ep, bep->in_progress);
+	TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress);
 
 	if (status != USBD_STATUS_SUCCESS)
-		TRACE_ERROR("%s error, status=%d\r\n", __func__, status);
+		TRACE_ERROR("%s error, status=%d\n", __func__, status);
 
 	usb_buf_free(msg);
 }
 
-/* check if the spcified IN endpoint is idle and submit the next buffer from queue */
 int usb_refill_to_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
@@ -84,44 +75,44 @@ int usb_refill_to_host(uint8_t ep)
 
 	bep->in_progress++;
 
-	msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
+	msg = msgb_dequeue(&bep->queue);
 
 	local_irq_restore(x);
 
-	TRACE_DEBUG("%s (EP=0x%02x), in_progress=%lu\r\n", __func__, ep, bep->in_progress);
+	TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress);
 
 	msg->dst = bep;
 
 	rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg),
 			(TransferCallback) &usb_write_cb, msg);
 	if (rc != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("%s error %x\r\n", __func__, rc);
+		TRACE_ERROR("%s error %x\n", __func__, rc);
 		/* re-insert to head of queue */
 		llist_add_irqsafe(&msg->list, &bep->queue);
 		local_irq_save(x);
 		bep->in_progress--;
 		local_irq_restore(x);
-		TRACE_DEBUG("%02x: in_progress=%lu\r\n", bep->ep, bep->in_progress);
+		TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress);
 		return 0;
 	}
 
 	return 1;
 }
 
-/* call-back after (successful?) read transfer of a buffer on OUT EP */
+/* call-back after (successful?) transfer of a buffer */
 static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 			uint32_t remaining)
 {
 	struct msgb *msg = (struct msgb *) arg;
 	struct usb_buffered_ep *bep = msg->dst;
 
-	TRACE_DEBUG("%s (EP=%u, len=%lu, q=%p)\r\n", __func__,
+	TRACE_DEBUG("%s (EP=%u, len=%u, q=%p)\r\n", __func__,
 			bep->ep, transferred, &bep->queue);
 
 	bep->in_progress = 0;
 
 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("%s error, status=%d\r\n", __func__, status);
+		TRACE_ERROR("%s error, status=%d\n", __func__, status);
 		usb_buf_free(msg);
 		return;
 	}
@@ -129,7 +120,6 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
 	llist_add_tail_irqsafe(&msg->list, &bep->queue);
 }
 
-/* refill the read queue for data received from host PC on OUT EP, if needed */
 int usb_refill_from_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
@@ -160,7 +150,7 @@ int usb_refill_from_host(uint8_t ep)
 	rc = USBD_Read(ep, msg->head, msgb_tailroom(msg),
 			(TransferCallback) &usb_read_cb, msg);
 	if (rc != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("%s error %d\r\n", __func__, rc);
+		TRACE_ERROR("%s error %d\n", __func__, rc);
 		usb_buf_free(msg);
 		bep->in_progress = 0;
 	}
@@ -168,7 +158,6 @@ int usb_refill_from_host(uint8_t ep)
 	return 1;
 }
 
-/* drain any buffers from the queue of the endpoint and release their memory */
 int usb_drain_queue(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
@@ -188,7 +177,7 @@ int usb_drain_queue(uint8_t ep)
 	}
 
 	/* free all queued msgbs */
-	while ((msg = msgb_dequeue_count(&bep->queue, &bep->queue_len))) {
+	while ((msg = msgb_dequeue(&bep->queue))) {
 		usb_buf_free(msg);
 		ret++;
 	}

firmware/libcommon/source/main_common.c

@@ -1,54 +0,0 @@
-/* SIMtrace 2 firmware common main helpers
- *
- * (C) 2015-2019 by Harald Welte <hwelte@hmw-consulting.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "board.h"
-#include "utils.h"
-
-void print_banner(void)
-{
-	printf("\n\r\n\r"
-		"=============================================================================\n\r"
-		"SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\n\r"
-		"(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
-		"=============================================================================\n\r");
-
-#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
-	/* print chip-unique ID */
-	unsigned int unique_id[4];
-	EEFC_ReadUniqueID(unique_id);
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
-		   unique_id[0], unique_id[1], unique_id[2], unique_id[3]);
-
-	/* print reset cause */
-	uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
-	static const char* reset_causes[] = {
-		"general reset (first power-up reset)",
-		"backup reset (return from backup mode)",
-		"watchdog reset (watchdog fault occurred)",
-		"software reset (processor reset required by the software)",
-		"user reset (NRST pin detected low)",
-	};
-	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
-	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
-	}
-#endif
-}

firmware/libcommon/source/mode_cardemu.c

@@ -23,7 +23,6 @@
 #include "ringbuffer.h"
 #include "card_emu.h"
 #include "iso7816_3.h"
-#include "iso7816_fidi.h"
 #include "utils.h"
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/msgb.h>
@@ -45,7 +44,7 @@ static const Pin pin_usim1_rst	= PIN_USIM1_nRST;
 static const Pin pin_usim1_vcc	= PIN_USIM1_VCC;
 
 #ifdef CARDEMU_SECOND_UART
-static const Pin pins_usim2[]	= {PINS_USIM2};
+static const Pin pins_usim2[]    = {PINS_USIM2};
 static const Pin pin_usim2_rst	= PIN_USIM2_nRST;
 static const Pin pin_usim2_vcc	= PIN_USIM2_VCC;
 #endif
@@ -65,14 +64,8 @@ struct cardem_inst {
 	uint8_t ep_int;
 	const Pin pin_io;
 	const Pin pin_insert;
-#ifdef DETECT_VCC_BY_ADC
 	uint32_t vcc_uv;
 	uint32_t vcc_uv_last;
-#endif
-	bool vcc_active;
-	bool vcc_active_last;
-	bool rst_active;
-	bool rst_active_last;
 };
 
 struct cardem_inst cardem_inst[] = {
@@ -153,11 +146,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 		 * receiver enabled during transmit */
 		USART_SetReceiverEnabled(usart, 1);
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-#ifdef BOARD_simtrace
 		USART_EnableIt(usart, US_IER_TXRDY | US_IER_TIMEOUT);
-#else
-		USART_EnableIt(usart, US_IER_TXRDY);
-#endif
 		USART_SetTransmitterEnabled(usart, 1);
 		break;
 	case ENABLE_RX:
@@ -167,11 +156,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 		USART_SetTransmitterEnabled(usart, 1);
 		wait_tx_idle(usart);
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK;
-#ifdef BOARD_simtrace
 		USART_EnableIt(usart, US_IER_RXRDY | US_IER_TIMEOUT);
-#else
-		USART_EnableIt(usart, US_IER_RXRDY);
-#endif
 		USART_SetReceiverEnabled(usart, 1);
 		break;
 	case 0:
@@ -209,7 +194,6 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 	return 1;
 }
 
-
 /* FIXME: integrate this with actual irq handler */
 static void usart_irq_rx(uint8_t inst_num)
 {
@@ -221,10 +205,6 @@ static void usart_irq_rx(uint8_t inst_num)
 	struct cardem_inst *ci = &cardem_inst[inst_num];
 	uint32_t csr;
 	uint8_t byte = 0;
-	uint32_t errflags = (US_CSR_OVRE | US_CSR_FRAME | US_CSR_PARE | US_CSR_NACK | (1 << 10));
-#ifndef BOARD_simtrace
-	errflags |= US_CSR_TIMEOUT;
-#endif
 
 	csr = usart->US_CSR & usart->US_IMR; // save state/flags before they get changed
 
@@ -239,11 +219,11 @@ static void usart_irq_rx(uint8_t inst_num)
 			USART_DisableIt(usart, US_IER_TXRDY); // stop the TX ready signal if not byte has been transmitted
 	}
 
-	if (csr & errflags) { // error flag set
+	if (csr & (US_CSR_OVRE | US_CSR_FRAME | US_CSR_PARE | US_CSR_NACK | (1 << 10))) { // error flag set
 		usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK; // reset UART state to clear flag
 		TRACE_ERROR("%u USART error on 0x%x status: 0x%lx\n", ci->num, byte, csr); // warn user about error
 	}
-#ifdef BOARD_simtrace
+
 	// handle timeout
 	if (csr & US_CSR_TIMEOUT) { // RX has been inactive for some time
 		if (ci->wt_remaining <= (usart->US_RTOR & 0xffff)) { // waiting time has passed
@@ -265,7 +245,6 @@ static void usart_irq_rx(uint8_t inst_num)
 		usart->US_CR |= US_CR_STTTO; // clear timeout flag (and stop timeout until next character is received)
 		usart->US_CR |= US_CR_RETTO; // restart the counter (it wt is 0, the timeout is not started)
 	}
-#endif
 }
 
 /*! ISR called for USART0 */
@@ -282,19 +261,8 @@ void mode_cardemu_usart1_irq(void)
 	usart_irq_rx(0);
 }
 
-/* call-back from card_emu.c to change UART baud rate */
-int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
-{
-	int rc;
-	Usart *usart = get_usart_by_chan(uart_chan);
-
-	usart->US_CR |= US_CR_RXDIS | US_CR_RSTRX;
-	usart->US_FIDI = fidi & 0x3ff;
-	usart->US_CR |= US_CR_RXEN | US_CR_STTTO;
-	return 0;
-}
-
 // call-back from card_emu.c to change UART baud rate
+
 void card_emu_uart_update_fd(uint8_t uart_chan, uint16_t f, uint8_t d)
 {
 	Usart *usart = get_usart_by_chan(uart_chan); // get the USART based on the card handle
@@ -399,7 +367,7 @@ void card_emu_uart_interrupt(uint8_t uart_chan)
 
 #ifdef DETECT_VCC_BY_ADC
 
-static volatile int adc_triggered = 0;
+static int adc_triggered = 0;
 static int adc_sam3s_reva_errata = 0;
 
 static int card_vcc_adc_init(void)
@@ -447,16 +415,20 @@ static int card_vcc_adc_init(void)
 }
 
 #define VCC_UV_THRESH_1V8	1500000
-#define VCC_UV_THRESH_3V	2500000
+#define VCC_UV_THRESH_3V	2800000
 
 static void process_vcc_adc(struct cardem_inst *ci)
 {
 	if (ci->vcc_uv >= VCC_UV_THRESH_3V &&
 	    ci->vcc_uv_last < VCC_UV_THRESH_3V) {
-		ci->vcc_active = true;
+		card_emu_io_statechg(ci->ch, CARD_IO_VCC, 1);
+		/* FIXME do this for real */
+		card_emu_io_statechg(ci->ch, CARD_IO_CLK, 1);
 	} else if (ci->vcc_uv < VCC_UV_THRESH_3V &&
 		 ci->vcc_uv_last >= VCC_UV_THRESH_3V) {
-		ci->vcc_active = false;
+		/* FIXME do this for real */
+		card_emu_io_statechg(ci->ch, CARD_IO_CLK, 0);
+		card_emu_io_statechg(ci->ch, CARD_IO_VCC, 0);
 	}
 	ci->vcc_uv_last = ci->vcc_uv;
 }
@@ -481,54 +453,44 @@ void ADC_IrqHandler(void)
 		cardem_inst[0].vcc_uv = adc2uv(val);
 		process_vcc_adc(&cardem_inst[0]);
 		ADC->ADC_CR |= ADC_CR_START;
-		adc_triggered = 1;
 	}
 }
 #endif /* DETECT_VCC_BY_ADC */
 
-
-/* called from main loop; dispatches card I/O state changes to card_emu from main loop */
-static void process_io_statechg(struct cardem_inst *ci)
-{
-	if (ci->vcc_active != ci->vcc_active_last) {
-		card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active);
-		/* FIXME do this for real */
-		card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active);
-		ci->vcc_active_last = ci->vcc_active;
-	}
-
-	if (ci->rst_active != ci->rst_active_last) {
-		card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active);
-		ci->rst_active_last = ci->rst_active;
-	}
-}
-
 /***********************************************************************
  * Core USB  / main loop integration
  ***********************************************************************/
 
 static void usim1_rst_irqhandler(const Pin *pPin)
 {
-	cardem_inst[0].rst_active = PIO_Get(&pin_usim1_rst) ? false : true;
+	int active = PIO_Get(&pin_usim1_rst) ? 0 : 1;
+	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_RST, active);
 }
 
 #ifndef DETECT_VCC_BY_ADC
 static void usim1_vcc_irqhandler(const Pin *pPin)
 {
-	cardem_inst[0].vcc_active = PIO_Get(&pin_usim1_vcc) ? true : false;
+	int active = PIO_Get(&pin_usim1_vcc) ? 1 : 0;
+	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active);
+	/* FIXME readers enable clock after providing power and before releasing reset, but we should check it */
+	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active);
 }
 #endif /* !DETECT_VCC_BY_ADC */
 
 #ifdef CARDEMU_SECOND_UART
 static void usim2_rst_irqhandler(const Pin *pPin)
 {
-	cardem_inst[1].rst_active = PIO_Get(&pin_usim2_rst) ? false : true;
+	int active = PIO_Get(&pin_usim2_rst) ? 0 : 1;
+	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_RST, active);
 }
 
 #ifndef DETECT_VCC_BY_ADC
 static void usim2_vcc_irqhandler(const Pin *pPin)
 {
-	cardem_inst[1].vcc_active = PIO_Get(&pin_usim2_vcc) ? true : false;
+	int active = PIO_Get(&pin_usim2_vcc) ? 1 : 0;
+	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active);
+	/* FIXME readers enable clock after providing power and before releasing reset, but we should check it */
+	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active);
 }
 #endif /* !DETECT_VCC_BY_ADC */
 #endif /* CARDEMU_SECOND_UART */
@@ -564,41 +526,17 @@ void mode_cardemu_init(void)
 	INIT_LLIST_HEAD(&cardem_inst[0].usb_out_queue);
 	rbuf_reset(&cardem_inst[0].rb);
 	PIO_Configure(pins_usim1, PIO_LISTSIZE(pins_usim1));
-
-	/* configure USART as ISO-7816 slave (e.g. card) */
-	ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE);
-#ifdef BOARD_simtrace
-	/* simtrace board uses uart timeouts */
-
-	/*  don't use receive timeout timer for now */
-	cardem_inst[0].usart_info.base->US_RTOR = 0;
-	/* enable interrupts to indicate when data has been received or timeout occurred */
-	USART_EnableIt(cardem_inst[0].usart_info.base, US_IER_RXRDY | US_IER_TIMEOUT);
-#else
-	/* enable interrupts to indicate when data has been received */
-	USART_EnableIt(cardem_inst[0].usart_info.base, US_IER_RXRDY );
-#endif
-	/*  enable interrupt requests for the USART peripheral */
-	NVIC_EnableIRQ(USART1_IRQn);
-
-	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);
-	PIO_EnableIt(&pin_usim1_rst);
-
-	/* obtain current RST state */
-	usim1_rst_irqhandler(&pin_usim1_rst);
+	ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE); // configure USART as ISO-7816 slave (e.g. card)
+	cardem_inst[0].usart_info.base->US_RTOR = 0; // don't use receive timeout timer for now
+	USART_EnableIt(cardem_inst[0].usart_info.base, US_IER_RXRDY | US_IER_TIMEOUT); // enable interrupts to indicate when data has been received or timeout occurred
+	NVIC_EnableIRQ(USART1_IRQn); // enable interrupt requests for the USART peripheral
+	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler); // register ISR to handle reset signal change
+	PIO_EnableIt(&pin_usim1_rst); // enable interrupt for reset pin change
 #ifndef DETECT_VCC_BY_ADC
-	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler);
-	PIO_EnableIt(&pin_usim1_vcc);
-
-	/* obtain current VCC state */
-	usim1_vcc_irqhandler(&pin_usim1_vcc);
-#else
-	do {} while (!adc_triggered); /* wait for first ADC reading */
+	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler); // register ISR to handle VCC signal change
+	PIO_EnableIt(&pin_usim1_vcc); // enable interrupt for VCC pin change
 #endif /* DETECT_VCC_BY_ADC */
-
-	cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
-					  SIMTRACE_CARDEM_USB_EP_USIM1_INT, cardem_inst[0].vcc_active,
-					  cardem_inst[0].rst_active, cardem_inst[0].vcc_active);
+	cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT);
 	sim_switch_use_physical(0, 1);
 #ifndef DETECT_VCC_BY_ADC
 	usim1_vcc_irqhandler(NULL); // check VCC/CLK state
@@ -614,21 +552,15 @@ void mode_cardemu_init(void)
 	NVIC_EnableIRQ(USART0_IRQn);
 	PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler);
 	PIO_EnableIt(&pin_usim2_rst);
-	usim2_rst_irqhandler(&pin_usim2_rst); /* obtain current RST state */
 #ifndef DETECT_VCC_BY_ADC
 	PIO_ConfigureIt(&pin_usim2_vcc, usim2_vcc_irqhandler);
 	PIO_EnableIt(&pin_usim2_vcc);
-	usim2_vcc_irqhandler(&pin_usim2_vcc); /* obtain current VCC state */
-#else
-	do {} while (!adc_triggered); /* wait for first ADC reading */
 #endif /* DETECT_VCC_BY_ADC */
-
-	cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
-					  SIMTRACE_CARDEM_USB_EP_USIM2_INT, cardem_inst[1].vcc_active,
-					  cardem_inst[1].rst_active, cardem_inst[1].vcc_active);
+	cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT);
 	sim_switch_use_physical(1, 1);
 	// TODO check rst and vcc
 #endif /* CARDEMU_SECOND_UART */
+
 }
 
 /* called if config is deactivated */
@@ -677,7 +609,6 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 	struct simtrace_msg_hdr *hdr;
 	struct cardemu_usb_msg_set_atr *atr;
 	struct cardemu_usb_msg_cardinsert *cardins;
-	struct cardemu_usb_msg_config *cfg;
 	struct llist_head *queue;
 
 	hdr = (struct simtrace_msg_hdr *) msg->l1h;
@@ -697,7 +628,6 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 		if (!ci->pin_insert.pio) {
 			TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
 				   ci->num, cardins->card_insert ? "INSERTED" : "REMOVED");
-			usb_buf_free(msg);
 			break;
 		}
 		TRACE_INFO("%u: set card_insert to %s\r\n", ci->num,
@@ -709,13 +639,9 @@ static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci
 		usb_buf_free(msg);
 		break;
 	case SIMTRACE_MSGT_BD_CEMU_STATUS:
-		card_emu_report_status(ci->ch, false);
+		card_emu_report_status(ci->ch);
 		usb_buf_free(msg);
 		break;
-	case SIMTRACE_MSGT_BD_CEMU_CONFIG:
-		cfg = (struct cardemu_usb_msg_config *) msg->l2h;
-		card_emu_set_config(ci->ch, cfg, msgb_l2len(msg));
-		break;
 	case SIMTRACE_MSGT_BD_CEMU_STATS:
 	default:
 		/* FIXME: Send Error */
@@ -849,10 +775,9 @@ static void dispatch_received_msg(struct msgb *msg, struct cardem_inst *ci)
 		}
 
 		if (mh->msg_len > msgb_length(msg)) {
-			TRACE_ERROR("%u: Unexpected large message (%u bytes)\r\n",
+			TRACE_ERROR("%u: Unexpected large message (%u bytes)\n",
 					ci->num, mh->msg_len);
 			usb_buf_free(segm);
-			break;
 		} else {
 			uint8_t *cur = msgb_put(segm, mh->msg_len);
 			segm->l1h = segm->head;
@@ -912,8 +837,6 @@ void mode_cardemu_run(void)
 			//TRACE_ERROR("%uRx%02x\r\n", i, byte);
 		}
 
-		process_io_statechg(ci);
-
 		/* first try to send any pending messages on IRQ */
 		usb_refill_to_host(ci->ep_int);
 

firmware/libcommon/source/pseudo_talloc.c

@@ -15,16 +15,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
  */
 #include <stdint.h>
-#include <stdio.h>
 
 #include "talloc.h"
 #include "trace.h"
 #include "utils.h"
 #include <osmocom/core/utils.h>
 
-/* TODO: this number should dynamically scale. We need at least one per IN/IRQ endpoint,
- * as well as at least 3 for every OUT endpoint.  Plus some more depending on the application */
-#define NUM_RCTX_SMALL 20
+#define NUM_RCTX_SMALL 10
 #define RCTX_SIZE_SMALL 348
 
 static uint8_t msgb_data[NUM_RCTX_SMALL][RCTX_SIZE_SMALL] __attribute__((aligned(sizeof(long))));
@@ -66,7 +63,6 @@ int _talloc_free(void *ptr, const char *location)
 		if (ptr == msgb_data[i]) {
 			if (!msgb_inuse[i]) {
 				TRACE_ERROR("%s: double_free by %s\r\n", __func__, location);
-				OSMO_ASSERT(0);
 			} else {
 				msgb_inuse[i] = 0;
 			}
@@ -77,24 +73,9 @@ int _talloc_free(void *ptr, const char *location)
 
 	local_irq_restore(x);
 	TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location);
-	OSMO_ASSERT(0);
 	return -1;
 }
 
-void talloc_report(const void *ptr, FILE *f)
-{
-	unsigned int i;
-
-	fprintf(f, "talloc_report(): ");
-	for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) {
-		if (msgb_inuse[i])
-			fputc('X', f);
-		else
-			fputc('_', f);
-	}
-	fprintf(f, "\r\n");
-}
-
 void talloc_set_name_const(const void *ptr, const char *name)
 {
 	/* do nothing */

firmware/libcommon/source/simtrace_iso7816.c

@@ -71,7 +71,7 @@ void ISR_PhoneRST(const Pin * pPin)
 	     USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1,
 			(TransferCallback) & Callback_PhoneRST_ISR,
 			0)) != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USB err status: %d (%s)\r\n", ret, __FUNCTION__);
+		TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
 		return;
 	}
 
@@ -109,7 +109,7 @@ void mode_trace_usart1_irq(void)
 			/* Fill char into buffer */
 			rbuf_write(&sim_rcv_buf, c);
 		} else {
-			TRACE_DEBUG("e %x st: %lx\r\n", c, stat);
+			TRACE_DEBUG("e %x st: %x\n", c, stat);
 		}		/* else: error occurred */
 
 		char_stat = stat;

firmware/libcommon/source/sniffer.c

@@ -303,10 +303,22 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
 }
 
 const struct value_string data_flags[] = {
-	{ SNIFF_DATA_FLAG_ERROR_INCOMPLETE,	"incomplete" },
-	{ SNIFF_DATA_FLAG_ERROR_MALFORMED,	"malformed" },
-	{ SNIFF_DATA_FLAG_ERROR_CHECKSUM,	"checksum error" },
-	{ 0, NULL }
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,
+		.str = "incomplete",
+	},
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_MALFORMED,
+		.str = "malformed",
+	},
+	{
+		.value = SNIFF_DATA_FLAG_ERROR_CHECKSUM,
+		.str = "checksum error",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
 };
 
 static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) {

firmware/libcommon/source/stdio.c

@@ -358,7 +358,6 @@ signed int vsnprintf(char *pStr, size_t length, const char *pFormat, va_list ap)
 				case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break;
 				case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break;
 				case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break;
-				case 'p': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned long)); break;
 				case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break;
 				case 's': num = PutString(pStr, va_arg(ap, char *)); break;
 				case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break;

firmware/libcommon/source/tc_etu.c

@@ -23,9 +23,6 @@
 
 #include "chip.h"
 
-void card_emu_wt_halfed(void *handle);
-void card_emu_wt_expired(void *handle);
-
 /* pins for Channel 0 of TC-block 0, we only use TCLK + TIOB */
 #define PIN_TCLK0	{PIO_PA4, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT }
 #define PIN_TIOA0	{PIO_PA0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
@@ -88,7 +85,7 @@ static void tc_etu_irq(struct tc_etu_state *te)
 		te->nr_events++;
 		if (te->nr_events == te->wait_events/2) {
 			/* Indicate that half the waiting tim has expired */
-			card_emu_wt_halfed(te->handle);
+			tc_etu_wtime_half_expired(te->handle);
 		}
 		if (te->nr_events >= te->wait_events) {
 			TcChannel *chan = te->chan;
@@ -99,7 +96,7 @@ static void tc_etu_irq(struct tc_etu_state *te)
 			chan->TC_CCR = TC_CCR_CLKEN;
 
 			/* Indicate that the waiting tim has expired */
-			card_emu_wt_expired(te->handle);
+			tc_etu_wtime_expired(te->handle);
 		}
 	}
 }

firmware/libcommon/source/usb.c

@@ -2,7 +2,7 @@
  *         ATMEL Microcontroller Software Support
  * ----------------------------------------------------------------------------
  * Copyright (c) 2009, Atmel Corporation
- * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * All rights reserved.
  *
@@ -46,10 +46,7 @@
  *       USB String descriptors 
  *------------------------------------------------------------------------------*/
 #include "usb_strings_generated.h"
-
-// the index of the strings (must match the order in usb_strings.txt)
 enum strDescNum {
-	// static strings from usb_strings
 	MANUF_STR = 1,
 	PRODUCT_STRING,
 	SNIFFER_CONF_STR,
@@ -58,82 +55,9 @@ enum strDescNum {
 	MITM_CONF_STR,
 	CARDEM_USIM1_INTF_STR,
 	CARDEM_USIM2_INTF_STR,
-	CARDEM_USIM3_INTF_STR,
-	CARDEM_USIM4_INTF_STR,
-	// runtime strings
-	SERIAL_STR,
-	VERSION_CONF_STR,
-	VERSION_STR,
-	// count
 	STRING_DESC_CNT
 };
 
-/** array of static (from usb_strings) and runtime (serial, version) USB strings
- */
-static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 3];
-
-/* USB string for the serial (using 128-bit device ID) */
-static unsigned char usb_string_serial[] = {
-	USBStringDescriptor_LENGTH(32),
-	USBGenericDescriptor_STRING,
-	USBStringDescriptor_UNICODE('0'),
-	USBStringDescriptor_UNICODE('0'),
-	USBStringDescriptor_UNICODE('1'),
-	USBStringDescriptor_UNICODE('1'),
-	USBStringDescriptor_UNICODE('2'),
-	USBStringDescriptor_UNICODE('2'),
-	USBStringDescriptor_UNICODE('3'),
-	USBStringDescriptor_UNICODE('3'),
-	USBStringDescriptor_UNICODE('4'),
-	USBStringDescriptor_UNICODE('4'),
-	USBStringDescriptor_UNICODE('5'),
-	USBStringDescriptor_UNICODE('5'),
-	USBStringDescriptor_UNICODE('6'),
-	USBStringDescriptor_UNICODE('6'),
-	USBStringDescriptor_UNICODE('7'),
-	USBStringDescriptor_UNICODE('7'),
-	USBStringDescriptor_UNICODE('8'),
-	USBStringDescriptor_UNICODE('8'),
-	USBStringDescriptor_UNICODE('9'),
-	USBStringDescriptor_UNICODE('9'),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('b'),
-	USBStringDescriptor_UNICODE('b'),
-	USBStringDescriptor_UNICODE('c'),
-	USBStringDescriptor_UNICODE('c'),
-	USBStringDescriptor_UNICODE('d'),
-	USBStringDescriptor_UNICODE('d'),
-	USBStringDescriptor_UNICODE('e'),
-	USBStringDescriptor_UNICODE('e'),
-	USBStringDescriptor_UNICODE('f'),
-	USBStringDescriptor_UNICODE('f'),
-};
-
-/* USB string for the version */
-static const unsigned char usb_string_version_conf[] = {
-	USBStringDescriptor_LENGTH(16),
-	USBGenericDescriptor_STRING,
-	USBStringDescriptor_UNICODE('f'),
-	USBStringDescriptor_UNICODE('i'),
-	USBStringDescriptor_UNICODE('r'),
-	USBStringDescriptor_UNICODE('m'),
-	USBStringDescriptor_UNICODE('w'),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('r'),
-	USBStringDescriptor_UNICODE('e'),
-	USBStringDescriptor_UNICODE(' '),
-	USBStringDescriptor_UNICODE('v'),
-	USBStringDescriptor_UNICODE('e'),
-	USBStringDescriptor_UNICODE('r'),
-	USBStringDescriptor_UNICODE('s'),
-	USBStringDescriptor_UNICODE('i'),
-	USBStringDescriptor_UNICODE('o'),
-	USBStringDescriptor_UNICODE('n'),
-};
-static const char git_version[] = GIT_VERSION;
-static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2];
-
 /*------------------------------------------------------------------------------
  *       USB Device descriptors 
  *------------------------------------------------------------------------------*/
@@ -599,40 +523,6 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 };
 #endif /* HAVE_CARDEM */
 
-/* USB descriptor just to show the version */
-typedef struct _SIMTraceDriverConfigurationDescriptorVersion {
-	/** Standard configuration descriptor. */
-	USBConfigurationDescriptor configuration;
-	USBInterfaceDescriptor version;
-} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion;
-
-static const SIMTraceDriverConfigurationDescriptorVersion
-				configurationDescriptorVersion = {
-	/* Standard configuration descriptor for the interface descriptor*/
-	.configuration = {
-		.bLength 		= sizeof(USBConfigurationDescriptor),
-		.bDescriptorType	= USBGenericDescriptor_CONFIGURATION,
-		.wTotalLength		= sizeof(SIMTraceDriverConfigurationDescriptorVersion),
-		.bNumInterfaces		= 1,
-		.bConfigurationValue	= CFG_NUM_VERSION,
-		.iConfiguration		= VERSION_CONF_STR,
-		.bmAttributes		= USBD_BMATTRIBUTES,
-		.bMaxPower		= USBConfigurationDescriptor_POWER(100),
-	},
-	/* Interface standard descriptor just holding the version information */
-	.version = {
-		.bLength = sizeof(USBInterfaceDescriptor),
-		.bDescriptorType 	= USBGenericDescriptor_INTERFACE,
-		.bInterfaceNumber	= 0,
-		.bAlternateSetting	= 0,
-		.bNumEndpoints		= 0,
-		.bInterfaceClass	= USB_CLASS_PROPRIETARY,
-		.bInterfaceSubClass	= 0xff,
-		.bInterfaceProtocol	= 0,
-		.iInterface		= VERSION_STR,
-	},
-};
-
 const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
 #ifdef HAVE_SNIFFER
 	&configurationDescriptorSniffer.configuration,
@@ -646,7 +536,6 @@ const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
 #ifdef HAVE_MITM
 	&configurationDescriptorMITM.configuration,
 #endif
-	&configurationDescriptorVersion.configuration,
 };
 
 /** Standard USB device descriptor for the CDC serial driver */
@@ -663,7 +552,7 @@ const USBDeviceDescriptor deviceDescriptor = {
 	.bcdDevice		= 2,	/* Release number */
 	.iManufacturer		= MANUF_STR,
 	.iProduct		= PRODUCT_STRING,
-	.iSerialNumber		= SERIAL_STR,
+	.iSerialNumber		= 0,
 	.bNumConfigurations	= ARRAY_SIZE(configurationDescriptorsArr),
 };
 
@@ -677,8 +566,8 @@ static const USBDDriverDescriptors driverDescriptors = {
 	0,			/* No high-speed configuration descriptor */
 	0,			/* No high-speed device qualifier descriptor */
 	0,			/* No high-speed other speed configuration descriptor */
-	usb_strings_extended,
-	ARRAY_SIZE(usb_strings_extended),/* cnt string descriptors in list */
+	usb_strings,
+	ARRAY_SIZE(usb_strings),/* cnt string descriptors in list */
 };
 
 /*----------------------------------------------------------------------------
@@ -687,7 +576,7 @@ static const USBDDriverDescriptors driverDescriptors = {
 
 void SIMtrace_USB_Initialize(void)
 {
-	unsigned int i;
+
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
 #ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
@@ -704,32 +593,6 @@ void SIMtrace_USB_Initialize(void)
 	// Get std USB driver
 	USBDDriver *pUsbd = USBD_GetDriver();
 
-	// put device ID into USB serial number description
-	unsigned int device_id[4];
-	EEFC_ReadUniqueID(device_id);
-	char device_id_string[32 + 1];
-	snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x",
-		device_id[0], device_id[1], device_id[2], device_id[3]);
-	for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) {
-		usb_string_serial[2 + 2 * i] = device_id_string[i];
-	}
-
-	// put version into USB string
-	usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1);
-	usb_string_version[1] = USBGenericDescriptor_STRING;
-	for (i = 0; i < ARRAY_SIZE(git_version) - 1; i++) {
-		usb_string_version[2 + i * 2 + 0] = git_version[i];
-		usb_string_version[2 + i * 2 + 1] = 0;
-	}
-
-	// fill extended USB strings
-	for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) {
-		usb_strings_extended[i] = usb_strings[i];
-	}
-	usb_strings_extended[SERIAL_STR] = usb_string_serial;
-	usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf;
-	usb_strings_extended[VERSION_STR] = usb_string_version;
-
 	// Initialize standard USB driver
 	USBDDriver_Initialize(pUsbd, &driverDescriptors, 0);	// Multiple interface settings not supported
 	USBD_Init();

firmware/libcommon/source/usb_buf.c

@@ -24,7 +24,6 @@
 #include <errno.h>
 
 #define USB_ALLOC_SIZE	280
-#define USB_MAX_QLEN	3
 
 static struct usb_buffered_ep usb_buffered_ep[BOARD_USB_NUMENDPOINTS];
 
@@ -79,18 +78,7 @@ int usb_buf_submit(struct msgb *msg)
 
 	/* no need for irqsafe operation, as the usb_tx_queue is
 	 * processed only by the main loop context */
-
-	if (ep->queue_len >= USB_MAX_QLEN) {
-		struct msgb *evict;
-		/* free the first pending buffer in the queue */
-		TRACE_INFO("EP%02x: dropping first queue element (qlen=%u)\r\n",
-			   ep->ep, ep->queue_len);
-		evict = msgb_dequeue_count(&ep->queue, &ep->queue_len);
-		OSMO_ASSERT(evict);
-		usb_buf_free(evict);
-	}
-
-	msgb_enqueue_count(&ep->queue, msg, &ep->queue_len);
+	msgb_enqueue(&ep->queue, msg);
 	return 0;
 }
 
@@ -101,6 +89,5 @@ void usb_buf_init(void)
 	for (i = 0; i < ARRAY_SIZE(usb_buffered_ep); i++) {
 		struct usb_buffered_ep *ep = &usb_buffered_ep[i];
 		INIT_LLIST_HEAD(&ep->queue);
-		ep->ep = i;
 	}
 }

firmware/libosmocore/include/osmocom/core/msgb.h

@@ -80,49 +80,6 @@ extern int msgb_resize_area(struct msgb *msg, uint8_t *area,
 extern struct msgb *msgb_copy(const struct msgb *msg, const char *name);
 static int msgb_test_invariant(const struct msgb *msg) __attribute__((pure));
 
-/*! Free all msgbs from a queue built with msgb_enqueue().
- * \param[in] queue  list head of a msgb queue.
- */
-static inline void msgb_queue_free(struct llist_head *queue)
-{
-	struct msgb *msg;
-	while ((msg = msgb_dequeue(queue))) msgb_free(msg);
-}
-
-/*! Enqueue message buffer to tail of a queue and increment queue size counter
- * \param[in] queue linked list header of queue
- * \param[in] msg message buffer to be added to the queue
- * \param[in] count pointer to variable holding size of the queue
- *
- * The function will append the specified message buffer \a msg to the queue
- * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count,
- * then increment \a count
- */
-static inline void msgb_enqueue_count(struct llist_head *queue, struct msgb *msg,
-					unsigned int *count)
-{
-	msgb_enqueue(queue, msg);
-	(*count)++;
-}
-
-/*! Dequeue message buffer from head of queue and decrement queue size counter
- * \param[in] queue linked list header of queue
- * \param[in] count pointer to variable holding size of the queue
- * \returns message buffer (if any) or NULL if queue empty
- *
- * The function will remove the first message buffer from the queue
- * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count,
- * and decrement \a count, all if queue is not empty.
- */
-static inline struct msgb *msgb_dequeue_count(struct llist_head *queue,
-						unsigned int *count)
-{
-	struct msgb *msg = msgb_dequeue(queue);
-	if (msg)
-		(*count)--;
-	return msg;
-}
-
 #ifdef MSGB_DEBUG
 #include <osmocom/core/panic.h>
 #define MSGB_ABORT(msg, fmt, args ...) do {		\

firmware/test/Makefile

@@ -11,12 +11,12 @@ CFLAGS=-g -Wall $(LIBOSMOCORE_CFLAGS) \
 	-I../libboard/common/include \
 	-I../libboard/simtrace/include \
 	-I.
-LIBS=$(LIBOSMOCORE_LIBS)
+LDFLAGS=$(LIBOSMOCORE_LIBS)
 
 VPATH=../src_simtrace ../libcommon/source
 
 card_emu_test:	card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^
 
 %.hobj: %.c
 	$(CC) $(CFLAGS) -o $@ -c $^

firmware/test/card_emu_tests.c

@@ -13,9 +13,7 @@
 #define PHONE_INT	2
 #define PHONE_DATAOUT	3
 
-/***********************************************************************
- * stub functions required by card_emu.c
- ***********************************************************************/
+/* stub functions required by card_emu.c */
 
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan)
 {
@@ -32,7 +30,6 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
 static uint8_t tx_debug_buf[1024];
 static unsigned int tx_debug_buf_idx;
 
-/* the card emulator wants to send some data to the host [reader] */
 int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 {
 	printf("UART_TX(%02x)\n", byte);
@@ -40,6 +37,13 @@ int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte)
 	return 1;
 }
 
+static void reader_check_and_clear(const uint8_t *data, unsigned int len)
+{
+	assert(len == tx_debug_buf_idx);
+	assert(!memcmp(tx_debug_buf, data, len));
+	tx_debug_buf_idx = 0;
+}
+
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 {
 	char *rts;
@@ -91,21 +95,7 @@ void tc_etu_disable(uint8_t chan_nr)
 	printf("tc_etu_disable(tc_chan=%u)\n", chan_nr);
 }
 
-
-
-/***********************************************************************
- * test helper functions
- ***********************************************************************/
-
-
-static void reader_check_and_clear(const uint8_t *data, unsigned int len)
-{
-	assert(len == tx_debug_buf_idx);
-	assert(!memcmp(tx_debug_buf, data, len));
-	tx_debug_buf_idx = 0;
-}
-
-static const uint8_t atr[] = { 0x3b, 0x02, 0x14, 0x50 };
+const uint8_t atr[] = { 0x3b, 0x02, 0x14, 0x50 };
 
 static int verify_atr(struct card_handle *ch)
 {
@@ -140,7 +130,6 @@ static void io_start_card(struct card_handle *ch)
 	verify_atr(ch);
 }
 
-/* emulate the host/reader sending some bytes to the [emulated] card */
 static void reader_send_bytes(struct card_handle *ch, const uint8_t *bytes, unsigned int len)
 {
 	unsigned int i;
@@ -177,14 +166,14 @@ static void dump_rctx(struct msgb *msg)
 
 static void get_and_verify_rctx(uint8_t ep, const uint8_t *data, unsigned int len)
 {
-	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
+	struct llist_head *queue = usb_get_queue(ep);
 	struct msgb *msg;
 	struct cardemu_usb_msg_tx_data *td;
 	struct cardemu_usb_msg_rx_data *rd;
 	struct simtrace_msg_hdr *mh;
 
-	assert(bep);
-	msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
+	assert(queue);
+	msg = msgb_dequeue(queue);
 	assert(msg);
 	dump_rctx(msg);
 	assert(msg->l1h);
@@ -214,13 +203,13 @@ static void get_and_verify_rctx(uint8_t ep, const uint8_t *data, unsigned int le
 
 static void get_and_verify_rctx_pps(const uint8_t *data, unsigned int len)
 {
-	struct usb_buffered_ep *bep = usb_get_buf_ep(PHONE_DATAIN);
+	struct llist_head *queue = usb_get_queue(PHONE_DATAIN);
 	struct msgb *msg;
 	struct simtrace_msg_hdr *mh;
 	struct cardemu_usb_msg_pts_info *ptsi;
 
-	assert(bep);
-	msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
+	assert(queue);
+	msg = msgb_dequeue(queue);
 	assert(msg);
 	dump_rctx(msg);
 	assert(msg->l1h);
@@ -408,7 +397,7 @@ int main(int argc, char **argv)
 	struct card_handle *ch;
 	unsigned int i;
 
-	ch = card_emu_init(0, 23, 42, PHONE_DATAIN, PHONE_INT, false, true, false);
+	ch = card_emu_init(0, 23, 42, PHONE_DATAIN, PHONE_INT);
 	assert(ch);
 
 	usb_buf_init();

host/.gitignore

@@ -1,38 +0,0 @@
-.o
-*.a
-*.lo
-*.la
-.deps
-Makefile
-Makefile.in
-
-#configure
-aclocal.m4
-autom4te.cache/
-compile
-config.guess
-config.log
-config.status
-config.sub
-configure
-configure.lineno
-depcomp
-install-sh
-missing
-stamp-h1
-m4
-
-#libtool
-ltmain.sh
-libtool
-.libs
-
-.tarball-version
-.version
-
-*.pc
-
-simtrace2-list
-simtrace2-sniff
-simtrace2-remsim
-simtrace2-remsim-usb2udp

host/COPYING

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

host/Makefile

@@ -5,7 +5,7 @@ APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
 
 all: $(APPS)
 
-simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o simtrace2_api.o libusb_util.o
+simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o
 	$(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite`
 
 simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o

host/Makefile.am

@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include lib src contrib #tests examples doc
-
-EXTRA_DIST = .version git-version-gen
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmo-simtrace2.pc
-
-@RELMAKE@
-
-BUILT_SOURCES = $(top_srcdir)/.version
-$(top_srcdir)/.version:
-	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
-	echo $(VERSION) > $(distdir)/.tarball-version

host/apdu_dispatch.c

@@ -1,6 +1,6 @@
 /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU
  *
- * (C) 2016-2019 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016 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
@@ -24,25 +24,24 @@
 #include <errno.h>
 
 #include <osmocom/core/utils.h>
-#include <osmocom/core/logging.h>
 #include <osmocom/sim/sim.h>
 #include <osmocom/sim/class_tables.h>
 
-#include <osmocom/simtrace2/apdu_dispatch.h>
+#include "apdu_dispatch.h"
 
 /*! \brief Has the command-data phase been completed yet? */
-static inline bool is_dc_complete(struct osmo_apdu_context *ac)
+static inline bool is_dc_complete(struct apdu_context *ac)
 {
 	return (ac->lc.tot == ac->lc.cur);
 }
 
 /*! \brief Has the expected-data phase been completed yet? */
-static inline bool is_de_complete(struct osmo_apdu_context *ac)
+static inline bool is_de_complete(struct apdu_context *ac)
 {
 	return (ac->le.tot == ac->le.cur);
 }
 
-static const char *stringify_apdu_hdr(const struct osim_apdu_cmd_hdr *h)
+static const char *dump_apdu_hdr(const struct osim_apdu_cmd_hdr *h)
 {
 	static char buf[256];
 	sprintf(buf, "CLA=%02x INS=%02x P1=%02x P2=%02x P3=%02x",
@@ -51,19 +50,12 @@ static const char *stringify_apdu_hdr(const struct osim_apdu_cmd_hdr *h)
 	return buf;
 }
 
-/*! generate string representation of APDU context in specified output buffer.
- *  \param[in] buf output string buffer provided by caller
- *  \param[in] buf_len size of buf in bytes
- *  \param[in] ac APDU context to dump in buffer
- *  \returns pointer to buf on success */
-const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len,
-				       const struct osmo_apdu_context *ac)
+static void dump_apdu_ctx(const struct apdu_context *ac)
 {
-	snprintf(buf, buf_len, "%s; case=%d, lc=%d(%d), le=%d(%d)\n",
-		 stringify_apdu_hdr(&ac->hdr), ac->apdu_case,
-		 ac->lc.tot, ac->lc.cur,
-		 ac->le.tot, ac->le.cur);
-	return buf;
+	printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n",
+		dump_apdu_hdr(&ac->hdr), ac->apdu_case,
+		ac->lc.tot, ac->lc.cur,
+		ac->le.tot, ac->le.cur);
 }
 
 /*! \brief input function for APDU segmentation
@@ -79,8 +71,8 @@ const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len,
  *  The function retunrs APDU_ACT_RX_MORE_CAPDU_FROM_READER when there
  *  is more data to be received from the card reader (GSM Phone).
  */
-int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,
-			 unsigned int apdu_len, bool new_apdu)
+int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf,
+		    unsigned int apdu_len, bool new_apdu)
 {
 	int rc = 0;
 
@@ -113,7 +105,7 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,
 			break;
 		case 0:
 		default:
-			LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case);
+			fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case);
 			return -1;
 		}
 	} else {
@@ -132,8 +124,8 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,
 			ac->lc.cur += cpy_len;
 			break;
 		default:
-			LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case);
-			return -1;
+			fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case);
+			break;
 		}
 	}
 
@@ -171,9 +163,11 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,
 		break;
 	case 0:
 	default:
-		LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case);
-		return -1;
+		fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case);
+		break;
 	}
 
+	dump_apdu_ctx(ac);
+
 	return rc;
 }

host/apdu_dispatch.h

@@ -1,6 +1,6 @@
 /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU
  *
- * (C) 2016-2019 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016 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
@@ -23,7 +23,7 @@
 
 #include <osmocom/sim/sim.h>
 
-struct osmo_apdu_context {
+struct apdu_context {
 	struct osim_apdu_cmd_hdr hdr;
 	uint8_t dc[256];
 	uint8_t de[256];
@@ -39,13 +39,11 @@ struct osmo_apdu_context {
 	} le;
 };
 
-enum osmo_apdu_action {
+enum apdu_action {
 	APDU_ACT_TX_CAPDU_TO_CARD		= 0x0001,
 	APDU_ACT_RX_MORE_CAPDU_FROM_READER	= 0x0002,
 };
 
-const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len,
-					const struct osmo_apdu_context *ac);
 
-int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,
-			 unsigned int apdu_len, bool new_apdu);
+int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf,
+		    unsigned int apdu_len, bool new_apdu);

host/configure.ac

@@ -1,103 +0,0 @@
-AC_INIT([simtrace2],
-	m4_esyscmd([./git-version-gen .tarball-version]),
-	[simtrace@lists.osmocom.org])
-
-dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
-AC_CONFIG_AUX_DIR([.])
-
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects])
-AC_CONFIG_TESTDIR(tests)
-
-dnl kernel style compile messages
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl include release helper
-RELMAKE='-include osmo-release.mk'
-AC_SUBST([RELMAKE])
-
-dnl checks for programs
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_PROG_INSTALL
-LT_INIT([pic-only])
-
-dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
-AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
-if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
-        AC_MSG_WARN([You need to install pkg-config])
-fi
-PKG_PROG_PKG_CONFIG([0.20])
-
-AC_CONFIG_MACRO_DIR([m4])
-
-CFLAGS="$CFLAGS -Wall"
-CPPFLAGS="$CPPFLAGS -Wall"
-
-AC_ARG_ENABLE(sanitize,
-	[AS_HELP_STRING(
-		[--enable-sanitize],
-		[Compile with address sanitizer enabled],
-	)],
-	[sanitize=$enableval], [sanitize="no"])
-if test x"$sanitize" = x"yes"
-then
-	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
-	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
-fi
-
-# The following test is taken from WebKit's webkit.m4
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fvisibility=hidden "
-AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
-      [ AC_MSG_RESULT([yes])
-        SYMBOL_VISIBILITY="-fvisibility=hidden"],
-        AC_MSG_RESULT([no]))
-CFLAGS="$saved_CFLAGS"
-AC_SUBST(SYMBOL_VISIBILITY)
-
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 0.0.0)
-PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
-
-AC_ARG_ENABLE(sanitize,
-	[AS_HELP_STRING(
-		[--enable-sanitize],
-		[Compile with address sanitizer enabled],
-	)],
-	[sanitize=$enableval], [sanitize="no"])
-if test x"$sanitize" = x"yes"
-then
-	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
-	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
-fi
-
-AC_ARG_ENABLE(werror,
-	[AS_HELP_STRING(
-		[--enable-werror],
-		[Turn all compiler warnings into errors, with exceptions:
-		 a) deprecation (allow upstream to mark deprecation without breaking builds);
-		 b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds)
-		]
-	)],
-	[werror=$enableval], [werror="no"])
-if test x"$werror" = x"yes"
-then
-	WERROR_FLAGS="-Werror"
-	WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations"
-	WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
-	CFLAGS="$CFLAGS $WERROR_FLAGS"
-	CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
-fi
-
-AC_MSG_RESULT([CFLAGS="$CFLAGS"])
-AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
-
-AC_OUTPUT(
-	libosmo-simtrace2.pc
-	include/Makefile
-	src/Makefile
-	lib/Makefile
-	contrib/Makefile
-	Makefile)

host/contrib/Makefile.am

@@ -1 +0,0 @@
-EXTRA_DIST = 99-simtrace2.rules

host/git-version-gen

@@ -1,151 +0,0 @@
-#!/bin/sh
-# Print a version string.
-scriptversion=2010-01-28.01
-
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
-#
-# 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 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
-# It may be run two ways:
-# - from a git repository in which the "git describe" command below
-#   produces useful output (thus requiring at least one signed tag)
-# - from a non-git-repo directory containing a .tarball-version file, which
-#   presumes this script is invoked like "./git-version-gen .tarball-version".
-
-# In order to use intra-version strings in your project, you will need two
-# separate generated version string files:
-#
-# .tarball-version - present only in a distribution tarball, and not in
-#   a checked-out repository.  Created with contents that were learned at
-#   the last time autoconf was run, and used by git-version-gen.  Must not
-#   be present in either $(srcdir) or $(builddir) for git-version-gen to
-#   give accurate answers during normal development with a checked out tree,
-#   but must be present in a tarball when there is no version control system.
-#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
-#   hooks to force a reconfigure at distribution time to get the value
-#   correct, without penalizing normal development with extra reconfigures.
-#
-# .version - present in a checked-out repository and in a distribution
-#   tarball.  Usable in dependencies, particularly for files that don't
-#   want to depend on config.h but do want to track version changes.
-#   Delete this file prior to any autoconf run where you want to rebuild
-#   files to pick up a version string change; and leave it stale to
-#   minimize rebuild time after unrelated changes to configure sources.
-#
-# It is probably wise to add these two files to .gitignore, so that you
-# don't accidentally commit either generated file.
-#
-# Use the following line in your configure.ac, so that $(VERSION) will
-# automatically be up-to-date each time configure is run (and note that
-# since configure.ac no longer includes a version string, Makefile rules
-# should not depend on configure.ac for version updates).
-#
-# AC_INIT([GNU project],
-#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-#         [bug-project@example])
-#
-# Then use the following lines in your Makefile.am, so that .version
-# will be present for dependencies, and so that .tarball-version will
-# exist in distribution tarballs.
-#
-# BUILT_SOURCES = $(top_srcdir)/.version
-# $(top_srcdir)/.version:
-#	echo $(VERSION) > $@-t && mv $@-t $@
-# dist-hook:
-#	echo $(VERSION) > $(distdir)/.tarball-version
-
-case $# in
-    1) ;;
-    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
-esac
-
-tarball_version_file=$1
-nl='
-'
-
-# First see if there is a tarball-only version file.
-# then try "git describe", then default.
-if test -f $tarball_version_file
-then
-    v=`cat $tarball_version_file` || exit 1
-    case $v in
-	*$nl*) v= ;; # reject multi-line output
-	[0-9]*) ;;
-	*) v= ;;
-    esac
-    test -z "$v" \
-	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
-fi
-
-if test -n "$v"
-then
-    : # use $v
-elif
-       v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
-	  || git describe --abbrev=4 HEAD 2>/dev/null` \
-    && case $v in
-	 [0-9]*) ;;
-	 v[0-9]*) ;;
-	 *) (exit 1) ;;
-       esac
-then
-    # Is this a new git that lists number of commits since the last
-    # tag or the previous older version that did not?
-    #   Newer: v6.10-77-g0f8faeb
-    #   Older: v6.10-g0f8faeb
-    case $v in
-	*-*-*) : git describe is okay three part flavor ;;
-	*-*)
-	    : git describe is older two part flavor
-	    # Recreate the number of commits and rewrite such that the
-	    # result is the same as if we were using the newer version
-	    # of git describe.
-	    vtag=`echo "$v" | sed 's/-.*//'`
-	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
-	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
-	    ;;
-    esac
-
-    # Change the first '-' to a '.', so version-comparing tools work properly.
-    # Remove the "g" in git describe's output string, to save a byte.
-    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
-else
-    v=UNKNOWN
-fi
-
-v=`echo "$v" |sed 's/^v//'`
-
-# Don't declare a version "dirty" merely because a time stamp has changed.
-git status > /dev/null 2>&1
-
-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-case "$dirty" in
-    '') ;;
-    *) # Append the suffix only if there isn't one already.
-	case $v in
-	  *-dirty) ;;
-	  *) v="$v-dirty" ;;
-	esac ;;
-esac
-
-# Omit the trailing newline, so that m4_esyscmd can use the result directly.
-echo "$v" | tr -d '\012'
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

host/include/Makefile.am

@@ -1,8 +0,0 @@
-nobase_include_HEADERS = \
-		osmocom/simtrace2/apdu_dispatch.h \
-		osmocom/simtrace2/simtrace2_api.h \
-		osmocom/simtrace2/simtrace_usb.h \
-		osmocom/simtrace2/simtrace_prot.h \
-		osmocom/simtrace2/usb_util.h \
-		osmocom/simtrace2/gsmtap.h \
-		$(NULL)

host/include/osmocom/simtrace2/gsmtap.h

@@ -1,6 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <osmocom/core/gsmtap.h>
-
-int osmo_st2_gsmtap_init(const char *gsmtap_host);
-int osmo_st2_gsmtap_send_apdu(uint8_t sub_type, const uint8_t *apdu, unsigned int len);

host/include/osmocom/simtrace2/simtrace2_api.h

@@ -1,63 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <osmocom/sim/sim.h>
-
-/* transport to a SIMtrace device */
-struct osmo_st2_transport {
-	/* USB */
-	struct libusb_device_handle *usb_devh;
-	struct {
-		uint8_t in;
-		uint8_t out;
-		uint8_t irq_in;
-	} usb_ep;
-
-	/* UDP */
-	int udp_fd;
-};
-
-/* a SIMtrace slot; communicates over a transport */
-struct osmo_st2_slot {
-	/* transport through which the slot can be reached */
-	struct osmo_st2_transport *transp;
-	/* number of the slot within the transport */
-	uint8_t slot_nr;
-};
-
-/* One istance of card emulation */
-struct osmo_st2_cardem_inst {
-	/* slot on which this card emulation instance runs */
-	struct osmo_st2_slot *slot;
-	/* libosmosim SIM card profile */
-	const struct osim_cla_ins_card_profile *card_prof;
-	/* libosmosim SIM card channel */
-	struct osim_chan_hdl *chan;
-	/* path of the underlying USB device */
-	char *usb_path;
-	/* opaque data TBD by user */
-	void *priv;
-};
-
-int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg);
-
-int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
-                         uint8_t msg_class, uint8_t msg_type);
-
-
-int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted);
-int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le);
-int osmo_st2_cardem_request_pb_and_tx(struct osmo_st2_cardem_inst *ci, uint8_t pb,
-				      const uint8_t *data, uint16_t data_len_in);
-int osmo_st2_cardem_request_sw_tx(struct osmo_st2_cardem_inst *ci, const uint8_t *sw);
-int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8_t *atr,
-				    unsigned int atr_len);
-int osmo_st2_cardem_request_config(struct osmo_st2_cardem_inst *ci, uint32_t features);
-
-
-int osmo_st2_modem_reset_pulse(struct osmo_st2_slot *slot, uint16_t duration_ms);
-int osmo_st2_modem_reset_active(struct osmo_st2_slot *slot);
-int osmo_st2_modem_reset_inactive(struct osmo_st2_slot *slot);
-int osmo_st2_modem_sim_select_local(struct osmo_st2_slot *slot);
-int osmo_st2_modem_sim_select_remote(struct osmo_st2_slot *slot);
-int osmo_st2_modem_get_status(struct osmo_st2_slot *slot);

host/include/osmocom/simtrace2/simtrace_prot.h

@@ -1 +0,0 @@
-../../../../firmware/libcommon/include/simtrace_prot.h

host/include/osmocom/simtrace2/simtrace_usb.h

@@ -1 +0,0 @@
-../../../../firmware/libcommon/include/simtrace_usb.h

host/include/osmocom/simtrace2/usb_util.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <osmocom/usb/libusb.h>
-
-extern const struct dev_id osmo_st2_compatible_dev_ids[];