Change in osmo-e1-hardware[master]: icE1usb fw: Don't store E1_*_CR_*_CLR in variables

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Jan 5 22:19:43 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21878 )

Change subject: icE1usb fw: Don't store E1_*_CR_*_CLR in variables
......................................................................

icE1usb fw: Don't store E1_*_CR_*_CLR in variables

Those clear bits are only set once at start-up and then later
explicitly.  They shouldn't be stored with the user configuration
in state variables.

Change-Id: If38e86aefea7f1be4e1ff5a88860f8be593eeedc
---
M firmware/ice40-riscv/icE1usb/e1.c
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  tnt: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c
index 7682ce0..b1771f5 100644
--- a/firmware/ice40-riscv/icE1usb/e1.c
+++ b/firmware/ice40-riscv/icE1usb/e1.c
@@ -248,17 +248,15 @@
 	e1f_reset(&g_e1.tx.fifo, 128, 128);
 
 	/* Enable Rx */
-	g_e1.rx.cr = E1_RX_CR_OVFL_CLR |
-	             E1_RX_CR_MODE_MFA |
+	g_e1.rx.cr = E1_RX_CR_MODE_MFA |
 	             E1_RX_CR_ENABLE;
-	e1_regs->rx.csr = g_e1.rx.cr;
+	e1_regs->rx.csr = E1_RX_CR_OVFL_CLR | g_e1.rx.cr;
 
 	/* Enable Tx */
-	g_e1.tx.cr = E1_TX_CR_UNFL_CLR |
-	             (clk_mode ? E1_TX_CR_TICK_REMOTE : E1_TX_CR_TICK_LOCAL) |
+	g_e1.tx.cr = (clk_mode ? E1_TX_CR_TICK_REMOTE : E1_TX_CR_TICK_LOCAL) |
 	             E1_TX_CR_MODE_TS0_CRC_E |
 		     E1_TX_CR_ENABLE;
-	e1_regs->tx.csr = g_e1.tx.cr;
+	e1_regs->tx.csr = E1_TX_CR_UNFL_CLR | g_e1.tx.cr;
 
 	/* State */
 	g_e1.rx.state = BOOT;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21878
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-e1-hardware
Gerrit-Branch: master
Gerrit-Change-Id: If38e86aefea7f1be4e1ff5a88860f8be593eeedc
Gerrit-Change-Number: 21878
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210105/c3aa03c4/attachment.htm>


More information about the gerrit-log mailing list