<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/23638">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">card_emu: Rename fi to Fi and di to Di<br><br>As we will soon introduce the distinction between Fi and F, we should<br>use uppercase letters, as lower-case 'f' is defined in ISO7816-3 as<br>the frequency, which is different from the upper-case 'F'.<br><br>Change-Id: Iaede621551520576e9b9af878fa46fbc88e59c2a<br>---<br>M firmware/libcommon/source/card_emu.c<br>1 file changed, 14 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/38/23638/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 5ab6cab..5feb157 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -155,8 +155,8 @@</span><br><span> bool clocked; /*< if clock is active ( true = active, false = inactive) */</span><br><span> </span><br><span> /* timing parameters, from PTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t fi;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t di;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t Fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t Di;</span><br><span> uint8_t wi;</span><br><span> </span><br><span> uint8_t tc_chan; /* TC channel number */</span><br><span>@@ -361,10 +361,10 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = compute_fidi_ratio(ch->fi, ch->di);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = compute_fidi_ratio(ch->Fi, ch->Di);</span><br><span> if (rc > 0 && rc < 0x400) {</span><br><span> TRACE_INFO("%u: computed Fi(%u) Di(%u) ratio: %d\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ch->num, ch->fi, ch->di, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->num, ch->Fi, ch->Di, rc);</span><br><span> /* make sure UART uses new F/D ratio */</span><br><span> card_emu_uart_update_fidi(ch->uart_chan, rc);</span><br><span> /* notify ETU timer about this */</span><br><span>@@ -395,8 +395,8 @@</span><br><span> break;</span><br><span> case ISO_S_WAIT_ATR:</span><br><span> /* Reset to initial Fi / Di ratio */</span><br><span style="color: hsl(0, 100%, 40%);">- ch->fi = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- ch->di = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Fi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Di = 1;</span><br><span> emu_update_fidi(ch);</span><br><span> /* the ATR should only be sent 400 to 40k clock cycles after the RESET.</span><br><span> * we use the tc_etu mechanism to wait this time.</span><br><span>@@ -490,7 +490,7 @@</span><br><span> }</span><br><span> }</span><br><span> /* update waiting time (see ISO 7816-3 10.2) */</span><br><span style="color: hsl(0, 100%, 40%);">- ch->waiting_time = ch->wi * 960 * ch->fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->waiting_time = ch->wi * 960 * ch->Fi;</span><br><span> tc_etu_set_wtime(ch->tc_chan, ch->waiting_time);</span><br><span> /* go to next state */</span><br><span> card_set_state(ch, ISO_S_WAIT_TPDU);</span><br><span>@@ -626,10 +626,9 @@</span><br><span> case PTS_S_WAIT_RESP_PTS1:</span><br><span> byte = ch->pts.resp[_PTS1];</span><br><span> /* This must be TA1 */</span><br><span style="color: hsl(0, 100%, 40%);">- ch->fi = byte >> 4;</span><br><span style="color: hsl(0, 100%, 40%);">- ch->di = byte & 0xf;</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%u: found Fi=%u Di=%u\r\n", ch->num,</span><br><span style="color: hsl(0, 100%, 40%);">- ch->fi, ch->di);</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Fi = byte >> 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Di = byte & 0xf;</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%u: found Fi=%u Di=%u\r\n", ch->num, ch->Fi, ch->Di);</span><br><span> break;</span><br><span> case PTS_S_WAIT_RESP_PTS2:</span><br><span> byte = ch->pts.resp[_PTS2];</span><br><span>@@ -1025,8 +1024,8 @@</span><br><span> if (ch->in_reset)</span><br><span> sts->flags |= CEMU_STATUS_F_RESET_ACTIVE;</span><br><span> /* FIXME: voltage + card insert */</span><br><span style="color: hsl(0, 100%, 40%);">- sts->fi = ch->fi;</span><br><span style="color: hsl(0, 100%, 40%);">- sts->di = ch->di;</span><br><span style="color: hsl(120, 100%, 40%);">+ sts->fi = ch->Fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ sts->di = ch->Di;</span><br><span> sts->wi = ch->wi;</span><br><span> sts->waiting_time = ch->waiting_time;</span><br><span> </span><br><span>@@ -1232,8 +1231,8 @@</span><br><span> ch->in_reset = in_reset;</span><br><span> ch->clocked = clocked;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ch->fi = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- ch->di = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Fi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->Di = 1;</span><br><span> ch->wi = ISO7816_3_DEFAULT_WI;</span><br><span> </span><br><span> ch->tc_chan = tc_chan;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/23638">change 23638</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/+/23638"/><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: Iaede621551520576e9b9af878fa46fbc88e59c2a </div>
<div style="display:none"> Gerrit-Change-Number: 23638 </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-MessageType: newchange </div>