<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10311">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cardem: use TC2 as WI and update WT after ATR<br><br>Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2<br>---<br>M firmware/libcommon/source/card_emu.c<br>1 file changed, 33 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/10311/1</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 51fd923..ad6b4d9 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -363,11 +363,39 @@</span><br><span> TRACE_DEBUG("%u: ATR TX: %02x\n\r", ch->num, byte);</span><br><span> return 1;</span><br><span> } else { /* The ATR has been completely transmitted */</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO update WI using optional TC2 and then update WT */</span><br><span style="color: hsl(0, 100%, 40%);">- //ch->wi = ISO7816_3_DEFAULT_WI;</span><br><span style="color: hsl(0, 100%, 40%);">- /* update waiting time */</span><br><span style="color: hsl(0, 100%, 40%);">- //ch->waiting_time = ISO7816_3_INIT_WTIME;</span><br><span style="color: hsl(0, 100%, 40%);">- //tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* search for TC2 to updated WI */</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->wi = ISO7816_3_DEFAULT_WI;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.len >= 2 && ch->atr.atr[1] & 0xf0) { /* Y1 has some data */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t atr_td1 = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[1] & 0x10) { /* TA1 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_td1++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[1] & 0x20) { /* TB1 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_td1++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[1] & 0x40) { /* TC1 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_td1++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[1] & 0x80) { /* TD1 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.len > atr_td1 && ch->atr.atr[atr_td1] & 0xf0) { /* Y2 has some data */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t atr_tc2 = atr_td1+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[atr_td1] & 0x10) { /* TA2 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_tc2++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[atr_td1] & 0x20) { /* TB2 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_tc2++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.atr[atr_td1] & 0x40) { /* TC2 is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch->atr.len > atr_tc2 && ch->atr.atr[atr_tc2]) { /* TC2 encodes WI */</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->wi = ch->atr.atr[atr_tc2]; /* set WI */</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* update waiting time (see ISO 7816-3 10.2) */</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->waiting_time = ch->wi * 960 * ch->fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);</span><br><span> /* reset PTS to initial state */</span><br><span> set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);</span><br><span> /* go to next state */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10311">change 10311</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/10311"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 </div>
<div style="display:none"> Gerrit-Change-Number: 10311 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>