<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9853">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ISO7816: change update_fidi to use provided USART, and disable write protection for USART register if required<br><br>Change-Id: I716f4bc3a22800cbce402b146f14ef8b2aab2a98<br>---<br>M firmware/libcommon/include/simtrace.h<br>M firmware/libcommon/source/simtrace_iso7816.c<br>2 files changed, 23 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/53/9853/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h</span><br><span>index 278d5d2..3dfefe4 100644</span><br><span>--- a/firmware/libcommon/include/simtrace.h</span><br><span>+++ b/firmware/libcommon/include/simtrace.h</span><br><span>@@ -77,7 +77,11 @@</span><br><span> </span><br><span> extern const USBConfigurationDescriptor *configurationDescriptorsArr[];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void update_fidi(uint8_t fidi);</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Update USART baud rate to Fi/Di ratio</span><br><span style="color: hsl(120, 100%, 40%);">+ *  @param[io] usart USART peripheral base address</span><br><span style="color: hsl(120, 100%, 40%);">+ *  @param[in] fidi FiDi value as provided in TA interface byte</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void update_fidi(Usart *usart, uint8_t fidi);</span><br><span> </span><br><span> void ISR_PhoneRST( const Pin *pPin);</span><br><span> </span><br><span>diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>index 81ae980..3d843a7 100644</span><br><span>--- a/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>+++ b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>@@ -116,20 +116,27 @@</span><br><span> }</span><br><span> </span><br><span> /*  FIDI update functions   */</span><br><span style="color: hsl(0, 100%, 40%);">-void update_fidi(uint8_t fidi)</span><br><span style="color: hsl(120, 100%, 40%);">+void update_fidi(Usart *usart, uint8_t fidi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       if (NULL==usart) {</span><br><span style="color: hsl(120, 100%, 40%);">+            return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</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(120, 100%, 40%);">+  int ratio = compute_fidi_ratio(fi, di);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rc = compute_fidi_ratio(fi, di);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (rc > 0 && rc < 0x400) {</span><br><span style="color: hsl(0, 100%, 40%);">-               TRACE_INFO("computed Fi(%u) Di(%u) ratio: %d", fi, di, rc);</span><br><span style="color: hsl(0, 100%, 40%);">-           /* make sure UART uses new F/D ratio */</span><br><span style="color: hsl(0, 100%, 40%);">-         USART_PHONE->US_CR |= US_CR_RXDIS | US_CR_RSTRX;</span><br><span style="color: hsl(0, 100%, 40%);">-             USART_PHONE->US_FIDI = rc & 0x3ff;</span><br><span style="color: hsl(0, 100%, 40%);">-               USART_PHONE->US_CR |= US_CR_RXEN | US_CR_STTTO;</span><br><span style="color: hsl(0, 100%, 40%);">-      } else</span><br><span style="color: hsl(0, 100%, 40%);">-          TRACE_INFO("computed FiDi ratio %d unsupported", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (ratio > 0 && ratio < 0x8000) {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* make sure USART uses new F/D ratio */</span><br><span style="color: hsl(120, 100%, 40%);">+              usart->US_CR |= US_CR_RXDIS | US_CR_RSTRX;</span><br><span style="color: hsl(120, 100%, 40%);">+         /* disable write protection */</span><br><span style="color: hsl(120, 100%, 40%);">+                if (usart->US_WPMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      usart->US_WPMR = US_WPMR_WPKEY(0x555341);</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span style="color: hsl(120, 100%, 40%);">+             usart->US_FIDI = (ratio & 0x7ff);</span><br><span style="color: hsl(120, 100%, 40%);">+              usart->US_CR |= US_CR_RXEN | US_CR_STTTO;</span><br><span style="color: hsl(120, 100%, 40%);">+          TRACE_INFO("updated USART Fi(%u)/Di(%u) ratio(%d): %u\n\r", fi, di, ratio, usart->US_FIDI);</span><br><span style="color: hsl(120, 100%, 40%);">+      } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              TRACE_WARNING("computed Fi/Di ratio %d unsupported\n\r", ratio);</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9853">change 9853</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/9853"/><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: I716f4bc3a22800cbce402b146f14ef8b2aab2a98 </div>
<div style="display:none"> Gerrit-Change-Number: 9853 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>