Bump version: 0.8.1 → 0.9.0

Change-Id: I6965017fcd5323677ce11fd9860d4355eb8f770f

.checkpatch.conf

@@ -0,0 +1 @@
+--exclude ^firmware/atmel_softpack_libraries/.*$

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: osmocom

README.md

@@ -13,12 +13,17 @@ stack and host software.
 Supported Hardware
 ------------------
 
-* Osmocom SIMtrace 1.x with SAM3 controller
-** this is open hardware and schematics / PCB design is published
-* sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
-** this is a proprietary device, publicly available from sysmocom
+* Osmocom [SIMtrace2](https://osmocom.org/projects/simtrace2/wiki) with SAM3 controller
+  * 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)
+* Osmocom [ngff-cardem](https://osmocom.org/projects/ngff-cardem/wiki) M.2/NGFF modem carrier with SAM3 controller
+  * 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
 ---------------
@@ -36,3 +41,14 @@ 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.

TODO-RELEASE

@@ -3,8 +3,7 @@
 # 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:0.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a.
 # 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

contrib/jenkins.sh

@@ -27,21 +27,45 @@ 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"
 
-BUILDS=""
-BUILDS+="simtrace/dfu simtrace/blupdate simtrace/trace simtrace/cardem "
-BUILDS+="qmod/dfu qmod/blupdate qmod/cardem "
-BUILDS+="owhw/dfu owhw/blupdate owhw/cardem "
-BUILDS+="octsimtest/cardem "
-BUILDS+="ngff_cardem/dfu ngff_cardem/blupdate ngff_cardem/cardem ngff_cardem/trace "
+# dfu target MUST be built first, the combined targets need a bl that can be combined..
+BUILDS="simtrace/dfu qmod/dfu owhw/dfu ngff_cardem/dfu "
+#
+BUILDS+="simtrace/blupdate qmod/blupdate owhw/blupdate ngff_cardem/blupdate "
+BUILDS+="simtrace/cardem qmod/cardem owhw/cardem octsimtest/cardem ngff_cardem/cardem "
+BUILDS+="simtrace/trace 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
-	echo "=============== $board / $app START  =============="
-	make BOARD="$board" APP="$app"
-	echo "=============== $board / $app RES:$? =============="
+	# Build the bootloader with clang, the rest with gcc (OS#5260, OS#6026)
+	if [ "$app" = "dfu" ]; then
+		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

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.*)$ ]];then
+		if ! [[ "$file" =~ ^(.*padded.*|.*nocrcstub.*bin)$ ]];then
 			without_ext="${file%.*}"
 			cp -v "$file" "$without_ext-latest.$ext"
 			cp -v "$file" "$without_ext-$GIT_VERSION.$ext"

contrib/simtrace.lua

@@ -1,3 +1,12 @@
+-- wireshark LUA dissector for the SIMtrace USB protocol
+-- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild
+-- SPDX-License-Identifier: GPL-2.0+
+--
+-- Usage: Move this file to your "personal lua plugins" folder that
+-- can be found in the Wireshark Help->About Wireshark->Folders tab
+-- Windows: %APPDATA%\Wireshark\plugins.
+-- Unix-like systems: ~/.local/lib/wireshark/plugins.
+
 usb_simtrace_protocol = Proto("USB_simtrace",  "USB simtrace protocol")
 
 
@@ -7,48 +16,65 @@ local control_commands = {
 [0x0001] = "SIMTRACE_CMD_BD_BOARD_INFO",
 
 -- /* SIMTRACE_MSGC_CARDEM */
-[0x0101] = "SIMTRACE_MSGT_DT_CEMU_TX_DATA",
-[0x0102] = "SIMTRACE_MSGT_DT_CEMU_SET_ATR",
-[0x0103] = "SIMTRACE_MSGT_BD_CEMU_STATS",
-[0x0104] = "SIMTRACE_MSGT_BD_CEMU_STATUS",
-[0x0105] = "SIMTRACE_MSGT_DT_CEMU_CARDINSERT",
-[0x0106] = "SIMTRACE_MSGT_DO_CEMU_RX_DATA",
-[0x0107] = "SIMTRACE_MSGT_DO_CEMU_PTS",
-[0x0108] = "SIMTRACE_MSGT_BD_CEMU_CONFIG",
+[0x0101] = "DT_CEMU_TX_DATA",
+[0x0102] = "DT_CEMU_SET_ATR",
+[0x0103] = "BD_CEMU_STATS",
+[0x0104] = "BD_CEMU_STATUS",
+[0x0105] = "DT_CEMU_CARDINSERT",
+[0x0106] = "DO_CEMU_RX_DATA",
+[0x0107] = "DO_CEMU_PTS",
+[0x0108] = "BD_CEMU_CONFIG",
 
 -- /* SIMTRACE_MSGC_MODEM */
-[0x0201] = "SIMTRACE_MSGT_DT_MODEM_RESET",
-[0x0202] = "SIMTRACE_MSGT_DT_MODEM_SIM_SELECT",
-[0x0203] = "SIMTRACE_MSGT_BD_MODEM_STATUS",
+[0x0201] = "DT_MODEM_RESET",
+[0x0202] = "DT_MODEM_SIM_SELECT",
+[0x0203] = "BD_MODEM_STATUS",
 
 -- /* SIMTRACE_MSGC_SNIFF */
-[0x0300] = "SIMTRACE_MSGT_SNIFF_CHANGE",
-[0x0301] = "SIMTRACE_MSGT_SNIFF_FIDI",
-[0x0302] = "SIMTRACE_MSGT_SNIFF_ATR",
-[0x0304] = "SIMTRACE_MSGT_SNIFF_TPDU",
-[0x0303] = "SIMTRACE_MSGT_SNIFF_PPS"
+[0x0300] = "SNIFF_CHANGE",
+[0x0301] = "SNIFF_FIDI",
+[0x0302] = "SNIFF_ATR",
+[0x0304] = "SNIFF_TPDU",
+[0x0303] = "SNIFF_PPS"
 }
 
 local msgtype  = ProtoField.uint16("usb_simtrace.msgtype", "Message Type", base.HEX_DEC, control_commands)
-local seqnr  = ProtoField.uint8("usb_simtrace.seqnr", "Sequence Number", base.HEX_DEC)
-local slotnr  = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.HEX_DEC)
+local seqnr  = ProtoField.uint8("usb_simtrace.seqnr", "Sequence Number", base.DEC)
+local slotnr  = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.DEC)
 local reserved  = ProtoField.uint16("usb_simtrace.reserved", "reserved", base.HEX_DEC)
-local payloadlen  = ProtoField.uint16("usb_simtrace.length", "length", base.HEX_DEC)
+local payloadlen  = ProtoField.uint16("usb_simtrace.length", "length", base.DEC)
 local payload  = ProtoField.bytes("usb_simtrace.payload", "Data")
 
 local pb_and_rx  = ProtoField.uint32("usb_simtrace.pb_and_rx", "pb_and_rx", base.HEX_DEC, NULL, 0x8)
 local pb_and_tx  = ProtoField.uint32("usb_simtrace.pb_and_tx", "pb_and_tx", base.HEX_DEC, NULL, 0x4)
 local final  = ProtoField.uint32("usb_simtrace.final", "final", base.HEX_DEC, NULL, 0x2)
 local tpdu_hdr  = ProtoField.uint32("usb_simtrace.tpdu_hdr", "tpdu_hdr", base.HEX_DEC, NULL, 0x1)
-local rxtxdatalen  = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.HEX_DEC)
+local rxtxdatalen  = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.DEC)
 local rxtxdata  = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx (data)")
 
+local hf_pts_len = ProtoField.uint8("usb_simtrace.pts_len", "PTS length", base.DEC)
+local hf_pts_req = ProtoField.bytes("usb_simtrace.pts_req", "PTS request")
+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",
+    [0x01] = "inserted",
+}
+local hf_cemu_cardinsert = ProtoField.uint8("usb_simtrace.cardinsert", "Card Insert", base.DEC, card_insert_types, 0xff)
+
 local CEMU_STATUS_F_VCC_PRESENT  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_VCC_PRESENT", "VCC_PRESENT", base.HEX_DEC, NULL, 0x00000001)
 local CEMU_STATUS_F_CLK_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CLK_ACTIVE", "CLK_ACTIVE", base.HEX_DEC, NULL, 0x00000002)
 local CEMU_STATUS_F_RCEMU_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RCEMU_ACTIVE", "CEMU_ACTIVE", base.HEX_DEC, NULL, 0x00000004)
 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",
@@ -57,11 +83,21 @@ local modem_reset_types = {
 local modem_reset_status = ProtoField.uint8("usb_simtrace.modem.reset_type", "modem reset type", base.HEX, modem_reset_types, 0xf)
 local modem_reset_len = ProtoField.uint8("usb_simtrace.modem.reset_len", "modem reset length (ms)", base.DEC)
 
+local modem_sim_select_types = {
+    [0x00] = "local",
+    [0x01] = "remote",
+}
+local hf_modem_sim_select = ProtoField.uint8("usb_simtrace.modem.sim_select", "SIM card selection", base.DEC, modem_sim_select_types, 0xff)
+
 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,
-  modem_reset_status, modem_reset_len
+  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_cardinsert, hf_modem_sim_select,
 }
 
 local is_hdr = Field.new("usb_simtrace.tpdu_hdr")
@@ -83,6 +119,30 @@ function dissect_rxtx(payload_data,pinfo,tree)
   headerSubtree:add(rxtxdatalen, len)
   headerSubtree:add_le(rxtxdata, payload_data(6,len))
 
+  local flagstr = " "
+  if is_pbrx().value == 1 then
+    flagstr = flagstr .. "R"
+  else
+    flagstr = flagstr .. "."
+  end
+  if is_pbtx().value == 1 then
+    flagstr = flagstr .. "T"
+  else
+    flagstr = flagstr .. "."
+  end
+  if is_final().value == 1 then
+    flagstr = flagstr .. "F"
+  else
+    flagstr = flagstr .. "."
+  end
+  if is_hdr().value == 1 then
+    flagstr = flagstr .. "H"
+  else
+    flagstr = flagstr .. "."
+  end
+  flagstr = flagstr .. " "
+  pinfo.cols.info:append(flagstr .. payload_data(6,len))
+
   -- ghetto dissection does not work due to mixed in procedure bytes
   --if pinfo.visited == false then
   -- Dissector.get("iso7816"):call(payload_data(6):tvb(), pinfo, tree)
@@ -142,6 +202,52 @@ function dissect_modem_reset(payload_data,pinfo,tree)
 
 end
 
+function dissect_pts(payload_data, pinfo, tree)
+  local subtree = tree:add(usb_simtrace_protocol, payload_data, "PTS")
+  local pts_len = payload_data(0,1):le_uint()
+  local pts_req = payload_data(1, pts_len);
+  local pts_resp = payload_data(7, pts_len);
+
+  subtree:add(hf_pts_len, pts_len);
+  subtree:add(hf_pts_req, pts_req);
+  subtree:add(hf_pts_resp, pts_resp);
+
+  pinfo.cols.info:append(" Req: " .. pts_req .. ", Resp: " .. pts_resp);
+end
+
+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")
+  local sim_select = payload_data(0,1):le_uint();
+
+  subtree:add(hf_modem_sim_select, sim_select);
+  pinfo.cols.info:append(" " .. modem_sim_select_types[sim_select]);
+end
+
+function dissect_cemu_cardinsert(payload_data, pinfo, tree)
+  local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Insert")
+  local cins_type = payload_data(0,1):le_uint()
+
+  subtree:add(hf_cemu_cardinsert, cins_type);
+  pinfo.cols.info:append(" " .. card_insert_types[cins_type]);
+end
+
+
+
 function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
   length = buffer:len()
   if length == 0 then return end
@@ -160,11 +266,19 @@ function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
   if(command == 0x0101 or command == 0x0106) then
     return dissect_rxtx(payload_data(),pinfo,subtree)
   elseif(command == 0x0104) then
-	return dissect_status(payload_data(),pinfo,subtree)
+    return dissect_status(payload_data(),pinfo,subtree)
   elseif(command == 0x0102) then
-	return dissect_atr(payload_data(),pinfo,subtree)
+    return dissect_atr(payload_data(),pinfo,subtree)
+  elseif(command == 0x0105) then
+    return dissect_cemu_cardinsert(payload_data(),pinfo,subtree)
+  elseif(command == 0x0107) then
+    return dissect_pts(payload_data(),pinfo,subtree)
+  elseif(command == 0x0108) then
+    return dissect_cemu_config(payload_data(),pinfo,subtree)
   elseif(command == 0x0201) then
-	return dissect_modem_reset(payload_data(),pinfo,subtree)
+    return dissect_modem_reset(payload_data(),pinfo,subtree)
+  elseif(command == 0x0202) then
+    return dissect_modem_sim_sel(payload_data(),pinfo,subtree)
   else
     subtree:add(payload, payload_data)
   end
@@ -173,10 +287,13 @@ end
 
 
 function usb_simtrace_protocol.init()
-local usb_product_dissectors = DissectorTable.get("usb.product")
-usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol)
-usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol)
-DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
-DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
---concatss =  ByteArray.new()
+  local usb_product_dissectors = DissectorTable.get("usb.product")
+  usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST
+  usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM
+  usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2
+  usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD
+  usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW
+  DissectorTable.get("usb.device"):add_for_decode_as(usb_simtrace_protocol)
+  DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
+  DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
 end

debian/changelog

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

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,8 +1,8 @@
 Source: simtrace2
-Maintainer: Harald Welte <laforge@gnumonks.org>
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                autotools-dev,
                autoconf,
                automake,
@@ -10,14 +10,14 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                git,
                dh-autoreconf,
-               libosmocore-dev (>= 1.4.0),
+               libosmocore-dev (>= 1.11.0),
                libpcsclite-dev,
                libnewlib-arm-none-eabi,
                libusb-1.0-0-dev,
                gcc-arm-none-eabi
 Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/simtrace2.git
-Vcs-Browser: http://git.osmocom.org/simtrace2/
+Vcs-Git: https://gitea.osmocom.org/sim-card/simtrace2
+Vcs-Browser: https://gitea.osmocom.org/sim-card/simtrace2
 Homepage: http://osmocom.org/projects/simtrace2/wiki
 
 Package: simtrace2-firmware

debian/rules

@@ -13,7 +13,4 @@ export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 
 
 %:
-	dh $@
-
-override_dh_autoreconf:
-	cd host && dh_autoreconf
+	dh $@ --no-parallel

firmware/Makefile

@@ -29,6 +29,13 @@
 #   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
 #-------------------------------------------------------------------------------

firmware/apps/cardem/main.c

@@ -155,7 +155,7 @@ extern int main(void)
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
 		   (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
 
-	PIO_InitializeInterrupts(0);
+	PIO_InitializeInterrupts(10);
 
 	print_banner();
 	board_main_top();
@@ -194,8 +194,8 @@ extern int main(void)
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
 		const char rotor[] = { '-', '\\', '|', '/' };
-		putchar('\b');
 		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+		putchar('\b');
 #endif
 		check_exec_dbg_cmd();
 		osmo_timers_prepare();
@@ -206,6 +206,10 @@ 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");
 

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

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

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

firmware/libboard/common/source/uart_console.c

@@ -100,6 +100,7 @@ extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
 
 	/* Enable TX interrupts */
 	pUart->UART_IER = UART_IER_TXRDY;
+	NVIC_SetPriority(CONSOLE_IRQ, 15); /* lowest priority */
 	NVIC_EnableIRQ(CONSOLE_IRQ);
 	
 	/* Enable receiver and transmitter */

firmware/libboard/ngff_cardem/source/board_ngff_cardem.c

@@ -146,8 +146,8 @@ int board_override_enter_dfu(void)
 	return 0;
 }
 
- static const Pin deton = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
- static const Pin detoff = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT};
+static const Pin deton = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+static const Pin detoff = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT};
 
 void board_set_card_insert(struct cardem_inst *ci, bool card_insert)
 {

firmware/libcommon/include/card_emu.h

@@ -69,6 +69,8 @@ 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);
 
+int card_emu_get_vcc(uint8_t uart_chan);
+
 struct cardemu_usb_msg_config;
 int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,
 			unsigned int scfg_len);

firmware/libcommon/include/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
-	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	/// For T=0 ,B0 - 0b, B7-2 - 000000b
+	/// 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
-	/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
-	/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	/// For T=1, B7-2 - 000100b
+	/// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
+	/// 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
-   /// PPPP –Lower Word- Encodes the supported protocol types. A ‘1’ in a given
+   /// RRRR -Upper Word- is RFU = 0000h
+   /// 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

firmware/libcommon/include/ringbuffer.h

@@ -32,4 +32,22 @@ 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 */

firmware/libcommon/include/simtrace.h

@@ -124,4 +124,8 @@ 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  */

firmware/libcommon/include/simtrace_prot.h

@@ -261,12 +261,21 @@ 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));
 
 /***********************************************************************
@@ -313,6 +322,9 @@ 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 {

firmware/libcommon/source/card_emu.c

@@ -24,6 +24,7 @@
 #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>
@@ -775,6 +776,15 @@ 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;
 	}
@@ -1058,7 +1068,10 @@ void card_emu_report_status(struct card_handle *ch, bool report_on_irq)
 		sts->flags |= CEMU_STATUS_F_CLK_ACTIVE;
 	if (ch->in_reset)
 		sts->flags |= CEMU_STATUS_F_RESET_ACTIVE;
-	/* FIXME: voltage + card insert */
+#ifdef DETECT_VCC_BY_ADC
+	sts->voltage_mv = card_emu_get_vcc(ch->num);
+#endif
+	/* FIXME: card insert */
 	sts->F_index = ch->F_index;
 	sts->D_index = ch->D_index;
 	sts->wi = ch->wi;
@@ -1084,7 +1097,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);
 }
@@ -1102,7 +1115,12 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
 			card_set_state(ch, ISO_S_WAIT_POWER);
 			chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
 		} else if (active == 1 && ch->vcc_active == 0) {
+#ifdef DETECT_VCC_BY_ADC
+			TRACE_INFO("%u: VCC activated (%d mV)\r\n", ch->num,
+				   card_emu_get_vcc(ch->num));
+#else
 			TRACE_INFO("%u: VCC activated\r\n", ch->num);
+#endif
 			card_set_state(ch, ISO_S_WAIT_CLK);
 			chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
 		}
@@ -1253,6 +1271,11 @@ 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);
 

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
-	// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
+	// For T=0 ,B0 - 0b, B7-2 - 000000b
+	// 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

firmware/libcommon/source/mode_cardemu.c

@@ -79,14 +79,28 @@ 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[] = {
@@ -102,7 +116,10 @@ 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
+#endif /* PIN_SET_USIM1_PRES */
+#ifdef PIN_SET_USIM1_PRES_INVERTED
+		.pin_insert_inverted = true,
+#endif /* PIN_SET_USIM1_PRES_INVERTED */
 	},
 #ifdef CARDEMU_SECOND_UART
 	{
@@ -117,7 +134,10 @@ 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
+#endif /* PIN_SET_USIM2_PRES */
+#ifdef PIN_SET_USIM2_PRES_INVERTED
+		.pin_insert_inverted = true,
+#endif /* PIN_SET_USIM2_PRES_INVERTED */
 	},
 #endif
 };
@@ -168,6 +188,16 @@ static void card_emu_uart_set_direction(uint8_t uart_chan, bool tx)
 #endif
 }
 
+int card_emu_get_vcc(uint8_t uart_chan)
+{
+	struct cardem_inst *ci = &cardem_inst[uart_chan];
+#ifdef DETECT_VCC_BY_ADC
+	return ci->vcc_uv / 1000;
+#else
+	return -1;
+#endif
+}
+
 /* call-back from card_emu.c to enable/disable transmit and/or receive */
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
 {
@@ -400,10 +430,9 @@ void card_emu_uart_reset_wt(uint8_t uart_chan)
 /* call-back from card_emu.c to force a USART interrupt */
 void card_emu_uart_interrupt(uint8_t uart_chan)
 {
+	OSMO_ASSERT(uart_chan < ARRAY_SIZE(cardem_inst));
 	Usart *usart = get_usart_by_chan(uart_chan);
-	if (!usart) {
-		return;
-	}
+
 	if (USART0 == usart) {
 		NVIC_SetPendingIRQ(USART0_IRQn);
 	} else if (USART1 == usart) {
@@ -417,7 +446,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_{1V1,3V} if you use ADC VCC detection"
+#error "You must define VCC_UV_THRESH_{1V8,3V} if you use ADC VCC detection"
 #endif
 
 static volatile int adc_triggered = 0;
@@ -461,6 +490,7 @@ static int card_vcc_adc_init(void)
 	ADC->ADC_CHER |= ADC_CHER_CH6;
 	ADC->ADC_IER |= ADC_IER_EOC6;
 #endif
+	NVIC_SetPriority(ADC_IRQn, 13);
 	NVIC_EnableIRQ(ADC_IRQn);
 	ADC->ADC_CR |= ADC_CR_START;
 
@@ -505,19 +535,25 @@ 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)
 {
-	if (ci->vcc_active != ci->vcc_active_last) {
-		card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active);
+	const bool vcc_active = ci->vcc_active && ci->enabled;
+	if (vcc_active != ci->vcc_active_last) {
+		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, ci->vcc_active);
-		ci->vcc_active_last = ci->vcc_active;
+		card_emu_io_statechg(ci->ch, CARD_IO_CLK, vcc_active);
+		ci->vcc_active_last = 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;
+	const bool rst_active = ci->rst_active && ci->enabled;
+	if (rst_active != ci->rst_active_last) {
+		card_emu_io_statechg(ci->ch, CARD_IO_RST, rst_active);
+		ci->rst_active_last = rst_active;
 	}
 }
 
@@ -564,6 +600,8 @@ void mode_cardemu_init(void)
 
 	TRACE_ENTRY();
 
+	NVIC_SetPriority(UDP_IRQn, 14);
+
 #ifdef PINS_CARDSIM
 	PIO_Configure(pins_cardsim, PIO_LISTSIZE(pins_cardsim));
 #endif
@@ -577,6 +615,7 @@ void mode_cardemu_init(void)
 
 	/* configure USART as ISO-7816 slave (e.g. card) */
 	ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE);
+	NVIC_SetPriority(FIRST_USART_IRQ, 0);
 	NVIC_EnableIRQ(FIRST_USART_IRQ);
 	PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);
 	PIO_EnableIt(&pin_usim1_rst);
@@ -604,6 +643,7 @@ void mode_cardemu_init(void)
 	PIO_Configure(pins_usim2, PIO_LISTSIZE(pins_usim2));
 	ISO7816_Init(&cardem_inst[1].usart_info, CLK_SLAVE);
 	/* TODO enable timeout */
+	NVIC_SetPriority(USART0_IRQn, 0);
 	NVIC_EnableIRQ(USART0_IRQn);
 	PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler);
 	PIO_EnableIt(&pin_usim2_rst);
@@ -669,7 +709,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);
+	board_set_card_insert(ci, card_insert ^ ci->pin_insert_inverted);
 #else
 	if (!ci->pin_insert.pio) {
 		TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
@@ -677,7 +717,7 @@ static void process_card_insert(struct cardem_inst *ci, bool card_insert)
 		return;
 	}
 
-	if (card_insert)
+	if (card_insert ^ ci->pin_insert_inverted)
 		PIO_Set(&ci->pin_insert);
 	else
 		PIO_Clear(&ci->pin_insert);
@@ -764,10 +804,8 @@ static int usb_command_sim_select(struct msgb *msg, struct cardem_inst *ci)
 	if (msgb_l2len(msg) < sizeof(*mss))
 		return -1;
 
-	if (mss->remote_sim)
-		sim_switch_use_physical(ci->num, 0);
-	else
-		sim_switch_use_physical(ci->num, 1);
+	ci->enabled = mss->remote_sim ? true : false;
+	sim_switch_use_physical(ci->num, !ci->enabled);
 
 	return 0;
 }
@@ -911,7 +949,10 @@ void mode_cardemu_run(void)
 			}
 			uint8_t byte = rbuf_read(&ci->rb);
 			__enable_irq();
-			card_emu_process_rx_byte(ci->ch, byte);
+
+			if (ci->enabled) {
+				card_emu_process_rx_byte(ci->ch, byte);
+			}
 			//TRACE_ERROR("%uRx%02x\r\n", i, byte);
 		}
 
@@ -930,3 +971,25 @@ 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;
+}

firmware/libcommon/source/ringbuffer.c

@@ -28,6 +28,16 @@ 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;
@@ -41,21 +51,49 @@ 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;
@@ -68,6 +106,18 @@ 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;
@@ -84,4 +134,18 @@ 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;
+	}
+}

firmware/libcommon/source/sniffer.c

@@ -1,6 +1,6 @@
 /* SIMtrace 2 sniffer mode
  *
- * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016-2022 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,6 +111,13 @@ 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
  *------------------------------------------------------------------------------*/
@@ -138,50 +145,58 @@ static struct Usart_info sniff_usart = {
 	.state = USART_RCV,
 };
 /*! Ring buffer to store sniffer communication data */
-static struct ringbuf sniff_buffer;
+static struct ringbuf16 sniff_buffer;
 
 /* Flags  to know is the card status changed (see SIMTRACE_MSGT_DT_SNIFF_CHANGE flags) */
-volatile uint32_t change_flags = 0;
+static volatile uint32_t change_flags = 0;
 
 /* ISO 7816 variables */
 /*! ISO 7816-3 state */
-enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
-/*! ATR 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 = 0;
+static enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
+
+static struct {
+	/*! ATR state */
+	enum atr_sniff_state 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;
+} g_atr;
+
 /*! If convention conversion is needed */
-bool convention_convert = false;
+static bool convention_convert = false;
 /*! The supported T protocols */
-uint16_t t_protocol_support = 0;
-/*! PPS state 
- *  @remark it is shared between request and response since they aren't simultaneous but follow the same procedure
- */
-enum pps_sniff_state pps_state;
-/*! PPS request data
- *  @remark can be used to check PPS response
- */
-uint8_t pps_req[MAX_PPS_SIZE];
-/*! PPS response data */
-uint8_t pps_rsp[MAX_PPS_SIZE];
-/*! TPDU 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
- */
-uint8_t tpdu_packet[5+256+2];
-/*! Current index in TPDU packet */
-uint16_t tpdu_packet_i = 0;
+static uint16_t t_protocol_support = 0;
+
+static struct {
+	/*! PPS state
+	 *  @remark it is shared between request and response since they aren't simultaneous but
+	 *  follow the same procedure */
+	enum pps_sniff_state state;
+	/*! PPS request data
+	 *  @remark can be used to check PPS response */
+	uint8_t req[MAX_PPS_SIZE];
+	/*! PPS response data */
+	uint8_t rsp[MAX_PPS_SIZE];
+} g_pps;
+
+static struct {
+	/*! TPDU state */
+	enum tpdu_sniff_state 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 */
+	uint8_t packet[5+256+2];
+	/*! Current index in TPDU packet */
+	uint16_t packet_i;
+} g_tpdu;
 
 /*! Waiting Time (WT)
  *  @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
  */
-uint32_t wt = 9600;
+static uint32_t g_wt = 9600;
 
 /*------------------------------------------------------------------------------
  *         Internal functions
@@ -196,10 +211,11 @@ 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)
+static void update_wt(uint8_t wi, uint8_t d, const char *cause)
 {
 	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) */
@@ -210,8 +226,8 @@ static void update_wt(uint8_t wi, uint8_t d)
 	if (0 != d) {
 		wt_d = d;
 	}
-	wt = wt_wi * 960UL * wt_d;
-	TRACE_INFO("WT updated to %lu ETU\n\r", wt);
+	g_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);
 }
 
 /*! Allocate USB buffer and push + initialize simtrace_msg_hdr
@@ -255,6 +271,15 @@ 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
  */
@@ -270,32 +295,33 @@ 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 WT time-out */
+		update_wt(10, 1, "RESET"); /* reset WT time-out */
 		break;
 	case ISO7816_S_WAIT_ATR:
-		rbuf_reset(&sniff_buffer); /* reset buffer for new communication */
+		rbuf16_reset(&sniff_buffer); /* reset buffer for new communication */
 		break;
 	case ISO7816_S_IN_ATR:
-		atr_i = 0;
+		g_atr.atr_i = 0;
 		convention_convert = false;
 		t_protocol_support = 0;
-		atr_state = ATR_S_WAIT_TS;
+		g_atr.state = ATR_S_WAIT_TS;
 		break;
 	case ISO7816_S_IN_PPS_REQ:
 	case ISO7816_S_IN_PPS_RSP:
-		pps_state = PPS_S_WAIT_PPSS;
+		g_pps.state = PPS_S_WAIT_PPSS;
 		break;
 	case ISO7816_S_WAIT_TPDU:
-		tpdu_state = TPDU_S_CLA;
-		tpdu_packet_i = 0;
+		change_tpdu_state(TPDU_S_CLA);
+		g_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[] = {
@@ -380,13 +406,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 (atr_i >= ARRAY_SIZE(atr)) {
+	if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
 		TRACE_ERROR("ATR buffer overflow\n\r");
 		return;
 	}
 
 	/* Send ATR over USB */
-	usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, atr, atr_i, flags);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, g_atr.atr, g_atr.atr_i, flags);
 }
 
 /*! Process ATR byte
@@ -404,16 +430,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 (atr_i >= ARRAY_SIZE(atr)) {
+	if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
 		TRACE_ERROR("ATR data overflow\n\r");
 		return;
 	}
 
 	/* save data for use by other functions */
-	atr[atr_i++] = byte;
+	g_atr.atr[g_atr.atr_i++] = byte;
 
 	/* handle ATR byte depending on current state */
-	switch (atr_state) {
+	switch (g_atr.state) {
 	case ATR_S_WAIT_TS: /* see ISO/IEC 7816-3:2006 section 8.1 */
 		flags = 0;
 		switch (byte) {
@@ -422,7 +448,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 */
-			atr_state = ATR_S_WAIT_T0; /* wait for format byte */
+			g_atr.state = ATR_S_WAIT_T0; /* wait for format byte */
 			break;
 		default:
 			TRACE_WARNING("Invalid TS received\n\r");
@@ -435,41 +461,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 == atr_state) {
+		if (ATR_S_WAIT_T0 == g_atr.state) {
 			atr_hist_len = (byte & 0x0f); /* save the number of historical bytes */
-		} else if (ATR_S_WAIT_TD == atr_state) {
+		} else if (ATR_S_WAIT_TD == g_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) {
-			atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */
+			g_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) {
-			atr_state = ATR_S_WAIT_TB; /* wait for interface byte TB */
+			g_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) {
-			atr_state = ATR_S_WAIT_TC; /* wait for interface byte TC */
+			g_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==atr_state && 2==i) {
+		if (ATR_S_WAIT_TC == g_atr.state && 2 == i) {
 			if (0 == byte) {
-				update_wt(10, 0);
+				update_wt(10, 0, "TC2=0");
 			} else {
-				update_wt(byte, 0);
+				update_wt(byte, 0, "TC2");
 			}
 		}
 		if (y & 0x80) {
-			atr_state = ATR_S_WAIT_TD; /* wait for interface byte TD */
+			g_atr.state = ATR_S_WAIT_TD; /* wait for interface byte TD */
 			break;
 		} else if (atr_hist_len) {
-			atr_state = ATR_S_WAIT_HIST; /* wait for historical bytes */
+			g_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 */
@@ -478,7 +504,7 @@ static void process_byte_atr(uint8_t byte)
 		}
 		if (0 == atr_hist_len) {
 			if (t_protocol_support > 1) {
-				atr_state = ATR_S_WAIT_TCK; /* wait for check bytes */
+				g_atr.state = ATR_S_WAIT_TCK; /* wait for check bytes */
 				break;
 			}
 		} else {
@@ -486,11 +512,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 == atr_state) {
+		if (ATR_S_WAIT_TCK == g_atr.state) {
 			uint8_t ui;
 			uint8_t checksum = 0;
-			for (ui = 1; ui < atr_i; ui++) {
-				checksum ^= atr[ui];
+			for (ui = 1; ui < g_atr.atr_i; ui++) {
+				checksum ^= g_atr.atr[ui];
 			}
 			if (checksum) {
 				flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
@@ -503,7 +529,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", atr_state);
+		TRACE_INFO("Unknown ATR state %u\n\r", g_atr.state);
 	}
 }
 
@@ -517,9 +543,9 @@ static void usb_send_pps(uint32_t flags)
 
 	/* Sanity check */
 	if (ISO7816_S_IN_PPS_REQ == iso_state) {
-		pps_cur = pps_req;
+		pps_cur = g_pps.req;
 	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
-		pps_cur = pps_rsp;
+		pps_cur = g_pps.rsp;
 	} else {
 		TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);
 		return;
@@ -528,22 +554,22 @@ static void usb_send_pps(uint32_t flags)
 	/* Get only relevant data */
 	uint8_t pps[6];
 	uint8_t pps_i = 0;
-	if (pps_state > PPS_S_WAIT_PPSS) {
+	if (g_pps.state > PPS_S_WAIT_PPSS) {
 		pps[pps_i++] = pps_cur[0];
 	}
-	if (pps_state > PPS_S_WAIT_PPS0) {
+	if (g_pps.state > PPS_S_WAIT_PPS0) {
 		pps[pps_i++] = pps_cur[1];
 	}
-	if (pps_state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
+	if (g_pps.state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
 		pps[pps_i++] = pps_cur[2];
 	}
-	if (pps_state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
+	if (g_pps.state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
 		pps[pps_i++] = pps_cur[3];
 	}
-	if (pps_state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
+	if (g_pps.state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
 		pps[pps_i++] = pps_cur[4];
 	}
-	if (pps_state > PPS_S_WAIT_PCK) {
+	if (g_pps.state > PPS_S_WAIT_PCK) {
 		pps[pps_i++] = pps_cur[5];
 	}
 
@@ -573,21 +599,21 @@ static void process_byte_pps(uint8_t byte)
 
 	/* sanity check */
 	if (ISO7816_S_IN_PPS_REQ == iso_state) {
-		pps_cur = pps_req;
+		pps_cur = g_pps.req;
 	} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
-		pps_cur = pps_rsp;
+		pps_cur = g_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 (pps_state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
+	switch (g_pps.state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
 	case PPS_S_WAIT_PPSS: /*!< initial byte */
 		flags = 0;
-		if (0xff) {
+		if (byte == 0xff) {
 			pps_cur[0] = byte;
-			pps_state = PPS_S_WAIT_PPS0; /* go to next state */
+			g_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 */
@@ -598,24 +624,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) {
-			pps_state = PPS_S_WAIT_PPS1; /* go to next state */
+			g_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) {
-			pps_state = PPS_S_WAIT_PPS2; /* go to next state */
+			g_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) {
-			pps_state = PPS_S_WAIT_PPS3; /* go to next state */
+			g_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 */
-		pps_state = PPS_S_WAIT_PCK; /* go to next state */
+		g_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 */
@@ -636,7 +662,7 @@ static void process_byte_pps(uint8_t byte)
 		if (check) {
 			flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
 		}
-		pps_state = PPS_S_WAIT_END;
+		g_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 */
@@ -657,7 +683,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]);
+				update_wt(0, iso7816_3_di_table[dn], "PPS");
 				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");
@@ -666,10 +692,10 @@ static void process_byte_pps(uint8_t byte)
 		}
 		break;
 	case PPS_S_WAIT_END:
-		TRACE_WARNING("Unexpected PPS received %u\n\r", pps_state);
+		TRACE_WARNING("Unexpected PPS received %u\n\r", g_pps.state);
 		break;
 	default:
-		TRACE_WARNING("Unknown PPS state %u\n\r", pps_state);
+		TRACE_WARNING("Unknown PPS state %u\n\r", g_pps.state);
 		break;
 	}
 }
@@ -687,7 +713,7 @@ static void usb_send_tpdu(uint32_t flags)
 	}
 
 	/* Send ATR over USB */
-	usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, tpdu_packet, tpdu_packet_i, flags);
+	usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, g_tpdu.packet, g_tpdu.packet_i, flags);
 }
 
 static void process_byte_tpdu(uint8_t byte)
@@ -697,13 +723,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 (tpdu_packet_i >= ARRAY_SIZE(tpdu_packet)) {
+	if (g_tpdu.packet_i >= ARRAY_SIZE(g_tpdu.packet)) {
 		TRACE_ERROR("TPDU data overflow\n\r");
 		return;
 	}
 
 	/* handle TPDU byte depending on current state */
-	switch (tpdu_state) {
+	switch (g_tpdu.state) {
 	case TPDU_S_CLA:
 		if (0xff == byte) {
 			TRACE_WARNING("0xff is not a valid class byte\n\r");
@@ -712,51 +738,51 @@ static void process_byte_tpdu(uint8_t byte)
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 			return;
 		}
-		tpdu_packet_i = 0;
-		tpdu_packet[tpdu_packet_i++] = byte;
-		tpdu_state = TPDU_S_INS;
+		g_tpdu.packet_i = 0;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		change_tpdu_state(TPDU_S_INS);
 		break;
 	case TPDU_S_INS:
 		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
-			TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
+			TRACE_WARNING("invalid INS 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;
 		}
-		tpdu_packet_i = 1;
-		tpdu_packet[tpdu_packet_i++] = byte;
-		tpdu_state = TPDU_S_P1;
+		g_tpdu.packet_i = 1;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		change_tpdu_state(TPDU_S_P1);
 		break;
 	case TPDU_S_P1:
-		tpdu_packet_i = 2;
-		tpdu_packet[tpdu_packet_i++] = byte;
-		tpdu_state = TPDU_S_P2;
+		g_tpdu.packet_i = 2;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		change_tpdu_state(TPDU_S_P2);
 		break;
 	case TPDU_S_P2:
-		tpdu_packet_i = 3;
-		tpdu_packet[tpdu_packet_i++] = byte;
-		tpdu_state = TPDU_S_P3;
+		g_tpdu.packet_i = 3;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		change_tpdu_state(TPDU_S_P3);
 		break;
 	case TPDU_S_P3:
-		tpdu_packet_i = 4;
-		tpdu_packet[tpdu_packet_i++] = byte;
-		tpdu_state = TPDU_S_PROCEDURE;
+		g_tpdu.packet_i = 4;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		change_tpdu_state(TPDU_S_PROCEDURE);
 		break;
 	case TPDU_S_PROCEDURE:
 		if (0x60 == byte) { /* wait for next procedure byte */
 			break;
-		} else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */
-			tpdu_state = TPDU_S_DATA_REMAINING;
+		} else if (g_tpdu.packet[1] == byte) { /* get all remaining data bytes */
+			change_tpdu_state(TPDU_S_DATA_REMAINING);
 			break;
-		} else if ((~tpdu_packet[1]) == byte) { /* get single data byte */
-			tpdu_state = TPDU_S_DATA_SINGLE;
+		} else if ((~g_tpdu.packet[1]) == byte) { /* get single data byte */
+			change_tpdu_state(TPDU_S_DATA_SINGLE);
 			break;
 		}
 	case TPDU_S_SW1:
 		if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */
-			tpdu_packet[tpdu_packet_i++] = byte;
-			tpdu_state = TPDU_S_SW2;
+			g_tpdu.packet[g_tpdu.packet_i++] = byte;
+			change_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 */
@@ -766,28 +792,28 @@ static void process_byte_tpdu(uint8_t byte)
 		}
 		break;
 	case TPDU_S_SW2:
-		tpdu_packet[tpdu_packet_i++] = byte;
+		g_tpdu.packet[g_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:
-		tpdu_packet[tpdu_packet_i++] = byte;
-		if (0 == tpdu_packet[4]) {
-			if (5+256 <= tpdu_packet_i) {
-				tpdu_state = TPDU_S_PROCEDURE;
+		g_tpdu.packet[g_tpdu.packet_i++] = byte;
+		if (0 == g_tpdu.packet[4]) {
+			if (5+256 <= g_tpdu.packet_i) {
+				change_tpdu_state(TPDU_S_PROCEDURE);
 			}
 		} else {
-			if (5+tpdu_packet[4] <= tpdu_packet_i) {
-				tpdu_state = TPDU_S_PROCEDURE;
+			if (5+g_tpdu.packet[4] <= g_tpdu.packet_i) {
+				change_tpdu_state(TPDU_S_PROCEDURE);
 			}
 		}
-		if (TPDU_S_DATA_SINGLE == tpdu_state) {
-			tpdu_state = TPDU_S_PROCEDURE;
+		if (TPDU_S_DATA_SINGLE == g_tpdu.state) {
+			change_tpdu_state(TPDU_S_PROCEDURE);
 		}
 		break;
 	default:
-		TRACE_ERROR("unhandled TPDU state %u\n\r", tpdu_state);
+		TRACE_ERROR("unhandled TPDU state %u\n\r", g_tpdu.state);
 	}
 }
 
@@ -799,37 +825,37 @@ void Sniffer_usart_isr(void)
 
 	/* Read channel status register */
 	uint32_t csr = sniff_usart.base->US_CSR;
-	/* Verify if there was an error */
-	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;
-	}
+
+	uint16_t byte = 0;
 
 	/* Verify if character has been received */
 	if (csr & US_CSR_RXRDY) {
 		/* Read communication data byte between phone and SIM */
-		uint8_t byte = sniff_usart.base->US_RHR;
+		byte = RBUF16_F_DATA_BYTE | (sniff_usart.base->US_RHR & 0xff);
 		/* Reset WT timer */
-		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);
-		}
+		wt_remaining = g_wt;
 	}
 
+	/* 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 = wt;
+			wt_remaining = g_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 */
 		}
@@ -845,6 +871,12 @@ 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
@@ -886,6 +918,8 @@ 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)
 {
@@ -897,7 +931,7 @@ void Sniffer_exit(void)
 {
 	TRACE_INFO("Sniffer exit\n\r");
 	/* Disable USART */
-	USART_DisableIt(sniff_usart.base, US_IER_RXRDY);
+	USART_DisableIt(sniff_usart.base, SNIFFER_IER);
 	/* 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);
@@ -925,15 +959,15 @@ void Sniffer_init(void)
 	PIO_EnableIt(&pin_rst);
 
 	/* Clear ring buffer containing the sniffed data */
-	rbuf_reset(&sniff_buffer);
+	rbuf16_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 = wt;
+	sniff_usart.base->US_RTOR = g_wt;
 	/* Enable interrupt to indicate when data has been received or timeout occurred */
-	USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT);
+	USART_EnableIt(sniff_usart.base, SNIFFER_IER);
 	/* 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);
@@ -991,45 +1025,82 @@ void Sniffer_run(void)
 	 * is remaining
 	 */
 	/* Handle sniffed data */
-	if (!rbuf_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
-		uint8_t byte = rbuf_read(&sniff_buffer);
-		/* 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 */
-			break;
-		case ISO7816_S_WAIT_ATR: /* After a reset we expect the ATR */
-			change_state(ISO7816_S_IN_ATR); /* go to next state */
-		case ISO7816_S_IN_ATR: /* More ATR data incoming */
-			process_byte_atr(byte);
-			break;
-		case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
-		case ISO7816_S_WAIT_PPS_RSP:
-			if (0xff == byte) {
-				if (ISO7816_S_WAIT_PPS_RSP == iso_state) {
-					change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
-				} else {
-					change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */
+	if (!rbuf16_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
+		uint16_t entry = rbuf16_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 */
+				break;
+			case ISO7816_S_WAIT_ATR: /* After a reset we expect the ATR */
+				change_state(ISO7816_S_IN_ATR); /* go to next state */
+			case ISO7816_S_IN_ATR: /* More ATR data incoming */
+				process_byte_atr(byte);
+				break;
+			case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
+			case ISO7816_S_WAIT_PPS_RSP:
+				if (0xff == byte) {
+					if (ISO7816_S_WAIT_PPS_RSP == iso_state) {
+						change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
+					} else {
+						change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */
+					}
+					process_byte_pps(byte);
+					break;
 				}
+			case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
+				if (ISO7816_S_WAIT_TPDU == iso_state) {
+					change_state(ISO7816_S_IN_TPDU);
+				}
+				process_byte_tpdu(byte);
+				break;
+			case ISO7816_S_IN_PPS_REQ:
+			case ISO7816_S_IN_PPS_RSP:
 				process_byte_pps(byte);
 				break;
+			default:
+				TRACE_ERROR("Data received in unknown state %u\n\r", iso_state);
 			}
-		case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
-			if (ISO7816_S_WAIT_TPDU == iso_state) {
-				change_state(ISO7816_S_IN_TPDU);
-			}
-			process_byte_tpdu(byte);
-			break;
-		case ISO7816_S_IN_PPS_REQ:
-		case ISO7816_S_IN_PPS_RSP:
-			process_byte_pps(byte);
-			break;
-		default:
-			TRACE_ERROR("Data received in unknown state %u\n\r", iso_state);
 		}
+
+		/* 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 */
@@ -1063,30 +1134,6 @@ 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 */

firmware/libcommon/source/usb.c

@@ -206,7 +206,7 @@ static const SIMTraceDriverConfigurationDescriptorSniffer
 						SIMTRACE_USB_EP_CARD_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
 		.wMaxPacketSize	= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-		.bInterval = 0x10,
+		.bInterval = 1,
 	},
 	DFURT_IF_DESCRIPTOR(1, 0),
 };
@@ -382,7 +382,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 						SIMTRACE_CARDEM_USB_EP_USIM1_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
 		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-		.bInterval		= 0x10
+		.bInterval		= 1
 	},
 #ifdef CARDEMU_SECOND_UART
 	/* Communication class interface standard descriptor */
@@ -429,7 +429,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 						SIMTRACE_CARDEM_USB_EP_USIM2_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
 		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-		.bInterval		= 0x10,
+		.bInterval		= 1,
 	},
 	DFURT_IF_DESCRIPTOR(2, 0),
 #else
@@ -547,7 +547,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 						      CCID_EPT_NOTIFICATION),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
 		.wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-		.bInterval = 0x10,
+		.bInterval = 1,
 	},
 
 	/* Communication class interface standard descriptor */
@@ -593,7 +593,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 						SIMTRACE_USB_EP_PHONE_INT),
 		.bmAttributes		= USBEndpointDescriptor_INTERRUPT,
 		.wMaxPacketSize		= USBEndpointDescriptor_MAXINTERRUPTSIZE_FS,
-		.bInterval		= 0x10
+		.bInterval		= 1
 	},
 	DFURT_IF_DESCRIPTOR(2, 0),
 };
@@ -689,6 +689,7 @@ 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();

firmware/test/Makefile

@@ -7,6 +7,7 @@ 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 \

firmware/test/card_emu_tests.c

@@ -93,7 +93,14 @@ 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

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.4.0)
-PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.4.0)
-PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.4.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.11.0)
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
 
 AC_ARG_ENABLE(sanitize,
@@ -100,5 +100,4 @@ AC_OUTPUT(
 	src/Makefile
 	lib/Makefile
 	contrib/Makefile
-	contrib/simtrace2.spec
 	Makefile)

host/contrib/simtrace2.spec.in

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

host/include/osmocom/simtrace2/simtrace2_api.h

@@ -41,6 +41,8 @@ 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);
 
@@ -53,7 +55,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);

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=1:0:0
+ST2_LIBVERSION=2:0:1
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_CFLAGS)

host/lib/simtrace2_api.c

@@ -272,6 +272,21 @@ 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
  ***********************************************************************/

host/src/simtrace2-cardem-pcsc.c

@@ -1,7 +1,7 @@
 /* simtrace2-cardem-pcsc - main program for the host PC to provide a remote SIM
  * using the SIMtrace 2 firmware in card emulation mode
  *
- * (C) 2016-2021 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2016-2022 by Harald Welte <hwelte@hmw-consulting.de>
  * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
  *
  * This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@
 #include <osmocom/sim/class_tables.h>
 #include <osmocom/sim/sim.h>
 
-#define LOGCI(ci, lvl, fmt, args ...) printf(fmt, ## args)
+#define LOGCI(ci, lvl, fmt, args ...) LOGP(DLGLOBAL, lvl,  fmt, ## args)
 
 static void atr_update_csum(uint8_t *atr, unsigned int atr_len)
 {
@@ -62,7 +62,7 @@ static void atr_update_csum(uint8_t *atr, unsigned int atr_len)
 	atr[atr_len-1] = csum;
 }
 
-static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags)
+static void cemu_status_flags2str(char *out, unsigned int out_len, uint32_t flags)
 {
 	snprintf(out, out_len, "%s%s%s%s%s",
 		 flags & CEMU_STATUS_F_RESET_ACTIVE ? "RESET " : "",
@@ -72,25 +72,57 @@ static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags)
 		 flags & CEMU_STATUS_F_RCEMU_ACTIVE ? "RCEMU " : "");
 }
 
-static uint32_t last_flags = 0;
+static uint32_t last_status_flags = 0;
 
-static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags)
+#define NO_RESET 0
+#define COLD_RESET 1
+#define WARM_RESET 2
+
+static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags)
 {
 	struct osim_card_hdl *card = ci->chan->card;
+	int reset = NO_RESET;
 
+	/* check if card is _now_ operational: VCC+CLK present, RST absent */
 	if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) &&
 	    !(flags & CEMU_STATUS_F_RESET_ACTIVE)) {
-		if (last_flags & CEMU_STATUS_F_RESET_ACTIVE) {
+		if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) {
 			/* a reset has just ended, forward it to the real card */
-			bool cold_reset = true;
-			if (last_flags & CEMU_STATUS_F_VCC_PRESENT)
-				cold_reset = false;
-			LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n",
-				cold_reset ? "Cold" : "Warm");
-			osim_card_reset(card, cold_reset);
+			if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT)
+				reset = WARM_RESET;
+			else
+				reset = COLD_RESET;
+		} else if (!(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) {
+			/* power-up has just happened, perform cold reset */
+			reset = COLD_RESET;
 		}
+	} else if (flags == CEMU_STATUS_F_VCC_PRESENT &&
+		   !(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) {
+		/* improper power-up: Only power enabled, but no reset active. */
+		reset = COLD_RESET;
 	}
-	last_flags = flags;
+
+	if (reset) {
+		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;
+}
+
+static const char *cemu_data_flags2str(uint32_t flags)
+{
+	static char out[64];
+	snprintf(out, sizeof(out), "%s%s%s%s",
+		 flags & CEMU_DATA_F_TPDU_HDR ? "HDR " : "",
+		 flags & CEMU_DATA_F_FINAL ? "FINAL " : "",
+		 flags & CEMU_DATA_F_PB_AND_TX ? "PB_AND_TX " : "",
+		 flags & CEMU_DATA_F_PB_AND_RX ? "PB_AND_RX" : "");
+	return out;
 }
 
 /***********************************************************************
@@ -103,12 +135,12 @@ static int process_do_status(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int
 	struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf;
 	char fbuf[80];
 
-	cemu_flags2str(fbuf, sizeof(fbuf), status->flags);
-	printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
+	cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags);
+	LOGCI(ci, LOGL_NOTICE, "=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
 		status->flags, status->fi, status->di, status->wi,
 		status->waiting_time, fbuf);
 
-	update_flags(ci, status->flags);
+	update_status_flags(ci, status->flags);
 
 	return 0;
 }
@@ -119,7 +151,7 @@ static int process_do_pts(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len
 	struct cardemu_usb_msg_pts_info *pts;
 	pts = (struct cardemu_usb_msg_pts_info *) buf;
 
-	printf("=> PTS req: %s\n", osmo_hexdump(pts->req, sizeof(pts->req)));
+	LOGCI(ci, LOGL_NOTICE, "=> PTS req: %s\n", osmo_hexdump(pts->req, pts->pts_len));
 
 	return 0;
 }
@@ -133,11 +165,18 @@ static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int l
 
 	data = (struct cardemu_usb_msg_rx_data *) buf;
 
-	printf("=> DATA: flags=%x, %s: ", data->flags,
-		osmo_hexdump(data->data, data->data_len));
+	LOGCI(ci, LOGL_INFO, "=> DATA: flags=0x%02x (%s), %s\n ", data->flags,
+	      cemu_data_flags2str(data->flags), osmo_hexdump(data->data, data->data_len));
 
 	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");
@@ -160,10 +199,12 @@ 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;
-		printf("SW=0x%04x, len_rx=%d\n", msgb_apdu_sw(tmsg), msgb_l3len(tmsg));
 		if (msgb_l3len(tmsg))
 			osmo_st2_cardem_request_pb_and_tx(ci, ac.hdr.ins, tmsg->l3h, msgb_l3len(tmsg));
 		osmo_st2_cardem_request_sw_tx(ci, ac.sw);
@@ -179,8 +220,6 @@ static int process_usb_msg(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int le
 	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;
 	int rc;
 
-	printf("-> %s\n", osmo_hexdump(buf, len));
-
 	buf += sizeof(*sh);
 
 	switch (sh->msg_type) {
@@ -212,12 +251,12 @@ static int process_irq_status(struct osmo_st2_cardem_inst *ci, const uint8_t *bu
 	const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf;
 	char fbuf[80];
 
-	cemu_flags2str(fbuf, sizeof(fbuf), status->flags);
-	LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
+	cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags);
+	LOGCI(ci, LOGL_NOTICE, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n",
 		status->flags, status->fi, status->di, status->wi,
 		status->waiting_time, fbuf);
 
-	update_flags(ci, status->flags);
+	update_status_flags(ci, status->flags);
 
 	return 0;
 }
@@ -227,8 +266,6 @@ static int process_usb_msg_irq(struct osmo_st2_cardem_inst *ci, const uint8_t *b
 	struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;
 	int rc;
 
-	LOGCI(ci, LOGL_INFO, "SIMtrace IRQ %s\n", osmo_hexdump(buf, len));
-
 	buf += sizeof(*sh);
 
 	switch (sh->msg_type) {
@@ -254,6 +291,9 @@ static void usb_in_xfer_cb(struct libusb_transfer *xfer)
 		/* hand the message up the stack */
 		process_usb_msg(ci, xfer->buffer, xfer->actual_length);
 		break;
+	case LIBUSB_TRANSFER_ERROR:
+		LOGCI(ci, LOGL_FATAL, "USB IN transfer error, trying resubmit\n");
+		break;
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");
 		exit(1);
@@ -305,12 +345,15 @@ static void usb_irq_xfer_cb(struct libusb_transfer *xfer)
 	case LIBUSB_TRANSFER_COMPLETED:
 		process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length);
 		break;
+	case LIBUSB_TRANSFER_ERROR:
+		LOGCI(ci, LOGL_FATAL, "USB INT transfer error, trying resubmit\n");
+		break;
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");
 		exit(1);
 		break;
 	default:
-		LOGCI(ci, LOGL_FATAL, "USB IN transfer failed, status=%u\n", xfer->status);
+		LOGCI(ci, LOGL_FATAL, "USB INT transfer failed, status=%u\n", xfer->status);
 		exit(1);
 		break;
 	}
@@ -351,7 +394,7 @@ static void allocate_and_submit_irq(struct osmo_st2_cardem_inst *ci)
 static void print_welcome(void)
 {
 	printf("simtrace2-cardem-pcsc - Using PC/SC reader as SIM\n"
-	       "(C) 2010-2020, Harald Welte <laforge@gnumonks.org>\n"
+	       "(C) 2010-2022, Harald Welte <laforge@gnumonks.org>\n"
 	       "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>\n\n");
 }
 
@@ -370,6 +413,7 @@ 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"
 		);
 }
@@ -388,6 +432,7 @@ 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 }
 };
 
@@ -444,21 +489,30 @@ 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();
 
+	osmo_init_logging2(NULL, &log_info);
+
 	rc = osmo_libusb_init(NULL);
 	if (rc < 0) {
 		fprintf(stderr, "libusb initialization failed\n");
 		return rc;
 	}
 
-	osmo_init_logging2(NULL, &log_info);
+	log_set_print_category_hex(osmo_stderr_target, false);
+	log_set_print_category(osmo_stderr_target, true);
+	log_set_print_level(osmo_stderr_target, true);
+	log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
+	log_set_category_filter(osmo_stderr_target, DLINP, 1, LOGL_DEBUG);
+	log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG);
 
 	while (1) {
 		int option_index = 0;
 
-		c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:", opts, &option_index);
+		c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:Z:", opts, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -502,6 +556,10 @@ 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;
 		}
 	}
 
@@ -549,19 +607,21 @@ int main(int argc, char **argv)
 
 	do {
 		struct usb_interface_match _ifm, *ifm = &_ifm;
+		memset(ifm, 0, sizeof(*ifm));
 		ifm->vendor = vendor_id;
 		ifm->product = product_id;
 		ifm->configuration = config_id;
 		ifm->interface = if_num;
 		ifm->altsetting = altsetting;
-		ifm->addr = addr;
+		if (addr > 0 && addr < 256)
+			ifm->addr = addr;
 		if (path)
 			osmo_strlcpy(ifm->path, path, sizeof(ifm->path));
 		transp->udp_fd = -1;
 		transp->usb_async = true;
 		transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);
 		if (!transp->usb_devh) {
-			fprintf(stderr, "can't open USB device\n");
+			fprintf(stderr, "can't open USB device: %s\n", strerror(errno));
 			goto close;
 		}
 
@@ -583,7 +643,7 @@ int main(int argc, char **argv)
 			allocate_and_submit_in(ci);
 
 		/* request firmware to generate STATUS on IRQ endpoint */
-		osmo_st2_cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ);
+		osmo_st2_cardem_request_config2(ci, &cardem_config);
 
 		/* simulate card-insert to modem (owhw, not qmod) */
 		osmo_st2_cardem_request_card_insert(ci, true);

host/src/simtrace2-sniff.c

@@ -442,9 +442,9 @@ int main(int argc, char **argv)
 	}
 	struct usb_interface_match ifm_selected = ifm_filtered[0];
 	printf("Using USB device %04x:%04x Addr=%u, Path=%s, Cfg=%u, Intf=%u, Alt=%u: %d/%d/%d ",
-	ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path,
-	ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting,
-	ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol);
+		ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path,
+		ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting,
+		ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol);
 	libusb_device_handle *dev_handle;
 	rc = libusb_open(ifm_selected.usb_dev, &dev_handle);
 	if (rc < 0) {
@@ -472,7 +472,7 @@ int main(int argc, char **argv)
 	do {
 		_transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected);
 		if (!_transp.usb_devh) {
-			fprintf(stderr, "can't open USB device\n");
+			fprintf(stderr, "can't open USB device: %s\n", strerror(errno));
 			goto close_exit;
 		}
 

host/src/simtrace2-tool.c

@@ -290,6 +290,8 @@ int main(int argc, char **argv)
 
 	transp->udp_fd = -1;
 
+	print_welcome();
+
 	osmo_init_logging2(NULL, &log_info);
 
 	rc = osmo_libusb_init(NULL);
@@ -298,22 +300,22 @@ int main(int argc, char **argv)
 		goto do_exit;
 	}
 
-	print_welcome();
-
 	do {
 		if (transp->udp_fd < 0) {
 			struct usb_interface_match _ifm, *ifm = &_ifm;
+			memset(ifm, 0, sizeof(*ifm));
 			ifm->vendor = vendor_id;
 			ifm->product = product_id;
 			ifm->configuration = config_id;
 			ifm->interface = if_num;
 			ifm->altsetting = altsetting;
-			ifm->addr = addr;
+			if (addr > 0 && addr < 256)
+				ifm->addr = addr;
 			if (path)
 				osmo_strlcpy(ifm->path, path, sizeof(ifm->path));
 			transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);
 			if (!transp->usb_devh) {
-				fprintf(stderr, "can't open USB device\n");
+				fprintf(stderr, "can't open USB device: %s\n", strerror(errno));
 				goto close_exit;
 			}
 

host/src/simtrace2_usb.c

@@ -18,6 +18,8 @@
 #include <errno.h>
 
 #include <osmocom/core/utils.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/application.h>
 
 #include <osmocom/usb/libusb.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
@@ -71,9 +73,12 @@ static int find_devices(void)
 	return num_interfaces;
 }
 
+static struct log_info log_info = {};
+
 int main(int argc, char **argv)
 {
-	osmo_libusb_init(NULL);
+	osmo_init_logging2(NULL, &log_info);
+	OSMO_ASSERT(osmo_libusb_init(NULL) == 0);
 	find_devices();
 	return 0;
 }