simtrace2_api: Fix transmission of SIMTRACE_CMD_BD_BOARD_INFO

Prior to this commit we didn't pass the pointer to the slot when
requesting board_info.

Change-Id: Ib99e7c0a96f7738480ca68ed2c144c1756a5f11b

.checkpatch.conf

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

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,42 +16,55 @@ 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 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)
@@ -57,11 +79,20 @@ 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
+  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_cardinsert, hf_modem_sim_select,
 }
 
 local is_hdr = Field.new("usb_simtrace.tpdu_hdr")
@@ -83,6 +114,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 +197,44 @@ 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));
+  subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1));
+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 +253,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 +274,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/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,
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 9),
                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/blupdate/main.c

@@ -113,15 +113,15 @@ extern int main(void)
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-	printf("\r\n\r\n");
-	printf("bootloader updater %s for board %s\r\n"
-	       "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\r\n",
+	printf("\n\r\n\r");
+	printf("bootloader updater %s for board %s\n\r"
+	       "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r",
 	       manifest_revision, manifest_board);
 
 	/* clear g_dfu on power-up reset */
 	memset(g_dfu, 0, sizeof(*g_dfu));
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
 	USBD_Disconnect();
 

firmware/apps/cardem/main.c

@@ -155,12 +155,12 @@ 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();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -169,7 +169,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\r\n");
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -177,25 +177,25 @@ extern int main(void)
 		i++;
 	}
 
-	TRACE_INFO("calling configure of all configurations...\r\n");
+	TRACE_INFO("calling configure of all configurations...\n\r");
 	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}
 
-	TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
 	if (config_func_ptrs[simtrace_config].init) {
 		config_func_ptrs[simtrace_config].init();
 	}
 	last_simtrace_config = simtrace_config;
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
 		const char rotor[] = { '-', '\\', '|', '/' };
-		putchar('\b');
 		putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
+		putchar('\b');
 #endif
 		check_exec_dbg_cmd();
 		osmo_timers_prepare();
@@ -206,13 +206,17 @@ 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\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\r\n",
+			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
 			if (config_func_ptrs[last_simtrace_config].exit) {
 				config_func_ptrs[last_simtrace_config].exit();

firmware/apps/dfu/main.c

@@ -78,9 +78,9 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 	}
 
 #if TRACE_LEVEL >= TRACE_LEVEL_INFO
-	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\r\n", altif, offset, len);
+	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
 #else
-	printf("DL off=%u\r\n", offset);
+	printf("DL off=%u\n\r", offset);
 #endif
 
 #ifdef PINS_LEDS
@@ -113,19 +113,19 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		}
 		rc = FLASHD_Unlock(addr, addr + len, 0, 0);
 		if (rc != 0) {
-			TRACE_ERROR("DFU download flash unlock failed\r\n");
+			TRACE_ERROR("DFU download flash unlock failed\n\r");
 			rc =  DFU_RET_STALL;
 			break;
 		}
 		rc = FLASHD_Write(addr, data, len);
 		if (rc != 0) {
-			TRACE_ERROR("DFU download flash erase failed\r\n");
+			TRACE_ERROR("DFU download flash erase failed\n\r");
 			rc = DFU_RET_STALL;
 			break;
 		}
 		for (i = 0; i < len; i++) {
 			if (((uint8_t*)addr)[i]!=data[i]) {
-				TRACE_ERROR("DFU download flash data written not correct\r\n");
+				TRACE_ERROR("DFU download flash data written not correct\n\r");
 				rc = DFU_RET_STALL;
 				break;
 			}
@@ -133,7 +133,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		rc = DFU_RET_ZLP;
 		break;
 	default:
-		TRACE_ERROR("DFU download for unknown AltIf %d\r\n", altif);
+		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
 		rc = DFU_RET_STALL;
 		break;
 	}
@@ -179,11 +179,11 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
 		memcpy(data, (void *)addr, req_len);
 		break;
 	default:
-		TRACE_ERROR("DFU upload for unknown AltIf %d\r\n", altif);
+		TRACE_ERROR("DFU upload for unknown AltIf %d\n\r", altif);
 		/* FIXME: set error codes */
 		return -1;
 	}
-	printf("=%u\r\n", req_len);
+	printf("=%u\n\r", req_len);
 	return req_len;
 }
 
@@ -274,16 +274,16 @@ extern int main(void)
 
 	EEFC_ReadUniqueID(g_unique_id);
 
-	printf("\r\n\r\n");
+	printf("\n\r\n\r");
 	print_line();
-	printf("DFU bootloader %s for board %s\r\n"
-		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\r\n",
+	printf("DFU bootloader %s for board %s\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r",
 		manifest_revision, manifest_board);
 	print_line();
 
 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\r\n", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
 	static const char* reset_causes[] = {
@@ -294,9 +294,9 @@ extern int main(void)
 		"user reset (NRST pin detected low)",
 	};
 	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\r\n", reset_causes[reset_cause]);
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
 	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\r\n", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
 	}
 #endif
 
@@ -306,25 +306,25 @@ extern int main(void)
 	switch (USBDFU_OverrideEnterDFU()) {
 	case 0:
 		if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-			TRACE_INFO_WP("unknown\r\n");
+			TRACE_INFO_WP("unknown\n\r");
 		} else {
-			TRACE_INFO_WP("DFU is the main application\r\n");
+			TRACE_INFO_WP("DFU is the main application\n\r");
 		}
 		break;
 	case 1:
-		TRACE_INFO_WP("DFU switch requested by main application\r\n");
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
 		break;
 	case 2:
-		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\r\n");
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
 		break;
 	case 3:
-		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\r\n");
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
 		break;
 	case 4: // the is no reason
-		TRACE_INFO_WP("reset vector (second application word) does no point in flash\r\n");
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
 		break;
 	default:
-		TRACE_INFO_WP("unknown\r\n");
+		TRACE_INFO_WP("unknown\n\r");
 		break;
 	}
 #endif
@@ -335,7 +335,7 @@ extern int main(void)
 
 	board_main_top();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
 	USBD_Disconnect();
 	mdelay(500);
@@ -346,7 +346,7 @@ extern int main(void)
 		check_exec_dbg_cmd();
 #if 1
 		if (i >= MAX_USB_ITER * 3) {
-			TRACE_ERROR("Resetting board (USB could not be configured)\r\n");
+			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
 			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
 			USBD_Disconnect();
 			NVIC_SystemReset();
@@ -358,7 +358,7 @@ extern int main(void)
 	/* Initialize the flash to be able to write it, using the IAP ROM code */
 	FLASHD_Initialize(BOARD_MCK, 1);
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -378,7 +378,7 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}

firmware/apps/freq_ctr/main.c

@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);
 
 
-	printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\r\n"
-		"=============================================================================\r\n");
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\n\r"
+		"=============================================================================\n\r");
 
 	board_main_top();
 
-	TRACE_INFO("starting frequency counter...\r\n");
+	TRACE_INFO("starting frequency counter...\n\r");
 	freq_ctr_init();
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 

firmware/apps/gpio_test/gpio_test.c

@@ -4,5 +4,5 @@
 
 void gpio_test_init(void)
 {
-	printf("FIXME run tests here\r\n");
+	printf("FIXME run tests here\n\r");
 }

firmware/apps/gpio_test/main.c

@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);
 
 
-	printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\r\n"
-		"=============================================================================\r\n");
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\n\r"
+		"=============================================================================\n\r");
 
 	board_main_top();
 
-	TRACE_INFO("starting gpio test...\r\n");
+	TRACE_INFO("starting gpio test...\n\r");
 	gpio_test_init();
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 

firmware/apps/trace/main.c

@@ -156,7 +156,7 @@ extern int main(void)
 	print_banner();
 	board_main_top();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -165,7 +165,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\r\n");
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -173,17 +173,17 @@ extern int main(void)
 		i++;
 	}
 
-	TRACE_INFO("calling configure of all configurations...\r\n");
+	TRACE_INFO("calling configure of all configurations...\n\r");
 	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}
 
-	TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
 	config_func_ptrs[simtrace_config].init();
 	last_simtrace_config = simtrace_config;
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -201,12 +201,12 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\r\n",
+			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
 			config_func_ptrs[last_simtrace_config].exit();
 			config_func_ptrs[simtrace_config].init();

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/libchip_sam3s/source/USBD_HAL.c

@@ -767,7 +767,7 @@ static void UDP_EndpointHandler(uint8_t bEndpoint)
         }
         else {
             // Acknowledge interrupt
-            TRACE_ERROR("Error Wr%d, %x\r\n", bEndpoint, pEndpoint->state);
+            TRACE_ERROR("Error Wr%d, %x\n\r", bEndpoint, pEndpoint->state);
             CLEAR_CSR(bEndpoint, UDP_CSR_TXCOMP);
         }
     }
@@ -914,11 +914,11 @@ static inline uint8_t UDP_Write(uint8_t    bEndpoint,
 /*    int i;
     for (i = 0; i < dLength; i++) {
        if (!(i%16)) {
-            printf("\r\n");
+            printf("\n\r");
         }
         printf("0x%x ", ((uint8_t*)pData)[i]);
     }
-    printf("\r\n");
+    printf("\n\r");
 */
 
     /* Setup the transfer descriptor */
@@ -1053,11 +1053,11 @@ static inline uint8_t UDP_Read(uint8_t  bEndpoint,
 /*    int i;
     for (i = 0; i < dLength; i++) {
         if (!(i%16)) {
-            printf("\r\n");
+            printf("\n\r");
         }
         printf("0x%x ", ((uint8_t*)pData)[i]);
     }
-    printf("\r\n");
+    printf("\n\r");
 */
 
     /* Set the transfer descriptor */
@@ -1114,7 +1114,7 @@ void USBD_IrqHandler(void)
     /* Return immediately if there is no interrupt to service */
     if (status == 0) {
 
-        TRACE_DEBUG_WP(".\r\n");
+        TRACE_DEBUG_WP(".\n\r");
         return;
     }
 
@@ -1212,7 +1212,7 @@ void USBD_IrqHandler(void)
 
                 if (status != 0) {
 
-                    TRACE_DEBUG_WP("\r\n  - ");
+                    TRACE_DEBUG_WP("\n\r  - ");
                 }
             }
             eptnum++;
@@ -1221,7 +1221,7 @@ void USBD_IrqHandler(void)
 
     /* Toggle LED back to its previous state */
     TRACE_DEBUG_WP("!");
-    TRACE_DEBUG_WP("\r\n");
+    TRACE_DEBUG_WP("\n\r");
     if (USBD_GetState() >= USBD_STATE_POWERED) {
 
         //LED_Clear(USBD_LEDUSB);
@@ -1581,7 +1581,7 @@ void USBD_HAL_SetConfiguration(uint8_t cfgnum)
  */
 void USBD_HAL_Init(void)
 {
-    TRACE_DEBUG("%s\r\n", "USBD_HAL_Init");
+    TRACE_DEBUG("%s\n\r", "USBD_HAL_Init");
 
     /* Must before USB & TXVC access! */
     UDP_EnablePeripheralClock();
@@ -1610,7 +1610,7 @@ uint8_t USBD_HAL_Stall(uint8_t bEP)
 
     /* Check that endpoint is in Idle state */
     if (pEndpoint->state != UDP_ENDPOINT_IDLE) {
-        TRACE_WARNING("UDP_Stall: EP%d locked\r\n", bEP);
+        TRACE_WARNING("UDP_Stall: EP%d locked\n\r", bEP);
         return USBD_STATUS_LOCKED;
     }
     /* STALL endpoint */
@@ -1672,6 +1672,10 @@ uint8_t USBD_HAL_Halt(uint8_t bEndpoint, uint8_t ctl)
             UDP->UDP_RST_EP |= 1 << bEndpoint;
             UDP->UDP_RST_EP &= ~(1 << bEndpoint);
         }
+
+        /* This fixes a weird bug with regard to ping-pong OUT endpoints */
+        UDP->UDP_RST_EP |= 1 << bEndpoint;
+        UDP->UDP_RST_EP &= ~(1 << bEndpoint);
     }
 
     /* Return Halt status */

firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c

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

firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c

@@ -104,7 +104,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
     /* Check pending events */
     if ( status != 0 )
     {
-        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\r\n", id ) ;
+        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
 
         /* Find triggering source */
         i = 0;
@@ -119,7 +119,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
                 /* Source has PIOs whose statuses have changed */
                 if ( (status & _aIntSources[i].pPin->mask) != 0 )
                 {
-                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\r\n", i ) ;
+                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
 
                     _aIntSources[i].handler(_aIntSources[i].pPin);
                     status &= ~(_aIntSources[i].pPin->mask);
@@ -177,13 +177,13 @@ extern void PIOC_IrqHandler( void )
  */
 extern void PIO_InitializeInterrupts( uint32_t dwPriority )
 {
-    TRACE_DEBUG( "PIO_Initialize()\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
 
     /* Reset sources */
     _dwNumSources = 0 ;
 
     /* Configure PIO interrupt sources */
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
     PMC_EnablePeripheral( ID_PIOA ) ;
     PIOA->PIO_ISR ;
     PIOA->PIO_IDR = 0xFFFFFFFF ;
@@ -192,7 +192,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
     NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
     NVIC_EnableIRQ( PIOA_IRQn ) ;
 
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
     PMC_EnablePeripheral( ID_PIOB ) ;
     PIOB->PIO_ISR ;
     PIOB->PIO_IDR = 0xFFFFFFFF ;
@@ -201,7 +201,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
     NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
     NVIC_EnableIRQ( PIOB_IRQn ) ;
 
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
     PMC_EnablePeripheral( ID_PIOC ) ;
     PIOC->PIO_ISR ;
     PIOC->PIO_IDR = 0xFFFFFFFF ;
@@ -234,7 +234,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
     Pio* pio ;
     InterruptSource* pSource ;
 
-    TRACE_DEBUG( "PIO_ConfigureIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
 
     assert( pPin ) ;
     pio = pPin->pio ;
@@ -242,7 +242,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
     pSource = find_intsource4pin(pPin);
     if (!pSource) {
         /* Define new source */
-        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\r\n",  _dwNumSources ) ;
+        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
         assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
         pSource = &(_aIntSources[_dwNumSources]) ;
         pSource->pPin = pPin ;
@@ -288,7 +288,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
  */
 extern void PIO_EnableIt( const Pin *pPin )
 {
-    TRACE_DEBUG( "PIO_EnableIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
 
     assert( pPin != NULL ) ;
 
@@ -320,7 +320,7 @@ extern void PIO_DisableIt( const Pin *pPin )
 {
     assert( pPin != NULL ) ;
 
-    TRACE_DEBUG( "PIO_DisableIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
 
     pPin->pio->PIO_IDR = pPin->mask;
 }

firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c

@@ -63,7 +63,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
     {
         if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
         {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\r\n", dwId ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
         }
         else
         {
@@ -75,7 +75,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
         dwId -= 32;
         if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
         {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\r\n", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
         }
         else
         {
@@ -100,7 +100,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
     {
         if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
         {
-            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId ) ;
+            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
         }
         else
         {
@@ -112,7 +112,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
         dwId -= 32 ;
         if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
         {
-            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
         }
         else
         {
@@ -132,7 +132,7 @@ extern void PMC_EnableAllPeripherals( void )
     PMC->PMC_PCER1 = MASK_STATUS1 ;
     while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
 
-    TRACE_DEBUG( "Enable all periph clocks\r\n" ) ;
+    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
 }
 
 /**
@@ -146,7 +146,7 @@ extern void PMC_DisableAllPeripherals( void )
     PMC->PMC_PCDR1 = MASK_STATUS1 ;
     while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
 
-    TRACE_DEBUG( "Disable all periph clocks\r\n" ) ;
+    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
 }
 
 /**

firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c

@@ -198,7 +198,7 @@ void USART_Write(
 
             if (timeOut == 0) {
 
-                TRACE_ERROR("USART_Write: Timed out.\r\n");
+                TRACE_ERROR("USART_Write: Timed out.\n\r");
                 return;
             }
             timeOut--;
@@ -269,7 +269,7 @@ uint16_t USART_Read(
 
             if (timeOut == 0) {
 
-                TRACE_ERROR( "USART_Read: Timed out.\r\n" ) ;
+                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
                 return 0;
             }
             timeOut--;

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

@@ -140,7 +140,7 @@ void USBD_ResetHandler()
 void USBD_RequestHandler(uint8_t bEndpoint,
                          const USBGenericRequest* pRequest)
 {
-    TRACE_DEBUG("%s\r\n", "USBD_RequestHandler");
+    TRACE_DEBUG("%s\n\r", "USBD_RequestHandler");
     if (bEndpoint != 0) {
         TRACE_WARNING("EP%d request not supported, default EP only",
                       bEndpoint);
@@ -316,7 +316,7 @@ void USBD_RemoteWakeUp(void)
     /* Device is NOT suspended */
     if (deviceState != USBD_STATE_SUSPENDED) {
 
-        TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\r\n");
+        TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\n\r");
         return;
     }
     USBD_HAL_Activate();
@@ -356,7 +356,7 @@ void USBD_Disconnect(void)
  */
 void USBD_Init(void)
 {
-    TRACE_INFO_WP("USBD_Init\r\n");
+    TRACE_INFO_WP("USBD_Init\n\r");
 
     /* HW Layer Initialize */
     USBD_HAL_Init();
@@ -367,7 +367,7 @@ void USBD_Init(void)
 
     /* Upper Layer Initialize */
     USBDCallbacks_Initialized();
-    TRACE_DEBUG("%s\r\n", "..");
+    TRACE_DEBUG("%s\n\r", "..");
 }
 
 /**

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

@@ -83,7 +83,7 @@ static void SetConfiguration(USBDDriver *pDriver, uint8_t cfgnum)
     const USBConfigurationDescriptor *pConfiguration;
 
     /* Use different descriptor depending on device speed */
-    TRACE_DEBUG("%s\r\n", "SetConfiguration");
+    TRACE_DEBUG("%s\n\r", "SetConfiguration");
 
     if (USBD_IsHighSpeed()) {
 
@@ -361,7 +361,7 @@ static void GetDescriptor(
 
         default:
             TRACE_WARNING(
-                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\r\n",
+                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\n\r",
                       type);
             USBD_Stall(0);
     }
@@ -565,7 +565,7 @@ void USBDDriver_RequestHandler(
 
                 default:
                     TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown recipient (%d)\r\n",
+                              "USBDDriver_RequestHandler: Unknown recipient (%d)\n\r",
                               USBGenericRequest_GetRecipient(pRequest));
                     USBD_Stall(0);
             }
@@ -595,7 +595,7 @@ void USBDDriver_RequestHandler(
 
                 default:
                     TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
+                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
                               USBFeatureRequest_GetFeatureSelector(pRequest));
                     USBD_Stall(0);
             }
@@ -642,7 +642,7 @@ void USBDDriver_RequestHandler(
 
             default:
                 TRACE_WARNING(
-                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
+                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
                           USBFeatureRequest_GetFeatureSelector(pRequest));
                 USBD_Stall(0);
         }
@@ -665,7 +665,7 @@ void USBDDriver_RequestHandler(
 
     default:
         TRACE_WARNING(
-                  "USBDDriver_RequestHandler: Unknown request code (%d)\r\n",
+                  "USBDDriver_RequestHandler: Unknown request code (%d)\n\r",
                   USBGenericRequest_GetRequest(pRequest));
         USBD_Stall(0);
     }

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

@@ -49,7 +49,7 @@ struct dfudata *g_dfu = &_g_dfu;
 
 WEAK void dfu_drv_updstatus(void)
 {
-	TRACE_INFO("DFU: updstatus()\r\n");
+	TRACE_INFO("DFU: updstatus()\n\r");
 
 	/* we transition immediately from MANIFEST_SYNC to MANIFEST,
 	 * as the flash-writing is not asynchronous in this
@@ -72,7 +72,7 @@ static __dfufunc void handle_getstatus(void)
 	dstat.iString = 0;
 	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
 
-	TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
 
 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -81,7 +81,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%ld)\r\n", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -106,10 +106,10 @@ static void dnload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;
 
-	TRACE_DEBUG("COMPLETE\r\n");
+	TRACE_DEBUG("COMPLETE\n\r");
 
 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD download callback status %d\r\n", status);
+		TRACE_ERROR("USBD download callback status %d\n\r", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -136,14 +136,14 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
 	int rc;
 
 	if (len > BOARD_DFU_PAGE_SIZE) {
-		TRACE_ERROR("DFU length exceeds flash page size\r\n");
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
 	}
 
 	if (len & 0x03) {
-		TRACE_ERROR("DFU length not four-byte-aligned\r\n");
+		TRACE_ERROR("DFU length not four-byte-aligned\n\r");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -153,7 +153,7 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
 		g_dfu->total_bytes = 0;
 
 	if (len == 0) {
-		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\r\n");
+		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\n\r");
 		g_dfu->state = DFU_STATE_dfuMANIFEST_SYNC;
 		return DFU_RET_ZLP;
 	}
@@ -172,10 +172,10 @@ static void upload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;
 
-	TRACE_DEBUG("COMPLETE\r\n");
+	TRACE_DEBUG("COMPLETE\n\r");
 
 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD upload callback status %d\r\n", status);
+		TRACE_ERROR("USBD upload callback status %d\n\r", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -191,7 +191,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)
 		g_dfu->total_bytes = 0;
 
 	if (len > BOARD_DFU_PAGE_SIZE) {
-		TRACE_ERROR("DFU length exceeds flash page size\r\n");
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -199,7 +199,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)
 
 	rc = USBDFU_handle_upload(if_altsettings[0], g_dfu->total_bytes, dfu_buf, len);
 	if (rc < 0) {
-		TRACE_ERROR("application handle_upload() returned %d\r\n", rc);
+		TRACE_ERROR("application handle_upload() returned %d\n\r", rc);
 		return DFU_RET_STALL;
 	}
 
@@ -217,7 +217,7 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request)
 	uint16_t val = USBGenericRequest_GetValue(request);
 	int rc, ret = DFU_RET_NOTHING;
 
-	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);

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

@@ -55,7 +55,7 @@ static __dfufunc void handle_getstatus(void)
 	dstat.iString = 0;
 	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
 
-	TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
 
 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -64,7 +64,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%lu)\r\n", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -110,7 +110,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	uint16_t val = USBGenericRequest_GetValue(request);
 	int rc, ret = DFU_RET_NOTHING;
 
-	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);
@@ -159,7 +159,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 			/* we switch it DETACH state, send a ZLP and
 			 * return.  The next USB reset in this state
 			 * will then trigger DFURT_SwitchToDFU() below */
-			TRACE_DEBUG("\r\n====dfu_detach\r\n");
+			TRACE_DEBUG("\r\n====dfu_detach\n\r");
 			g_dfu->state = DFU_STATE_appDETACH;
 			USBD_Write(0, 0, 0, 0, 0);
 			DFURT_SwitchToDFU();

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 */
@@ -238,7 +239,7 @@ extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
 		printf( "%02X ", pucFrame[dw] ) ;
 	}
 
-	printf( "\r\n" ) ;
+	printf( "\n\r" ) ;
 }
 
 /**
@@ -273,7 +274,7 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
 			UART_PutChar( *pucTmp++ ) ;
 		}
 
-		printf( "\r\n" ) ;
+		printf( "\n\r" ) ;
 	}
 
 	if ( (dwSize%16) != 0 )
@@ -304,7 +305,7 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
 			UART_PutChar( pucBuffer[j] ) ;
 		}
 
-		printf( "\r\n" ) ;
+		printf( "\n\r" ) ;
 	}
 }
 
@@ -335,12 +336,12 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			{
 				if ( ucNbNb == 0 )
 				{
-					printf( "\r\nWrite a number and press ENTER or SPACE!\r\n" ) ;
+					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
 					return 0 ;
 				}
 				else
 				{
-					printf( "\r\n" ) ;
+					printf( "\n\r" ) ;
 					*pdwValue=dwValue ;
 
 					return 1 ;
@@ -348,7 +349,7 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			}
 			else
 			{
-				printf( "\r\n'%c' not a number!\r\n", ucKey ) ;
+				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
 
 				return 0 ;
 			}
@@ -375,12 +376,12 @@ extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint3
 
 	if ( dwValue < dwMin || dwValue > dwMax )
  {
-		printf( "\r\nThe number have to be between %d and %d\r\n", (int)dwMin, (int)dwMax ) ;
+		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
 
 		return 0 ;
 	}
 
-	printf( "\r\n" ) ;
+	printf( "\n\r" ) ;
 
 	*pdwValue = dwValue ;
 
@@ -421,7 +422,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 				}
 				else
 				{
-					printf( "\r\nIt is not a hexa character!\r\n" ) ;
+					printf( "\n\rIt is not a hexa character!\n\r" ) ;
 
 					return 0 ;
 				}
@@ -429,7 +430,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 		}
 	}
 
-	printf("\r\n" ) ;
+	printf("\n\r" ) ;
 	*pdwValue = dwValue ;
 
 	return 1 ;

firmware/libboard/ngff_cardem/source/board_ngff_cardem.c

@@ -32,39 +32,39 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
-		printf("\tl\tswitch off LED 1\r\n");
-		printf("\tL\tswitch on  LED 1\r\n");
-		printf("\tg\tswitch off LED 2\r\n");
-		printf("\tG\tswitch on  LED 2\r\n");
-		printf("\t1\tGenerate 1ms reset pulse on WWAN1\r\n");
-		printf("\t!\tSwitch Channel A from physical -> remote\r\n");
-		printf("\tt\t(pseudo)talloc report\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		printf("\tl\tswitch off LED 1\n\r");
+		printf("\tL\tswitch on  LED 1\n\r");
+		printf("\tg\tswitch off LED 2\n\r");
+		printf("\tG\tswitch on  LED 2\n\r");
+		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
+		printf("\t!\tSwitch Channel A from physical -> remote\n\r");
+		printf("\tt\t(pseudo)talloc report\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	case 'l':
 		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
-		printf("LED 1 switched off\r\n");
+		printf("LED 1 switched off\n\r");
 		break;
 	case 'L':
 		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
-		printf("LED 1 switched on\r\n");
+		printf("LED 1 switched on\n\r");
 		break;
 	case 'g':
 		led_blink(LED_RED, BLINK_ALWAYS_OFF);
-		printf("LED 2 switched off\r\n");
+		printf("LED 2 switched off\n\r");
 		break;
 	case 'G':
 		led_blink(LED_RED, BLINK_ALWAYS_ON);
-		printf("LED 2 switched on\r\n");
+		printf("LED 2 switched on\n\r");
 		break;
 	case '1':
-		printf("Resetting Modem\r\n");
+		printf("Resetting Modem\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
 		break;
 	case '!':
@@ -74,7 +74,7 @@ void board_exec_dbg_cmd(int ch)
 		talloc_report(NULL, stdout);
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }

firmware/libboard/ngff_cardem/source/sim_switch.c

@@ -37,7 +37,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}
 
-	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
 		   physical ? "physical" : "virtual");
 
 	switch (nr) {
@@ -46,7 +46,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 
 	default:
-		TRACE_ERROR("Invalid SIM%u\r\n", nr);
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
 		return -1;
 	}
 

firmware/libboard/octsimtest/source/board_octsimtest.c

@@ -30,12 +30,12 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\t0-8\tselect physical SIM slot\r\n");
-		printf("\tR\treset SAM3\r\n");
-		printf("\tm\trun mcp23017 test\r\n");
-		printf("\ti\tset card insert via I2C\r\n");
-		printf("\tI\tdisable card insert\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\t0-8\tselect physical SIM slot\n\r");
+		printf("\tR\treset SAM3\n\r");
+		printf("\tm\trun mcp23017 test\n\r");
+		printf("\ti\tset card insert via I2C\n\r");
+		printf("\tI\tdisable card insert\n\r");
 		break;
 	case '0': mux_set_slot(0); break;
 	case '1': mux_set_slot(1); break;
@@ -46,7 +46,7 @@ void board_exec_dbg_cmd(int ch)
 	case '6': mux_set_slot(6); break;
 	case '7': mux_set_slot(7); break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
@@ -62,7 +62,7 @@ void board_exec_dbg_cmd(int ch)
 		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -93,7 +93,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;

firmware/libboard/octsimtest/source/mcp23017.c

@@ -94,7 +94,7 @@ out_stop:
 
 int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
 {
-	TRACE_DEBUG("mcp23017_init\r\n");
+	TRACE_DEBUG("mcp23017_init\n\r");
 
 	// all gpio input
 	if (mcp23017_write_byte(slave, MCP23017_IODIRA, iodira))
@@ -105,23 +105,23 @@ int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
 	if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP (autoinc addressing)
 		goto out_err;
 
-	TRACE_DEBUG("mcp23017 found\r\n");
+	TRACE_DEBUG("mcp23017 found\n\r");
 	return 0;
 
 out_err:
-	TRACE_WARNING("mcp23017 NOT found!\r\n");
+	TRACE_WARNING("mcp23017 NOT found!\n\r");
 	return -1;
 }
 
 int mcp23017_test(uint8_t slave)
 {
-	printf("mcp23017_test\r\n");
-	printf("GPIOA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_GPIOA));
-	printf("GPIOB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_GPIOB));
-	printf("IODIRA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IODIRA));
-	printf("IODIRB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IODIRB));
-	printf("IOCONA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IOCONA));
-	printf("IOCONB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IOCONB));
+	printf("mcp23017_test\n\r");
+	printf("GPIOA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOA));
+	printf("GPIOB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOB));
+	printf("IODIRA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRA));
+	printf("IODIRB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRB));
+	printf("IOCONA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONA));
+	printf("IOCONB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONB));
 
 	return 0;
 }
@@ -142,13 +142,13 @@ int mcp23017_toggle(uint8_t slave)
 	static bool foo=false;
 	if (foo)
 	{
-		printf("+\r\n");
+		printf("+\n\r");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x80);
 		foo=false;
 	}
 	else
 	{
-		printf("-\r\n");
+		printf("-\n\r");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x00);
 		foo=true;
 	}

firmware/libboard/owhw/source/owhw.c

@@ -25,16 +25,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }

firmware/libboard/owhw/source/sim_switch.c

@@ -36,7 +36,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}
 
-	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
 		   physical ? "physical" : "virtual");
 
 	switch (nr) {
@@ -53,7 +53,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 #endif
 	default:
-		TRACE_ERROR("Invalid SIM%u\r\n", nr);
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
 		return -1;
 	}
 

firmware/libboard/qmod/source/board_qmod.c

@@ -74,27 +74,27 @@ static int write_hub_eeprom(void)
 	/* wait */
 	mdelay(100);
 
-	TRACE_INFO("Writing EEPROM...\r\n");
+	TRACE_INFO("Writing EEPROM...\n\r");
 	/* write the EEPROM once */
 	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
 		if (rc < 0) {
-			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\r\n",
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}
 
 	/* then pursue re-reading it again and again */
-	TRACE_INFO("Verifying EEPROM...\r\n");
+	TRACE_INFO("Verifying EEPROM...\n\r");
 	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_DEBUG("0x%02x: %02x\r\n", i, byte);
+		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
-			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\r\n",
+			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
 					i, __eeprom_bin[i], byte);
 	}
-	TRACE_INFO("EEPROM written\r\n");
+	TRACE_INFO("EEPROM written\n\r");
 
 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -109,17 +109,17 @@ static int erase_hub_eeprom(void)
 	/* wait */
 	mdelay(100);
 
-	TRACE_INFO("Erasing EEPROM...\r\n");
+	TRACE_INFO("Erasing EEPROM...\n\r");
 	/* write the EEPROM once */
 	for (i = 0; i < 256; i++) {
 		int rc = eeprom_write_byte(0x50, i, 0xff);
 		if (rc < 0) {
-			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\r\n",
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}
-	TRACE_INFO("EEPROM erased\r\n");
+	TRACE_INFO("EEPROM erased\n\r");
 
 	return 0;
 }
@@ -143,41 +143,41 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'O':
-		printf("Setting PRTPWR_OVERRIDE\r\n");
+		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
 		break;
 	case 'o':
-		printf("Clearing PRTPWR_OVERRIDE\r\n");
+		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'H':
-		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\r\n");
+		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
 		break;
 	case 'h':
 		/* high level drives transistor -> HUB_RESET low */
-		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\r\n");
+		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\n\r");
 		PIO_Set(&pin_hub_rst);
 		break;
 	case 'w':
 		if (PIO_GetOutputDataStatus(&pin_hub_rst) == 0)
-			printf("WARNING: attempting EEPROM access while HUB not in reset\r\n");
-		printf("Please enter EEPROM offset:\r\n");
+			printf("WARNING: attempting EEPROM access while HUB not in reset\n\r");
+		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("Please enter EEPROM value:\r\n");
+		printf("Please enter EEPROM value:\n\r");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\r\n", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'r':
-		printf("Please enter EEPROM offset:\r\n");
+		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02lx] = 0x%02x\r\n", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -194,93 +194,93 @@ void board_exec_dbg_cmd(int ch)
 
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
-		printf("\tl\tswitch off LED 1\r\n");
-		printf("\tL\tswitch off LED 1\r\n");
-		printf("\tg\tswitch off LED 2\r\n");
-		printf("\tG\tswitch off LED 2\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		printf("\tl\tswitch off LED 1\n\r");
+		printf("\tL\tswitch off LED 1\n\r");
+		printf("\tg\tswitch off LED 2\n\r");
+		printf("\tG\tswitch off LED 2\n\r");
 		if (qmod_sam3_is_12()) {
 #if (ALLOW_PEER_ERASE > 0)
-			printf("\tE\tprogram EEPROM\r\n");
-			printf("\te\tErase EEPROM\r\n");
+			printf("\tE\tprogram EEPROM\n\r");
+			printf("\te\tErase EEPROM\n\r");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tO\tEnable PRTPWR_OVERRIDE\r\n");
-			printf("\to\tDisable PRTPWR_OVERRIDE\r\n");
+			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
+			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
 #if (ALLOW_PEER_ERASE > 0)
-			printf("\tH\tRelease HUB RESET (high)\r\n");
-			printf("\th\tAssert HUB RESET (low)\r\n");
-			printf("\tw\tWrite single byte in EEPROM\r\n");
+			printf("\tH\tRelease HUB RESET (high)\n\r");
+			printf("\th\tAssert HUB RESET (low)\n\r");
+			printf("\tw\tWrite single byte in EEPROM\n\r");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tr\tRead single byte from EEPROM\r\n");
+			printf("\tr\tRead single byte from EEPROM\n\r");
 		}
-		printf("\tX\tRelease peer SAM3 from reset\r\n");
-		printf("\tx\tAssert peer SAM3 reset\r\n");
+		printf("\tX\tRelease peer SAM3 from reset\n\r");
+		printf("\tx\tAssert peer SAM3 reset\n\r");
 #if (ALLOW_PEER_ERASE > 0)
-		printf("\tY\tRelease peer SAM3 ERASE signal\r\n");
-		printf("\ta\tAllow asserting peer SAM3 ERASE signal\r\n");
-		printf("\ty\tAssert peer SAM3 ERASE signal\r\n");
+		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
+		printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");
+		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
 #endif /* ALLOW_PEER_ERASE */
-		printf("\tU\tProceed to USB Initialization\r\n");
-		printf("\t1\tGenerate 1ms reset pulse on WWAN1\r\n");
-		printf("\t2\tGenerate 1ms reset pulse on WWAN2\r\n");
-		printf("\t!\tSwitch Channel A from physical -> remote\r\n");
-		printf("\t@\tSwitch Channel B from physical -> remote\r\n");
-		printf("\tt\t(pseudo)talloc report\r\n");
+		printf("\tU\tProceed to USB Initialization\n\r");
+		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
+		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
+		printf("\t!\tSwitch Channel A from physical -> remote\n\r");
+		printf("\t@\tSwitch Channel B from physical -> remote\n\r");
+		printf("\tt\t(pseudo)talloc report\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	case 'l':
 		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
-		printf("LED 1 switched off\r\n");
+		printf("LED 1 switched off\n\r");
 		break;
 	case 'L':
 		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
-		printf("LED 1 switched on\r\n");
+		printf("LED 1 switched on\n\r");
 		break;
 	case 'g':
 		led_blink(LED_RED, BLINK_ALWAYS_OFF);
-		printf("LED 2 switched off\r\n");
+		printf("LED 2 switched off\n\r");
 		break;
 	case 'G':
 		led_blink(LED_RED, BLINK_ALWAYS_ON);
-		printf("LED 2 switched on\r\n");
+		printf("LED 2 switched on\n\r");
 		break;
 	case 'X':
-		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\r\n");
+		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
 		PIO_Clear(&pin_peer_rst);
 		break;
 	case 'x':
-		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\r\n");
+		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
-		printf("Clearing SIMTRACExx_ERASE (inactive)\r\n");
+		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
 	case 'a':
-		printf("Asserting SIMTRACExx_ERASE allowed on next command\r\n");
+		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
 		allow_erase = true;
 		break;
 	case 'y':
 		if (allow_erase) {
-			printf("Setting SIMTRACExx_ERASE (active)\r\n");
+			printf("Setting SIMTRACExx_ERASE (active)\n\r");
 			PIO_Set(&pin_peer_erase);
 		} else {
-			printf("Please first allow setting SIMTRACExx_ERASE\r\n");
+			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
 		}
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case '1':
-		printf("Resetting Modem 1 (of this SAM3)\r\n");
+		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
 		break;
 	case '2':
-		printf("Resetting Modem 2 (of this SAM3)\r\n");
+		printf("Resetting Modem 2 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(1, 300);
 		break;
 	case '!':
@@ -294,7 +294,7 @@ void board_exec_dbg_cmd(int ch)
 		break;
 	default:
 		if (!qmod_sam3_is_12())
-			printf("Unknown command '%c'\r\n", ch);
+			printf("Unknown command '%c'\n\r", ch);
 		else
 			board_exec_dbg_cmd_st12only(ch);
 		break;
@@ -335,9 +335,9 @@ void board_main_top(void)
 #endif
 
 	if (qmod_sam3_is_12()) {
-		TRACE_INFO("Detected Quad-Modem ST12\r\n");
+		TRACE_INFO("Detected Quad-Modem ST12\n\r");
 	} else {
-		TRACE_INFO("Detected Quad-Modem ST34\r\n");
+		TRACE_INFO("Detected Quad-Modem ST34\n\r");
 #ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather

firmware/libboard/qmod/source/sim_switch.c

@@ -36,7 +36,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}
 
-	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
 		   physical ? "physical" : "virtual");
 
 	switch (nr) {
@@ -53,7 +53,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 #endif
 	default:
-		TRACE_ERROR("Invalid SIM%u\r\n", nr);
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
 		return -1;
 	}
 

firmware/libboard/sam3p256/source/board_sam3p256.c

@@ -24,16 +24,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -57,7 +57,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;

firmware/libboard/simtrace/source/board_simtrace.c

@@ -24,16 +24,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -57,7 +57,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;

firmware/libboard/simtrace/source/sim_switch.c

@@ -28,7 +28,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		return -1;
 	}
 
-	TRACE_INFO("Modem %u: %s SIM\r\n", nr, physical ? "physical" : "virtual");
+	TRACE_INFO("Modem %u: %s SIM\n\r", nr, physical ? "physical" : "virtual");
 
 	if (physical) {
 		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);

firmware/libcommon/include/assert.h

@@ -89,11 +89,11 @@
 		/// \param condition  Condition to verify.
 		#define ASSERT(condition)  { \
 			if (!(condition)) { \
-				printf_sync("-F- ASSERT: %s %s:%d\r\n", #condition, __BASE_FILE__, __LINE__); \
+				printf_sync("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
 				while (1); \
 			} \
 		}
-		#define SANITY_ERROR            "Sanity check failed at %s:%d\r\n"
+		#define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
 	
 		/// Performs the same duty as the ASSERT() macro, except a default error
 		/// message is output if the condition is false.

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_prot.h

@@ -1,6 +1,6 @@
 /* SIMtrace2 USB protocol
  *
- * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
+ * (C) 2015-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
@@ -84,6 +84,8 @@ enum simtrace_msg_type_sniff {
 	SIMTRACE_MSGT_SNIFF_PPS,
 	/* TPDU data */
 	SIMTRACE_MSGT_SNIFF_TPDU,
+	/* Statistics */
+	SIMTRACE_MSGT_DO_SNIFF_STATS,
 };
 
 /* common message header */
@@ -313,6 +315,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 {
@@ -335,3 +340,24 @@ struct sniff_data {
 	/* data */
 	uint8_t data[0];
 } __attribute__ ((packed));
+
+/* SIMTRACE_MSGT_DO_SNIFF_STATS */
+struct st_sniff_stats {
+	uint32_t flags;				/* RFU */
+	uint32_t num_bytes;			/* total lnumber of bytes received */
+	uint32_t num_tpdu;			/* total number of TPDUs received */
+	uint32_t num_atr;			/* total number of ATRs received */
+	uint32_t num_pps;			/* total number of PPS (req, resp) received */
+	uint32_t num_reset;			/* total number of resets */
+	struct {
+		uint32_t overruns;
+		uint32_t framing_errs;
+		uint32_t parity_errs;
+		uint32_t breaks;
+	} num_usart;
+	uint32_t num_waiting_time_exp;
+	uint32_t num_tpdu_overflows;		/* TPDU buffer overflows */
+	uint32_t num_csum_errors;		/* ATR + PPS checksum */
+	uint32_t num_ringbuf_overflows;		/* ISR->main ringbuffer overflows */
+	uint32_t num_tpdu_malformed;
+} __attribute__ ((packed));

firmware/libcommon/source/card_emu.c

@@ -264,24 +264,24 @@ struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 		if (!msg) { // allocation failed, we might be out of memory
 			struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 			if (!bep) {
-				TRACE_ERROR("ep %u: %s queue does not exist\r\n",
+				TRACE_ERROR("ep %u: %s queue does not exist\n\r",
 				            ep, __func__);
 				return NULL;
 			}
 			if (llist_empty(&bep->queue)) {
-				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\r\n",
+				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r",
 				            ep, __func__);
 				return NULL;
 			}
 			msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
 			if (!msg) {
-				TRACE_ERROR("ep %u: %s no msg in non-empty queue\r\n",
+				TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
 				            ep, __func__);
 				return NULL;
 			}
 			usb_buf_free(msg);
 			msg = NULL;
-			TRACE_DEBUG("ep %u: %s queue msg dropped\r\n",
+			TRACE_DEBUG("ep %u: %s queue msg dropped\n\r",
 			            ep, __func__);
 		}
 	}
@@ -313,7 +313,7 @@ static void flush_rx_buffer(struct card_handle *ch)
 	rd = (struct cardemu_usb_msg_rx_data *) msg->l2h;
 	rd->data_len = msgb_l2len(msg) - sizeof(*rd);
 
-	TRACE_DEBUG("%u: %s (%u)\r\n",
+	TRACE_INFO("%u: %s (%u)\n\r",
 			ch->num, __func__, rd->data_len);
 
 	usb_buf_upd_len_and_submit(msg);
@@ -460,11 +460,11 @@ static void card_set_state(struct card_handle *ch,
 static int tx_byte_atr(struct card_handle *ch)
 {
 	if (NULL == ch) {
-		TRACE_ERROR("ATR TX: no card handle provided\r\n");
+		TRACE_ERROR("ATR TX: no card handle provided\n\r");
 		return 0;
 	}
 	if (ISO_S_IN_ATR != ch->state) {
-		TRACE_ERROR("%u: ATR TX: no in ATR state\r\n", ch->num);
+		TRACE_ERROR("%u: ATR TX: no in ATR state\n\r", ch->num);
 		return 0;
 	}
 
@@ -775,6 +775,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;
 	}
@@ -812,7 +821,7 @@ static void send_tpdu_header(struct card_handle *ch)
 	struct cardemu_usb_msg_rx_data *rd;
 	uint8_t *cur;
 
-	TRACE_DEBUG("%u: %s: %02x %02x %02x %02x %02x\r\n",
+	TRACE_INFO("%u: %s: %02x %02x %02x %02x %02x\r\n",
 			ch->num, __func__,
 			ch->tpdu.hdr[0], ch->tpdu.hdr[1],
 			ch->tpdu.hdr[2], ch->tpdu.hdr[3],
@@ -1058,7 +1067,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;
@@ -1102,7 +1114,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;
 		}
@@ -1174,7 +1191,7 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len)
 	for (i = 0; i < ch->atr.len; i++) {
 		TRACE_INFO_WP("%02x ", atr[i]);
 	}
-	TRACE_INFO_WP("\r\n");
+	TRACE_INFO_WP("\n\r");
 #endif
 	/* FIXME: race condition with transmitting ATR to reader? */
 

firmware/libcommon/source/cciddriver.c

@@ -184,7 +184,7 @@ static void RDRtoPCDatablock_ATR( void )
 	if( length > 5 ) {
 		ccidDriver.ProtocolDataStructure[1] = Atr[3]&0x0F; // TD(1)
 		ccidDriver.bProtocol = Atr[3]&0x0F;           // TD(1)
-		TRACE_INFO("Protocol data structure: 0x%x\r\n",
+		TRACE_INFO("Protocol data structure: 0x%x\n\r",
 					    ccidDriver.ProtocolDataStructure[1]);
 	}
 
@@ -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 
@@ -367,7 +367,7 @@ static void PCtoRDRIccPowerOn( void )
 	// for emulation only //JCB 
 	if ( ccidDriver.sCcidCommand.bSpecific_0 != VOLTS_5_0 ) {
 
-		TRACE_ERROR("POWER_NOT_SUPPORTED\r\n");
+		TRACE_ERROR("POWER_NOT_SUPPORTED\n\r");
 	}
 
 	else {
@@ -428,7 +428,7 @@ static void PCtoRDRXfrBlock( void )
 	uint16_t msglen = 0;
 	uint32_t ret;
 
-	TRACE_DEBUG("PCtoRDRXfrBlock\r\n");
+	TRACE_DEBUG("PCtoRDRXfrBlock\n\r");
 
 	// Check the block length
 	if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {
@@ -439,7 +439,7 @@ static void PCtoRDRXfrBlock( void )
 	// check bBWI
 	else if ( 0 != ccidDriver.sCcidCommand.bSpecific_0 ) {
 
-		 TRACE_ERROR("Bad bBWI\r\n");
+		 TRACE_ERROR("Bad bBWI\n\r");
 	}
 	else {
 
@@ -463,16 +463,16 @@ static void PCtoRDRXfrBlock( void )
 				}
 				else {
 					if (ccidDriver.ProtocolDataStructure[1] == PROTOCOL_T1) {
-					    TRACE_DEBUG("Not supported T=1\r\n");
+					    TRACE_DEBUG("Not supported T=1\n\r");
 					}
 					else {
-					    TRACE_DEBUG("Not supported 0x%x\r\n", ccidDriver.ProtocolDataStructure[1]);
+					    TRACE_DEBUG("Not supported 0x%x\n\r", ccidDriver.ProtocolDataStructure[1]);
 					}
 				}
 				break;
 
 			case CCID_FEATURES_EXC_APDU:
-				TRACE_DEBUG("Not supported CCID_FEATURES_EXC_APDU\r\n");
+				TRACE_DEBUG("Not supported CCID_FEATURES_EXC_APDU\n\r");
 				break;
 
 			default:
@@ -482,7 +482,7 @@ static void PCtoRDRXfrBlock( void )
 	}
 
 	ccidDriver.sCcidMessage.wLength = msglen;
-	TRACE_DEBUG("USB: 0x%X, 0x%X, 0x%X, 0x%X, 0x%X\r\n", ccidDriver.sCcidMessage.abData[0], 
+	TRACE_DEBUG("USB: 0x%X, 0x%X, 0x%X, 0x%X, 0x%X\n\r", ccidDriver.sCcidMessage.abData[0], 
 					                                                ccidDriver.sCcidMessage.abData[1], 
 					                                                ccidDriver.sCcidMessage.abData[2], 
 					                                                ccidDriver.sCcidMessage.abData[3],
@@ -614,7 +614,7 @@ static void PCtoRDRSecure( void )
 {
 	TRACE_DEBUG(".");
 
-	TRACE_DEBUG("For user\r\n");
+	TRACE_DEBUG("For user\n\r");
 }
 
 //------------------------------------------------------------------------------
@@ -628,7 +628,7 @@ static void PCtoRDRSecure( void )
 static void PCtoRDRMechanical( void )
 {
 	TRACE_DEBUG(".");
-	TRACE_DEBUG("Not implemented\r\n");
+	TRACE_DEBUG("Not implemented\n\r");
 
 	RDRtoPCSlotStatus();
 }
@@ -682,7 +682,7 @@ static void vCCIDCommandNotSupported( void )
 	// Command not supported
 	// vCCIDReportError(CMD_NOT_SUPPORTED);
 
-	TRACE_DEBUG("CMD_NOT_SUPPORTED\r\n");
+	TRACE_DEBUG("CMD_NOT_SUPPORTED\n\r");
 
 	// Header fields settings
 	ccidDriver.sCcidMessage.bMessageType = RDR_TO_PC_SLOTSTATUS;
@@ -708,7 +708,7 @@ static void vCCIDSendResponse( void )
 					          ccidDriver.sCcidMessage.bSizeToSend, 0, 0 );
 	} while (bStatus != USBD_STATUS_SUCCESS);
 
-	TRACE_DEBUG("bStatus: 0x%x\r\n", bStatus);
+	TRACE_DEBUG("bStatus: 0x%x\n\r", bStatus);
 }
 
 
@@ -723,7 +723,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 		TRACE_ERROR("USB error: %d", status);
 		return;
 	}
-	TRACE_DEBUG("Command: 0x%X 0x%x 0x%X 0x%X 0x%X 0x%X 0x%X\r\n\r\n",
+	TRACE_DEBUG("Command: 0x%X 0x%x 0x%X 0x%X 0x%X 0x%X 0x%X\n\r\n\r",
 				   (unsigned int)ccidDriver.sCcidCommand.bMessageType,
 				   (unsigned int)ccidDriver.sCcidCommand.wLength,
 				   (unsigned int)ccidDriver.sCcidCommand.bSlot,
@@ -735,10 +735,10 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 	// Check the slot number
 	if ( ccidDriver.sCcidCommand.bSlot > 0 ) {
 
-		TRACE_ERROR("BAD_SLOT_NUMBER\r\n");
+		TRACE_ERROR("BAD_SLOT_NUMBER\n\r");
 	}
 
-	TRACE_INFO("typ=0x%X\r\n", ccidDriver.sCcidCommand.bMessageType);
+	TRACE_INFO("typ=0x%X\n\r", ccidDriver.sCcidCommand.bMessageType);
 
 	ccidDriver.sCcidMessage.bStatus = 0;
 
@@ -807,7 +807,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 			}
 			else {
 				// command not supported
-				TRACE_INFO("Not supported: PC_TO_RDR_T0APDU\r\n");
+				TRACE_INFO("Not supported: PC_TO_RDR_T0APDU\n\r");
 				vCCIDCommandNotSupported();
 			}
 			MessageToSend = 1;
@@ -834,7 +834,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 			break;
 
 		default:
-			TRACE_DEBUG("default: Not supported: 0x%X\r\n", ccidDriver.sCcidCommand.bMessageType);
+			TRACE_DEBUG("default: Not supported: 0x%X\n\r", ccidDriver.sCcidCommand.bMessageType);
 			vCCIDCommandNotSupported();
 			MessageToSend = 1;
 			break;
@@ -853,7 +853,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 //------------------------------------------------------------------------------
 static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 {
-	TRACE_DEBUG("CCID_RHl\r\n");
+	TRACE_DEBUG("CCID_RHl\n\r");
 
 	// Check if this is a class request
 	if (USBGenericRequest_GetType(pRequest) == USBGenericRequest_CLASS) {
@@ -862,23 +862,23 @@ static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 		switch (USBGenericRequest_GetRequest(pRequest)) {
 
 			case CCIDGenericRequest_ABORT:
-				TRACE_DEBUG("CCIDGenericRequest_ABORT\r\n");
+				TRACE_DEBUG("CCIDGenericRequest_ABORT\n\r");
 				break;
 
 			case CCIDGenericRequest_GET_CLOCK_FREQUENCIES:
-				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_CLOCK_FREQUENCIES\r\n");
+				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_CLOCK_FREQUENCIES\n\r");
 				// A CCID with bNumClockSupported equal to 00h does not have 
 				// to support this request
 				break;
 
 			case CCIDGenericRequest_GET_DATA_RATES:
-				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_DATA_RATES\r\n");
+				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_DATA_RATES\n\r");
 				// A CCID with bNumDataRatesSupported equal to 00h does not have 
 				// to support this request.
 				break;
 
 			default:
-				TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request (%d)\r\n",
+				TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request (%d)\n\r",
 					                                USBGenericRequest_GetRequest(pRequest));
 				USBD_Stall(0);
 		}
@@ -892,7 +892,7 @@ static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 	else {
 
 		// Unsupported request type
-		TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request type (%d)\r\n",
+		TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request type (%d)\n\r",
 					                                USBGenericRequest_GetType(pRequest));
 		USBD_Stall(0);
 	}
@@ -921,7 +921,7 @@ void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
 void CCID_SmartCardRequest( void )
 {
 	unsigned char bStatus;
-	TRACE_DEBUG("CCID_req\r\n");
+	TRACE_DEBUG("CCID_req\n\r");
 
 	do {
 
@@ -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/iso7816_4.c

@@ -92,7 +92,7 @@ uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
 	while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
 	WDT_Restart(WDT);
 		if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
-			TRACE_WARNING("TimeOut\r\n");
+			TRACE_WARNING("TimeOut\n\r");
 			return( 0 );
 		}
 	}
@@ -107,9 +107,9 @@ uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
 					                  (1<<10)));
 
 	if (status != 0 ) {
-		TRACE_DEBUG("R:0x%" PRIX32 "\r\n", status); 
-		TRACE_DEBUG("R:0x%" PRIX32 "\r\n", us_base->US_CSR);
-		TRACE_DEBUG("Nb:0x%" PRIX32 "\r\n", us_base->US_NER );
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
+		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
+		TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
 		us_base->US_CR = US_CR_RSTSTA;
 	}
 
@@ -159,11 +159,11 @@ uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart )
 
 	if (status != 0 ) {
 		TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
-					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\r\n",
+					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
 					status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
 					((status & US_CSR_TIMEOUT) >> 8), ((status & (1 << 10)) >> 10));
-		TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\r\n", us_base->US_CSR);
-		TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\r\n", us_base->US_NER );
+		TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\n\r", us_base->US_CSR);
+		TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
 		us_base->US_CR = US_CR_RSTSTA;
 	}
 
@@ -219,13 +219,13 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 	uint8_t cmdCase;
 	uint32_t status = 0;
 
-	TRACE_INFO("pAPDU[0]=0x%X\r\n",pAPDU[0]);
-	TRACE_INFO("pAPDU[1]=0x%X\r\n",pAPDU[1]);
-	TRACE_INFO("pAPDU[2]=0x%X\r\n",pAPDU[2]);
-	TRACE_INFO("pAPDU[3]=0x%X\r\n",pAPDU[3]);
-	TRACE_INFO("pAPDU[4]=0x%X\r\n",pAPDU[4]);
-	TRACE_INFO("pAPDU[5]=0x%X\r\n",pAPDU[5]);
-	TRACE_INFO("wlength=%d\r\n",wLength);
+	TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
+	TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
+	TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
+	TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
+	TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
+	TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
+	TRACE_INFO("wlength=%d\n\r",wLength);
 
 	ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
 	ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
@@ -272,7 +272,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		}
 	}
 
-	TRACE_DEBUG("CASE=0x%X NeNc=0x%X\r\n", cmdCase, NeNc);
+	TRACE_DEBUG("CASE=0x%X NeNc=0x%X\n\r", cmdCase, NeNc);
 
 	/* Handle Procedure Bytes */
 	do {
@@ -280,20 +280,20 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		if (status != 0) {
 			return status;
 		}
-		TRACE_INFO("procByte: 0x%X\r\n", procByte);
+		TRACE_INFO("procByte: 0x%X\n\r", procByte);
 		/* Handle NULL */
 		if ( procByte == ISO_NULL_VAL ) {
-			TRACE_INFO("INS\r\n");
+			TRACE_INFO("INS\n\r");
 			continue;
 		}
 		/* Handle SW1 */
 		else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
-			TRACE_INFO("SW1\r\n");
+			TRACE_INFO("SW1\n\r");
 			SW1 = 1;
 		}
 		/* Handle INS */
 		else if ( pAPDU[1] == procByte) {
-			TRACE_INFO("HdlINS\r\n");
+			TRACE_INFO("HdlINS\n\r");
 			if (cmdCase == CASE2) {
 				/* receive data from card */
 				do {
@@ -317,14 +317,14 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		#pragma GCC diagnostic ignored "-Wsign-compare"
 		if ( pAPDU[1] == (procByte ^ 0xff)) {
 		#pragma GCC diagnostic pop
-			TRACE_INFO("HdlINS+\r\n");
+			TRACE_INFO("HdlINS+\n\r");
 			if (cmdCase == CASE2) {
 				/* receive data from card */
 				status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
 				if (status != 0) {
 					return status;
 				}
-				TRACE_INFO("Rcv: 0x%X\r\n", pMessage[indexMsg-1]);
+				TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
 			}
 			else {
 				status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
@@ -336,7 +336,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		}
 		else {
 			/* ?? */
-			TRACE_INFO("procByte=0x%X\r\n", procByte);
+			TRACE_INFO("procByte=0x%X\n\r", procByte);
 			break;
 		}
 	} while (NeNc != 0);
@@ -356,7 +356,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		return status;
 	}
 
-	TRACE_WARNING("SW1=0x%X, SW2=0x%X\r\n", pMessage[indexMsg-2], pMessage[indexMsg-1]);
+	TRACE_WARNING("SW1=0x%X, SW2=0x%X\n\r", pMessage[indexMsg-2], pMessage[indexMsg-1]);
 
 	*retlen = indexMsg;
 	return status;
@@ -368,7 +368,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
  */
 void ISO7816_Escape( void )
 {
-	TRACE_DEBUG("For user, if needed\r\n");
+	TRACE_DEBUG("For user, if needed\n\r");
 }
 
 /**
@@ -376,7 +376,7 @@ void ISO7816_Escape( void )
  */
 void ISO7816_RestartClock( void )
 {
-	TRACE_DEBUG("ISO7816_RestartClock\r\n");
+	TRACE_DEBUG("ISO7816_RestartClock\n\r");
 	USART_SIM->US_BRGR = 13;
 }
 
@@ -385,7 +385,7 @@ void ISO7816_RestartClock( void )
  */
 void ISO7816_StopClock( void )
 {
-	TRACE_DEBUG("ISO7816_StopClock\r\n");
+	TRACE_DEBUG("ISO7816_StopClock\n\r");
 	USART_SIM->US_BRGR = 0;
 }
 
@@ -394,8 +394,8 @@ void ISO7816_StopClock( void )
  */
 void ISO7816_toAPDU( void )
 {
-	TRACE_DEBUG("ISO7816_toAPDU\r\n");
-	TRACE_DEBUG("Not supported at this time\r\n");
+	TRACE_DEBUG("ISO7816_toAPDU\n\r");
+	TRACE_DEBUG("Not supported at this time\n\r");
 }
 
 /**
@@ -549,26 +549,26 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 	uint32_t y;
 	uint8_t offset;
 
-	printf("\r\n");
-	printf("ATR: Answer To Reset:\r\n");
+	printf("\n\r");
+	printf("ATR: Answer To Reset:\n\r");
 	printf("TS = 0x%X Initial character ",pAtr[0]);
 	if( pAtr[0] == 0x3B ) {
 
-		printf("Direct Convention\r\n");
+		printf("Direct Convention\n\r");
 	}
 	else {
 		if( pAtr[0] == 0x3F ) {
 
-			printf("Inverse Convention\r\n");
+			printf("Inverse Convention\n\r");
 		}
 		else {
-			printf("BAD Convention\r\n");
+			printf("BAD Convention\n\r");
 		}
 	}
 
-	printf("T0 = 0x%X Format caracter\r\n",pAtr[1]);
-	printf("    Number of historical bytes: K = %d\r\n", pAtr[1]&0x0F);
-	printf("    Presence further interface byte:\r\n");
+	printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
+	printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
+	printf("    Presence further interface byte:\n\r");
 	if( pAtr[1]&0x80 ) {
 		printf("TA ");
 	}
@@ -582,7 +582,7 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 		printf("TD ");
 	}
 	if( pAtr[1] != 0 ) {
-		printf(" present\r\n");
+		printf(" present\n\r");
 	}
 
 	i = 2;
@@ -598,11 +598,11 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 				printf("FI = %d ", (pAtr[i]>>8));
 				printf("DI = %d", (pAtr[i]&0x0F));
 			}
-			printf("\r\n");
+			printf("\n\r");
 			i++;
 		}
 		if (y & 0x20) {  /* TB[i] */
-			printf("TB[%d] = 0x%X\r\n", offset, pAtr[i]);
+			printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
 			i++;
 		}
 		if (y & 0x40) {  /* TC[i] */
@@ -610,11 +610,11 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 			if( offset == 1 ) {
 				printf("Extra Guard Time: N = %d", pAtr[i]);
 			}
-			printf("\r\n");
+			printf("\n\r");
 			i++;
 		}
 		if (y & 0x80) {  /* TD[i] */
-			printf("TD[%d] = 0x%X\r\n", offset, pAtr[i]);
+			printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
 			y =  pAtr[i++] & 0xF0;
 		}
 		else {
@@ -624,13 +624,13 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 	}
 
 	/* Historical Bytes */
-	printf("Historical bytes:\r\n");
+	printf("Historical bytes:\n\r");
 	y = pAtr[1] & 0x0F;
 	for( j=0; j < y; j++ ) {
 		printf(" 0x%X", pAtr[i]);
 		i++;
 	}
-	printf("\r\n\r\n");
+	printf("\n\r\n\r");
 
 }
 
@@ -645,7 +645,7 @@ void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC) {
 void ISO7816_Init( Usart_info *usart, bool master_clock )
 {
 	uint32_t clk;
-	TRACE_DEBUG("ISO_Init\r\n");
+	TRACE_DEBUG("ISO_Init\n\r");
 
 	Usart *us_base = usart->base;
 	uint32_t us_id = usart->id;

firmware/libcommon/source/main_common.c

@@ -18,18 +18,18 @@
 
 void print_banner(void)
 {
-	printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\r\n"
-		"(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\r\n"
-		"=============================================================================\r\n");
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\n\r"
+		"(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
+		"=============================================================================\n\r");
 
 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
 	/* print chip-unique ID */
 	unsigned int unique_id[4];
 	EEFC_ReadUniqueID(unique_id);
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\r\n", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
 		   unique_id[0], unique_id[1], unique_id[2], unique_id[3]);
 
 	/* print reset cause */
@@ -42,9 +42,9 @@ void print_banner(void)
 		"user reset (NRST pin detected low)",
 	};
 	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\r\n", reset_causes[reset_cause]);
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
 	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\r\n", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
 	}
 #endif
 }

firmware/libcommon/source/mode_cardemu.c

@@ -83,10 +83,21 @@ struct cardem_inst {
 #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[] = {
@@ -168,6 +179,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 +421,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 +437,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 +481,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 +526,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 +591,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 +606,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 +634,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);
@@ -764,10 +795,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 +940,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);
 		}
 

firmware/libcommon/source/mode_ccid.c

@@ -84,15 +84,15 @@ static const Pin pinSmartCard = SMARTCARD_CONNECT_PIN;
 static void ISR_PioSmartCard(const Pin * pPin)
 {
 /* FIXME: why is pinSmartCard.pio->PIO_ISR the wrong number?
-	printf("+++++ Trying to check for pending interrupts (PIO ISR: 0x%X)\r\n", pinSmartCard.pio->PIO_ISR);
-	printf("+++++ Mask: 0x%X\r\n", pinSmartCard.mask);
+	printf("+++++ Trying to check for pending interrupts (PIO ISR: 0x%X)\n\r", pinSmartCard.pio->PIO_ISR);
+	printf("+++++ Mask: 0x%X\n\r", pinSmartCard.mask);
 Output:
 	+++++ Trying to check for pending interrupts (PIO ISR: 0x400)) = 1<<10
 	+++++ Mask: 0x100 = 1<<8
 */
 	// PA10 is DTXD, which is the debug uart transmit pin
 
-	printf("Interrupt!!\r\n");
+	printf("Interrupt!!\n\r");
 	/*  Check all pending interrupts */
 	// FIXME: this if condition is not always true...
 //    if ( (pinSmartCard.pio->PIO_ISR & pinSmartCard.mask) != 0 )
@@ -100,11 +100,11 @@ Output:
 		/*  Check current level on pin */
 		if (PIO_Get(&pinSmartCard) == 0) {
 			sim_inserted = 1;
-			printf("-I- Smartcard inserted\r\n");
+			printf("-I- Smartcard inserted\n\r");
 			CCID_Insertion();
 		} else {
 			sim_inserted = 0;
-			printf("-I- Smartcard removed\r\n");
+			printf("-I- Smartcard removed\n\r");
 			CCID_Removal();
 		}
 	}
@@ -115,7 +115,7 @@ Output:
  */
 static void ConfigureCardDetection(void)
 {
-	printf("+++++ Configure PIOs\r\n");
+	printf("+++++ Configure PIOs\n\r");
 	PIO_Configure(&pinSmartCard, 1);
 	NVIC_EnableIRQ(PIOA_IRQn);
 	PIO_EnableIt(&pinSmartCard);
@@ -177,7 +177,7 @@ void CCID_init(void)
 
 	// FIXME. what if smcard is not inserted?
 	if (PIO_Get(&pinSmartCard) == 0) {
-		printf("SIM card inserted\r\n");
+		printf("SIM card inserted\n\r");
 		CCID_Insertion();
 	}
 }

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/simtrace_iso7816.c

@@ -50,7 +50,7 @@ volatile ringbuf sim_rcv_buf = { {0}, 0, 0 };
 static void Callback_PhoneRST_ISR(uint8_t * pArg, uint8_t status,
 				  uint32_t transferred, uint32_t remaining)
 {
-	printf("rstCB\r\n");
+	printf("rstCB\n\r");
 	PIO_EnableIt(&pinPhoneRST);
 }
 
@@ -58,7 +58,7 @@ void ISR_PhoneRST(const Pin * pPin)
 {
 	int ret;
 	// FIXME: no printfs in ISRs?
-	printf("+++ Int!! %lx\r\n", pinPhoneRST.pio->PIO_ISR);
+	printf("+++ Int!! %lx\n\r", pinPhoneRST.pio->PIO_ISR);
 	if (((pinPhoneRST.pio->PIO_ISR & pinPhoneRST.mask) != 0)) {
 		if (PIO_Get(&pinPhoneRST) == 0) {
 			printf(" 0 ");
@@ -136,8 +136,8 @@ void update_fidi(Usart_info *usart, uint8_t fidi)
 		}
 		usart->base->US_FIDI = (ratio & 0x7ff);
 		usart->base->US_CR |= US_CR_RXEN | US_CR_STTTO;
-		//TRACE_INFO("updated USART(%u) Fi(%u)/Di(%u) ratio(%d): %u\r\n", usart->id, fi, di, ratio, usart->base->US_FIDI);
+		//TRACE_INFO("updated USART(%u) Fi(%u)/Di(%u) ratio(%d): %u\n\r", usart->id, fi, di, ratio, usart->base->US_FIDI);
 	} else {
-		//TRACE_WARNING("computed Fi/Di ratio %d unsupported\r\n", ratio); /* don't print since this is function is also called by ISRs */
+		//TRACE_WARNING("computed Fi/Di ratio %d unsupported\n\r", ratio); /* don't print since this is function is also called by ISRs */
 	}
 }

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,14 @@ 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_BREAK		0x1000
+#define RBUF16_F_DATA_BYTE	0x8000
+
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
@@ -138,50 +146,61 @@ 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;
+
+/* statistics for SIMTRACE_MSGT_DO_SNIFF_STATS */
+static struct st_sniff_stats g_stats;
 
 /* 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 +215,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 +230,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\r\n", 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 +275,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
  */
@@ -262,7 +291,7 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
 {
 	/* sanity check */
 	if (iso_state_new == iso_state) {
-		TRACE_WARNING("Already in ISO 7816 state %u\r\n", iso_state);
+		TRACE_WARNING("Already in ISO 7816 state %u\n\r", iso_state);
 		return;
 	}
 
@@ -270,32 +299,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\r\n", iso_state);
 }
 
 const struct value_string data_flags[] = {
@@ -353,7 +383,7 @@ static void usb_send_data(enum simtrace_msg_type_sniff type, const uint8_t* data
 	for (i = 0; i < length; i++) {
 		printf("%02x ", data[i]);
 	}
-	printf("\r\n");
+	printf("\n\r");
 
 	/* Send data over USB */
 	struct msgb *usb_msg = usb_msg_alloc_hdr(SIMTRACE_USB_EP_CARD_DATAIN, SIMTRACE_MSGC_SNIFF, type);
@@ -377,16 +407,16 @@ static void usb_send_atr(uint32_t flags)
 {
 	/* Check state */
 	if (ISO7816_S_IN_ATR != iso_state) {
-		TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\r\n", iso_state);
+		TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (atr_i >= ARRAY_SIZE(atr)) {
-		TRACE_ERROR("ATR buffer overflow\r\n");
+	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
@@ -401,19 +431,19 @@ static void process_byte_atr(uint8_t byte)
 
 	/* sanity check */
 	if (ISO7816_S_IN_ATR != iso_state) {
-		TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\r\n", iso_state);
+		TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
-	if (atr_i >= ARRAY_SIZE(atr)) {
-		TRACE_ERROR("ATR data overflow\r\n");
+	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,11 +452,12 @@ 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\r\n");
+			TRACE_WARNING("Invalid TS received\n\r");
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			g_stats.num_tpdu_malformed++;
 			usb_send_atr(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_ATR); /* reset state */
 			break;
@@ -435,41 +466,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 +509,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,24 +517,26 @@ 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;
 				/* We still consider the data as valid (e.g. for WT) even is the checksum is wrong.
 				 * It is up to the reader to handle this error (e.g. by resetting)
 				 */
+				g_stats.num_csum_errors++;
 			}
 		}
 		usb_send_atr(flags); /* send ATR to host software using USB */
+		g_stats.num_atr++;
 		change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 		break;
 	default:
-		TRACE_INFO("Unknown ATR state %u\r\n", atr_state);
+		TRACE_INFO("Unknown ATR state %u\n\r", g_atr.state);
 	}
 }
 
@@ -517,33 +550,33 @@ 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\r\n", iso_state);
+		TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
 
 	/* 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,24 +606,25 @@ 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\r\n", iso_state);
+		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\r\n");
+			TRACE_INFO("Invalid PPSS received\n\r");
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			g_stats.num_tpdu_malformed++;
 			usb_send_pps(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
 			change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
 		}
@@ -598,24 +632,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,12 +670,13 @@ 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 */
 				change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */
 			} else { /* checksum is invalid */
+				g_stats.num_csum_errors++;
 				change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 			}
 		} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
@@ -654,22 +689,24 @@ static void process_byte_pps(uint8_t byte)
 					fn = 1;
 					dn = 1;
 				}
-				TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\r\n",
+				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\r\n");
+				TRACE_INFO("PPS negotiation failed\n\r");
+				g_stats.num_csum_errors++;
 			}
+			g_stats.num_pps++;
 			change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
 		}
 		break;
 	case PPS_S_WAIT_END:
-		TRACE_WARNING("Unexpected PPS received %u\r\n", pps_state);
+		TRACE_WARNING("Unexpected PPS received %u\n\r", g_pps.state);
 		break;
 	default:
-		TRACE_WARNING("Unknown PPS state %u\r\n", pps_state);
+		TRACE_WARNING("Unknown PPS state %u\n\r", g_pps.state);
 		break;
 	}
 }
@@ -682,112 +719,117 @@ static void usb_send_tpdu(uint32_t flags)
 {
 	/* Check state */
 	if (ISO7816_S_IN_TPDU != iso_state) {
-		TRACE_WARNING("Can't print TPDU in ISO 7816-3 state %u\r\n", iso_state);
+		TRACE_WARNING("Can't print TPDU in ISO 7816-3 state %u\n\r", iso_state);
 		return;
 	}
 
 	/* 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)
 {
 	/* sanity check */
 	if (ISO7816_S_IN_TPDU != iso_state) {
-		TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\r\n", iso_state);
+		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)) {
-		TRACE_ERROR("TPDU data overflow\r\n");
+	if (g_tpdu.packet_i >= ARRAY_SIZE(g_tpdu.packet)) {
+		g_stats.num_tpdu_overflows++;
+		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\r\n");
+			TRACE_WARNING("0xff is not a valid class byte\n\r");
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			g_stats.num_tpdu_malformed++;
 			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 = 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\r\n", byte);
+			TRACE_WARNING("invalid INS 0x%02x\n\r", byte);
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			g_stats.num_tpdu_malformed++;
 			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\r\n", byte);
+			TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
 			led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
+			g_stats.num_tpdu_malformed++;
 			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;
 		}
 		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 */
+		g_stats.num_tpdu++;
 		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\r\n", tpdu_state);
+		TRACE_ERROR("unhandled TPDU state %u\n\r", g_tpdu.state);
 	}
 }
 
@@ -799,37 +841,49 @@ 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\r\n");
-		sniff_usart.base->US_CR |= US_CR_RSTSTA;
-	}
-	if (csr & US_CSR_FRAME) {
-		TRACE_WARNING("USART framing error\r\n");
-		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);
+		g_stats.num_bytes++;
 		/* 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\r\n");
-		} else {
-			rbuf_write(&sniff_buffer, byte);
-		}
+		wt_remaining = g_wt;
 	}
 
+	/* Verify if there was an error */
+	if (csr & US_CSR_OVRE) {
+		g_stats.num_usart.overruns++;
+		byte |= RBUF16_F_OVERRUN;
+	}
+	if (csr & US_CSR_FRAME) {
+		g_stats.num_usart.framing_errs++;
+		byte |= RBUF16_F_FRAMING;
+	}
+	if (csr & US_CSR_PARE) {
+		g_stats.num_usart.parity_errs++;
+		byte |= RBUF16_F_PARITY;
+	}
+	if (csr & US_CSR_RXBRK) {
+		g_stats.num_usart.breaks++;
+		byte |= RBUF16_F_BREAK;
+	};
+
+	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;
+			g_stats.num_waiting_time_exp++;
 		} 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 +899,14 @@ 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) {
+			g_stats.num_ringbuf_overflows++;
+			TRACE_ERROR("USART buffer full\n\r");
+		}
+	}
 }
 
 /** PIO interrupt service routine to checks if the card reset line has changed
@@ -853,12 +915,13 @@ static void Sniffer_reset_isr(const Pin* pPin)
 {
 	/* Ensure an edge on the reset pin cause the interrupt */
 	if (pPin->id != pin_rst.id || 0 == (pPin->mask & pin_rst.mask)) {
-		TRACE_ERROR("Pin other than reset caused a interrupt\r\n");
+		TRACE_ERROR("Pin other than reset caused a interrupt\n\r");
 		return;
 	}
 	/* Update the ISO state according to the reset change (reset is active low) */
 	if (PIO_Get(&pin_rst)) {
 		change_flags |= SNIFF_CHANGE_FLAG_RESET_DEASSERT; /* set flag and let main loop send it */
+		g_stats.num_reset++;
 	} else {
 		change_flags |= SNIFF_CHANGE_FLAG_RESET_ASSERT; /* set flag and let main loop send it */
 	}
@@ -886,18 +949,21 @@ 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 | \
+		     US_CSR_RXBRK)
+
 /* Called during USB enumeration after device is enumerated by host */
 void Sniffer_configure(void)
 {
-	TRACE_INFO("Sniffer config\r\n");
+	TRACE_INFO("Sniffer config\n\r");
 }
 
 /* called when *different* configuration is set by host */
 void Sniffer_exit(void)
 {
-	TRACE_INFO("Sniffer exit\r\n");
+	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);
@@ -909,7 +975,9 @@ void Sniffer_exit(void)
 /* called when *Sniffer* configuration is set by host */
 void Sniffer_init(void)
 {
-	TRACE_INFO("Sniffer Init\r\n");
+	TRACE_INFO("Sniffer Init\n\r");
+
+	memset(&g_stats, 0, sizeof(g_stats));
 
 	/* Configure pins to sniff communication between phone and card */
 	PIO_Configure(pins_sniff, PIO_LISTSIZE(pins_sniff));
@@ -925,15 +993,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);
@@ -958,7 +1026,7 @@ static void usb_send_change(uint32_t flags)
 	}
 
 	if (flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
-		printf("waiting time (WT) timeout\r\n");
+		printf("waiting time (WT) timeout\n\r");
 	}
 
 	/* Send message over USB */
@@ -991,45 +1059,84 @@ 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\r\n", 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");
+		if (entry & RBUF16_F_BREAK)
+			TRACE_ERROR("USART BREAK Error\r\n");
 	}
 
 	/* Handle flags */
@@ -1054,37 +1161,13 @@ void Sniffer_run(void)
 			}
 			if (ISO7816_S_RESET != iso_state) {
 				change_state(ISO7816_S_RESET);
-				printf("reset asserted\r\n");
+				printf("reset asserted\n\r");
 			}
 		}
 		if (change_flags & SNIFF_CHANGE_FLAG_RESET_DEASSERT) {
 			if (ISO7816_S_WAIT_ATR != iso_state) {
 				change_state(ISO7816_S_WAIT_ATR);
-				printf("reset de-asserted\r\n");
-			}
-		}
-		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;
+				printf("reset de-asserted\n\r");
 			}
 		}
 		if (change_flags) {

firmware/libcommon/source/stdio.c

@@ -439,7 +439,7 @@ signed int vfprintf(FILE *pStream, const char *pFormat, va_list ap)
 		return rc;
 	}
 	if (rc >= MAX_STRING_SIZE) {
-		fputs("stdio.c: increase MAX_STRING_SIZE\r\n", stderr);
+		fputs("stdio.c: increase MAX_STRING_SIZE\n\r", stderr);
 		return rc;
 	}
 
@@ -469,7 +469,7 @@ signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap)
 		return rc;
 	}
 	if (rc >= MAX_STRING_SIZE) {
-		fputs_sync("stdio.c: increase MAX_STRING_SIZE\r\n", stderr);
+		fputs_sync("stdio.c: increase MAX_STRING_SIZE\n\r", stderr);
 		return rc;
 	}
 

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();

host/include/osmocom/simtrace2/simtrace2_api.h

@@ -44,6 +44,7 @@ struct osmo_st2_cardem_inst {
 int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
                          uint8_t msg_class, uint8_t msg_type);
 
+int osmo_st2_generic_request_board_info(struct osmo_st2_slot *slot);
 
 int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted);
 int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le);

host/lib/simtrace2_api.c

@@ -154,6 +154,19 @@ int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,
 	return rc;
 }
 
+/***********************************************************************
+ * Generic protocol
+ ***********************************************************************/
+
+/*! \brief Requeset the SIMtrace2 board information structure from the device */
+int osmo_st2_generic_request_board_info(struct osmo_st2_slot *slot)
+{
+	struct msgb *msg = st_msgb_alloc();
+
+	return osmo_st2_slot_tx_msg(slot, msg, SIMTRACE_MSGC_GENERIC, SIMTRACE_CMD_BD_BOARD_INFO);
+}
+
+
 /***********************************************************************
  * Card Emulation 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");
 }
 
@@ -447,13 +490,21 @@ int main(int argc, char **argv)
 
 	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;
@@ -549,19 +600,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;
 		}
 

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

@@ -63,6 +63,7 @@ static void print_help(void)
 		"\n"
 		);
 	printf( "Commands:\n"
+		"\tgeneric board-info\n"
 		"\tmodem reset (enable|disable|cycle)\n"
 		"\tmodem sim-switch (local|remote)\n"
 		"\tmodem sim-card (insert|remove)\n"
@@ -98,9 +99,15 @@ static void run_mainloop(struct osmo_st2_cardem_inst *ci)
 			fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);
 			return;
 		}
+		if (rc >= 0) {
+			printf("Rx(%u): %s\n", xfer_len, osmo_hexdump(buf, xfer_len));
+			osmo_st2_generic_request_board_info(ci->slot);
+		}
+#if 0
 		/* break the loop if no new messages arrive within 100ms */
 		if (rc == LIBUSB_ERROR_TIMEOUT)
 			return;
+#endif
 	}
 }
 
@@ -216,6 +223,36 @@ static int do_subsys_modem(int argc, char **argv)
 	return rc;
 }
 
+
+static int do_generic_board_info(int argc, char **argv)
+{
+	printf("ci: %p\n", ci);
+	printf("ci->slot: %p\n", ci->slot);
+	printf("ci->slot->transp: %p\n", ci->slot->transp);
+	return osmo_st2_generic_request_board_info(ci->slot);
+}
+
+static int do_subsys_generic(int argc, char **argv)
+{
+	char *command;
+	int rc;
+
+	if (argc < 1)
+		return -EINVAL;
+	command = argv[0];
+	argc--;
+	argv++;
+
+	if (!strcmp(command, "board-info")) {
+		rc = do_generic_board_info(argc, argv);
+	} else {
+		fprintf(stderr, "Unsupported command for subsystem generic: '%s'\n", command);
+		return -EINVAL;
+	}
+
+	return rc;
+}
+
 static int do_command(int argc, char **argv)
 {
 	char *subsys;
@@ -227,7 +264,9 @@ static int do_command(int argc, char **argv)
 	argc--;
 	argv++;
 
-	if (!strcmp(subsys, "modem"))
+	if (!strcmp(subsys, "generic")) {
+		rc= do_subsys_generic(argc, argv);
+	} else if (!strcmp(subsys, "modem"))
 		rc = do_subsys_modem(argc, argv);
 	else {
 		fprintf(stderr, "Unsupported subsystem '%s'\n", subsys);
@@ -290,6 +329,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 +339,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;
 }