<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21716">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  tnt: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">icE1usb fw: Have e1_rx_need_data() optionally return FIFO position<br><br>The position indicates where we are in terms of frame and multiframe.<br><br>The related code was ported over from e1-tracer.<br><br>Related: OS#4674<br>Change-Id: I9e59d86a2e8f4e85ca84c592438ad79966b49448<br>---<br>M firmware/ice40-riscv/icE1usb/e1.c<br>M firmware/ice40-riscv/icE1usb/usb_e1.c<br>2 files changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>index 5d4d3ee..0f1d89d 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>@@ -328,7 +328,7 @@</span><br><span> #include "dma.h"</span><br><span> </span><br><span> unsigned int</span><br><span style="color: hsl(0, 100%, 40%);">-e1_rx_need_data(unsigned int usb_addr, unsigned int max_frames)</span><br><span style="color: hsl(120, 100%, 40%);">+e1_rx_need_data(unsigned int usb_addr, unsigned int max_frames, unsigned int *pos)</span><br><span> {</span><br><span>     unsigned int ofs;</span><br><span>    int tot_frames = 0;</span><br><span>@@ -340,6 +340,12 @@</span><br><span>           if (!n_frames)</span><br><span>                       break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+            /* Give pos */</span><br><span style="color: hsl(120, 100%, 40%);">+                if (pos) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    *pos = ofs & g_e1.rx.fifo.mask;</span><br><span style="color: hsl(120, 100%, 40%);">+                   pos = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          /* Copy from FIFO to USB */</span><br><span>          dma_exec(e1f_ofs_to_dma(ofs), usb_addr, n_frames * (32 / 4), false, NULL, NULL);</span><br><span> </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 f724665..6bcb1b4 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>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> </span><br><span> /* Hack */</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len, unsigned int *pos);</span><br><span> unsigned int e1_tx_feed_data(unsigned int usb_addr, unsigned int len);</span><br><span> unsigned int e1_tx_level(void);</span><br><span> unsigned int e1_rx_level(void);</span><br><span>@@ -93,7 +93,7 @@</span><br><span>                 else if (!n)</span><br><span>                         break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-              n = e1_rx_need_data((ptr >> 2) + 1, n);</span><br><span style="color: hsl(120, 100%, 40%);">+         n = e1_rx_need_data((ptr >> 2) + 1, n, NULL);</span><br><span> </span><br><span>              /* Write header */</span><br><span>           hdr = 0x616b00b5;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21716">change 21716</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/+/21716"/><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: I9e59d86a2e8f4e85ca84c592438ad79966b49448 </div>
<div style="display:none"> Gerrit-Change-Number: 21716 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>