host/lib/gsmtap.c: Add GPLv2 disclaimer

Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2
host: Add COPYING file for host software (GPLv2)
2026-03-24 09:18:33 +03:00 · 2020-01-17 10:59:41 +01:00 · 2020-01-17 10:59:32 +01:00
58 changed files with 859 additions and 1072 deletions
--- a/contrib/flash.py
+++ b/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")
--- a/contrib/jenkins.sh
+++ b/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"

@@ -63,8 +60,6 @@ make dist
 #	make -C "$base/doc/manuals" publish
 #fi

-rm -rf $TOPDIR/firmware/bin/simtrace-cardem*
-
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -41,7 +41,7 @@ APP ?= dfu

 # Defines which are the available memory targets for the SAM3S-EK board.
 ifeq ($(APP), dfu)
-MEMORIES ?= flash dfu
+MEMORIES ?= flash
 else
 MEMORIES ?= dfu
 endif
@@ -99,8 +99,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
+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))
@@ -171,7 +170,7 @@ CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
 ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--print-memory-usage $(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
--- a/firmware/apps/cardem/main.c
+++ b/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
@@ -155,7 +154,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");
@@ -176,7 +202,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();
 	}
@@ -220,7 +247,6 @@ extern int main(void)
 			}
 			last_simtrace_config = simtrace_config;
 		} else {
-			//FIXME: usb_proces() for every interface in this configuration?
 			if (config_func_ptrs[simtrace_config].run) {
 				config_func_ptrs[simtrace_config].run();
 			}
--- a/firmware/apps/dfu/main.c
+++ b/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;
--- a/firmware/apps/dfu/usb_strings.txt
+++ b/firmware/apps/dfu/usb_strings.txt
@@ -3,4 +3,3 @@ PRODUCT_STRING
 DFU (Device Firmware Upgrade)
 RAM
 Flash (Application Partition)
-Flash (Bootloader Partition)
--- a/firmware/apps/trace/main.c
+++ b/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");
--- a/firmware/apps/triple_play/main.c
+++ b/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");
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
+++ b/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;
@@ -1672,10 +1662,6 @@ uint8_t USBD_HAL_Halt(uint8_t bEndpoint, uint8_t ctl)
            UDP->UDP_RST_EP |= 1 << bEndpoint;
            UDP->UDP_RST_EP &= ~(1 << bEndpoint);
        }
-
-        /* This fixes a weird bug with regard to ping-pong OUT endpoints */
-        UDP->UDP_RST_EP |= 1 << bEndpoint;
-        UDP->UDP_RST_EP &= ~(1 << bEndpoint);
    }

    /* Return Halt status */
@@ -1706,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();
 }

 /**
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
+++ b/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 )
    {
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
+++ b/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 ) ;
 }


--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/unique_id.c
+++ b/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();
 }
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
@@ -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
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c
@@ -19,10 +19,9 @@ enum {
 	STR_MANUF	= 1,
 	STR_PROD,
 	STR_CONFIG,
-	// strings for the first alternate interface (e.g. DFU)
 	_STR_FIRST_ALT,
 	// serial string
-	STR_SERIAL	= (_STR_FIRST_ALT + BOARD_DFU_NUM_IF),
+	STR_SERIAL	= (_STR_FIRST_ALT+BOARD_DFU_NUM_IF),
 	// version string (on additional interface)
 	VERSION_CONF_STR,
 	VERSION_STR,
@@ -30,25 +29,6 @@ enum {
 	STRING_DESC_CNT,
 };

-/* string used to replace one of both DFU flash partition atlsettings */
-static const unsigned char usb_string_notavailable[] = {
-	USBStringDescriptor_LENGTH(13),
-	USBGenericDescriptor_STRING,
-	USBStringDescriptor_UNICODE('n'),
-	USBStringDescriptor_UNICODE('o'),
-	USBStringDescriptor_UNICODE('t'),
-	USBStringDescriptor_UNICODE(' '),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('v'),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('i'),
-	USBStringDescriptor_UNICODE('l'),
-	USBStringDescriptor_UNICODE('a'),
-	USBStringDescriptor_UNICODE('b'),
-	USBStringDescriptor_UNICODE('l'),
-	USBStringDescriptor_UNICODE('e'),
-};
-
 /* USB string for the serial (using 128-bit device ID) */
 static unsigned char usb_string_serial[] = {
 	USBStringDescriptor_LENGTH(32),
@@ -141,7 +121,7 @@ static const USBDeviceDescriptor fsDevice = {
 		.bNumEndpoints =	0,					\
 		.bInterfaceClass =	0xfe,					\
 		.bInterfaceSubClass =	1,					\
-		.iInterface =		(_STR_FIRST_ALT + ALT),			\
+		.iInterface =		(_STR_FIRST_ALT+ALT),			\
 		.bInterfaceProtocol =	2,					\
 	}

@@ -200,11 +180,6 @@ void set_usb_serial_str(void)
 	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;
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c
+++ b/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);
 }
@@ -463,20 +461,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();
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
+++ b/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);
 }
--- a/firmware/atmel_softpack_libraries/usb/include/USBD.h
+++ b/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);
--- a/firmware/libboard/common/include/board_common.h
+++ b/firmware/libboard/common/include/board_common.h
@@ -112,13 +112,10 @@
 #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);
--- a/firmware/libboard/common/resources/sam3s4/dfu.ld
+++ b/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);
--- a/firmware/libboard/common/resources/sam3s4/flash.ld
+++ b/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 */ 
--- a/firmware/libboard/common/source/board_cstartup_gnu.c
+++ b/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();
--- a/firmware/libboard/qmod/source/board_qmod.c
+++ b/firmware/libboard/qmod/source/board_qmod.c
@@ -194,7 +194,7 @@ void board_exec_dbg_cmd(int ch)
 	   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 */
+#endif

 	switch (ch) {
 	case '?':
@@ -205,17 +205,13 @@ 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");
@@ -224,13 +220,10 @@ void board_exec_dbg_cmd(int ch)
 		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 */
+#endif
 		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");
@@ -278,7 +271,7 @@ void board_exec_dbg_cmd(int ch)
 			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
 		}
 		break;
-#endif /* ALLOW_PEER_ERASE */
+#endif
 	case '1':
 		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
@@ -293,9 +286,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);
@@ -309,7 +299,7 @@ void board_exec_dbg_cmd(int ch)
 	if ('a' != ch) {
 		allow_erase = false;
 	}
-#endif /* ALLOW_PEER_ERASE */
+#endif
 }

 void board_main_top(void)
--- a/firmware/libcommon/include/card_emu.h
+++ b/firmware/libcommon/include/card_emu.h
@@ -56,7 +56,7 @@ 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);

 #define ENABLE_TX	0x01
 #define ENABLE_RX	0x02
@@ -66,7 +66,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);
--- a/firmware/libcommon/include/main_common.h
+++ b/firmware/libcommon/include/main_common.h
@@ -1,3 +0,0 @@
-#pragma once
-
-void print_banner(void);
--- a/firmware/libcommon/include/ringbuffer.h
+++ b/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];
--- a/firmware/libcommon/include/simtrace_prot.h
+++ b/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 */
@@ -256,15 +254,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
 ***********************************************************************/
--- a/firmware/libcommon/include/simtrace_usb.h
+++ b/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
--- a/firmware/libcommon/include/talloc.h
+++ b/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);
--- a/firmware/libcommon/include/usb_buf.h
+++ b/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);
@@ -42,15 +40,5 @@ int usb_drain_queue(uint8_t ep);
 void usb_buf_init(void);
 struct usb_buffered_ep *usb_get_buf_ep(uint8_t ep);

-struct usb_if {
-	uint8_t if_num;		/* interface number */
-	uint8_t ep_out;		/* OUT endpoint (0 if none) */
-	uint8_t ep_in;		/* IN endpint (0 if none) */
-	uint8_t ep_int;		/* INT endpoint (0 if none) */
-	void *data;		/* opaque data, passed through */
-	struct {
-		/* call-back to be called for inclming messages on OUT EP */
-		void (*rx_out)(struct msgb *msg, const struct usb_if *usb_if);
-	} ops;
-};
-void usb_process(const struct usb_if *usb_if);
+int usb_refill_to_host(uint8_t ep);
+int usb_refill_from_host(uint8_t ep);
--- a/firmware/libcommon/source/card_emu.c
+++ b/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 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
@@ -37,9 +37,6 @@

 #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 */
@@ -58,15 +55,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,
+	},
 };


@@ -86,22 +110,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
@@ -123,15 +131,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 */
@@ -144,9 +179,6 @@ 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 */
@@ -201,27 +233,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;
-
-	tc_etu_disable(ch->tc_chan);
-
-	/* 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;
@@ -249,18 +260,18 @@ struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 	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) {
+			struct llist_head *queue = usb_get_queue(ep);
+			if (!queue) {
 				TRACE_ERROR("ep %u: %s queue does not exist\n\r",
 				            ep, __func__);
 				return NULL;
 			}
-			if (llist_empty(&bep->queue)) {
+			if (llist_empty(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);
+			msg = msgb_dequeue(queue);
 			if (!msg) {
 				TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
 				            ep, __func__);
@@ -392,6 +403,13 @@ static void card_set_state(struct card_handle *ch,
 	case ISO_S_WAIT_RST:
 		/* disable Rx and Tx of UART */
 		card_emu_uart_enable(ch->uart_chan, 0);
+		/* check end activation state (only necessary if the reader to not respect the activation sequence) */
+		if (ch->vcc_active && ch->clocked && !ch->in_reset) {
+			/* enable the TC/ETU counter once reset has been released */
+			tc_etu_enable(ch->tc_chan);
+			/* prepare to send the ATR */
+			card_set_state(ch, ISO_S_WAIT_ATR);
+		}
 		break;
 	case ISO_S_WAIT_ATR:
 		/* Reset to initial Fi / Di ratio */
@@ -403,7 +421,7 @@ static void card_set_state(struct card_handle *ch,
 		 * 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 */
+		/* ensure the TC_ETU timer is enabled */
 		tc_etu_enable(ch->tc_chan);
 		break;
 	case ISO_S_IN_ATR:
@@ -492,6 +510,8 @@ static int tx_byte_atr(struct card_handle *ch)
 		/* update waiting time (see ISO 7816-3 10.2) */
 		ch->waiting_time = ch->wi * 960 * ch->fi;
 		tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);
+		/* reset PTS to initial state */
+		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 		/* go to next state */
 		card_set_state(ch, ISO_S_WAIT_TPDU);
 		return 0;
@@ -508,9 +528,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;
 }

@@ -590,8 +609,8 @@ process_byte_pts(struct card_handle *ch, uint8_t byte)
 		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 */
@@ -641,8 +660,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;
 	}

@@ -658,6 +677,7 @@ static int tx_byte_pts(struct card_handle *ch)
 		emu_update_fidi(ch);
 		/* Wait for the next TPDU */
 		card_set_state(ch, ISO_S_WAIT_TPDU);
+		set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
 		break;
 	default:
 		/* calculate the next state and set it */
@@ -847,8 +867,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 */
@@ -935,8 +955,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;
@@ -949,8 +967,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;
 	}

@@ -1003,16 +1021,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;

@@ -1033,38 +1048,18 @@ 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);
+			tc_etu_disable(ch->tc_chan);
 			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;
@@ -1073,10 +1068,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;
@@ -1089,34 +1082,13 @@ 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;
+			tc_etu_disable(ch->tc_chan);
 		}
 		ch->in_reset = active;
 		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 */
@@ -1184,18 +1156,6 @@ 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 *ch;
@@ -1229,7 +1189,8 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
 	ch->atr.len = sizeof(default_atr);
 	memcpy(ch->atr.atr, default_atr, ch->atr.len);

-	card_handle_reset(ch);
+	ch->pts.state = PTS_S_WAIT_REQ_PTSS;
+	ch->tpdu.state = TPDU_S_WAIT_CLA;

 	tc_etu_init(ch->tc_chan, ch);

--- a/firmware/libcommon/source/cciddriver.c
+++ b/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 {

--- a/firmware/libcommon/source/host_communication.c
+++ b/firmware/libcommon/source/host_communication.c
@@ -27,37 +27,28 @@
 * 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 */
-static int usb_refill_to_host(uint8_t ep)
+int usb_refill_to_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
@@ -84,44 +75,44 @@ static 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,8 +120,7 @@ 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 */
-static int usb_refill_from_host(uint8_t ep)
+int usb_refill_from_host(uint8_t ep)
 {
 	struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 	struct msgb *msg;
@@ -160,7 +150,7 @@ static 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 @@ static 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++;
 	}
@@ -198,45 +187,3 @@ int usb_drain_queue(uint8_t ep)

 	return ret;
 }
-
-
-
-/* iterate over the queue of incoming USB commands and dispatch/execute
- * them */
-static void process_any_usb_commands(const struct usb_if *usb_if)
-{
-	struct llist_head *queue = usb_get_queue(usb_if->ep_out);
-	struct llist_head *lh;
-	struct msgb *msg;
-	int i;
-
-	/* limit the number of iterations to 10, to ensure we don't get
-	 * stuck here without returning to main loop processing */
-	for (i = 0; i < 10; i++) {
-		/* de-queue the list head in an irq-safe way */
-		lh = llist_head_dequeue_irqsafe(queue);
-		if (!lh)
-			break;
-		msg = llist_entry(lh, struct msgb, list);
-		usb_if->ops.rx_out(msg, usb_if);
-	}
-}
-
-/* perform any action related to USB processing (IRQ/INT/OUT EP refill, handling OUT) */
-void usb_process(const struct usb_if *usb_if)
-{
-	/* first try to send any pending messages on IRQ */
-	if (usb_if->ep_int)
-		usb_refill_to_host(usb_if->ep_int);
-
-	/* then try to send any pending messages on IN */
-	if (usb_if->ep_in)
-		usb_refill_to_host(usb_if->ep_in);
-
-	/* ensure we can handle incoming USB messages from the
-	 * host */
-	if (usb_if->ep_out) {
-		usb_refill_from_host(usb_if->ep_out);
-		process_any_usb_commands(usb_if);
-	}
-}
--- a/firmware/libcommon/source/main_common.c
+++ b/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
-}
--- a/firmware/libcommon/source/mode_cardemu.c
+++ b/firmware/libcommon/source/mode_cardemu.c
@@ -34,8 +34,6 @@

 #define TRACE_ENTRY()	TRACE_DEBUG("%s entering\r\n", __func__)

-static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if);
-
 #ifdef PINS_CARDSIM
 static const Pin pins_cardsim[] = PINS_CARDSIM;
 #endif
@@ -58,15 +56,12 @@ struct cardem_inst {
 	struct ringbuf rb;
 	struct Usart_info usart_info;
 	int usb_pending_old;
-	struct usb_if usb_if;
+	uint8_t ep_out;
+	uint8_t ep_in;
+	uint8_t ep_int;
 	const Pin pin_insert;
-#ifdef DETECT_VCC_BY_ADC
 	uint32_t vcc_uv;
-#endif
-	bool vcc_active;
-	bool vcc_active_last;
-	bool rst_active;
-	bool rst_active_last;
+	uint32_t vcc_uv_last;
 };

 struct cardem_inst cardem_inst[] = {
@@ -77,16 +72,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART1,
 			.state = USART_RCV
 		},
-		.usb_if = {
-			.if_num = 0,
-			.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
-			.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
-			.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
-			.data = &cardem_inst[0],
-			.ops = {
-				.rx_out = dispatch_received_usb_msg,
-			},
-		},
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
 #ifdef PIN_SET_USIM1_PRES
 		.pin_insert = PIN_SET_USIM1_PRES,
 #endif
@@ -99,16 +87,9 @@ struct cardem_inst cardem_inst[] = {
 			.id = ID_USART0,
 			.state = USART_RCV
 		},
-		.usb_if = {
-			.if_num = 1,
-			.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
-			.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
-			.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
-			.data = &cardem_inst[1],
-			.ops = {
-				.rx_out = dispatch_received_usb_msg,
-			},
-		}
+		.ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT,
+		.ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,
+		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
 #ifdef PIN_SET_USIM2_PRES
 		.pin_insert = PIN_SET_USIM2_PRES,
 #endif
@@ -280,7 +261,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)
@@ -332,10 +313,18 @@ static int card_vcc_adc_init(void)

 static void process_vcc_adc(struct cardem_inst *ci)
 {
-	if (ci->vcc_uv >= VCC_UV_THRESH_3V)
-		ci->vcc_active = true;
-	else
-		ci->vcc_active = false;
+	if (ci->vcc_uv >= VCC_UV_THRESH_3V &&
+	    ci->vcc_uv_last < VCC_UV_THRESH_3V) {
+		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) {
+		/* 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;
 }

 void ADC_IrqHandler(void)
@@ -358,54 +347,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;
+	bool active = PIO_Get(&pin_usim1_rst) ? false : true;
+	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;
+	bool active = PIO_Get(&pin_usim1_vcc) ? true : false;
+	card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active);
+	/* FIXME do this for real */
+	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;
+	bool active = PIO_Get(&pin_usim2_rst) ? false : true;
+	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;
+	bool active = PIO_Get(&pin_usim2_vcc) ? true : false;
+	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active);
+	/* FIXME do this for real */
+	card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active);
 }
 #endif /* !DETECT_VCC_BY_ADC */
 #endif /* CARDEMU_SECOND_UART */
@@ -437,18 +416,11 @@ void mode_cardemu_init(void)
 	NVIC_EnableIRQ(USART1_IRQn);
 	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);
 	PIO_EnableIt(&pin_usim1_rst);
-	usim1_rst_irqhandler(&pin_usim1_rst); /* obtain current RST state */
 #ifndef DETECT_VCC_BY_ADC
 	PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler);
 	PIO_EnableIt(&pin_usim1_vcc);
-	usim1_vcc_irqhandler(&pin_usim1_vcc); /* obtain current VCC state */
-#else
-	do {} while (!adc_triggered); /* wait for first ADC reading */
 #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, PIO_Get(&pin_usim1_vcc) ? true : false, PIO_Get(&pin_usim1_rst) ? false : true, PIO_Get(&pin_usim1_vcc) ? true : false);
 	sim_switch_use_physical(0, 1);

 #ifdef CARDEMU_SECOND_UART
@@ -459,18 +431,11 @@ 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, PIO_Get(&pin_usim2_vcc) ? true : false, PIO_Get(&pin_usim2_rst) ? false : true, PIO_Get(&pin_usim2_vcc) ? true : false);
 	sim_switch_use_physical(1, 1);
 #endif /* CARDEMU_SECOND_UART */
 }
@@ -521,7 +486,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;
@@ -541,7 +505,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,
@@ -553,13 +516,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 */
@@ -635,9 +594,8 @@ static void dispatch_usb_command_modem(struct msgb *msg, struct cardem_inst *ci)
 }

 /* handle a single USB command as received from the USB host */
-static void dispatch_usb_command(struct msgb *msg, const struct usb_if *usb_if)
+static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci)
 {
-	struct cardem_inst *ci = usb_if->data;
 	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *) msg->l1h;

 	if (msgb_length(msg) < sizeof(*sh)) {
@@ -666,8 +624,7 @@ static void dispatch_usb_command(struct msgb *msg, const struct usb_if *usb_if)
 	}
 }

-/* handle a single USB transfer as received from the USB host */
-static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if)
+static void dispatch_received_msg(struct msgb *msg, struct cardem_inst *ci)
 {
 	struct msgb *segm;
 	struct simtrace_msg_hdr *mh;
@@ -678,7 +635,7 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	mh = (struct simtrace_msg_hdr *) msg->data;
 	if (mh->msg_len == msgb_length(msg)) {
 		/* fast path: only one message in buffer */
-		dispatch_usb_command(msg, usb_if);
+		dispatch_usb_command(msg, ci);
 		return;
 	}

@@ -687,23 +644,22 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	while (1) {
 		mh = (struct simtrace_msg_hdr *) msg->data;

-		segm = usb_buf_alloc(usb_if->ep_out);
+		segm = usb_buf_alloc(ci->ep_out);
 		if (!segm) {
 			TRACE_ERROR("%u: ENOMEM during msg segmentation\r\n",
-				    usb_if->if_num);
+				    ci->num);
 			break;
 		}

 		if (mh->msg_len > msgb_length(msg)) {
-			TRACE_ERROR("%u: Unexpected large message (%u bytes)\r\n",
-					usb_if->if_num, mh->msg_len);
+			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;
 			memcpy(cur, mh, mh->msg_len);
-			dispatch_usb_command(segm, usb_if);
+			dispatch_usb_command(segm, ci);
 		}
 		/* pull this message */
 		msgb_pull(msg, mh->msg_len);
@@ -715,14 +671,35 @@ static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb
 	usb_buf_free(msg);
 }

+/* iterate over the queue of incoming USB commands and dispatch/execute
+ * them */
+static void process_any_usb_commands(struct llist_head *main_q,
+				     struct cardem_inst *ci)
+{
+	struct llist_head *lh;
+	struct msgb *msg;
+	int i;
+
+	/* limit the number of iterations to 10, to ensure we don't get
+	 * stuck here without returning to main loop processing */
+	for (i = 0; i < 10; i++) {
+		/* de-queue the list head in an irq-safe way */
+		lh = llist_head_dequeue_irqsafe(main_q);
+		if (!lh)
+			break;
+		msg = llist_entry(lh, struct msgb, list);
+		dispatch_received_msg(msg, ci);
+	}
+}
+
 /* main loop function, called repeatedly */
 void mode_cardemu_run(void)
 {
+	struct llist_head *queue;
 	unsigned int i;

 	for (i = 0; i < ARRAY_SIZE(cardem_inst); i++) {
 		struct cardem_inst *ci = &cardem_inst[i];
-		struct usb_if *usb_if = &ci->usb_if;

 		/* drain the ring buffer from UART into card_emu */
 		while (1) {
@@ -737,8 +714,16 @@ 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);

-		usb_process(&ci->usb_if);
+		/* then try to send any pending messages on IN */
+		usb_refill_to_host(ci->ep_in);
+
+		/* ensure we can handle incoming USB messages from the
+		 * host */
+		usb_refill_from_host(ci->ep_out);
+		queue = usb_get_queue(ci->ep_out);
+		process_any_usb_commands(queue, ci);
 	}
 }
--- a/firmware/libcommon/source/pseudo_talloc.c
+++ b/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 */
--- a/firmware/libcommon/source/simtrace_iso7816.c
+++ b/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;
--- a/firmware/libcommon/source/sniffer.c
+++ b/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) {
@@ -974,42 +986,20 @@ static void usb_send_change(uint32_t flags)
 	usb_msg_upd_len_and_submit(usb_msg);
 }

-/* handle incoming message from USB OUT EP */
-static void dispatch_usb_out(struct msgb *msg, const struct usb_if *usb_if)
-{
-	struct simtrace_msg_hdr *sh = (Struct simtrace_msg_hdr *) msg->l1h;
-
-	if (msg_length(msg) < sizeof(*sh)) {
-		usb_buf_free(msg);
-		return;
-	}
-	msg->l2h = msg->l1h + sizeof(*sh);
-
-	switch (sh->msg_class) {
-	case SIMTRACE_MSGC_GENERIC:
-		break;
-	default:
-		break;
-	}
-
-	usb_buf_free(msg);
-}
-
-static const struct usb_if sniffer_usb_if = {
-	.if_num = 0,
-	.ep_in = SIMTRACE_USB_EP_CARD_DATAIN,
-	.ep_int = SIMTRACE_USB_EP_CARD_INT,
-	.ep_out = SIMTRACE_USB_EP_CARD_DATAOUT,
-	.ops = {
-		.rx_out = dispatch_usb_out,
-	}
-};
-
 /* Main (idle/busy) loop of this USB configuration */
 void Sniffer_run(void)
 {
 	/* Handle USB queue */
-	usb_process(&sniffer_usb_if);
+	/* first try to send any pending messages on INT */
+	usb_refill_to_host(SIMTRACE_USB_EP_CARD_INT);
+	/* then try to send any pending messages on IN */
+	usb_refill_to_host(SIMTRACE_USB_EP_CARD_DATAIN);
+	/* ensure we can handle incoming USB messages from the host */
+	/* currently we don't need any incoming data
+	usb_refill_from_host(SIMTRACE_USB_EP_CARD_DATAOUT);
+	struct llist_head *queue = usb_get_queue(SIMTRACE_USB_EP_CARD_DATAOUT);
+	process_any_usb_commands(queue);
+	*/

 	/* WARNING: the signal data and flags are not synchronized. We have to hope 
 	 * the processing is fast enough to not land in the wrong state while data
--- a/firmware/libcommon/source/stdio.c
+++ b/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;
--- a/firmware/libcommon/source/usb_buf.c
+++ b/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;
 	}
 }
--- a/firmware/libosmocore/include/osmocom/core/msgb.h
+++ b/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 {		\
--- a/firmware/test/card_emu_tests.c
+++ b/firmware/test/card_emu_tests.c
@@ -177,14 +177,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 +214,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);
--- a/host/.gitignore
+++ b/host/.gitignore
@@ -20,7 +20,6 @@ depcomp
 install-sh
 missing
 stamp-h1
-m4

 #libtool
 ltmain.sh
@@ -31,8 +30,3 @@ libtool
 .version

 *.pc
-
-simtrace2-list
-simtrace2-sniff
-simtrace2-remsim
-simtrace2-remsim-usb2udp
--- a/host/configure.ac
+++ b/host/configure.ac
@@ -58,7 +58,6 @@ 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,
--- a/host/include/Makefile.am
+++ b/host/include/Makefile.am
@@ -1,8 +1,7 @@
 nobase_include_HEADERS = \
 		osmocom/simtrace2/apdu_dispatch.h \
+		osmocom/simtrace2/libusb_util.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)
+		osmocom/simtrace2/gsmtap.h
--- a/host/include/osmocom/simtrace2/apdu_dispatch.h
+++ b/host/include/osmocom/simtrace2/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
@@ -44,8 +44,6 @@ enum osmo_apdu_action {
 	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);
--- a/host/include/osmocom/simtrace2/libusb_util.h
+++ b/host/include/osmocom/simtrace2/libusb_util.h
@@ -0,0 +1,73 @@
+/* libisb utilities
+ * 
+ * (C) 2010-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
+ * 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.
+ */
+#pragma once
+
+#include <libusb.h>
+
+#define USB_MAX_PATH_LEN 20
+
+struct dev_id {
+	uint16_t vendor_id;
+	uint16_t product_id;
+};
+
+/* Find any USB devices in the system matching the given Vendor and
+ * Product ID */
+libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids);
+
+/* structure describing a single matching interface found */
+struct usb_interface_match {
+	/* libusb device E*/
+	libusb_device *usb_dev;
+	/* Vendor ID of the device running matching interface */
+	uint16_t vendor;
+	/* Product ID of the device running matching interface */
+	uint16_t product;
+	/* USB Bus Address */
+	uint8_t addr;
+	/* physical path */
+	char path[USB_MAX_PATH_LEN];
+	/* configuration of matching interface */
+	uint8_t configuration;
+	/* interface number of matching interface */
+	uint8_t interface;
+	/* altsetting of matching interface */
+	uint8_t altsetting;
+	/* bInterfaceClass of matching interface */
+	uint8_t class;
+	/* bInterfaceSubClass of matching interface */
+	uint8_t sub_class;
+	/* bInterfaceProtocol of matching interface */
+	uint8_t protocol;
+	/* index of string descriptor of matching interface */
+	uint8_t string_idx;
+};
+
+int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol,
+				 struct usb_interface_match *out, unsigned int out_len);
+
+int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids,
+			 int class, int sub_class, int protocol,
+			 struct usb_interface_match *out, unsigned int out_len);
+
+libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
+					       const struct usb_interface_match *ifm);
+
+int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
+		     uint8_t *out, uint8_t *in, uint8_t *irq);
--- a/host/include/osmocom/simtrace2/simtrace2_api.h
+++ b/host/include/osmocom/simtrace2/simtrace2_api.h
@@ -12,8 +12,6 @@ struct osmo_st2_transport {
 		uint8_t out;
 		uint8_t irq_in;
 	} usb_ep;
-	/* use non-blocking / asynchronous libusb I/O */
-	bool usb_async;

 	/* UDP */
 	int udp_fd;
@@ -35,12 +33,10 @@ struct osmo_st2_cardem_inst {
 	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);

@@ -52,7 +48,6 @@ int osmo_st2_cardem_request_pb_and_tx(struct osmo_st2_cardem_inst *ci, uint8_t p
 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);
--- a/host/include/osmocom/simtrace2/usb_util.h
+++ b/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[];
--- a/host/lib/Makefile.am
+++ b/host/lib/Makefile.am
@@ -15,6 +15,5 @@ libosmo_simtrace2_la_LIBADD = $(COMMONLIBS)
 libosmo_simtrace2_la_SOURCES = \
 	apdu_dispatch.c \
 	gsmtap.c \
-	simtrace2_api.c \
-	usb_util.c \
-	$(NULL)
+	libusb_util.c \
+	simtrace2_api.c
--- a/host/lib/apdu_dispatch.c
+++ b/host/lib/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,7 +24,6 @@
 #include <errno.h>

 #include <osmocom/core/utils.h>
-#include <osmocom/core/logging.h>
 #include <osmocom/sim/sim.h>
 #include <osmocom/sim/class_tables.h>

@@ -42,7 +41,7 @@ static inline bool is_de_complete(struct osmo_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 osmo_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
@@ -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;
 }
--- a/host/lib/libusb_util.c
+++ b/host/lib/libusb_util.c
@@ -0,0 +1,338 @@
+/* libusb utilities
+ * 
+ * (C) 2010-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <libusb.h>
+
+#include <osmocom/simtrace2/libusb_util.h>
+
+static char path_buf[USB_MAX_PATH_LEN];
+
+static char *get_path(libusb_device *dev)
+{
+#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102)
+	uint8_t path[8];
+	int r,j;
+	r = libusb_get_port_numbers(dev, path, sizeof(path));
+	if (r > 0) {
+		sprintf(path_buf,"%d-%d",libusb_get_bus_number(dev),path[0]);
+		for (j = 1; j < r; j++){
+			sprintf(path_buf+strlen(path_buf),".%d",path[j]);
+		};
+	}
+	return path_buf;
+#else
+# warning "libusb too old - building without USB path support!"
+	return NULL;
+#endif
+}
+
+static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id)
+{
+	if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id))
+		return 1;
+	return 0;
+}
+
+
+static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids)
+{
+	const struct dev_id *id;
+
+	for (id = ids; id->vendor_id || id->product_id; id++) {
+		if (match_dev_id(desc, id))
+			return 1;
+	}
+	return 0;
+}
+
+libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids)
+{
+	libusb_device **list;
+	libusb_device **out = calloc(256, sizeof(libusb_device *));
+	libusb_device **cur = out;
+	unsigned int i;
+	int rc;
+
+	if (!out)
+		return NULL;
+
+	rc = libusb_get_device_list(NULL, &list);
+	if (rc <= 0) {
+		perror("No USB devices found");
+		free(out);
+		return NULL;
+	}
+
+	for (i = 0; list[i] != NULL; i++) {
+		struct libusb_device_descriptor dev_desc;
+		libusb_device *dev = list[i];
+
+		rc = libusb_get_device_descriptor(dev, &dev_desc);
+		if (rc < 0) {
+			perror("Couldn't get device descriptor\n");
+			libusb_unref_device(dev);
+			continue;
+		}
+
+		if (match_dev_ids(&dev_desc, dev_ids)) {
+			*cur = dev;
+			cur++;
+			/* FIXME: overflow check */
+		} else
+			libusb_unref_device(dev);
+	}
+	if (cur == out) {
+		libusb_free_device_list(list, 1);
+		free(out);
+		return NULL;
+	}
+
+	libusb_free_device_list(list, 0);
+	return out;
+}
+
+int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol,
+				 struct usb_interface_match *out, unsigned int out_len)
+{
+	struct libusb_device_descriptor dev_desc;
+	int rc, i, out_idx = 0;
+	uint8_t addr;
+	char *path;
+
+	rc = libusb_get_device_descriptor(dev, &dev_desc);
+	if (rc < 0) {
+		perror("Couldn't get device descriptor\n");
+		return -EIO;
+	}
+
+	addr = libusb_get_device_address(dev);
+	path = get_path(dev);
+
+	/* iterate over all configurations */
+	for (i = 0; i < dev_desc.bNumConfigurations; i++) {
+		struct libusb_config_descriptor *conf_desc;
+		int j;
+
+		rc = libusb_get_config_descriptor(dev, i, &conf_desc);
+		if (rc < 0) {
+			fprintf(stderr, "Couldn't get config descriptor %u\n", i);
+			continue;
+		}
+		/* iterate over all interfaces */
+		for (j = 0; j < conf_desc->bNumInterfaces; j++) {
+			const struct libusb_interface *intf = &conf_desc->interface[j];
+			int k;
+			/* iterate over all alternate settings */
+			for (k = 0; k < intf->num_altsetting; k++) {
+				const struct libusb_interface_descriptor *if_desc;
+				if_desc = &intf->altsetting[k];
+				if (class >= 0 && if_desc->bInterfaceClass != class)
+					continue;
+				if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class)
+					continue;
+				if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol)
+					continue;
+				/* MATCH! */
+				out[out_idx].usb_dev = dev;
+				out[out_idx].vendor = dev_desc.idVendor;
+				out[out_idx].product = dev_desc.idProduct;
+				out[out_idx].addr = addr;
+				strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1);
+				out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0';
+				out[out_idx].configuration = conf_desc->bConfigurationValue;
+				out[out_idx].interface = if_desc->bInterfaceNumber;
+				out[out_idx].altsetting = if_desc->bAlternateSetting;
+				out[out_idx].class = if_desc->bInterfaceClass;
+				out[out_idx].sub_class = if_desc->bInterfaceSubClass;
+				out[out_idx].protocol = if_desc->bInterfaceProtocol;
+				out[out_idx].string_idx = if_desc->iInterface;
+				out_idx++;
+				if (out_idx >= out_len)
+					return out_idx;
+			}
+		}
+	}
+	return out_idx;
+}
+
+int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids,
+			 int class, int sub_class, int protocol,
+			 struct usb_interface_match *out, unsigned int out_len)
+{
+	struct usb_interface_match *out_cur = out;
+	unsigned int out_len_remain = out_len;
+	libusb_device **list;
+	libusb_device **dev;
+
+	list = find_matching_usb_devs(dev_ids);
+	if (!list)
+		return 0;
+
+	for (dev = list; *dev; dev++) {
+		int rc;
+
+#if 0
+		struct libusb_device_descriptor dev_desc;
+		uint8_t ports[8];
+		uint8_t addr;
+		rc = libusb_get_device_descriptor(*dev, &dev_desc);
+		if (rc < 0) {
+			perror("Cannot get device descriptor");
+			continue;
+		}
+
+		addr = libusb_get_device_address(*dev);
+
+		rc = libusb_get_port_numbers(*dev, ports, sizeof(ports));
+		if (rc < 0) {
+			perror("Cannot get device path");
+			continue;
+		}
+
+		printf("Found USB Device %04x:%04x at address %d\n",
+			dev_desc.idVendor, dev_desc.idProduct, addr);
+#endif
+
+		rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain);
+		if (rc < 0)
+			continue;
+		out_cur += rc;
+		out_len_remain -= rc;
+
+	}
+	return out_len - out_len_remain;
+}
+
+libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
+					       const struct usb_interface_match *ifm)
+{
+	int rc, config;
+	struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } };
+	libusb_device **list;
+	libusb_device **dev;
+	libusb_device_handle *usb_devh = NULL;
+
+	list = find_matching_usb_devs(dev_ids);
+	if (!list) {
+		perror("No USB device with matching VID/PID");
+		return NULL;
+	}
+
+	for (dev = list; *dev; dev++) {
+		int addr;
+		char *path;
+
+		addr = libusb_get_device_address(*dev);
+		path = get_path(*dev);
+		if ((ifm->addr && addr == ifm->addr) ||
+		    (strlen(ifm->path) && !strcmp(path, ifm->path))) {
+			rc = libusb_open(*dev, &usb_devh);
+			if (rc < 0) {
+				fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc));
+				usb_devh = NULL;
+				break;
+			}
+			rc = libusb_get_configuration(usb_devh, &config);
+			if (rc < 0) {
+				fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc));
+				libusb_close(usb_devh);
+				usb_devh = NULL;
+				break;
+			}
+			if (config != ifm->configuration) {
+				rc = libusb_set_configuration(usb_devh, ifm->configuration);
+				if (rc < 0) {
+					fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc));
+					libusb_close(usb_devh);
+					usb_devh = NULL;
+					break;
+				}
+			}
+			rc = libusb_claim_interface(usb_devh, ifm->interface);
+			if (rc < 0) {
+				fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc));
+				libusb_close(usb_devh);
+				usb_devh = NULL;
+				break;
+			}
+			rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting);
+			if (rc < 0) {
+				fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc));
+				libusb_release_interface(usb_devh, ifm->interface);
+				libusb_close(usb_devh);
+				usb_devh = NULL;
+				break;
+			}
+		}
+	}
+
+	/* unref / free list */
+	for (dev = list; *dev; dev++)
+		libusb_unref_device(*dev);
+	free(list);
+
+	return usb_devh;
+}
+
+/*! \brief obtain the endpoint addresses for a given USB interface */
+int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
+		     uint8_t *out, uint8_t *in, uint8_t *irq)
+{
+	libusb_device *dev = libusb_get_device(devh);
+	struct libusb_config_descriptor *cdesc;
+	const struct libusb_interface_descriptor *idesc;
+	const struct libusb_interface *iface;
+	int rc, l;
+
+	rc = libusb_get_active_config_descriptor(dev, &cdesc);
+	if (rc < 0)
+		return rc;
+
+	iface = &cdesc->interface[if_num];
+	/* FIXME: we assume there's no altsetting */
+	idesc = &iface->altsetting[0];
+
+	for (l = 0; l < idesc->bNumEndpoints; l++) {
+		const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l];
+		switch (edesc->bmAttributes & 3) {
+		case LIBUSB_TRANSFER_TYPE_BULK:
+			if (edesc->bEndpointAddress & 0x80) {
+				if (in)
+					*in = edesc->bEndpointAddress;
+			} else {
+				if (out)
+					*out = edesc->bEndpointAddress;
+			}
+			break;
+		case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+			if (irq)
+				*irq = edesc->bEndpointAddress;
+			break;
+		default:
+			break;
+		}
+	}
+	return 0;
+}
--- a/host/lib/simtrace2_api.c
+++ b/host/lib/simtrace2_api.c
@@ -57,60 +57,23 @@ static struct msgb *st_msgb_alloc(void)
 	return msgb_alloc_headroom(1024+32, 32, "SIMtrace");
 }

-
-static void usb_out_xfer_cb(struct libusb_transfer *xfer)
+/*! \brief Transmit a given command to the SIMtrace2 device */
+int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg)
 {
-	struct msgb *msg = xfer->user_data;
+	int rc;

-	switch (xfer->status) {
-	case LIBUSB_TRANSFER_COMPLETED:
-		break;
-	case LIBUSB_TRANSFER_NO_DEVICE:
-		fprintf(stderr, "USB device disappeared\n");
-		exit(1);
-		break;
-	default:
-		fprintf(stderr, "USB OUT transfer failed, status=%u\n", xfer->status);
-		exit(1);
-		break;
+	printf("<- %s\n", msgb_hexdump(msg));
+
+	if (transp->udp_fd < 0) {
+		int xfer_len;
+
+		rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.out,
+					  msgb_data(msg), msgb_length(msg),
+					  &xfer_len, 100000);
+	} else {
+		rc = write(transp->udp_fd, msgb_data(msg), msgb_length(msg));
 	}

-	msgb_free(msg);
-	libusb_free_transfer(xfer);
-}
-
-
-static int st2_transp_tx_msg_usb_async(struct osmo_st2_transport *transp, struct msgb *msg)
-{
-	struct libusb_transfer *xfer;
-	int rc;
-
-	xfer = libusb_alloc_transfer(0);
-	OSMO_ASSERT(xfer);
-	xfer->dev_handle = transp->usb_devh;
-	xfer->flags = 0;
-	xfer->type = LIBUSB_TRANSFER_TYPE_BULK;
-	xfer->endpoint = transp->usb_ep.out;
-	xfer->timeout = 100000;
-	xfer->user_data = msg;
-	xfer->length = msgb_length(msg);
-	xfer->buffer = msgb_data(msg);
-	xfer->callback = usb_out_xfer_cb;
-
-	rc = libusb_submit_transfer(xfer);
-	OSMO_ASSERT(rc == 0);
-
-	return rc;
-}
-
-/*! \brief Transmit a given command to the SIMtrace2 device */
-static int st2_transp_tx_msg_usb_sync(struct osmo_st2_transport *transp, struct msgb *msg)
-{
-	int rc;
-	int xfer_len;
-	rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.out,
-				  msgb_data(msg), msgb_length(msg),
-				  &xfer_len, 100000);
 	msgb_free(msg);
 	return rc;
 }
@@ -135,24 +98,9 @@ static struct simtrace_msg_hdr *st_push_hdr(struct msgb *msg, uint8_t msg_class,
 int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
 			 uint8_t msg_class, uint8_t msg_type)
 {
-	struct osmo_st2_transport *transp = slot->transp;
-	int rc;
-
-	OSMO_ASSERT(transp);
-
 	st_push_hdr(msg, msg_class, msg_type, slot->slot_nr);
-	printf("SIMtrace <- %s\n", msgb_hexdump(msg));

-	if (transp->udp_fd < 0) {
-		if (transp->usb_async)
-			rc = st2_transp_tx_msg_usb_async(transp, msg);
-		else
-			rc = st2_transp_tx_msg_usb_sync(transp, msg);
-	} else {
-		rc = write(transp->udp_fd, msgb_data(msg), msgb_length(msg));
-		msgb_free(msg);
-	}
-	return rc;
+	return osmo_st2_transp_tx_msg(slot->transp, msg);
 }

 /***********************************************************************
@@ -256,21 +204,6 @@ int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8
 	return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_SET_ATR);
 }

-int osmo_st2_cardem_request_config(struct osmo_st2_cardem_inst *ci, uint32_t features)
-{
-	struct msgb *msg = st_msgb_alloc();
-	struct cardemu_usb_msg_config *cfg;
-
-	cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));
-
-	printf("<= %s(%08x)\n", __func__, features);
-
-	memset(cfg, 0, sizeof(*cfg));
-	cfg->features = features;
-
-	return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);
-}
-
 /***********************************************************************
 * Modem Control protocol
 ***********************************************************************/
--- a/host/lib/usb_util.c
+++ b/host/lib/usb_util.c
@@ -1,36 +0,0 @@
-/* usb_util - USB related utilities for SIMtrace 2 USB devices
- *
- * (C) 2016-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <getopt.h>
-
-#include <osmocom/core/utils.h>
-
-#include <osmocom/usb/libusb.h>
-#include <osmocom/simtrace2/simtrace_usb.h>
-
-/*! list of USB idVendor/idProduct tuples of devices using simtrace2 firmware */
-const struct dev_id osmo_st2_compatible_dev_ids[] = {
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 },
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 },
-	{ 0, 0 }
-};
--- a/host/src/Makefile.am
+++ b/host/src/Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBOSMOUSB_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS)
+AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS)
 AM_LDFLAGS=$(COVERAGE_LDFLAGS)

 LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \
-       $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS)
+       $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBUSB_LIBS)

 bin_PROGRAMS = simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff

--- a/host/src/simtrace2-remsim.c
+++ b/host/src/simtrace2-remsim.c
@@ -38,7 +38,7 @@

 #include <libusb.h>

-#include <osmocom/usb/libusb.h>
+#include <osmocom/simtrace2/libusb_util.h>
 #include <osmocom/simtrace2/simtrace2_api.h>
 #include <osmocom/simtrace2/simtrace_prot.h>
 #include <osmocom/simtrace2/apdu_dispatch.h>
@@ -182,7 +182,6 @@ static void print_help(void)
 		"\t-i\t--gsmtap-ip\tA.B.C.D\n"
 		"\t-a\t--skip-atr\n"
 		"\t-k\t--keep-running\n"
-		"\t-n\t--pcsc-reader-num\n"
 		"\t-V\t--usb-vendor\tVENDOR_ID\n"
 		"\t-P\t--usb-product\tPRODUCT_ID\n"
 		"\t-C\t--usb-config\tCONFIG_ID\n"
@@ -201,7 +200,6 @@ static const struct option opts[] = {
 	{ "skip-atr", 0, 0, 'a' },
 	{ "help", 0, 0, 'h' },
 	{ "keep-running", 0, 0, 'k' },
-	{ "pcsc-reader-num", 1, 0, 'n' },
 	{ "usb-vendor", 1, 0, 'V' },
 	{ "usb-product", 1, 0, 'P' },
 	{ "usb-config", 1, 0, 'C' },
@@ -287,7 +285,6 @@ int main(int argc, char **argv)
 	int remote_udp_port = 52342;
 	int if_num = 0, vendor_id = -1, product_id = -1;
 	int config_id = -1, altsetting = 0, addr = -1;
-	int reader_num = 0;
 	char *remote_udp_host = NULL;
 	char *path = NULL;
 	struct osim_reader_hdl *reader;
@@ -298,7 +295,7 @@ int main(int argc, char **argv)
 	while (1) {
 		int option_index = 0;

-		c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:akn:", opts, &option_index);
+		c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:ak", opts, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -321,9 +318,6 @@ int main(int argc, char **argv)
 		case 'k':
 			keep_running = 1;
 			break;
-		case 'n':
-			reader_num = atoi(optarg);
-			break;
 		case 'V':
 			vendor_id = strtol(optarg, NULL, 16);
 			break;
@@ -379,7 +373,7 @@ int main(int argc, char **argv)
 		goto close_exit;
 	}

-	reader = osim_reader_open(OSIM_READER_DRV_PCSC, reader_num, "", NULL);
+	reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL);
 	if (!reader) {
 		perror("unable to open PC/SC reader");
 		goto close_exit;
@@ -410,7 +404,7 @@ int main(int argc, char **argv)
 			ifm->addr = addr;
 			if (path)
 				osmo_strlcpy(ifm->path, path, sizeof(ifm->path));
-			transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);
+			transp->usb_devh = usb_open_claim_interface(NULL, ifm);
 			if (!transp->usb_devh) {
 				fprintf(stderr, "can't open USB device\n");
 				goto close_exit;
@@ -422,7 +416,7 @@ int main(int argc, char **argv)
 				goto close_exit;
 			}

-			rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out,
+			rc = get_usb_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out,
 					      &transp->usb_ep.in, &transp->usb_ep.irq_in);
 			if (rc < 0) {
 				fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);
--- a/host/src/simtrace2-sniff.c
+++ b/host/src/simtrace2-sniff.c
@@ -37,7 +37,7 @@

 #include <libusb.h>

-#include <osmocom/usb/libusb.h>
+#include <osmocom/simtrace2/libusb_util.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
 #include <osmocom/simtrace2/simtrace_prot.h>

@@ -61,19 +61,49 @@ struct st_transport {
 };

 const struct value_string change_flags[] = {
-	{ SNIFF_CHANGE_FLAG_CARD_INSERT, "card inserted" },
-	{ SNIFF_CHANGE_FLAG_CARD_EJECT, "card ejected" },
-	{ SNIFF_CHANGE_FLAG_RESET_ASSERT, "reset asserted" },
-	{ SNIFF_CHANGE_FLAG_RESET_DEASSERT, "reset de-asserted" },
-	{ SNIFF_CHANGE_FLAG_TIMEOUT_WT, "data transfer timeout" },
-	{ 0, NULL }
+	{
+		.value = SNIFF_CHANGE_FLAG_CARD_INSERT,
+		.str = "card inserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_CARD_EJECT,
+		.str = "card ejected",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_RESET_ASSERT,
+		.str = "reset asserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_RESET_DEASSERT,
+		.str = "reset de-asserted",
+	},
+	{
+		.value = SNIFF_CHANGE_FLAG_TIMEOUT_WT,
+		.str = "data transfer timeout",
+	},
+	{
+		.value = 0,
+		.str = NULL,
+	},
 };

 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) {
@@ -384,7 +414,7 @@ int main(int argc, char **argv)
 		goto do_exit;
 	}
 	struct usb_interface_match ifm_scan[16];
-	int num_interfaces = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids,
+	int num_interfaces = usb_match_interfaces(NULL, compatible_dev_ids,
 				 USB_CLASS_PROPRIETARY, SIMTRACE_SNIFFER_USB_SUBCLASS, -1, ifm_scan, ARRAY_SIZE(ifm_scan));
 	if (num_interfaces <= 0) {
 		perror("No compatible USB devices found");
@@ -473,7 +503,7 @@ int main(int argc, char **argv)
 	signal(SIGINT, &signal_handler);

 	do {
-		_transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected);
+		_transp.usb_devh = usb_open_claim_interface(NULL, &ifm_selected);
 		if (!_transp.usb_devh) {
 			fprintf(stderr, "can't open USB device\n");
 			goto close_exit;
@@ -485,8 +515,8 @@ int main(int argc, char **argv)
 			goto close_exit;
 		}

-		rc = osmo_libusb_get_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out,
-					      &_transp.usb_ep.in, &_transp.usb_ep.irq_in);
+		rc = get_usb_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out,
+				      &_transp.usb_ep.in, &_transp.usb_ep.irq_in);
 		if (rc < 0) {
 			fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);
 			goto close_exit;
--- a/host/src/simtrace2_usb.c
+++ b/host/src/simtrace2_usb.c
@@ -23,7 +23,7 @@

 #include <osmocom/core/utils.h>

-#include <osmocom/usb/libusb.h>
+#include <osmocom/simtrace2/libusb_util.h>
 #include <osmocom/simtrace2/simtrace_usb.h>

 static const struct dev_id compatible_dev_ids[] = {
@@ -38,9 +38,9 @@ static int find_devices(void)
 	struct usb_interface_match ifm[16];
 	int rc, i, num_interfaces;

-	/* scan for USB devices matching SIMtrace USB ID with proprietary class */
-	rc = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids,
-						  USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm));
+	/* scan for USB devices matching SIMtrace USB ID with proprietary class */ 
+	rc = usb_match_interfaces(NULL, compatible_dev_ids,
+				 USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm));
 	printf("USB matches: %d\n", rc);
 	if (rc < 0)
 		return rc;
--- a/host/src/usb2udp.c
+++ b/host/src/usb2udp.c
@@ -35,9 +35,9 @@

 #include <libusb.h>

-#include <osmocom/usb/libusb.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
 #include <osmocom/simtrace2/simtrace_prot.h>
+#include <osmocom/simtrace2/libusb_util.h>

 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>
@@ -259,7 +259,7 @@ int main(int argc, char **argv)
 	g_udp_ofd.cb = ofd_udp_cb;
 	osmo_sock_init_ofd(&g_udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, local_udp_port + if_num, OSMO_SOCK_F_BIND);

-	rc = osmo_libusb_get_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL);
+	rc = get_usb_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL);
 	if (rc < 0) {
 		fprintf(stderr, "couldn't find enpdoint addresses; rc=%d\n", rc);
 		goto close_exit;
Author	SHA1	Message	Date
Harald Welte	9ba5b5c1b9	host/lib/gsmtap.c: Add GPLv2 disclaimer Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2	2020-01-17 10:59:41 +01:00
Harald Welte	2c673c38f5	host: Add COPYING file for host software (GPLv2) Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa	2020-01-17 10:59:32 +01:00