<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16618">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;">cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ<br><br>If this feature flag is set by the host application, we will start<br>generating SIMTRACE_MSGT_BD_CEMU_STATUS towards the interrupt endpoint<br>on any changes to the SIM card status, such as change of VCC/CLK/RST<br><br>Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc<br>Related: OS#4330<br>---<br>M firmware/libcommon/source/card_emu.c<br>1 file changed, 13 insertions(+), 1 deletion(-)<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 8da844f..7a541e5 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -38,7 +38,7 @@</span><br><span> #define NUM_SLOTS 2</span><br><span> </span><br><span> /* bit-mask of supported CEMU_FEAT_F_ flags */</span><br><span style="color: hsl(0, 100%, 40%);">-#define SUPPORTED_FEATURES 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define SUPPORTED_FEATURES (CEMU_FEAT_F_STATUS_IRQ)</span><br><span> </span><br><span> #define ISO7816_3_INIT_WTIME 9600</span><br><span> #define ISO7816_3_DEFAULT_WI 10</span><br><span>@@ -1106,15 +1106,19 @@</span><br><span> /* hardware driver informs us that a card I/O signal has changed */</span><br><span> void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t chg_mask = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (io) {</span><br><span> case CARD_IO_VCC:</span><br><span> if (active == 0 && ch->vcc_active == 1) {</span><br><span> TRACE_INFO("%u: VCC deactivated\r\n", ch->num);</span><br><span> card_handle_reset(ch);</span><br><span> card_set_state(ch, ISO_S_WAIT_POWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_VCC_PRESENT;</span><br><span> } else if (active == 1 && ch->vcc_active == 0) {</span><br><span> TRACE_INFO("%u: VCC activated\r\n", ch->num);</span><br><span> card_set_state(ch, ISO_S_WAIT_CLK);</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_VCC_PRESENT;</span><br><span> }</span><br><span> ch->vcc_active = active;</span><br><span> break;</span><br><span>@@ -1123,8 +1127,10 @@</span><br><span> TRACE_INFO("%u: CLK activated\r\n", ch->num);</span><br><span> if (ch->state == ISO_S_WAIT_CLK)</span><br><span> card_set_state(ch, ISO_S_WAIT_RST);</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_CLK_ACTIVE;</span><br><span> } else if (active == 0 && ch->clocked == 1) {</span><br><span> TRACE_INFO("%u: CLK deactivated\r\n", ch->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_CLK_ACTIVE;</span><br><span> }</span><br><span> ch->clocked = active;</span><br><span> break;</span><br><span>@@ -1137,9 +1143,11 @@</span><br><span> /* prepare to send the ATR */</span><br><span> card_set_state(ch, ISO_S_WAIT_ATR);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_RESET_ACTIVE;</span><br><span> } else if (active && !ch->in_reset) {</span><br><span> TRACE_INFO("%u: RST asserted\r\n", ch->num);</span><br><span> card_handle_reset(ch);</span><br><span style="color: hsl(120, 100%, 40%);">+ chg_mask |= CEMU_STATUS_F_RESET_ACTIVE;</span><br><span> }</span><br><span> ch->in_reset = active;</span><br><span> break;</span><br><span>@@ -1159,6 +1167,10 @@</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* notify the host about the state change */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((ch->features & CEMU_FEAT_F_STATUS_IRQ) && chg_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_report_status(ch, true);</span><br><span> }</span><br><span> </span><br><span> /* User sets a new ATR to be returned during next card reset */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16618">change 16618</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/simtrace2/+/16618"/><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-Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc </div>
<div style="display:none"> Gerrit-Change-Number: 16618 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>