<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21731">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">icE1usb fw: Use green per-port LED to indicate alignment status<br><br>Whenever Rx is aligned, the green LED is permanently on.<br>Whenever Rx is not aligned, the green LED is blinking.<br><br>What's missing is to check for E1 clock ticks and turn the LED off<br>completely if there are no clock ticks.<br><br>Change-Id: I42d53544858dbbbae5206d9a62b08672966c9ebf<br>---<br>M doc/manuals/chapters/firmware.adoc<br>M firmware/ice40-riscv/icE1usb/e1.c<br>M firmware/ice40-riscv/icE1usb/e1.h<br>M firmware/ice40-riscv/icE1usb/misc.c<br>4 files changed, 51 insertions(+), 4 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/31/21731/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc</span><br><span>index d0542bd..254e235 100644</span><br><span>--- a/doc/manuals/chapters/firmware.adoc</span><br><span>+++ b/doc/manuals/chapters/firmware.adoc</span><br><span>@@ -128,9 +128,17 @@</span><br><span> </span><br><span> === Use of the E1 Interface LEDs</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Each E1 interface has two LEDs integrated into the RJ45 connector.</span><br><span style="color: hsl(120, 100%, 40%);">+Each E1 interface has two LEDs integrated into the RJ45 connector. They</span><br><span style="color: hsl(120, 100%, 40%);">+are (starting to get) used by the firmware to indicate status</span><br><span style="color: hsl(120, 100%, 40%);">+information to the user.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FIXME: describe how they are used.</span><br><span style="color: hsl(120, 100%, 40%);">+[options="header"]</span><br><span style="color: hsl(120, 100%, 40%);">+|===</span><br><span style="color: hsl(120, 100%, 40%);">+|Color | Pattern | Meaning</span><br><span style="color: hsl(120, 100%, 40%);">+|Green | Blinking (slow) | E1 Receiver attempting to align</span><br><span style="color: hsl(120, 100%, 40%);">+|Green | On | E1 Receiver fully aligned</span><br><span style="color: hsl(120, 100%, 40%);">+|===</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> === Use of the Multi-Color RGB LED</span><br><span> </span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>index b89b7c7..9ad2798 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>@@ -422,10 +422,14 @@</span><br><span> return;</span><br><span> </span><br><span> /* HACK: LED link status */</span><br><span style="color: hsl(0, 100%, 40%);">- if (e1_regs->rx.csr & E1_RX_SR_ALIGNED)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (e1_regs->rx.csr & E1_RX_SR_ALIGNED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_platform_led_set(0, E1P_LED_GREEN, E1P_LED_ST_ON);</span><br><span> led_color(0, 48, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_platform_led_set(0, E1P_LED_GREEN, E1P_LED_ST_BLINK);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: completely off if rx tick counter not incrementing */</span><br><span> led_color(48, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Recover any done TX BD */</span><br><span> while ( (bd = e1_regs->tx.bd) & E1_BD_VALID ) {</span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>index c56cf0c..c6b6fea 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>@@ -19,3 +19,19 @@</span><br><span> </span><br><span> volatile uint8_t *e1_data_ptr(int mf, int frame, int ts);</span><br><span> unsigned int e1_data_ofs(int mf, int frame, int ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum e1_platform_led {</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_GREEN = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_YELLOW = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum e1_platform_led_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_ST_OFF = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_ST_ON = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_ST_BLINK = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1P_LED_ST_BLINK_FAST = 3</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* external function provided by the platform; used by E1 driver to control LEDs */</span><br><span style="color: hsl(120, 100%, 40%);">+extern void e1_platform_led_set(uint8_t port, enum e1_platform_led led,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum e1_platform_led_state state);</span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/misc.c b/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>index dca126a..3117be9 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/misc.c</span><br><span>@@ -10,6 +10,7 @@</span><br><span> </span><br><span> #include "config.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> </span><br><span> struct misc {</span><br><span>@@ -51,6 +52,24 @@</span><br><span> misc_regs->e1_led = (enable ? 0x100 : 0x000) | cfg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void</span><br><span style="color: hsl(120, 100%, 40%);">+e1_platform_led_set(uint8_t port, enum e1_platform_led led,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum e1_platform_led_state state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int shift;</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;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ shift = 4*port + 2*led;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp = misc_regs->e1_led;</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp &= ~(3 << shift);</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp |= 0x100 | ((state & 3) << shift);</span><br><span style="color: hsl(120, 100%, 40%);">+ misc_regs->e1_led = tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> uint16_t</span><br><span> e1_tick_read(void)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21731">change 21731</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/+/21731"/><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: I42d53544858dbbbae5206d9a62b08672966c9ebf </div>
<div style="display:none"> Gerrit-Change-Number: 21731 </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>