<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26705">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">update ice1usb_proto.h to current master<br><br>Copy from firmware source code repo at<br>https://git.osmocom.org/osmo-e1-hardware/tree/firmware/ice40-riscv/icE1usb/ice1usb_proto.h<br>as of d376b2e852fbf26a60ac4d6f66e54bb85f0b7204<br><br>Change-Id: I8f7b9462482421993e3516aa9d0794bb8076b65b<br>---<br>M src/ice1usb_proto.h<br>M src/usb.c<br>2 files changed, 16 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/05/26705/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h</span><br><span>index 5f5f31c..71f7236 100644</span><br><span>--- a/src/ice1usb_proto.h</span><br><span>+++ b/src/ice1usb_proto.h</span><br><span>@@ -1,7 +1,14 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * ice1usb_proto.h</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2020  Harald Welte <laforge@osmocom.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * SPDX-License-Identifier: MIT</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Header file describing the USB protocol between the icE1usb firmware and the host</span><br><span style="color: hsl(120, 100%, 40%);">+ * software (currently really only osmo-e1d)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Header file describing the USB protocol between the icE1usb firmware and the host</span><br><span style="color: hsl(0, 100%, 40%);">- * software (currently really only osmo-e1d) */</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span> </span><br><span> /***********************************************************************</span><br><span>  * Control Endpoint / Device Requests</span><br><span>@@ -75,12 +82,12 @@</span><br><span>  ***********************************************************************/</span><br><span> </span><br><span> enum ice1usb_irq_type {</span><br><span style="color: hsl(0, 100%, 40%);">-        ICE1USB_IRQQ_T_ERRCNT           = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+  ICE1USB_IRQ_T_ERRCNT            = 1,</span><br><span> };</span><br><span> </span><br><span> /* Ensue ro keep those in sync with e1.h */</span><br><span> #define ICE1USB_ERR_F_ALIGN_ERR        0x01</span><br><span style="color: hsl(0, 100%, 40%);">-#define ICE1USB_ERR_F_TICK_ERR      0x02</span><br><span style="color: hsl(120, 100%, 40%);">+#define ICE1USB_ERR_F_LOS 0x02</span><br><span> </span><br><span> struct ice1usb_irq_err {</span><br><span>         /* 16-bit little-endian counters */</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index 3ec793f..0e08a9f 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -330,10 +330,10 @@</span><br><span>                         errcnt->flags & ICE1USB_ERR_F_ALIGN_ERR ? "LOST" : "REGAINED");</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if ((errcnt->flags & ICE1USB_ERR_F_TICK_ERR) != (last->flags & ICE1USB_ERR_F_TICK_ERR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if ((errcnt->flags & ICE1USB_ERR_F_LOS) != (last->flags & ICE1USB_ERR_F_LOS)) {</span><br><span>                LOGPLI(line, DE1D, LOGL_ERROR, "Rx Clock %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                       errcnt->flags & ICE1USB_ERR_F_TICK_ERR ? "LOST" : "REGAINED");</span><br><span style="color: hsl(0, 100%, 40%);">-               if (errcnt->flags & ICE1USB_ERR_F_TICK_ERR)</span><br><span style="color: hsl(120, 100%, 40%);">+                    errcnt->flags & ICE1USB_ERR_F_LOS ? "LOST" : "REGAINED");</span><br><span style="color: hsl(120, 100%, 40%);">+          if (errcnt->flags & ICE1USB_ERR_F_LOS)</span><br><span>                        line_ctr_add(line, LINE_CTR_LOS, 1);</span><br><span>         }</span><br><span> </span><br><span>@@ -351,7 +351,7 @@</span><br><span>  }</span><br><span> </span><br><span>        switch (irq->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case ICE1USB_IRQQ_T_ERRCNT:</span><br><span style="color: hsl(120, 100%, 40%);">+   case ICE1USB_IRQ_T_ERRCNT:</span><br><span>           if (xfer->actual_length < sizeof(*irq)) {</span><br><span>                      LOGPLI(line, DE1D, LOGL_ERROR, "Short ERRCNT interrupt: %u<%zu\n",</span><br><span>                              xfer->actual_length, sizeof(*irq));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26705">change 26705</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-e1d/+/26705"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8f7b9462482421993e3516aa9d0794bb8076b65b </div>
<div style="display:none"> Gerrit-Change-Number: 26705 </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>