laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/simtrace2/+/30187 )
Change subject: firmware/sniffer: Log cause of WT change
......................................................................
firmware/sniffer: Log cause of WT change
Change-Id: I14245c0ca96a258146e48bb9909efd9f8150f5ac
---
M firmware/libcommon/source/sniffer.c
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/87/30187/1
diff --git a/firmware/libcommon/source/sniffer.c
b/firmware/libcommon/source/sniffer.c
index cca140d..6aa5582 100644
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -204,10 +204,11 @@
/*! 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) */
@@ -219,7 +220,7 @@
wt_d = d;
}
wt = wt_wi * 960UL * wt_d;
- TRACE_INFO("WT updated to %lu ETU\n\r", wt);
+ TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d,
cause, wt);
}
/*! Allocate USB buffer and push + initialize simtrace_msg_hdr
@@ -287,7 +288,7 @@
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 */
@@ -478,9 +479,9 @@
/* retrieve WI encoded in TC2*/
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) {
@@ -675,7 +676,7 @@
TRACE_INFO("PPS negotiation successful: Fn=%u
Dn=%u\n\r",
iso7816_3_fi_table[fn],
iso7816_3_di_table[dn]);
update_fidi(&sniff_usart, pps_cur[2]);
- update_wt(0, iso7816_3_di_table[dn]);
+ update_wt(0, iso7816_3_di_table[dn], "PPS");
usb_send_fidi(pps_cur[2]); /* send Fi/Di change
notification to host software over USB */
} else { /* checksum is invalid */
TRACE_INFO("PPS negotiation failed\n\r");
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30187
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I14245c0ca96a258146e48bb9909efd9f8150f5ac
Gerrit-Change-Number: 30187
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <[email protected]>
Gerrit-MessageType: newchange
