<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iso7816_fsm: ignore RX_SINGLE events during transmit<br><br>When logging is enabled, we get a lot of LOGL_ERROR events<br>about RX_SINGLE events not being permitted. This is not very<br>useful in debugging, so suppress those error messages.<br><br>Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630<br>---<br>M ccid_common/iso7816_fsm.c<br>1 file changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c</span><br><span>index 059950f..3e78fc8 100644</span><br><span>--- a/ccid_common/iso7816_fsm.c</span><br><span>+++ b/ccid_common/iso7816_fsm.c</span><br><span>@@ -417,6 +417,8 @@</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(fi);</span><br><span> OSMO_ASSERT(fi->fsm == &iso7816_3_fsm);</span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_RX_SINGLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> case ISO7816_E_TX_COMPL:</span><br><span> /* Rx of single byte is already enabled by previous card_uart_tx() call */</span><br><span> osmo_fsm_inst_state_chg(fi, ISO7816_S_IN_PPS_RSP, 0, 0);</span><br><span>@@ -517,7 +519,8 @@</span><br><span> .name = "WAIT_PPS_RESP",</span><br><span> .in_event_mask = S(ISO7816_E_TX_COMPL) |</span><br><span> S(ISO7816_E_TX_ERR_IND) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(ISO7816_E_WTIME_EXP),</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ISO7816_E_WTIME_EXP) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ISO7816_E_RX_SINGLE),</span><br><span> .out_state_mask = S(ISO7816_S_RESET) |</span><br><span> S(ISO7816_S_WAIT_TPDU) |</span><br><span> S(ISO7816_S_WAIT_PPS_RSP) |</span><br><span>@@ -1218,6 +1221,8 @@</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);</span><br><span> OSMO_ASSERT(fi->fsm == &tpdu_fsm);</span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_RX_SINGLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> case ISO7816_E_TX_COMPL:</span><br><span> </span><br><span> card_uart_set_rx_threshold(ip->uart, 1);</span><br><span>@@ -1307,6 +1312,8 @@</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_RX_SINGLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> case ISO7816_E_TX_COMPL:</span><br><span> card_uart_set_rx_threshold(ip->uart, 1);</span><br><span> card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1);</span><br><span>@@ -1325,6 +1332,8 @@</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_RX_SINGLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> case ISO7816_E_TX_COMPL:</span><br><span> tfp->tpdu->l3h += 1;</span><br><span> card_uart_set_rx_threshold(ip->uart, 1);</span><br><span>@@ -1484,7 +1493,8 @@</span><br><span> },</span><br><span> [TPDU_S_TX_HDR] = {</span><br><span> .name = "TX_HDR",</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(ISO7816_E_TX_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(ISO7816_E_TX_COMPL) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ISO7816_E_RX_SINGLE),</span><br><span> .out_state_mask = S(TPDU_S_INIT) |</span><br><span> S(TPDU_S_PROCEDURE),</span><br><span> .action = tpdu_s_tx_hdr_action,</span><br><span>@@ -1503,14 +1513,16 @@</span><br><span> },</span><br><span> [TPDU_S_TX_REMAINING] = {</span><br><span> .name = "TX_REMAINING",</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(ISO7816_E_TX_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(ISO7816_E_TX_COMPL) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ISO7816_E_RX_SINGLE),</span><br><span> .out_state_mask = S(TPDU_S_INIT) |</span><br><span> S(TPDU_S_SW1),</span><br><span> .action = tpdu_s_tx_remaining_action,</span><br><span> },</span><br><span> [TPDU_S_TX_SINGLE] = {</span><br><span> .name = "TX_SINGLE",</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(ISO7816_E_TX_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(ISO7816_E_TX_COMPL) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ISO7816_E_RX_SINGLE),</span><br><span> .out_state_mask = S(TPDU_S_INIT) |</span><br><span> S(TPDU_S_PROCEDURE),</span><br><span> .action = tpdu_s_tx_single_action,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948">change 19948</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/c/osmo-ccid-firmware/+/19948"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 </div>
<div style="display:none"> Gerrit-Change-Number: 19948 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>