<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21772">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">icE1usb fw: e1_tick_read() for rx and tx<br><br>Change-Id: I8dd6765f27cdf5ab21ccb8290002c44eef67f96f<br>---<br>M firmware/ice40-riscv/icE1usb/misc.c<br>M firmware/ice40-riscv/icE1usb/misc.h<br>M firmware/ice40-riscv/icE1usb/usb_e1.c<br>3 files changed, 12 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/72/21772/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/ice40-riscv/icE1usb/misc.c b/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>index 25fb7f4..c84e848 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>@@ -71,13 +71,21 @@</span><br><span> }</span><br><span> </span><br><span> uint16_t</span><br><span style="color: hsl(0, 100%, 40%);">-e1_tick_read(uint8_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+e1_tick_read_tx(uint8_t port)</span><br><span> {</span><br><span>         if (port >= 2)</span><br><span>            return 0xffff;</span><br><span>       return misc_regs->e1_tick[port].tx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t</span><br><span style="color: hsl(120, 100%, 40%);">+e1_tick_read_rx(uint8_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   if (port >= 2)</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0xffff;</span><br><span style="color: hsl(120, 100%, 40%);">+        return misc_regs->e1_tick[port].rx;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void</span><br><span> reboot(int fw)</span><br><span> {</span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/misc.h b/firmware/ice40-riscv/icE1usb/misc.h</span><br><span>index b405b02..c680969 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/misc.h</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/misc.h</span><br><span>@@ -27,6 +27,7 @@</span><br><span> void pdm_set(int chan, bool enable, unsigned value, bool normalize);</span><br><span> </span><br><span> void e1_led_set(bool enable, uint8_t cfg);</span><br><span style="color: hsl(0, 100%, 40%);">-uint16_t e1_tick_read(uint8_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t e1_tick_read_rx(uint8_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t e1_tick_read_tx(uint8_t port);</span><br><span> </span><br><span> void reboot(int fw);</span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c</span><br><span>index 529ead3..e594a99 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/usb_e1.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/usb_e1.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span>     unsigned int level;</span><br><span> </span><br><span>      /* Compute real E1 tick count (with safety against bad values) */</span><br><span style="color: hsl(0, 100%, 40%);">-       ticks = e1_tick_read(0);</span><br><span style="color: hsl(120, 100%, 40%);">+      ticks = e1_tick_read_tx(0);</span><br><span>  val = (ticks - ticks_prev) & 0xffff;</span><br><span>     ticks_prev = ticks;</span><br><span>  if ((val < 7168) | (val > 9216))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21772">change 21772</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/osmo-e1-hardware/+/21772"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1-hardware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8dd6765f27cdf5ab21ccb8290002c44eef67f96f </div>
<div style="display:none"> Gerrit-Change-Number: 21772 </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>