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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">icE1usb fw: Internal API for configuring E1 rx/tx config register<br><br>Related: OS#4675<br>Change-Id: Ib23f9b99f169ab18d730bcf67b97a7b6bf863e98<br>---<br>M firmware/ice40-riscv/icE1usb/e1.c<br>M firmware/ice40-riscv/icE1usb/e1.h<br>2 files changed, 26 insertions(+), 0 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 b1771f5..1d8fd30 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>@@ -263,6 +263,29 @@</span><br><span>       g_e1.tx.state = BOOT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define TXCR_PERMITTED (                        \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_TX_CR_MODE_TS0_CRC_E |       \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_TX_CR_TICK_REMOTE |          \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_TX_CR_ALARM  |               \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_TX_CR_LOOPBACK |             \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_TX_CR_LOOPBACK_CROSS )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void</span><br><span style="color: hsl(120, 100%, 40%);">+e1_tx_config(uint16_t cr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       g_e1.tx.cr = (g_e1.tx.cr & ~TXCR_PERMITTED) | (cr & TXCR_PERMITTED);</span><br><span style="color: hsl(120, 100%, 40%);">+  e1_regs->tx.csr = g_e1.tx.cr;</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%);">+#define RXCR_PERMITTED (                 \</span><br><span style="color: hsl(120, 100%, 40%);">+             E1_RX_CR_MODE_MFA )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void</span><br><span style="color: hsl(120, 100%, 40%);">+e1_rx_config(uint16_t cr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     g_e1.rx.cr = (g_e1.rx.cr & ~RXCR_PERMITTED) | (cr & RXCR_PERMITTED);</span><br><span style="color: hsl(120, 100%, 40%);">+  e1_regs->rx.csr = g_e1.rx.cr;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> #include "dma.h"</span><br><span> </span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>index c438cb9..05ce19a 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>@@ -11,6 +11,9 @@</span><br><span> void e1_poll(void);</span><br><span> void e1_debug_print(bool data);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void e1_tx_config(uint16_t cr);</span><br><span style="color: hsl(120, 100%, 40%);">+void e1_rx_config(uint16_t cr);</span><br><span style="color: hsl(120, 100%, 40%);">+</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> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21774">change 21774</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/+/21774"/><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: Ib23f9b99f169ab18d730bcf67b97a7b6bf863e98 </div>
<div style="display:none"> Gerrit-Change-Number: 21774 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>