Change in osmo-e1d[master]: Add support for icE1usb RAI interrupt error flag

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26710 )


Change subject: Add support for icE1usb RAI interrupt error flag
......................................................................

Add support for icE1usb RAI interrupt error flag

In osmo-e1-hardware.git Change-Id Ic4f57cf79bd32cf75f81ef3073cb8d4a2d1857d8
we added support for passing RAI (remote alarm indication) as a flag via
the USB interrupt messages; let's add support for this here.

osmo-e1d already internally parses TS0 to determine the same
information, and we have to keep this for backwards-compatibility with
older firmware builds.  But maybe at some future point we can remove
our own TS0 scanning code here and rely on the USB device to inform
us about remote alarms.

Change-Id: Ie1994968e792c37f9272b9854547db95a41cab5b
---
M src/ice1usb_proto.h
M src/usb.c
2 files changed, 8 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/10/26710/1

diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h
index 71f7236..d0d7304 100644
--- a/src/ice1usb_proto.h
+++ b/src/ice1usb_proto.h
@@ -85,9 +85,10 @@
 	ICE1USB_IRQ_T_ERRCNT		= 1,
 };
 
-/* Ensue ro keep those in sync with e1.h */
+/* Ensue to keep those in sync with e1.h */
 #define ICE1USB_ERR_F_ALIGN_ERR	0x01
 #define ICE1USB_ERR_F_LOS	0x02
+#define ICE1USB_ERR_F_RAI	0x04
 
 struct ice1usb_irq_err {
 	/* 16-bit little-endian counters */
diff --git a/src/usb.c b/src/usb.c
index 0e08a9f..465aecd 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -337,6 +337,12 @@
 			line_ctr_add(line, LINE_CTR_LOS, 1);
 	}
 
+	if ((errcnt->flags & ICE1USB_ERR_F_RAI) != (last->flags & ICE1USB_ERR_F_RAI)) {
+		LOGPLI(line, DE1D, LOGL_ERROR, "Remote Alarm (YELLOW) %s\n",
+			errcnt->flags & ICE1USB_ERR_F_RAI ? "PRESENT" : "ABSENT");
+		/* don't increment counter here, our TS0 code in mux_demux.c does this */
+	}
+
 	ld->irq.last_errcnt = *errcnt;
 }
 

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

Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ie1994968e792c37f9272b9854547db95a41cab5b
Gerrit-Change-Number: 26710
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20220102/fa03e10a/attachment.htm>