<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11361">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cardem: add more debug information for TPDU state<br><br>this just adds the name of the TPDU state on top of the state number.<br><br>the ISO state is cleaned up accordingly<br><br>Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c<br>---<br>M firmware/libcommon/source/card_emu.c<br>1 file changed, 79 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c</span><br><span>index 75910c1..b7d0e1f 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -55,14 +55,38 @@</span><br><span> };</span><br><span> </span><br><span> const struct value_string iso7816_3_card_state_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_WAIT_POWER),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_WAIT_CLK),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_WAIT_RST),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_WAIT_ATR),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_IN_ATR),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_IN_PTS),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_WAIT_TPDU),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(ISO_S_IN_TPDU),</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_WAIT_POWER,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_POWER",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_WAIT_CLK,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_CLK",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_WAIT_RST,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_RST",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_WAIT_ATR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_ATR",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_IN_ATR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "IN_ATR",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_IN_PTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "IN_PTS",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_WAIT_TPDU,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_TPDU",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = ISO_S_IN_TPDU,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "IN_TPDU",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> {</span><br><span> .value = 0,</span><br><span> .str = NULL,</span><br><span>@@ -86,6 +110,7 @@</span><br><span> PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* PTS field byte index */</span><br><span> #define _PTSS 0</span><br><span> #define _PTS0 1</span><br><span> #define _PTS1 2</span><br><span>@@ -105,6 +130,46 @@</span><br><span> TPDU_S_WAIT_TX, /* waiting for more data to reader */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string tpdu_state_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_CLA,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_CLA",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_INS,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_INS",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_P1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_P1",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_P2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_P2",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_P3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_P3",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_PB,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_PB",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_RX,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_RX",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = TPDU_S_WAIT_TX,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "WAIT_TX",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* TPDU field byte index */</span><br><span> #define _CLA 0</span><br><span> #define _INS 1</span><br><span> #define _P1 2</span><br><span>@@ -304,9 +369,9 @@</span><br><span> if (ch->state == new_state)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%u: 7816 card state %u (%s) -> %u (%s)\r\n", ch->num,</span><br><span style="color: hsl(0, 100%, 40%);">- ch->state, get_value_string(iso7816_3_card_state_names, ch->state),</span><br><span style="color: hsl(0, 100%, 40%);">- new_state, get_value_string(iso7816_3_card_state_names, new_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%u: 7816 card state %s -> %s\r\n", ch->num,</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(iso7816_3_card_state_names, ch->state),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(iso7816_3_card_state_names, new_state));</span><br><span> ch->state = new_state;</span><br><span> </span><br><span> switch (new_state) {</span><br><span>@@ -651,9 +716,9 @@</span><br><span> if (ch->tpdu.state == new_ts)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%u: 7816 TPDU state %u -> %u\r\n", ch->num,</span><br><span style="color: hsl(0, 100%, 40%);">- ch->tpdu.state, new_ts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%u: 7816 TPDU state %s -> %s\r\n", ch->num,</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(tpdu_state_names, ch->tpdu.state),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(tpdu_state_names, new_ts));</span><br><span> ch->tpdu.state = new_ts;</span><br><span> </span><br><span> switch (new_ts) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11361">change 11361</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11361"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c </div>
<div style="display:none"> Gerrit-Change-Number: 11361 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>