<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21717">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: Include E1 frame number in Rx USB header<br><br>This should enable the host to detect discontinuities, and also know<br>when a multiframe starts.<br><br>Related: OS#4674<br>Change-Id: Ie0688647c56ebfc2e08de44f8ec569e1c2cd6a28<br>---<br>M firmware/ice40-riscv/icE1usb/usb_e1.c<br>1 file changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c</span><br><span>index 6bcb1b4..e37edc3 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>@@ -14,6 +14,7 @@</span><br><span> </span><br><span> #include "console.h"</span><br><span> #include "misc.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "e1.h"</span><br><span> </span><br><span> struct {</span><br><span>       bool running;           /* are we running (transceiving USB data)? */</span><br><span>@@ -76,6 +77,7 @@</span><br><span>    {</span><br><span>            uint32_t ptr = usb_ep_regs[2].in.bd[bdi].ptr;</span><br><span>                uint32_t hdr;</span><br><span style="color: hsl(120, 100%, 40%);">+         unsigned int pos;</span><br><span> </span><br><span>                /* Error check */</span><br><span>            if ((usb_ep_regs[2].in.bd[bdi].csr & USB_BD_STATE_MSK) == USB_BD_STATE_DONE_ERR)</span><br><span>@@ -93,10 +95,10 @@</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, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+           n = e1_rx_need_data((ptr >> 2) + 1, n, &pos);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-             /* Write header */</span><br><span style="color: hsl(0, 100%, 40%);">-              hdr = 0x616b00b5;</span><br><span style="color: hsl(120, 100%, 40%);">+             /* Write header: currently version and pos (mfr/fr number) */</span><br><span style="color: hsl(120, 100%, 40%);">+         hdr = (0 << 28) | (pos & 0xff);</span><br><span>            usb_data_write(ptr, &hdr, 4);</span><br><span> </span><br><span>                /* Resubmit */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21717">change 21717</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/+/21717"/><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: Ie0688647c56ebfc2e08de44f8ec569e1c2cd6a28 </div>
<div style="display:none"> Gerrit-Change-Number: 21717 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>