HACK: Solve weird problem with lost OUT transfer on ping-pong endpoint

This adds an unconditional endpoint reset procedure to every SET_FEATURE(UnHalt). It doesn't really make sense that this is required, *particularly* as we *MUST NOT* set bEndpoint->bank to 0 here. Without this patch, I'm observing the following problem: Every first OUT transfer after a SET_INTERFACE + UNHALT on a bulk endpoint is lost. "lost" means that it completes successfully on the host, can be seen completing successfully with an ACK on a USB bus analyzer, but still doesn't show up in the firmware. No Endpoint Interrupt is generated. This can be reproduced by calling libusb_set_interface_alt_setting() from the host and then submitting a single OUT transfer. Change-Id: I18ed530e617baddf76e8f9829512443ce2a76e0d
WIP: ignore STALL
2026-03-21 15:58:32 +03:00 · 2022-03-03 19:06:12 +01:00 · 2022-03-03 19:06:12 +01:00 · 2022-03-03 19:06:12 +01:00 · 2022-03-03 19:06:12 +01:00 · 2022-03-03 19:06:12 +01:00
39 changed files with 436 additions and 697 deletions
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -1 +0,0 @@
 --exclude ^firmware/atmel_softpack_libraries/.*$
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
 open_collective: osmocom
--- a/README.md
+++ b/README.md
@@ -13,17 +13,12 @@ stack and host software.
 Supported Hardware
 ------------------
-* Osmocom [SIMtrace2](https://osmocom.org/projects/simtrace2/wiki) with SAM3 controller
+* Osmocom SIMtrace 1.x with SAM3 controller
-  * this is open hardware and schematics / PCB design is published
+** this is open hardware and schematics / PCB design is published
-  * pre-built hardware available from [sysmocom webshop](https://shop.sysmocom.de/SIMtrace2-Hardware-Kit/simtrace2-kit)
+* sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
-* Osmocom [ngff-cardem](https://osmocom.org/projects/ngff-cardem/wiki) M.2/NGFF modem carrier with SAM3 controller
+** this is a proprietary device, publicly available from sysmocom
  * this is open hardware and schematics / PCB design is published
  * pre-built hardware available from [sysmocom webshoo](https://shop.sysmocom.de/M.2-modem-carrier-with-remote-SIM-tracing/ngff-cardem-kit-external)
 * sysmocom [sysmoQMOD](https://sysmocom.de/products/lab/sysmoqmod/index.html) (with 4 Modems,  4 SIM slots and 2 SAM3)
  * this is a proprietary device, publicly available from sysmocom
  * hardware evaluation kit available from [sysmocom webshop](https://shop.sysmocom.de/sysmoQMOD-evaluation-kit/sysmoQMOD-evk)
 * sysmocom OWHW (with 2 Modems and 1 SAM3 onboard)
-  * this is not publicly available hardware, but still supported
+** this is not publicly available hardware, but still supported
 This Repository
 ---------------
@@ -41,14 +36,3 @@ The host software includes
 * simtrace2-list - list any USB-attached devices running simtrace2 firmware
 * simtrace2-sniff - interface the 'trace' firmware to obtain card protocol traces
 * simtrace2-cardem-pcsc - interface the 'cardem' fimrware to use a SIM in a PC/SC reader
 Do not expect SIMtrace2 to work in VMs
 --------------------------------------
 We only support running SIMtrace2 together with a Linux system running
 "bare iron" on actual hardware (x86, x86_64, arm, ...).  **using VMs
 with USB pass-through for things with critical timing like SIMtrace2 is
 calling for trouble** and we will not accept related bug reports or
 support you if you do.  If you still want to use VMs: Feel free to do
 so, but understand that it's unsupported and you are on your own.
--- a/3
+++ b/3
@@ -3,7 +3,8 @@
 # In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
 # LIBVERSION=c:r:a
 # If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
-# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public release: c:r:0.
 #library	what			description / commit summary line
 simtrace2	API/ABI change		osmo_st2_transport new member
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -27,45 +27,21 @@ 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"
-# dfu target MUST be built first, the combined targets need a bl that can be combined..
+BUILDS=""
-BUILDS="simtrace/dfu qmod/dfu owhw/dfu ngff_cardem/dfu "
+BUILDS+="simtrace/dfu simtrace/blupdate simtrace/trace simtrace/cardem "
-#
+BUILDS+="qmod/dfu qmod/blupdate qmod/cardem "
-BUILDS+="simtrace/blupdate qmod/blupdate owhw/blupdate ngff_cardem/blupdate "
+BUILDS+="owhw/dfu owhw/blupdate owhw/cardem "
-BUILDS+="simtrace/cardem qmod/cardem owhw/cardem octsimtest/cardem ngff_cardem/cardem "
+BUILDS+="octsimtest/cardem "
-BUILDS+="simtrace/trace ngff_cardem/trace "
+BUILDS+="ngff_cardem/dfu ngff_cardem/blupdate ngff_cardem/cardem ngff_cardem/trace "
 cd $TOPDIR/firmware
 for build in $BUILDS; do
 	board=`echo $build | cut -d "/" -f 1`
 	app=`echo $build | cut -d "/" -f 2`
 	case "$build" in
 		"owhw/cardem")
 			comb="combined"
 			;;
 		"qmod/cardem")
 			comb="combined"
 			;;
 		"ngff_cardem/cardem")
 			comb="combined"
 			;;
 		"simtrace/trace")
 			comb="combined"
 			;;
 		*)
 			comb=""
 			;;
 	esac
 	echo
-	# Build the bootloader with clang, the rest with gcc (OS#5260, OS#6026)
+	echo "=============== $board / $app START  =============="
-	if [ "$app" = "dfu" ]; then
+	make BOARD="$board" APP="$app"
 		echo "=============== $board / $app START (CLANG) =============="
 		PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" APP="$app" $comb
 	echo "=============== $board / $app RES:$? =============="
 	else
 		echo "=============== $board / $app START (GCC) =============="
 		make USE_CLANG=0 BOARD="$board" APP="$app" $comb
 		echo "=============== $board / $app RES:$? =============="
 	fi
 done
 echo
--- a/contrib/prepare_upload.sh
+++ b/contrib/prepare_upload.sh
@@ -9,7 +9,7 @@ echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."
 cd firmware/bin
 for ext in bin elf; do
 	for file in *."$ext"; do
-		if ! [[ "$file" =~ ^(.*padded.*|.*nocrcstub.*bin)$ ]];then
+		if ! [[ "$file" =~ ^(.*padded.*|.*nocrcstub.*)$ ]];then
 			without_ext="${file%.*}"
 			cp -v "$file" "$without_ext-latest.$ext"
 			cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
--- a/contrib/simtrace.lua
+++ b/contrib/simtrace.lua
@@ -58,7 +58,6 @@ local hf_pts_resp = ProtoField.bytes("usb_simtrace.pts_resp", "PTS response")
 local hf_cemu_cfg_features = ProtoField.uint32("usb_simtrace.cemu_cfg.features.status_irq", "CardEm Features", base.HEX)
 local hf_cemu_cfg_slot_mux_nr = ProtoField.uint32("usb_simtrace.cemu_cfg.features.slot_mux_nr", "CardEm Slot Mux Nr", base.DEC)
 local hf_cemu_cfg_presence_polarity = ProtoField.uint8("usb_simtrace.cemu_cfg.features.presence_polarity", "Sim presence polarity", base.DEC)
 local card_insert_types = {
    [0x00] = "not inserted",
@@ -72,9 +71,6 @@ local CEMU_STATUS_F_RCEMU_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.
 local CEMU_STATUS_F_CARD_INSERT  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CARD_INSERT", "CARD_INSERT", base.HEX_DEC, NULL, 0x00000008)
 local CEMU_STATUS_F_RESET_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RESET_ACTIVE", "RESET_ACTIVE", base.HEX_DEC, NULL, 0x00000010)
 local CEMU_CONFIG_PRES_POL_PRES_H  = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_PRES_H", "PRESENCE_HIGH", base.HEX_DEC, NULL, 0x00000001)
 local CEMU_CONFIG_PRES_POL_VALID  = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_VALID", "PRESENCE_VALID", base.HEX_DEC, NULL, 0x00000002)
 local modem_reset_types = {
    [0x00] = "de-assert",
    [0x01] = "assert",
@@ -93,10 +89,9 @@ usb_simtrace_protocol.fields = {
  msgtype, seqnr, slotnr, reserved, payloadlen, payload,
  pb_and_rx, pb_and_tx, final, tpdu_hdr, rxtxdatalen, rxtxdata,
  CEMU_STATUS_F_VCC_PRESENT, CEMU_STATUS_F_CLK_ACTIVE, CEMU_STATUS_F_RCEMU_ACTIVE, CEMU_STATUS_F_CARD_INSERT, CEMU_STATUS_F_RESET_ACTIVE,
  CEMU_CONFIG_PRES_POL_PRES_H, CEMU_CONFIG_PRES_POL_VALID,
  modem_reset_status, modem_reset_len,
  hf_pts_len, hf_pts_req, hf_pts_resp,
-  hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr, hf_cemu_cfg_presence_polarity,
+  hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr,
  hf_cemu_cardinsert, hf_modem_sim_select,
 }
@@ -219,16 +214,8 @@ function dissect_cemu_config(payload_data, pinfo, tree)
  local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Emu Config")
  subtree:add(hf_cemu_cfg_features, payload_data(0,4));
  if payload_data:len() >= 4 then
  subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1));
 end
  if payload_data:len() >= 5 then
    local pres =  payload_data(5,1):le_uint();
    subtree:add(hf_cemu_cfg_presence_polarity, payload_data(5,1));
    headerSubtree:add(CEMU_CONFIG_PRES_POL_PRES_H, pres)
    headerSubtree:add(CEMU_CONFIG_PRES_POL_VALID, pres)
  end
 end
 function dissect_modem_sim_sel(payload_data, pinfo, tree)
  local subtree = tree:add(usb_simtrace_protocol, payload_data, "Modem SIM Select")
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,99 +1,3 @@
 simtrace2 (0.9.0) unstable; urgency=medium
  [ Oliver Smith ]
  * host/contrib/simtrace2.spec.in: update
  * treewide: remove FSF address
  * contrib/jenkins.sh: set USE_CLANG=1
  * Cosmetic: fix CI errors
  * debian/rules: remove override_dh_autoreconf
  * debian: set compat level to 10
  * contrib/jenkins: tweak shell logic
  * firmware/Makefile: don't use distribution's CFLAGS
  * contrib: remove rpm spec file
  [ Eric Wild ]
  * firmware: add crc stub to all dfu apps to ensure reliable loading
  * wireshark lua dissector: dissect more
  * lua dissector: adjust usage instructions
  * conrtrib/upload : upload elf files
  * contrib/jenkins.sh : build and publish combined targets
  * fw: only build the bl with clang
  [ James Tavares ]
  * simtrace2-tool: add "modem sim-card (insert|remove)" command
  * firmware: add definition for main osc bypass when using external osc
  * gitignore: add missing entries binaries
  * firmware: bugfix: disable cardemu comms in local SIM mode
  * main: rotor: erase immediately after send
  * Fix missing generation of waiting-time-extension in some situations
  [ Harald Welte ]
  * host: Print strerror(errno) in case of problems opening the USB device
  * cosmetic: Fix indent of printf() statement
  * host: properly zero-initialize interface match structures
  * contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices
  * cosmetic: contrib/simtrace.lua: more consistent formatting
  * contrib/simtrace.lua: Add header with author/description/usage
  * contrib/simtrace.lua: print length + slot-number in decimal only
  * contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO
  * contrib/simtrace.lua: Dissect some more cardem related message types
  * contrib/simtrace.lua: Register for "decode as..."
  * cardem: Report the VCC voltage (if supported)
  * card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan
  * cardem: set more reasonable interrupt priorities
  * host: Always initialize libosmocore logging before using it
  * simtrace2-cardem-pcsc: rename 'flags' to 'status_flags'
  * simtrace2-cardem-pcsc: Move all logging into libosmocore
  * simtrace2-cardem-pcsc: Detect card power-up without RESET
  * host: Don't pass -1 (converted to 255) as address
  * simtrace2-cardem-pcsc: Fix copy+paste error in log message
  * simtrace2-cardem-pcsc: continue in case of LIBUSB_TRANSFER_ERROR
  * contrib/simtrace.lua: Add Flag bits + Data to COL_INFO
  * Reduce bInterval of interrupt endpoints to avoid interrupt misses
  * simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
  * update git URLs (git -> https; gitea)
  * cardem: reset the uC in case of USB disconnect
  * cosmetic: Fix compile-time #error message string typo
  * firmware/sniffer: Fix copy+paste when logging invalid INS bytes
  * firmware/sniffer: Log parity errors, just like overruns and framing errors
  * firmware/sniffer: refactor setting TPDU state
  * firmware/sniffer: Log old and new state in ISO7816-3 state changes
  * firmware/sniffer: Avoid extra call for rbuf_is_full
  * firmware/sniffer: Fix programming error in PPS
  * firmware/sniffer: Make all global variables 'static'
  * firmware/sniffer: Group global variables in structs
  * firmware/sniffer: Log cause of WT change
  * firmware/sniffer: Rename global variable 'wt' to 'g_wt'
  * firmware/sniffer: Disable TIMEOUT interrupts in USART IER on exit
  * firmware/sniffer: Add + use 16bit ringbuffer
  * firmware/sniffer: Pass PARITY/OVERRUN/FRAMING error via ringbuffer
  * firmware/sniffer: Handle WT timeouts via ring-buffer
  * firmware/sniffer: introduce #define for interrupt enable flags
  * firmware/sniffer: Enable interrupts for overrun/parity/frame errors
  * Fix unchecked return value of osmo_libusb_init()
  * Add funding link to github mirror
  * README.md: Fix mark-down nested bullet syntax
  * README.md: Fix mark-down nested bullet syntax
  * README.md: add links to SIMtrace2 and QMOD
  * README.md: Add links to where hardware can be bought
  * README.md: Add section on ngff_carem
  * README.md: Add note to avoid using a VM
  [ Alexander Couzens ]
  * firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover from resets
  * ngff_cardem: cosmetic: fix superflous space
  * dissector: add support for sim polarity
  * firmware: allow to change the sim presence pin polarity
  * simtrace2-cardem-pcsc: allow to set sim presence polarity
  [ Vadim Yanitskiy ]
  * host/cardem: fix integer overflow in process_do_rx_da()
  [ Philipp Maier ]
  * simtrace2-cardem-pcsc: mark reset events in GSMTAP trace
 -- Oliver Smith <osmith@sysmocom.de>  Wed, 12 Feb 2025 16:07:53 +0100
 simtrace2 (0.8.1) unstable; urgency=medium
  * host/contrib/simtrace2.spec.in: fix soname
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+9
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: simtrace2
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Maintainer: Harald Welte <laforge@gnumonks.org>
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 9),
               autotools-dev,
               autoconf,
               automake,
@@ -10,14 +10,14 @@ Build-Depends: debhelper (>= 10),
               pkg-config,
               git,
               dh-autoreconf,
-               libosmocore-dev (>= 1.11.0),
+               libosmocore-dev (>= 1.4.0),
               libpcsclite-dev,
               libnewlib-arm-none-eabi,
               libusb-1.0-0-dev,
               gcc-arm-none-eabi
 Standards-Version: 3.9.8
-Vcs-Git: https://gitea.osmocom.org/sim-card/simtrace2
+Vcs-Git: git://git.osmocom.org/simtrace2.git
-Vcs-Browser: https://gitea.osmocom.org/sim-card/simtrace2
+Vcs-Browser: http://git.osmocom.org/simtrace2/
 Homepage: http://osmocom.org/projects/simtrace2/wiki
 Package: simtrace2-firmware
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,7 @@ export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 %:
-	dh $@ --no-parallel
+	dh $@
 override_dh_autoreconf:
 	cd host && dh_autoreconf
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -29,13 +29,6 @@
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
 CFLAGS = \
 	 -Werror=format-security \
 	 -Wformat \
 	 -g \
 	 $(NULL)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
--- a/firmware/apps/cardem/main.c
+++ b/firmware/apps/cardem/main.c
@@ -137,6 +137,12 @@ static void check_exec_dbg_cmd(void)
 	board_exec_dbg_cmd(ch);
 }
 #include <osmocom/core/panic.h>
 void WDT_IrqHandler(void)
 {
 	osmo_panic("WDT");
 }
 /*------------------------------------------------------------------------------
 *        Main
 *------------------------------------------------------------------------------*/
@@ -152,8 +158,9 @@ extern int main(void)
 	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
 	/* Enable watchdog for 2000ms, with no window */
-	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+	WDT_Enable(WDT, WDT_MR_WDFIEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
-		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+		   (WDT_GetPeriod(1000) << 16) | WDT_GetPeriod(1000));
 	NVIC_EnableIRQ(WDT_IRQn);
 	PIO_InitializeInterrupts(10);
@@ -194,8 +201,8 @@ extern int main(void)
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
 		const char rotor[] = { '-', '\\', '|', '/' };
 		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
 		putchar('\b');
 		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
 #endif
 		check_exec_dbg_cmd();
 		osmo_timers_prepare();
@@ -206,10 +213,6 @@ extern int main(void)
 			if (isUsbConnected) {
 				isUsbConnected = 0;
 			}
 			/* HACK: we don't really deal with USB disconnect yet,
 			 * so let's just reset the entire uC if this happens */
 			TRACE_INFO("Resetting uC on USB disconnect\n\r");
 			NVIC_SystemReset();
 		} else if (isUsbConnected == 0) {
 			TRACE_INFO("USB is now configured\n\r");
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
@@ -15,7 +15,7 @@
 /* Define attribute */
-#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
+#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
    #define WEAK __attribute__ ((weak))
 #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
    #define WEAK __weak
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
@@ -1672,6 +1672,10 @@ 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 */
--- a/firmware/atmel_softpack_libraries/usb/include/USBD.h
+++ b/firmware/atmel_softpack_libraries/usb/include/USBD.h
@@ -63,7 +63,7 @@
 *------------------------------------------------------------------------------*/
 /* Define attribute */
-#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
+#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
    #define WEAK __attribute__ ((weak))
 #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
    #define WEAK __weak
--- a/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
+++ b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
@@ -296,7 +296,7 @@ typedef uint32_t (*USBDescriptorParseFunction)(void *descriptor, void *parseArg)
 */
 #pragma pack(1)
-#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
+#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
 #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
 #define __attribute__(...)
 #elif defined (  __GNUC__  ) /* GCC CS3 2009q3-68 */
--- a/firmware/libboard/qmod/include/board.h
+++ b/firmware/libboard/qmod/include/board.h
@@ -89,8 +89,8 @@
 #define PINS_WWAN_IN		{ PIN_WWAN1, PIN_WWAN2 }
 /* outputs controlling RESET input of modems */
-#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
+#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP}
-#define PIN_PERST2		{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP}
+#define PIN_PERST2		{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP}
 #define PINS_PERST		{ PIN_PERST1, PIN_PERST2 }
 #define PIN_VERSION_DET		{PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT}
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -155,3 +155,7 @@
 #endif
 /* SIMtrace board supports man-in-the-middle mode */
 //#define HAVE_MITM
 #define DETECT_VCC_BY_ADC
 #define VCC_UV_THRESH_1V8	(1500000/2)	/* 10k/10k resistive divider halves voltage */
 #define VCC_UV_THRESH_3V	(2500000/2)	/* 10k/10k resistive divider halves voltage */
--- a/firmware/libcommon/include/cciddriver.h
+++ b/firmware/libcommon/include/cciddriver.h
@@ -175,11 +175,11 @@ typedef struct
 {
 	/// Number of seconds. If 00h then CCID default value is used.
 	unsigned char bTimeOut;
-	/// Several parameters for the PIN format options (defined in § 6.1.11.4)
+	/// Several parameters for the PIN format options (defined in § 6.1.11.4)
 	unsigned char bmFormatString4;
 	/// Define the length of the PIN to present in the APDU command
 	unsigned char bmPINBlockString;
-	/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
+	/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
 	unsigned char bmPinLengthFormat;
 	/// Insertion position offset in byte for the current PIN
 	unsigned char bInsertionOffsetOld;
@@ -218,13 +218,13 @@ typedef struct
 /// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
 typedef struct
 {
-	/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
 	/// clock rate conversion factor
-	/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
 	/// baud rate conversion factor
 	unsigned char bmFindexDindex;
-	/// For T=0 ,B0 - 0b, B7-2 - 000000b
+	/// For T=0 ,B0 – 0b, B7-2 – 000000b
-	/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
 	unsigned char bmTCCKST0;         // 0 to 2
 	/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
 	/// guardtime of 12etu. FFh is the same as 00h.
@@ -243,14 +243,14 @@ typedef struct
 /// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
 typedef struct
 {
-	/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
+	/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a 
 	/// clock rate conversion factor
-	/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
+	/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a 
 	/// baud rate conversion factor
 	unsigned char bmFindexDindex;
-	/// For T=1, B7-2 - 000100b
+	/// For T=1, B7-2 – 000100b
-	/// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
+	/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
-	/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
+	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
 	unsigned char bmTCCKST1;           // 10h, 11h, 12h, 13h
 	/// Extra Guardtime (0 to 254 etu between two characters). 
 	/// If value is FFh, then guardtime is reduced by 1.
@@ -292,8 +292,8 @@ typedef struct
   /// - 04h 1.8V
   /// Other bits are RFU.
   unsigned char  bVoltageSupport;
-   /// RRRR -Upper Word- is RFU = 0000h
+   /// RRRR –Upper Word- is RFU = 0000h
-   /// PPPP -Lower Word- Encodes the supported protocol types. A "1" in a given
+   /// PPPP –Lower Word- Encodes the supported protocol types. A ‘1’ in a given
   /// bit position indicates support for the associated ISO protocol.
   /// 0001h = Protocol T=0
   /// 0002h = Protocol T=1
@@ -318,7 +318,7 @@ typedef struct
   /// Indicates the maximum IFSD supported by CCID for protocol T=1.
   unsigned long  dwMaxIFSD;
   /// - RRRR-Upper Word- is RFU = 0000h
-   /// - PPPP-Lower Word- encodes the supported protocol types. A "1" in a given
+   /// - PPPP-Lower Word- encodes the supported protocol types. A ‘1’ in a given
   ///   bit position indicates support for the associated protocol.
   ///   0001h indicates support for the 2-wire protocol 1
   ///   0002h indicates support for the 3-wire protocol 1
--- a/firmware/libcommon/include/ringbuffer.h
+++ b/firmware/libcommon/include/ringbuffer.h
@@ -32,22 +32,4 @@ int rbuf_write(volatile ringbuf * rb, uint8_t item);
 bool rbuf_is_empty(volatile ringbuf * rb);
 bool rbuf_is_full(volatile ringbuf * rb);
 /* same as above but with 16bit values instead of 8bit */
 #define RING16_BUFLEN 512
 typedef struct ringbuf16 {
 	uint16_t buf[RING16_BUFLEN];
 	size_t ird;
 	size_t iwr;
 } ringbuf16;
 void rbuf16_reset(volatile ringbuf16 * rb);
 uint16_t rbuf16_read(volatile ringbuf16 * rb);
 uint16_t rbuf16_peek(volatile ringbuf16 * rb);
 int rbuf16_write(volatile ringbuf16 * rb, uint16_t item);
 bool rbuf16_is_empty(volatile ringbuf16 * rb);
 bool rbuf16_is_full(volatile ringbuf16 * rb);
 #endif /* end of include guard: SIMTRACE_RINGBUF_H */
--- a/firmware/libcommon/include/simtrace.h
+++ b/firmware/libcommon/include/simtrace.h
@@ -124,8 +124,4 @@ extern void mode_cardemu_usart1_irq(void);
 void Timer_Init( void );
 void TC0_Counter_Reset( void );
 /* Sim presence pins */
 bool mode_cardemu_get_presence_pol(uint8_t instance);
 void mode_cardemu_set_presence_pol(uint8_t instance, bool high);
 #endif  /*  SIMTRACE_H  */
--- a/firmware/libcommon/include/simtrace_prot.h
+++ b/firmware/libcommon/include/simtrace_prot.h
@@ -261,21 +261,12 @@ struct cardemu_usb_msg_error {
 /* enable/disable the generation of DO_STATUS on IRQ endpoint */
 #define CEMU_FEAT_F_STATUS_IRQ	0x00000001
 #define CEMU_CONFIG_PRES_POL_PRES_L 0x00
 #define CEMU_CONFIG_PRES_POL_PRES_H 0x01
 #define CEMU_CONFIG_PRES_POL_VALID 0x02
 /* SIMTRACE_MSGT_BD_CEMU_CONFIG */
 struct cardemu_usb_msg_config {
 	/* bit-mask of CEMU_FEAT_F flags */
 	uint32_t features;
 	/* the selected slot number (if an external mux is present) */
 	uint8_t slot_mux_nr;
 	/* Sim presence pin polarity. Bit 1 is a validity bit. Bit 0 gpio value when sim present.
 	 * When sim is present, set sim_present gpio to high -> 0x03
 	 * When sim is present, set sim_present gpio to low -> 0x02
 	 */
 	uint8_t pres_pol;
 } __attribute__ ((packed));
 /***********************************************************************
@@ -322,9 +313,6 @@ struct st_modem_status {
 #define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5)
 #define SNIFF_DATA_FLAG_ERROR_MALFORMED (1<<6)
 #define SNIFF_DATA_FLAG_ERROR_CHECKSUM (1<<7)
 #define SNIFF_DATA_FLAG_ERROR_OVERRUN (1<<8)
 #define SNIFF_DATA_FLAG_ERROR_FRAMING (1<<9)
 #define SNIFF_DATA_FLAG_ERROR_PARITY (1<<10)
 /* SIMTRACE_MSGT_SNIFF_CHANGE */
 struct sniff_change {
--- a/firmware/libcommon/source/card_emu.c
+++ b/firmware/libcommon/source/card_emu.c
@@ -24,7 +24,6 @@
 #include "trace.h"
 #include "iso7816_fidi.h"
 #include "card_emu.h"
 #include "simtrace.h"
 #include "simtrace_prot.h"
 #include "usb_buf.h"
 #include <osmocom/core/linuxlist.h>
@@ -776,15 +775,6 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
 		/* prepare to extend the waiting time once half of it is reached */
 		card_emu_uart_update_wt(ch->uart_chan, ch->waiting_time);
 		break;
 	case TPDU_S_WAIT_TX:
 		/* If we came from WAIT_RX, disable the receiver and
 		 * enable the transmitter. If we came from WAIT_RX or
 		 * WAIT_PB, reset the waiting time so that we can extend
 		 * waiting time if needed. */
 		card_emu_uart_enable(ch->uart_chan, ENABLE_TX);
 		/* prepare to extend the waiting time once half of it is reached */
 		card_emu_uart_update_wt(ch->uart_chan, ch->waiting_time);
 		break;
 	default:
 		break;
 	}
@@ -1097,7 +1087,7 @@ static void card_emu_report_config(struct card_handle *ch)
 #else
 	cfg->slot_mux_nr = 0;
 #endif
-	cfg->pres_pol = mode_cardemu_get_presence_pol(ch->num) | CEMU_CONFIG_PRES_POL_VALID;
+
 	usb_buf_upd_len_and_submit(msg);
 }
@@ -1271,11 +1261,6 @@ int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_con
 	}
 #endif
 	if (scfg_len >= sizeof(uint32_t)+sizeof(uint8_t)+sizeof(uint8_t)) {
 		if (scfg->pres_pol & CEMU_CONFIG_PRES_POL_VALID)
 			mode_cardemu_set_presence_pol(ch->num, scfg->pres_pol & CEMU_CONFIG_PRES_POL_PRES_H);
 	}
 	/* send back a report of our current configuration */
 	card_emu_report_config(ch);
--- a/firmware/libcommon/source/cciddriver.c
+++ b/firmware/libcommon/source/cciddriver.c
@@ -193,8 +193,8 @@ static void RDRtoPCDatablock_ATR( void )
 	ccidDriver.ProtocolDataStructure[0] = Atr[2];     // TA(1)
 	// bmTCCKST0
-	// For T=0 ,B0 - 0b, B7-2 - 000000b
+	// For T=0 ,B0 – 0b, B7-2 – 000000b
-	// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
+	// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
 	// bGuardTimeT0
 	// Extra Guardtime between two characters. Add 0 to 254 etu to the normal 
@@ -1005,7 +1005,7 @@ unsigned char CCID_Removal( void )
 //------------------------------------------------------------------------------
 /// Interrupt-IN Messages
 /// This message is sent when any bit in the bHardwareErrorCode field is set. 
-/// If this message is sent when there is no "outstanding" command, the bSeq
+/// If this message is sent when there is no “outstanding” command, the bSeq 
 /// field will be undefined.
 /// \param bSlot ICC slot number
 /// \param bSeq  Sequence number of the bulk OUT command when the hardware error
--- a/firmware/libcommon/source/mode_cardemu.c
+++ b/firmware/libcommon/source/mode_cardemu.c
@@ -79,28 +79,14 @@ struct cardem_inst {
 	uint8_t ep_out;
 	uint8_t ep_in;
 	uint8_t ep_int;
 	/*! Pin to set when SIM is present/inserted (SIM presence pin). */
 	const Pin pin_insert;
 	/*! Invert the Pin polarity. When not inverted, the SIM pin_insert will be High, when a SIM is present. */
 	bool pin_insert_inverted;
 #ifdef DETECT_VCC_BY_ADC
 	uint32_t vcc_uv;
 #endif
 	/*! real-time state of VCC I/O line, irrespective of enabled flag */
 	bool vcc_active;
 	/*! last VCC state we reported to the card emu state machine (conditioned by enabled flag) */
 	bool vcc_active_last;
 	/*! real-time state of RST I/O line, irrespective of enabled flag */
 	bool rst_active;
 	/*! last RST state we reported to the card emu state machine (conditioned by enabled flag) */
 	bool rst_active_last;
 	/*! flag indicating whether this instance should perform card emulation, or not */
 	bool enabled;
 };
 struct cardem_inst cardem_inst[] = {
@@ -116,10 +102,7 @@ struct cardem_inst cardem_inst[] = {
 		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
 #ifdef PIN_SET_USIM1_PRES
 		.pin_insert = PIN_SET_USIM1_PRES,
-#endif /* PIN_SET_USIM1_PRES */
+#endif
 #ifdef PIN_SET_USIM1_PRES_INVERTED
 		.pin_insert_inverted = true,
 #endif /* PIN_SET_USIM1_PRES_INVERTED */
 	},
 #ifdef CARDEMU_SECOND_UART
 	{
@@ -134,10 +117,7 @@ struct cardem_inst cardem_inst[] = {
 		.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
 #ifdef PIN_SET_USIM2_PRES
 		.pin_insert = PIN_SET_USIM2_PRES,
-#endif /* PIN_SET_USIM2_PRES */
+#endif
 #ifdef PIN_SET_USIM2_PRES_INVERTED
 		.pin_insert_inverted = true,
 #endif /* PIN_SET_USIM2_PRES_INVERTED */
 	},
 #endif
 };
@@ -446,7 +426,7 @@ void card_emu_uart_interrupt(uint8_t uart_chan)
 #ifdef DETECT_VCC_BY_ADC
 #if !defined(VCC_UV_THRESH_1V8) || !defined(VCC_UV_THRESH_3V)
-#error "You must define VCC_UV_THRESH_{1V8,3V} if you use ADC VCC detection"
+#error "You must define VCC_UV_THRESH_{1V1,3V} if you use ADC VCC detection"
 #endif
 static volatile int adc_triggered = 0;
@@ -535,25 +515,19 @@ void ADC_IrqHandler(void)
 #endif /* DETECT_VCC_BY_ADC */
-/**
+/* called from main loop; dispatches card I/O state changes to card_emu from main loop */
 * called from main loop; dispatches card I/O state changes to card_emu from main loop.
 * NOTE: conditions I/O state on the ci->enabled flag; if the instance is disabled, we assume VCC is
 * disabled and the device is not in reset
 */
 static void process_io_statechg(struct cardem_inst *ci)
 {
-	const bool vcc_active = ci->vcc_active && ci->enabled;
+	if (ci->vcc_active != ci->vcc_active_last) {
-	if (vcc_active != ci->vcc_active_last) {
+		card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active);
 		card_emu_io_statechg(ci->ch, CARD_IO_VCC, vcc_active);
 		/* FIXME do this for real */
-		card_emu_io_statechg(ci->ch, CARD_IO_CLK, vcc_active);
+		card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active);
-		ci->vcc_active_last = vcc_active;
+		ci->vcc_active_last = ci->vcc_active;
 	}
-	const bool rst_active = ci->rst_active && ci->enabled;
+	if (ci->rst_active != ci->rst_active_last) {
-	if (rst_active != ci->rst_active_last) {
+		card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active);
-		card_emu_io_statechg(ci->ch, CARD_IO_RST, rst_active);
+		ci->rst_active_last = ci->rst_active;
 		ci->rst_active_last = rst_active;
 	}
 }
@@ -593,6 +567,35 @@ void mode_cardemu_configure(void)
 	TRACE_ENTRY();
 }
 struct relevant_irq {
 	uint32_t irq;
 	uint32_t prio;
 	const char *name;
 };
 static const struct relevant_irq relevant_irqs[] = {
 	{ UDP_IRQn, 		14, "USB" },
 	{ CONSOLE_IRQ,		15, "CONSOLE" },
 	{ FIRST_USART_IRQ,	 0, "7816_0" },
 #ifdef CARDEMU_SECOND_UART
 	{ USART0_IRQn,	 	 0, "7816_1" },
 #endif
 #ifdef DETECT_VCC_BY_ADC
 	{ ADC_IRQn,		13, "ADC" },
 #endif
 	{ PIOA_IRQn,		10, "PIOA" },
 	{ PIOB_IRQn,		10, "PIOB" },
 	{ PIOC_IRQn,		10, "PIOC" },
 };
 void dump_irq_prios(void)
 {
 	printf("Interrupt Enable Mask (ISER): %08x%08x\n\r", NVIC->ISER[1], NVIC->ISER[0]);
 	for (unsigned int i = 0; i < ARRAY_SIZE(relevant_irqs); i++) {
 		const struct relevant_irq *ri = &relevant_irqs[i];
 		printf("IRQ prio %02u (%s): current=%u, expected=%u\r\n", ri->irq, ri->name,
 			NVIC_GetPriority(ri->irq), ri->prio);
 	}
 }
 /* called if config is activated */
 void mode_cardemu_init(void)
 {
@@ -662,6 +665,9 @@ void mode_cardemu_init(void)
 	sim_switch_use_physical(1, 1);
 	/* TODO check RST and VCC */
 #endif /* CARDEMU_SECOND_UART */
 	dump_irq_prios();
 }
 /* called if config is deactivated */
@@ -709,7 +715,7 @@ static void process_card_insert(struct cardem_inst *ci, bool card_insert)
 	TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, card_insert ? "INSERTED" : "REMOVED");
 #ifdef HAVE_BOARD_CARDINSERT
-	board_set_card_insert(ci, card_insert ^ ci->pin_insert_inverted);
+	board_set_card_insert(ci, card_insert);
 #else
 	if (!ci->pin_insert.pio) {
 		TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
@@ -717,7 +723,7 @@ static void process_card_insert(struct cardem_inst *ci, bool card_insert)
 		return;
 	}
-	if (card_insert ^ ci->pin_insert_inverted)
+	if (card_insert)
 		PIO_Set(&ci->pin_insert);
 	else
 		PIO_Clear(&ci->pin_insert);
@@ -804,8 +810,10 @@ static int usb_command_sim_select(struct msgb *msg, struct cardem_inst *ci)
 	if (msgb_l2len(msg) < sizeof(*mss))
 		return -1;
-	ci->enabled = mss->remote_sim ? true : false;
+	if (mss->remote_sim)
-	sim_switch_use_physical(ci->num, !ci->enabled);
+		sim_switch_use_physical(ci->num, 0);
 	else
 		sim_switch_use_physical(ci->num, 1);
 	return 0;
 }
@@ -949,10 +957,7 @@ void mode_cardemu_run(void)
 			}
 			uint8_t byte = rbuf_read(&ci->rb);
 			__enable_irq();
 			if (ci->enabled) {
 			card_emu_process_rx_byte(ci->ch, byte);
 			}
 			//TRACE_ERROR("%uRx%02x\r\n", i, byte);
 		}
@@ -971,25 +976,3 @@ void mode_cardemu_run(void)
 		process_any_usb_commands(queue, ci);
 	}
 }
 void mode_cardemu_set_presence_pol(uint8_t instance, bool high)
 {
 	struct cardem_inst *ci;
 	if (instance >= ARRAY_SIZE(cardem_inst))
 		return;
 	ci = &cardem_inst[instance];
 	ci->pin_insert_inverted = !high;
 }
 bool mode_cardemu_get_presence_pol(uint8_t instance)
 {
 	struct cardem_inst *ci;
 	if (instance >= ARRAY_SIZE(cardem_inst))
 		return false;
 	ci = &cardem_inst[instance];
 	return !ci->pin_insert_inverted;
 }
--- a/firmware/libcommon/source/ringbuffer.c
+++ b/firmware/libcommon/source/ringbuffer.c
@@ -28,16 +28,6 @@ void rbuf_reset(volatile ringbuf * rb)
 	local_irq_restore(state);
 }
 void rbuf16_reset(volatile ringbuf16 * rb)
 {
 	unsigned long state;
 	local_irq_save(state);
 	rb->ird = 0;
 	rb->iwr = 0;
 	local_irq_restore(state);
 }
 uint8_t rbuf_read(volatile ringbuf * rb)
 {
 	unsigned long state;
@@ -51,49 +41,21 @@ uint8_t rbuf_read(volatile ringbuf * rb)
 	return val;
 }
 uint16_t rbuf16_read(volatile ringbuf16 * rb)
 {
 	unsigned long state;
 	uint16_t val;
 	local_irq_save(state);
 	val = rb->buf[rb->ird];
 	rb->ird = (rb->ird + 1) % RING16_BUFLEN;
 	local_irq_restore(state);
 	return val;
 }
 uint8_t rbuf_peek(volatile ringbuf * rb)
 {
 	return rb->buf[rb->ird];
 }
 uint16_t rbuf16_peek(volatile ringbuf16 * rb)
 {
 	return rb->buf[rb->ird];
 }
 bool rbuf_is_empty(volatile ringbuf * rb)
 {
 	return rb->ird == rb->iwr;
 }
 bool rbuf16_is_empty(volatile ringbuf16 * rb)
 {
 	return rb->ird == rb->iwr;
 }
 static bool __rbuf_is_full(volatile ringbuf * rb)
 {
 	return rb->ird == (rb->iwr + 1) % RING_BUFLEN;
 }
 static bool __rbuf16_is_full(volatile ringbuf16 * rb)
 {
 	return rb->ird == (rb->iwr + 1) % RING16_BUFLEN;
 }
 bool rbuf_is_full(volatile ringbuf * rb)
 {
 	unsigned long state;
@@ -106,18 +68,6 @@ bool rbuf_is_full(volatile ringbuf * rb)
 	return rc;
 }
 bool rbuf16_is_full(volatile ringbuf16 * rb)
 {
 	unsigned long state;
 	bool rc;
 	local_irq_save(state);
 	rc = rb->ird == (rb->iwr + 1) % RING16_BUFLEN;
 	local_irq_restore(state);
 	return rc;
 }
 int rbuf_write(volatile ringbuf * rb, uint8_t item)
 {
 	unsigned long state;
@@ -134,18 +84,4 @@ int rbuf_write(volatile ringbuf * rb, uint8_t item)
 	}
 }
 int rbuf16_write(volatile ringbuf16 * rb, uint16_t item)
 {
 	unsigned long state;
 	local_irq_save(state);
 	if (!__rbuf16_is_full(rb)) {
 		rb->buf[rb->iwr] = item;
 		rb->iwr = (rb->iwr + 1) % RING16_BUFLEN;
 		local_irq_restore(state);
 		return 0;
 	} else {
 		local_irq_restore(state);
 		return -1;
 	}
 }
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -1,6 +1,6 @@
 /* SIMtrace 2 sniffer mode
 *
- * (C) 2016-2022 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
 * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -111,13 +111,6 @@ enum tpdu_sniff_state {
 	TPDU_S_SW2, /*!< second status word */
 };
 /*! Error flags we use to report USART errors via the ringbuffer */
 #define RBUF16_F_OVERRUN	0x0100
 #define RBUF16_F_FRAMING	0x0200
 #define RBUF16_F_PARITY		0x0400
 #define RBUF16_F_TIMEOUT_WT	0x0800
 #define RBUF16_F_DATA_BYTE	0x8000
 /*------------------------------------------------------------------------------
 *         Internal variables
 *------------------------------------------------------------------------------*/
@@ -145,58 +138,50 @@ static struct Usart_info sniff_usart = {
 	.state = USART_RCV,
 };
 /*! Ring buffer to store sniffer communication data */
-static struct ringbuf16 sniff_buffer;
+static struct ringbuf sniff_buffer;
 /* Flags  to know is the card status changed (see SIMTRACE_MSGT_DT_SNIFF_CHANGE flags) */
-static volatile uint32_t change_flags = 0;
+volatile uint32_t change_flags = 0;
 /* ISO 7816 variables */
 /*! ISO 7816-3 state */
-static enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
+enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
 static struct {
 /*! ATR state */
-	enum atr_sniff_state state;
+enum atr_sniff_state atr_state;
 /*! ATR data
 *  @remark can be used to check later protocol changes
 */
 uint8_t atr[MAX_ATR_SIZE];
 /*! Current index in the ATR data */
-	uint8_t atr_i;
+uint8_t atr_i = 0;
 } g_atr;
 /*! If convention conversion is needed */
-static bool convention_convert = false;
+bool convention_convert = false;
 /*! The supported T protocols */
-static uint16_t t_protocol_support = 0;
+uint16_t t_protocol_support = 0;
 static struct {
 /*! PPS state 
-	 *  @remark it is shared between request and response since they aren't simultaneous but
+ *  @remark it is shared between request and response since they aren't simultaneous but follow the same procedure
-	 *  follow the same procedure */
+ */
-	enum pps_sniff_state state;
+enum pps_sniff_state pps_state;
 /*! PPS request data
-	 *  @remark can be used to check PPS response */
+ *  @remark can be used to check PPS response
-	uint8_t req[MAX_PPS_SIZE];
+ */
 uint8_t pps_req[MAX_PPS_SIZE];
 /*! PPS response data */
-	uint8_t rsp[MAX_PPS_SIZE];
+uint8_t pps_rsp[MAX_PPS_SIZE];
 } g_pps;
 static struct {
 /*! TPDU state */
-	enum tpdu_sniff_state state;
+enum tpdu_sniff_state tpdu_state;
 /*! Final TPDU packet
 *  @note this is the complete command+response TPDU, including header, data, and status words
-	 *  @remark this does not include the procedure bytes */
+ *  @remark this does not include the procedure bytes
-	uint8_t packet[5+256+2];
+ */
 uint8_t tpdu_packet[5+256+2];
 /*! Current index in TPDU packet */
-	uint16_t packet_i;
+uint16_t tpdu_packet_i = 0;
 } g_tpdu;
 /*! Waiting Time (WT)
 *  @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
 */
-static uint32_t g_wt = 9600;
+uint32_t wt = 9600;
 /*------------------------------------------------------------------------------
 *         Internal functions
@@ -211,11 +196,10 @@ static const uint8_t convention_convert_lut[256] = { 0xff, 0x7f, 0xbf, 0x3f, 0xd
 /*! Update Waiting Time (WT)
 *  @param[in] wi Waiting Integer (0 if unchanged)
 *  @param[in] d Baud Rate divider (0 if unchanged)
 *  @param[in] cause String describing the source of the change
 *  @note set wt to be used by the receiver timeout
 *  @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
 */
-static void update_wt(uint8_t wi, uint8_t d, const char *cause)
+static void update_wt(uint8_t wi, uint8_t d)
 {
 	static uint8_t wt_wi = 10; /* Waiting time Integer (WI), used to calculate the Waiting Time (WT) */
 	static uint8_t wt_d = 1; /* baud rate adjustment integer (the actual value, not the table index) */
@@ -226,8 +210,8 @@ static void update_wt(uint8_t wi, uint8_t d, const char *cause)
 	if (0 != d) {
 		wt_d = d;
 	}
-	g_wt = wt_wi * 960UL * wt_d;
+	wt = wt_wi * 960UL * wt_d;
-	TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d, cause, g_wt);
+	TRACE_INFO("WT updated to %lu ETU\n\r", wt);
 }
 /*! Allocate USB buffer and push + initialize simtrace_msg_hdr
@@ -271,15 +255,6 @@ void usb_msg_upd_len_and_submit(struct msgb *usb_msg)
 	usb_buf_submit(usb_msg);
 }
 /*! Update the TPDU state
 *  @param[in] tpdu_state_new new TPDU state to update to
 */
 static void change_tpdu_state(enum tpdu_sniff_state tpdu_state_new)
 {
 	//TRACE_ERROR("TPDU state %u->%u\n\r", g_tpdu.state, tpdu_state_new);
 	g_tpdu.state = tpdu_state_new;
 }
 /*! Update the ISO 7816-3 state
 *  @param[in] iso_state_new new ISO 7816-3 state to update to
 */
@@ -295,33 +270,32 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
 	switch (iso_state_new) {
 	case ISO7816_S_RESET:
 		update_fidi(&sniff_usart, 0x11); /* reset baud rate to default Di/Fi values */
-		update_wt(10, 1, "RESET"); /* reset WT time-out */
+		update_wt(10, 1); /* reset WT time-out */
 		break;
 	case ISO7816_S_WAIT_ATR:
-		rbuf16_reset(&sniff_buffer); /* reset buffer for new communication */
+		rbuf_reset(&sniff_buffer); /* reset buffer for new communication */
 		break;
 	case ISO7816_S_IN_ATR:
-		g_atr.atr_i = 0;
+		atr_i = 0;
 		convention_convert = false;
 		t_protocol_support = 0;
-		g_atr.state = ATR_S_WAIT_TS;
+		atr_state = ATR_S_WAIT_TS;
 		break;
 	case ISO7816_S_IN_PPS_REQ:
 	case ISO7816_S_IN_PPS_RSP:
-		g_pps.state = PPS_S_WAIT_PPSS;
+		pps_state = PPS_S_WAIT_PPSS;
 		break;
 	case ISO7816_S_WAIT_TPDU:
-		change_tpdu_state(TPDU_S_CLA);
+		tpdu_state = TPDU_S_CLA;
-		g_tpdu.packet_i = 0;
+		tpdu_packet_i = 0;
 		break;
 	default:
 		break;
 	}
 	TRACE_INFO("ISO 7816-3 state %u->%u\n\r", iso_state, iso_state_new);
 	/* save new state */
 	iso_state = iso_state_new;
 	TRACE_INFO("Changed to ISO 7816-3 state %u\n\r", iso_state);
 }
 const struct value_string data_flags[] = {
@@ -406,13 +380,13 @@ static void usb_send_atr(uint32_t flags)
 		TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
+	if (atr_i >= ARRAY_SIZE(atr)) {
 		TRACE_ERROR("ATR buffer overflow\n\r");
 		return;
 	}
 	/* Send ATR over USB */
-	usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, g_atr.atr, g_atr.atr_i, flags);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, atr, atr_i, flags);
 }
 /*! Process ATR byte
@@ -430,16 +404,16 @@ static void process_byte_atr(uint8_t byte)
 		TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
+	if (atr_i >= ARRAY_SIZE(atr)) {
 		TRACE_ERROR("ATR data overflow\n\r");
 		return;
 	}
 	/* save data for use by other functions */
-	g_atr.atr[g_atr.atr_i++] = byte;
+	atr[atr_i++] = byte;
 	/* handle ATR byte depending on current state */
-	switch (g_atr.state) {
+	switch (atr_state) {
 	case ATR_S_WAIT_TS: /* see ISO/IEC 7816-3:2006 section 8.1 */
 		flags = 0;
 		switch (byte) {
@@ -448,7 +422,7 @@ static void process_byte_atr(uint8_t byte)
 			convention_convert = !convention_convert;
 		case 0x3b: /* direct convention used and correctly decoded */
 		case 0x3f: /* inverse convention used and correctly decoded */
-			g_atr.state = ATR_S_WAIT_T0; /* wait for format byte */
+			atr_state = ATR_S_WAIT_T0; /* wait for format byte */
 			break;
 		default:
 			TRACE_WARNING("Invalid TS received\n\r");
@@ -461,41 +435,41 @@ static void process_byte_atr(uint8_t byte)
 		break;
 	case ATR_S_WAIT_T0: /* see ISO/IEC 7816-3:2006 section 8.2.2 */
 	case ATR_S_WAIT_TD: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
-		if (ATR_S_WAIT_T0 == g_atr.state) {
+		if (ATR_S_WAIT_T0 == atr_state) {
 			atr_hist_len = (byte & 0x0f); /* save the number of historical bytes */
-		} else if (ATR_S_WAIT_TD == g_atr.state) {
+		} else if (ATR_S_WAIT_TD == atr_state) {
 			t_protocol_support |= (1<<(byte & 0x0f)); /* remember supported protocol to know if TCK will be present */
 		}
 		y = (byte & 0xf0); /* remember upcoming interface bytes */
 		i++; /* next interface byte sub-group is coming */
 		if (y & 0x10) {
-			g_atr.state = ATR_S_WAIT_TA; /* wait for interface byte TA */
+			atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */
 			break;
 		}
 	case ATR_S_WAIT_TA: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
 		if (y & 0x20) {
-			g_atr.state = ATR_S_WAIT_TB; /* wait for interface byte TB */
+			atr_state = ATR_S_WAIT_TB; /* wait for interface byte TB */
 			break;
 		}
 	case ATR_S_WAIT_TB: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
 		if (y & 0x40) {
-			g_atr.state = ATR_S_WAIT_TC; /* wait for interface byte TC */
+			atr_state = ATR_S_WAIT_TC; /* wait for interface byte TC */
 			break;
 		}
 	case ATR_S_WAIT_TC: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
 		/* retrieve WI encoded in TC2*/
-		if (ATR_S_WAIT_TC == g_atr.state && 2 == i) {
+		if (ATR_S_WAIT_TC==atr_state && 2==i) {
 			if (0 == byte) {
-				update_wt(10, 0, "TC2=0");
+				update_wt(10, 0);
 			} else {
-				update_wt(byte, 0, "TC2");
+				update_wt(byte, 0);
 			}
 		}
 		if (y & 0x80) {
-			g_atr.state = ATR_S_WAIT_TD; /* wait for interface byte TD */
+			atr_state = ATR_S_WAIT_TD; /* wait for interface byte TD */
 			break;
 		} else if (atr_hist_len) {
-			g_atr.state = ATR_S_WAIT_HIST; /* wait for historical bytes */
+			atr_state = ATR_S_WAIT_HIST; /* wait for historical bytes */
 			break;
 		}
 	case ATR_S_WAIT_HIST: /* see ISO/IEC 7816-3:2006 section 8.2.4 */
@@ -504,7 +478,7 @@ static void process_byte_atr(uint8_t byte)
 		}
 		if (0 == atr_hist_len) {
 			if (t_protocol_support > 1) {
-				g_atr.state = ATR_S_WAIT_TCK; /* wait for check bytes */
+				atr_state = ATR_S_WAIT_TCK; /* wait for check bytes */
 				break;
 			}
 		} else {
@@ -512,11 +486,11 @@ static void process_byte_atr(uint8_t byte)
 		}
 	case ATR_S_WAIT_TCK:  /* see ISO/IEC 7816-3:2006 section 8.2.5 */
 		/* verify checksum if present */
-		if (ATR_S_WAIT_TCK == g_atr.state) {
+		if (ATR_S_WAIT_TCK == atr_state) {
 			uint8_t ui;
 			uint8_t checksum = 0;
-			for (ui = 1; ui < g_atr.atr_i; ui++) {
+			for (ui = 1; ui < atr_i; ui++) {
-				checksum ^= g_atr.atr[ui];
+				checksum ^= atr[ui];
 			}
 			if (checksum) {
 				flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
@@ -529,7 +503,7 @@ static void process_byte_atr(uint8_t byte)
 		change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 		break;
 	default:
-		TRACE_INFO("Unknown ATR state %u\n\r", g_atr.state);
+		TRACE_INFO("Unknown ATR state %u\n\r", atr_state);
 	}
 }
@@ -543,9 +517,9 @@ static void usb_send_pps(uint32_t flags)
 	/* Sanity check */
 	if (ISO7816_S_IN_PPS_REQ == iso_state) {
-		pps_cur = g_pps.req;
+		pps_cur = pps_req;
 	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
-		pps_cur = g_pps.rsp;
+		pps_cur = pps_rsp;
 	} else {
 		TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);
 		return;
@@ -554,22 +528,22 @@ static void usb_send_pps(uint32_t flags)
 	/* Get only relevant data */
 	uint8_t pps[6];
 	uint8_t pps_i = 0;
-	if (g_pps.state > PPS_S_WAIT_PPSS) {
+	if (pps_state > PPS_S_WAIT_PPSS) {
 		pps[pps_i++] = pps_cur[0];
 	}
-	if (g_pps.state > PPS_S_WAIT_PPS0) {
+	if (pps_state > PPS_S_WAIT_PPS0) {
 		pps[pps_i++] = pps_cur[1];
 	}
-	if (g_pps.state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
+	if (pps_state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
 		pps[pps_i++] = pps_cur[2];
 	}
-	if (g_pps.state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
+	if (pps_state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
 		pps[pps_i++] = pps_cur[3];
 	}
-	if (g_pps.state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
+	if (pps_state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
 		pps[pps_i++] = pps_cur[4];
 	}
-	if (g_pps.state > PPS_S_WAIT_PCK) {
+	if (pps_state > PPS_S_WAIT_PCK) {
 		pps[pps_i++] = pps_cur[5];
 	}
@@ -599,21 +573,21 @@ static void process_byte_pps(uint8_t byte)
 	/* sanity check */
 	if (ISO7816_S_IN_PPS_REQ == iso_state) {
-		pps_cur = g_pps.req;
+		pps_cur = pps_req;
 	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
-		pps_cur = g_pps.rsp;
+		pps_cur = pps_rsp;
 	} else {
 		TRACE_ERROR("Processing PPS data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
 	/* handle PPS byte depending on current state */
-	switch (g_pps.state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
+	switch (pps_state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
 	case PPS_S_WAIT_PPSS: /*!< initial byte */
 		flags = 0;
-		if (byte == 0xff) {
+		if (0xff) {
 			pps_cur[0] = byte;
-			g_pps.state = PPS_S_WAIT_PPS0; /* go to next state */
+			pps_state = PPS_S_WAIT_PPS0; /* go to next state */
 		} else {
 			TRACE_INFO("Invalid PPSS received\n\r");
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
@@ -624,24 +598,24 @@ static void process_byte_pps(uint8_t byte)
 	case PPS_S_WAIT_PPS0: /*!< format byte */
 		pps_cur[1] = byte;
 		if (pps_cur[1] & 0x10) {
-			g_pps.state = PPS_S_WAIT_PPS1; /* go to next state */
+			pps_state = PPS_S_WAIT_PPS1; /* go to next state */
 			break;
 		}
 	case PPS_S_WAIT_PPS1: /*!< first parameter byte */
 		pps_cur[2] = byte; /* not always right but doesn't affect the process */
 		if (pps_cur[1] & 0x20) {
-			g_pps.state = PPS_S_WAIT_PPS2; /* go to next state */
+			pps_state = PPS_S_WAIT_PPS2; /* go to next state */
 			break;
 		}
 	case PPS_S_WAIT_PPS2: /*!< second parameter byte */
 		pps_cur[3] = byte; /* not always right but doesn't affect the process */
 		if (pps_cur[1] & 0x40) {
-			g_pps.state = PPS_S_WAIT_PPS3; /* go to next state */
+			pps_state = PPS_S_WAIT_PPS3; /* go to next state */
 			break;
 		}
 	case PPS_S_WAIT_PPS3: /*!< third parameter byte */
 		pps_cur[4] = byte; /* not always right but doesn't affect the process */
-		g_pps.state = PPS_S_WAIT_PCK; /* go to next state */
+		pps_state = PPS_S_WAIT_PCK; /* go to next state */
 		break;
 	case PPS_S_WAIT_PCK: /*!< check byte */
 		pps_cur[5] = byte; /* not always right but doesn't affect the process */
@@ -662,7 +636,7 @@ static void process_byte_pps(uint8_t byte)
 		if (check) {
 			flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
 		}
-		g_pps.state = PPS_S_WAIT_END;
+		pps_state = PPS_S_WAIT_END;
 		usb_send_pps(flags); /* send PPS to host software using USB */
 		if (ISO7816_S_IN_PPS_REQ == iso_state) {
 			if (0 == check) { /* checksum is valid */
@@ -683,7 +657,7 @@ static void process_byte_pps(uint8_t byte)
 				TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r",
 					   iso7816_3_fi_table[fn], iso7816_3_di_table[dn]);
 				update_fidi(&sniff_usart, pps_cur[2]);
-				update_wt(0, iso7816_3_di_table[dn], "PPS");
+				update_wt(0, iso7816_3_di_table[dn]);
 				usb_send_fidi(pps_cur[2]); /* send Fi/Di change notification to host software over USB */
 			} else { /* checksum is invalid */
 				TRACE_INFO("PPS negotiation failed\n\r");
@@ -692,10 +666,10 @@ static void process_byte_pps(uint8_t byte)
 		}
 		break;
 	case PPS_S_WAIT_END:
-		TRACE_WARNING("Unexpected PPS received %u\n\r", g_pps.state);
+		TRACE_WARNING("Unexpected PPS received %u\n\r", pps_state);
 		break;
 	default:
-		TRACE_WARNING("Unknown PPS state %u\n\r", g_pps.state);
+		TRACE_WARNING("Unknown PPS state %u\n\r", pps_state);
 		break;
 	}
 }
@@ -713,7 +687,7 @@ static void usb_send_tpdu(uint32_t flags)
 	}
 	/* Send ATR over USB */
-	usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, g_tpdu.packet, g_tpdu.packet_i, flags);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, tpdu_packet, tpdu_packet_i, flags);
 }
 static void process_byte_tpdu(uint8_t byte)
@@ -723,13 +697,13 @@ static void process_byte_tpdu(uint8_t byte)
 		TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (g_tpdu.packet_i >= ARRAY_SIZE(g_tpdu.packet)) {
+	if (tpdu_packet_i >= ARRAY_SIZE(tpdu_packet)) {
 		TRACE_ERROR("TPDU data overflow\n\r");
 		return;
 	}
 	/* handle TPDU byte depending on current state */
-	switch (g_tpdu.state) {
+	switch (tpdu_state) {
 	case TPDU_S_CLA:
 		if (0xff == byte) {
 			TRACE_WARNING("0xff is not a valid class byte\n\r");
@@ -738,51 +712,51 @@ static void process_byte_tpdu(uint8_t byte)
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
-		g_tpdu.packet_i = 0;
+		tpdu_packet_i = 0;
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		change_tpdu_state(TPDU_S_INS);
+		tpdu_state = TPDU_S_INS;
 		break;
 	case TPDU_S_INS:
 		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
-			TRACE_WARNING("invalid INS 0x%02x\n\r", byte);
+			TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 			usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
-		g_tpdu.packet_i = 1;
+		tpdu_packet_i = 1;
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		change_tpdu_state(TPDU_S_P1);
+		tpdu_state = TPDU_S_P1;
 		break;
 	case TPDU_S_P1:
-		g_tpdu.packet_i = 2;
+		tpdu_packet_i = 2;
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		change_tpdu_state(TPDU_S_P2);
+		tpdu_state = TPDU_S_P2;
 		break;
 	case TPDU_S_P2:
-		g_tpdu.packet_i = 3;
+		tpdu_packet_i = 3;
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		change_tpdu_state(TPDU_S_P3);
+		tpdu_state = TPDU_S_P3;
 		break;
 	case TPDU_S_P3:
-		g_tpdu.packet_i = 4;
+		tpdu_packet_i = 4;
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		change_tpdu_state(TPDU_S_PROCEDURE);
+		tpdu_state = TPDU_S_PROCEDURE;
 		break;
 	case TPDU_S_PROCEDURE:
 		if (0x60 == byte) { /* wait for next procedure byte */
 			break;
-		} else if (g_tpdu.packet[1] == byte) { /* get all remaining data bytes */
+		} else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */
-			change_tpdu_state(TPDU_S_DATA_REMAINING);
+			tpdu_state = TPDU_S_DATA_REMAINING;
 			break;
-		} else if ((~g_tpdu.packet[1]) == byte) { /* get single data byte */
+		} else if ((~tpdu_packet[1]) == byte) { /* get single data byte */
-			change_tpdu_state(TPDU_S_DATA_SINGLE);
+			tpdu_state = TPDU_S_DATA_SINGLE;
 			break;
 		}
 	case TPDU_S_SW1:
 		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */
-			g_tpdu.packet[g_tpdu.packet_i++] = byte;
+			tpdu_packet[tpdu_packet_i++] = byte;
-			change_tpdu_state(TPDU_S_SW2);
+			tpdu_state = TPDU_S_SW2;
 		} else {
 			TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
@@ -792,28 +766,28 @@ static void process_byte_tpdu(uint8_t byte)
 		}
 		break;
 	case TPDU_S_SW2:
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
 		usb_send_tpdu(0); /* send TPDU to host software using USB */
 		change_state(ISO7816_S_WAIT_TPDU); /* this is the end of the TPDU */
 		break;
 	case TPDU_S_DATA_SINGLE:
 	case TPDU_S_DATA_REMAINING:
-		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		tpdu_packet[tpdu_packet_i++] = byte;
-		if (0 == g_tpdu.packet[4]) {
+		if (0 == tpdu_packet[4]) {
-			if (5+256 <= g_tpdu.packet_i) {
+			if (5+256 <= tpdu_packet_i) {
-				change_tpdu_state(TPDU_S_PROCEDURE);
+				tpdu_state = TPDU_S_PROCEDURE;
 			}
 		} else {
-			if (5+g_tpdu.packet[4] <= g_tpdu.packet_i) {
+			if (5+tpdu_packet[4] <= tpdu_packet_i) {
-				change_tpdu_state(TPDU_S_PROCEDURE);
+				tpdu_state = TPDU_S_PROCEDURE;
 			}
 		}
-		if (TPDU_S_DATA_SINGLE == g_tpdu.state) {
+		if (TPDU_S_DATA_SINGLE == tpdu_state) {
-			change_tpdu_state(TPDU_S_PROCEDURE);
+			tpdu_state = TPDU_S_PROCEDURE;
 		}
 		break;
 	default:
-		TRACE_ERROR("unhandled TPDU state %u\n\r", g_tpdu.state);
+		TRACE_ERROR("unhandled TPDU state %u\n\r", tpdu_state);
 	}
 }
@@ -825,37 +799,37 @@ void Sniffer_usart_isr(void)
 	/* Read channel status register */
 	uint32_t csr = sniff_usart.base->US_CSR;
-
+	/* Verify if there was an error */
-	uint16_t byte = 0;
+	if (csr & US_CSR_OVRE) {
 		TRACE_WARNING("USART overrun error\n\r");
 		sniff_usart.base->US_CR |= US_CR_RSTSTA;
 	}
 	if (csr & US_CSR_FRAME) {
 		TRACE_WARNING("USART framing error\n\r");
 		sniff_usart.base->US_CR |= US_CR_RSTSTA;
 	}
 	/* Verify if character has been received */
 	if (csr & US_CSR_RXRDY) {
 		/* Read communication data byte between phone and SIM */
-		byte = RBUF16_F_DATA_BYTE | (sniff_usart.base->US_RHR & 0xff);
+		uint8_t byte = sniff_usart.base->US_RHR;
 		/* Reset WT timer */
-		wt_remaining = g_wt;
+		wt_remaining = wt;
 		/* Store sniffed data into buffer (also clear interrupt */
 		if (rbuf_is_full(&sniff_buffer)) {
 			TRACE_ERROR("USART buffer full\n\r");
 		} else {
 			rbuf_write(&sniff_buffer, byte);
 		}
 	}
 	/* Verify if there was an error */
 	if (csr & US_CSR_OVRE)
 		byte |= RBUF16_F_OVERRUN;
 	if (csr & US_CSR_FRAME)
 		byte |= RBUF16_F_FRAMING;
 	if (csr & US_CSR_PARE)
 		byte |= RBUF16_F_PARITY;
 	if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE))
 		sniff_usart.base->US_CR |= US_CR_RSTSTA;
 	/* Verify it WT timeout occurred, to detect unresponsive card */
 	if (csr & US_CSR_TIMEOUT) {
 		if (wt_remaining <= (sniff_usart.base->US_RTOR & 0xffff)) {
 			/* ensure the timeout is enqueued in the ring-buffer */
 			byte |= RBUF16_F_TIMEOUT_WT;
 			/* Just set the flag and let the main loop handle it */
 			change_flags |= SNIFF_CHANGE_FLAG_TIMEOUT_WT;
 			/* Reset timeout value */
-			wt_remaining = g_wt;
+			wt_remaining = wt;
 		} else {
 			wt_remaining -= (sniff_usart.base->US_RTOR & 0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */
 		}
@@ -871,12 +845,6 @@ void Sniffer_usart_isr(void)
 			sniff_usart.base->US_CR |= US_CR_RETTO;
 		}
 	}
 	/* Store sniffed data (or error flags, or both) into buffer */
 	if (byte) {
 		if (rbuf16_write(&sniff_buffer, byte) != 0)
 			TRACE_ERROR("USART buffer full\n\r");
 	}
 }
 /** PIO interrupt service routine to checks if the card reset line has changed
@@ -918,8 +886,6 @@ void Sniffer_usart0_irq(void)
 *          Initialization routine
 *-----------------------------------------------------------------------------*/
 #define SNIFFER_IER (US_IER_RXRDY | US_IER_TIMEOUT | US_IER_OVRE | US_IER_FRAME | US_IER_PARE)
 /* Called during USB enumeration after device is enumerated by host */
 void Sniffer_configure(void)
 {
@@ -931,7 +897,7 @@ void Sniffer_exit(void)
 {
 	TRACE_INFO("Sniffer exit\n\r");
 	/* Disable USART */
-	USART_DisableIt(sniff_usart.base, SNIFFER_IER);
+	USART_DisableIt(sniff_usart.base, US_IER_RXRDY);
 	/* NOTE: don't forget to set the IRQ according to the USART peripheral used */
 	NVIC_DisableIRQ(IRQ_USART_SIM);
 	USART_SetReceiverEnabled(sniff_usart.base, 0);
@@ -959,15 +925,15 @@ void Sniffer_init(void)
 	PIO_EnableIt(&pin_rst);
 	/* Clear ring buffer containing the sniffed data */
-	rbuf16_reset(&sniff_buffer);
+	rbuf_reset(&sniff_buffer);
 	/* Configure USART to as ISO-7816 slave communication to sniff communication */
 	ISO7816_Init(&sniff_usart, CLK_SLAVE);
 	/* Only receive data when sniffing */
 	USART_SetReceiverEnabled(sniff_usart.base, 1);
 	/* Enable Receiver time-out to detect waiting time (WT) time-out (e.g. unresponsive cards) */
-	sniff_usart.base->US_RTOR = g_wt;
+	sniff_usart.base->US_RTOR = wt;
 	/* Enable interrupt to indicate when data has been received or timeout occurred */
-	USART_EnableIt(sniff_usart.base, SNIFFER_IER);
+	USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT);
 	/* Set USB priority lower than USART to not miss sniffing data (both at 0 per default) */
 	if (NVIC_GetPriority(IRQ_USART_SIM) >= NVIC_GetPriority(UDP_IRQn)) {
 		NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM) + 2);
@@ -1025,16 +991,12 @@ void Sniffer_run(void)
 	 * is remaining
 	 */
 	/* Handle sniffed data */
-	if (!rbuf16_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
+	if (!rbuf_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
-		uint16_t entry = rbuf16_read(&sniff_buffer);
+		uint8_t byte = rbuf_read(&sniff_buffer);
 		if (entry & RBUF16_F_DATA_BYTE) {
 			uint8_t byte = entry & 0xff;
 		/* Convert convention if required */
 		if (convention_convert) {
 			byte = convention_convert_lut[byte];
 		}
 		//TRACE_ERROR_WP(">%02x", byte);
 		switch (iso_state) { /* Handle byte depending on state */
 		case ISO7816_S_RESET: /* During reset we shouldn't receive any data */
@@ -1070,39 +1032,6 @@ void Sniffer_run(void)
 		}
 	}
 		/* Use timeout to detect interrupted data transmission */
 		if (entry & RBUF16_F_TIMEOUT_WT) {
 			TRACE_ERROR("USART TIMEOUT Error\n\r");
 			switch (iso_state) {
 			case ISO7816_S_IN_ATR:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
 				change_state(ISO7816_S_WAIT_ATR);
 				break;
 			case ISO7816_S_IN_TPDU:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			case ISO7816_S_IN_PPS_REQ:
 			case ISO7816_S_IN_PPS_RSP:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			default:
 				break;
 			}
 		}
 		if (entry & RBUF16_F_PARITY)
 			TRACE_ERROR("USART PARITY Error\r\n");
 		if (entry & RBUF16_F_FRAMING)
 			TRACE_ERROR("USART FRAMING Error\r\n");
 		if (entry & RBUF16_F_OVERRUN)
 			TRACE_ERROR("USART OVERRUN Error\r\n");
 	}
 	/* Handle flags */
 	if (change_flags) { /* WARNING this is not synced with the data buffer handling */
 		if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) {
@@ -1134,6 +1063,30 @@ void Sniffer_run(void)
 				printf("reset de-asserted\n\r");
 			}
 		}
 		if (change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
 			/* Use timeout to detect interrupted data transmission */
 			switch (iso_state) {
 			case ISO7816_S_IN_ATR:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
 				change_state(ISO7816_S_WAIT_ATR);
 				break;
 			case ISO7816_S_IN_TPDU:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			case ISO7816_S_IN_PPS_REQ:
 			case ISO7816_S_IN_PPS_RSP:
 				led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
 				usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
 				change_state(ISO7816_S_WAIT_TPDU);
 				break;
 			default:
 				change_flags &= ~SNIFF_CHANGE_FLAG_TIMEOUT_WT; /* We don't care about the timeout is all other cases */
 				break;
 			}
 		}
 		if (change_flags) {
 			usb_send_change(change_flags); /* send timeout to host software over USB */
 			change_flags = 0; /* Reset flags */
--- a/firmware/libcommon/source/usb.c
+++ b/firmware/libcommon/source/usb.c
@@ -689,7 +689,6 @@ void SIMtrace_USB_Initialize(void)
 {
 	unsigned int i;
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
 	USBD_HAL_Disconnect();
 	USBD_HAL_Suspend();
 	mdelay(500);
 	USBD_HAL_Activate();
--- a/firmware/test/Makefile
+++ b/firmware/test/Makefile
@@ -7,7 +7,6 @@ CFLAGS=-g -Wall $(LIBOSMOCORE_CFLAGS) \
 	-I../atmel_softpack_libraries/libchip_sam3s/cmsis \
 	-I../atmel_softpack_libraries/libchip_sam3s/include \
 	-I../atmel_softpack_libraries/usb/include \
 	-I../atmel_softpack_libraries/ \
 	-I../libcommon/include \
 	-I../libboard/common/include \
 	-I../libboard/simtrace/include \
--- a/firmware/test/card_emu_tests.c
+++ b/firmware/test/card_emu_tests.c
@@ -93,14 +93,7 @@ void card_emu_uart_reset_wt(uint8_t uart_chan)
 	printf("%s(uart_chan=%u\n", __func__, uart_chan);
 }
 void mode_cardemu_set_presence_pol(uint8_t instance, bool high)
 {
 }
 bool mode_cardemu_get_presence_pol(uint8_t instance)
 {
 	return false;
 }
 /***********************************************************************
 * test helper functions
--- a/host/configure.ac
+++ b/host/configure.ac
@@ -56,9 +56,9 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
 CFLAGS="$saved_CFLAGS"
 AC_SUBST(SYMBOL_VISIBILITY)
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0)
-PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.4.0)
-PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.4.0)
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
 AC_ARG_ENABLE(sanitize,
@@ -100,4 +100,5 @@ AC_OUTPUT(
 	src/Makefile
 	lib/Makefile
 	contrib/Makefile
 	contrib/simtrace2.spec
 	Makefile)
--- a/host/contrib/simtrace2.spec.in
+++ b/host/contrib/simtrace2.spec.in
@@ -0,0 +1,102 @@
 #
 # spec file for package simtrace2
 #
 # Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2018-2021, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 %define sover 1
 Name:           simtrace2
 Version:        @VERSION@
 Release:        0
 Summary:        Osmocom SIMtrace host utility
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
 URL:            https://osmocom.org/projects/simtrace2/wiki
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libosmocore) >= 1.4.0
 BuildRequires:  pkgconfig(libosmosim) >= 1.4.0
 BuildRequires:  pkgconfig(libosmousb) >= 1.4.0
 BuildRequires:  pkgconfig(libpcsclite)
 BuildRequires:  pkgconfig(libusb-1.0)
 %description
 Osmocom SIMtrace 2 is a software and hardware system for passively
 tracing SIM-ME communication between the SIM card and the mobile phone,
 and remote SIM operation.
 This package contains SIMtrace 2 host utility.
 %package -n libosmo-simtrace2-%{sover}
 Summary:        Driver functions for Osmocom SIMtrace2 and compatible firmware
 Group:          System/Libraries
 %description -n libosmo-simtrace2-%{sover}
 This library contains core "driver" functionality to interface with the
 Osmocom SIMtrace2 (and compatible) USB device firmware.  It enables
 applications to implement SIM card / smart card tracing as well as
 SIM / smart card emulation functions.
 %package -n libosmo-simtrace2-devel
 Summary:        Development files for the Osmocom SIMtrace2 library
 Group:          Development/Libraries/C and C++
 Requires:       libosmo-simtrace2-%{sover} = %{version}
 %description -n libosmo-simtrace2-devel
 Osmocom SIMtrace2 (and compatible) USB device firmware.  It enables
 applications to implement SIM card / smart card tracing as well as
 SIM / smart card emulation functions.
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmo-simtrace2.
 %prep
 %setup -q
 %build
 cd host
 echo "%{version}" >.tarball-version
 autoreconf -fiv
 %configure --disable-static
 %make_build
 %install
 %make_install -C host
 install -Dm0644 host/contrib/99-simtrace2.rules %{buildroot}/%{_udevrulesdir}/99-simtrace2.rules
 find %{buildroot} -type f -name "*.la" -delete -print
 %post   -n libosmo-simtrace2-%{sover} -p /sbin/ldconfig
 %postun -n libosmo-simtrace2-%{sover} -p /sbin/ldconfig
 %files
 %license host/COPYING
 %doc README.md
 %{_bindir}/simtrace2-cardem-pcsc
 %{_bindir}/simtrace2-list
 %{_bindir}/simtrace2-sniff
 %{_bindir}/simtrace2-tool
 %{_udevrulesdir}/99-simtrace2.rules
 %files -n libosmo-simtrace2-%{sover}
 %{_libdir}/libosmo-simtrace2.so.%{sover}*
 %files -n libosmo-simtrace2-devel
 %dir %{_includedir}/osmocom/
 %dir %{_includedir}/osmocom/simtrace2/
 %{_includedir}/osmocom/simtrace2/*.h
 %{_libdir}/libosmo-simtrace2.so
 %{_libdir}/pkgconfig/libosmo-simtrace2.pc
 %changelog
--- a/host/include/osmocom/simtrace2/simtrace2_api.h
+++ b/host/include/osmocom/simtrace2/simtrace2_api.h
@@ -41,8 +41,6 @@ struct osmo_st2_cardem_inst {
 	void *priv;
 };
 struct cardemu_usb_msg_config;
 int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
                         uint8_t msg_class, uint8_t msg_type);
@@ -55,7 +53,7 @@ int osmo_st2_cardem_request_sw_tx(struct osmo_st2_cardem_inst *ci, const uint8_t
 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_cardem_request_config2(struct osmo_st2_cardem_inst *ci, const struct cardemu_usb_msg_config *config);
+
 int osmo_st2_modem_reset_pulse(struct osmo_st2_slot *slot, uint16_t duration_ms);
 int osmo_st2_modem_reset_active(struct osmo_st2_slot *slot);
--- a/host/lib/Makefile.am
+++ b/host/lib/Makefile.am
@@ -1,7 +1,7 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read chapter "Library interface versions" of the libtool documentation
 # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-ST2_LIBVERSION=2:0:1
+ST2_LIBVERSION=1:0:0
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_CFLAGS)
--- a/host/lib/simtrace2_api.c
+++ b/host/lib/simtrace2_api.c
@@ -272,21 +272,6 @@ int osmo_st2_cardem_request_config(struct osmo_st2_cardem_inst *ci, uint32_t fea
 	return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);
 }
 /* user_cfg is in host byte order. */
 int osmo_st2_cardem_request_config2(struct osmo_st2_cardem_inst *ci, const struct cardemu_usb_msg_config *user_cfg)
 {
 	struct msgb *msg = st_msgb_alloc();
 	struct cardemu_usb_msg_config *tx_cfg;
 	tx_cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*tx_cfg));
 	LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(features=%08x)\n", __func__, tx_cfg->features);
 	memcpy(tx_cfg, user_cfg, sizeof(*tx_cfg));
 	osmo_store32le(user_cfg->features, &tx_cfg->features);
 	return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);
 }
 /***********************************************************************
 * Modem Control protocol
 ***********************************************************************/
--- a/host/src/simtrace2-cardem-pcsc.c
+++ b/host/src/simtrace2-cardem-pcsc.c
@@ -106,9 +106,6 @@ static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags)
 		LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n",
 			reset == COLD_RESET ? "Cold" : "Warm");
 		osim_card_reset(card, reset == COLD_RESET ? true : false);
 		/* Mark reset event in GSMTAP wireshark trace */
 		osmo_st2_gsmtap_send_apdu(GSMTAP_SIM_ATR, card->atr, card->atr_len);
 	}
 	last_status_flags = flags;
@@ -170,13 +167,6 @@ static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int l
 	rc = osmo_apdu_segment_in(&ac, data->data, data->data_len,
 				  data->flags & CEMU_DATA_F_TPDU_HDR);
 	if (rc < 0) {
 		/* At this point the communication is broken.  We cannot keep running, as we
 		 * don't know if we should continue transmitting or receiving.  Only a successful
 		 * return value by osmo_apdu_segment_in() would allow us to know this. */
 		LOGCI(ci, LOGL_FATAL, "Failed to recognize APDU, terminating\n");
 		exit(1);
 	}
 	if (rc & APDU_ACT_TX_CAPDU_TO_CARD) {
 		struct msgb *tmsg = msgb_alloc(1024, "TPDU");
@@ -199,9 +189,6 @@ static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int l
 			msgb_free(tmsg);
 			return rc;
 		}
 		/* send via GSMTAP for wireshark tracing */
 		osmo_st2_gsmtap_send_apdu(GSMTAP_SIM_APDU, tmsg->data, msgb_length(tmsg));
 		msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg);
 		ac.sw[0] = msgb_apdu_sw(tmsg) >> 8;
 		ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff;
@@ -292,6 +279,7 @@ static void usb_in_xfer_cb(struct libusb_transfer *xfer)
 		process_usb_msg(ci, xfer->buffer, xfer->actual_length);
 		break;
 	case LIBUSB_TRANSFER_ERROR:
 	case LIBUSB_TRANSFER_STALL:
 		LOGCI(ci, LOGL_FATAL, "USB IN transfer error, trying resubmit\n");
 		break;
 	case LIBUSB_TRANSFER_NO_DEVICE:
@@ -346,6 +334,7 @@ static void usb_irq_xfer_cb(struct libusb_transfer *xfer)
 		process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length);
 		break;
 	case LIBUSB_TRANSFER_ERROR:
 	case LIBUSB_TRANSFER_STALL:
 		LOGCI(ci, LOGL_FATAL, "USB INT transfer error, trying resubmit\n");
 		break;
 	case LIBUSB_TRANSFER_NO_DEVICE:
@@ -413,7 +402,6 @@ static void print_help(void)
 		"\t-S\t--usb-altsetting ALTSETTING_ID\n"
 		"\t-A\t--usb-address\tADDRESS\n"
 		"\t-H\t--usb-path\tPATH\n"
 		"\t-Z\t--set-sim-presence\t<0/1>\n"
 		"\n"
 		);
 }
@@ -432,7 +420,6 @@ static const struct option opts[] = {
 	{ "usb-altsetting", 1, 0, 'S' },
 	{ "usb-address", 1, 0, 'A' },
 	{ "usb-path", 1, 0, 'H' },
 	{ "set-sim-presence", 1, 0, 'Z' },
 	{ NULL, 0, 0, 0 }
 };
@@ -489,7 +476,6 @@ int main(int argc, char **argv)
 	char *path = NULL;
 	struct osim_reader_hdl *reader;
 	struct osim_card_hdl *card;
 	struct cardemu_usb_msg_config cardem_config = { .features = CEMU_FEAT_F_STATUS_IRQ };
 	print_welcome();
@@ -512,7 +498,7 @@ int main(int argc, char **argv)
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:Z:", opts, &option_index);
+		c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:", opts, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -556,10 +542,6 @@ int main(int argc, char **argv)
 		case 'H':
 			path = optarg;
 			break;
 		case 'Z':
 			cardem_config.pres_pol = atoi(optarg) ? CEMU_CONFIG_PRES_POL_PRES_H : 0;
 			cardem_config.pres_pol |= CEMU_CONFIG_PRES_POL_VALID;
 			break;
 		}
 	}
@@ -643,7 +625,7 @@ int main(int argc, char **argv)
 			allocate_and_submit_in(ci);
 		/* request firmware to generate STATUS on IRQ endpoint */
-		osmo_st2_cardem_request_config2(ci, &cardem_config);
+		osmo_st2_cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ);
 		/* simulate card-insert to modem (owhw, not qmod) */
 		osmo_st2_cardem_request_card_insert(ci, true);
--- a/host/src/simtrace2_usb.c
+++ b/host/src/simtrace2_usb.c
@@ -78,7 +78,7 @@ static struct log_info log_info = {};
 int main(int argc, char **argv)
 {
 	osmo_init_logging2(NULL, &log_info);
-	OSMO_ASSERT(osmo_libusb_init(NULL) == 0);
+	osmo_libusb_init(NULL);
 	find_devices();
 	return 0;
 }
Author	SHA1	Message	Date
Harald Welte	050b9dde68	HACK: Solve weird problem with lost OUT transfer on ping-pong endpoint This adds an unconditional endpoint reset procedure to every SET_FEATURE(UnHalt). It doesn't really make sense that this is required, particularly as we MUST NOT set bEndpoint->bank to 0 here. Without this patch, I'm observing the following problem: Every first OUT transfer after a SET_INTERFACE + UNHALT on a bulk endpoint is lost. "lost" means that it completes successfully on the host, can be seen completing successfully with an ACK on a USB bus analyzer, but still doesn't show up in the firmware. No Endpoint Interrupt is generated. This can be reproduced by calling libusb_set_interface_alt_setting() from the host and then submitting a single OUT transfer. Change-Id: I18ed530e617baddf76e8f9829512443ce2a76e0d	2022-03-03 19:06:12 +01:00
Harald Welte	f1a0ed905b	WIP: ignore STALL Change-Id: I53741f265f71797c0594a818f5a1d37534fa3774	2022-03-03 19:06:12 +01:00
Harald Welte	874a1a2d64	HACK: dump enabled interrupts and priorities during startup Change-Id: I6a19aaa8674fa510e4e346cd14a3545f7bfcc838	2022-03-03 19:06:12 +01:00
Harald Welte	b07131f2a5	HACK: cardem: Don't reset on watchdog, but panic. This should help debug watchdog triggers. Also reduce the timer to 1s to hopefully increase the chance of triggering it. Change-Id: Ie3f47e5612cdf501abff8cb6954600b785b3a3fa	2022-03-03 19:06:12 +01:00
Harald Welte	7783cd7a28	fw/qmod: enable modem RESET by default at boot When the uC firmware starts, assert the (high-active) _RESET GPIOs, which will cause the transistors to drive the mPCIe slot !PERST low. There is of course a short instance of time between the uC reset until it executes wwan_perst_init(). To avoid this, a hardware pull-up would have to be re-worked onto the _RESET[1..4] signals on the PCBA Change-Id: I8742fefa4bf02e728e34d5d8cbc0fda771e78ffb	2022-03-03 19:06:12 +01:00
Harald Welte	09c279874e	simtrace: Enable VCC detection via ADC (voltage dependent) SIMtrace should reject any card activation at 1.8V as it is a 3[.3]V device without level shifters. For this, we must include the ADC in determining the VCC voltage. Change-Id: Ic76f06037590ff1c0dae818d5eb2c2019dd75f2d FIXME: reporting uses raw ADC voltage, not the voltage before divider	2022-03-03 19:06:12 +01:00
		`@@ -1 +0,0 @@`
			`--exclude ^firmware/atmel_softpack_libraries/.*$`