<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/23640">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iso7816_fidi: Add iso7816_3_ prefix to symbols; fix terminology<br><br>Fi/Di are not the index into the table, but the contents of the table<br>as resolved by Fi_index / Di_index.  Let's clarify the terminology.<br><br>Change-Id: If364e08e7c9a3a9707e6d54b9267c6a7c088e415<br>---<br>M firmware/libcommon/include/iso7816_fidi.h<br>M firmware/libcommon/source/card_emu.c<br>M firmware/libcommon/source/iso7816_fidi.c<br>M firmware/libcommon/source/simtrace_iso7816.c<br>M firmware/libcommon/source/sniffer.c<br>5 files changed, 19 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/40/23640/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/iso7816_fidi.h b/firmware/libcommon/include/iso7816_fidi.h</span><br><span>index c56478b..19483b0 100644</span><br><span>--- a/firmware/libcommon/include/iso7816_fidi.h</span><br><span>+++ b/firmware/libcommon/include/iso7816_fidi.h</span><br><span>@@ -21,10 +21,10 @@</span><br><span> #include <stdint.h></span><br><span> </span><br><span> /* Table 7 of ISO 7816-3:2006 */</span><br><span style="color: hsl(0, 100%, 40%);">-extern const uint16_t fi_table[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint16_t iso7816_3_fi_table[16];</span><br><span> </span><br><span> /* Table 8 from ISO 7816-3:2006 */</span><br><span style="color: hsl(0, 100%, 40%);">-extern const uint8_t di_table[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint8_t iso7816_3_di_table[16];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* compute the F/D ratio based on Fi and Di values */</span><br><span style="color: hsl(0, 100%, 40%);">-int compute_fidi_ratio(uint8_t fi, uint8_t di);</span><br><span style="color: hsl(120, 100%, 40%);">+/* compute the F/D ratio based on F_index and D_index values */</span><br><span style="color: hsl(120, 100%, 40%);">+int iso7816_3_compute_fd_ratio(uint8_t f_index, uint8_t d_index);</span><br><span>diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c</span><br><span>index 1193121..c5e4cfa 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -377,7 +377,7 @@</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->F_index, ch->D_index);</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = iso7816_3_compute_fd_ratio(ch->F_index, ch->D_index);</span><br><span>     if (rc > 0 && rc < 0x400) {</span><br><span>            TRACE_INFO("%u: computed F(%u)/D(%u) ratio: %d\r\n", ch->num,</span><br><span>                      ch->F_index, ch->D_index, rc);</span><br><span>@@ -508,7 +508,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 * fi_table[ch->F_index];</span><br><span style="color: hsl(120, 100%, 40%);">+             ch->waiting_time = ch->wi * 960 * iso7816_3_fi_table[ch->F_index];</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>@@ -647,7 +647,7 @@</span><br><span>           ch->F_index = byte >> 4;</span><br><span>            ch->D_index = byte & 0xf;</span><br><span>             TRACE_DEBUG("%u: found F=%u D=%u\r\n", ch->num,</span><br><span style="color: hsl(0, 100%, 40%);">-                        fi_table[ch->F_index], di_table[ch->D_index]);</span><br><span style="color: hsl(120, 100%, 40%);">+                          iso7816_3_fi_table[ch->F_index], iso7816_3_di_table[ch->D_index]);</span><br><span>                 /* FIXME: if F or D are 0, become unresponsive to signal error condition */</span><br><span>          break;</span><br><span>       case PTS_S_WAIT_RESP_PTS2:</span><br><span>diff --git a/firmware/libcommon/source/iso7816_fidi.c b/firmware/libcommon/source/iso7816_fidi.c</span><br><span>index 1c70467..033a325 100644</span><br><span>--- a/firmware/libcommon/source/iso7816_fidi.c</span><br><span>+++ b/firmware/libcommon/source/iso7816_fidi.c</span><br><span>@@ -23,38 +23,38 @@</span><br><span> #include "iso7816_fidi.h"</span><br><span> </span><br><span> /* Table 7 of ISO 7816-3:2006 */</span><br><span style="color: hsl(0, 100%, 40%);">-const uint16_t fi_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const uint16_t iso7816_3_fi_table[] = {</span><br><span>   372, 372, 558, 744, 1116, 1488, 1860, 0,</span><br><span>     0, 512, 768, 1024, 1536, 2048, 0, 0</span><br><span> };</span><br><span> </span><br><span> /* Table 8 from ISO 7816-3:2006 */</span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t di_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const uint8_t iso7816_3_di_table[] = {</span><br><span>      0, 1, 2, 4, 8, 16, 32, 64,</span><br><span>   12, 20, 2, 4, 8, 16, 32, 64,</span><br><span> };</span><br><span> </span><br><span> /* compute the F/D ratio based on Fi and Di values */</span><br><span style="color: hsl(0, 100%, 40%);">-int compute_fidi_ratio(uint8_t fi, uint8_t di)</span><br><span style="color: hsl(120, 100%, 40%);">+int iso7816_3_compute_fd_ratio(uint8_t f_index, uint8_t d_index)</span><br><span> {</span><br><span>         uint16_t f, d;</span><br><span>       int ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (fi >= ARRAY_SIZE(fi_table) ||</span><br><span style="color: hsl(0, 100%, 40%);">-        di >= ARRAY_SIZE(di_table))</span><br><span style="color: hsl(120, 100%, 40%);">+    if (f_index >= ARRAY_SIZE(iso7816_3_fi_table) ||</span><br><span style="color: hsl(120, 100%, 40%);">+       d_index >= ARRAY_SIZE(iso7816_3_di_table))</span><br><span>            return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     f = fi_table[fi];</span><br><span style="color: hsl(120, 100%, 40%);">+     f = iso7816_3_fi_table[f_index];</span><br><span>     if (f == 0)</span><br><span>          return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     d = di_table[di];</span><br><span style="color: hsl(120, 100%, 40%);">+     d = iso7816_3_di_table[d_index];</span><br><span>     if (d == 0)</span><br><span>          return -EINVAL;</span><br><span> </span><br><span>  /* See table 7 of ISO 7816-3: From 1000 on we divide by 1/d,</span><br><span>          * which equals a multiplication by d */</span><br><span style="color: hsl(0, 100%, 40%);">-        if (di < 8)</span><br><span style="color: hsl(120, 100%, 40%);">+        if (d_index < 8)</span><br><span>          ret = f / d;</span><br><span>         else</span><br><span>                 ret = f * d;</span><br><span>diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>index 8742696..27677a6 100644</span><br><span>--- a/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>+++ b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>@@ -125,7 +125,7 @@</span><br><span> </span><br><span>  uint8_t fi = fidi >> 4;</span><br><span>        uint8_t di = fidi & 0xf;</span><br><span style="color: hsl(0, 100%, 40%);">-    int ratio = compute_fidi_ratio(fi, di);</span><br><span style="color: hsl(120, 100%, 40%);">+       int ratio = iso7816_3_compute_fd_ratio(fi, di);</span><br><span> </span><br><span>  if (ratio > 0 && ratio < 0x8000) {</span><br><span>             /* make sure USART uses new F/D ratio */</span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 08770e2..57e2daa 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -658,9 +658,10 @@</span><br><span>                                     fn = 1;</span><br><span>                                      dn = 1;</span><br><span>                              }</span><br><span style="color: hsl(0, 100%, 40%);">-                               TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r", fi_table[fn], di_table[dn]);</span><br><span style="color: hsl(120, 100%, 40%);">+                              TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r",</span><br><span style="color: hsl(120, 100%, 40%);">+                                      iso7816_3_fi_table[fn], iso7816_3_di_table[dn]);</span><br><span>                          update_fidi(&sniff_usart, pps_cur[2]);</span><br><span style="color: hsl(0, 100%, 40%);">-                              update_wt(0, di_table[dn]);</span><br><span style="color: hsl(120, 100%, 40%);">+                           update_wt(0, iso7816_3_di_table[dn]);</span><br><span>                                usb_send_fidi(pps_cur[2]); /* send Fi/Di change notification to host software over USB */</span><br><span>                    } else { /* checksum is invalid */</span><br><span>                           TRACE_INFO("PPS negotiation failed\n\r");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/23640">change 23640</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/+/23640"/><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: If364e08e7c9a3a9707e6d54b9267c6a7c088e415 </div>
<div style="display:none"> Gerrit-Change-Number: 23640 </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-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>