<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9875">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniffer: display F and D values frim PPS<br><br>Change-Id: I3641dcb6c24695a6d3dd3a1ee4333f56a07c99f0<br>---<br>M firmware/libcommon/include/iso7816_fidi.h<br>M firmware/libcommon/source/iso7816_fidi.c<br>M firmware/libcommon/source/sniffer.c<br>3 files changed, 9 insertions(+), 3 deletions(-)<br><br></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 e4690a5..3b4b451 100644</span><br><span>--- a/firmware/libcommon/include/iso7816_fidi.h</span><br><span>+++ b/firmware/libcommon/include/iso7816_fidi.h</span><br><span>@@ -2,5 +2,11 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 7 of ISO 7816-3:2006 */</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint16_t fi_table[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 8 from ISO 7816-3:2006 */</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint8_t di_table[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* compute the F/D ratio based on Fi and Di values */</span><br><span> int compute_fidi_ratio(uint8_t fi, uint8_t di);</span><br><span>diff --git a/firmware/libcommon/source/iso7816_fidi.c b/firmware/libcommon/source/iso7816_fidi.c</span><br><span>index b35f068..bdccd55 100644</span><br><span>--- a/firmware/libcommon/source/iso7816_fidi.c</span><br><span>+++ b/firmware/libcommon/source/iso7816_fidi.c</span><br><span>@@ -24,13 +24,13 @@</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%);">-static const uint16_t fi_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const uint16_t 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%);">-static const uint8_t di_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const uint8_t 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>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 27f102d..fe550ea 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -565,7 +565,7 @@</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", fn, dn);</span><br><span style="color: hsl(120, 100%, 40%);">+                          TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r", fi_table[fn], di_table[dn]);</span><br><span>                             update_fidi(&sniff_usart, pps_cur[2]);</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9875">change 9875</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/9875"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3641dcb6c24695a6d3dd3a1ee4333f56a07c99f0 </div>
<div style="display:none"> Gerrit-Change-Number: 9875 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>