laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26709 )
Change subject: Use the error counters for remote alarm + remote CRC error
......................................................................
Use the error counters for remote alarm + remote CRC error
Some time ago we added various error counters, but for two of them
we missed to actually ever increment them at all.
Change-Id: Ieb83a2e2e83e334c543bee83726f04f83b19227a
---
M src/mux_demux.c
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/mux_demux.c b/src/mux_demux.c
index b0a9cf2..a588829 100644
--- a/src/mux_demux.c
+++ b/src/mux_demux.c
@@ -359,8 +359,10 @@
/* A bit is present in each odd frame */
if (frame_nr % 2) {
- if (frame[0] & 0x20)
+ if (frame[0] & 0x20) {
line->ts0.cur_errmask |= E1L_TS0_RX_ALARM;
+ line_ctr_add(line, LINE_CTR_RX_REMOTE_A, 1);
+ }
}
/* E bits are present in frame 13 + 15 */
@@ -368,8 +370,10 @@
line->ts0.e_bits = frame[0] & 0x80 ? 2 : 0;
if (frame_nr == 15) {
line->ts0.e_bits |= frame[0] & 0x80 ? 1 : 0;
- if (line->ts0.e_bits != 3)
+ if (line->ts0.e_bits != 3) {
line->ts0.cur_errmask |= E1L_TS0_RX_CRC4_ERR;
+ line_ctr_add(line, LINE_CTR_RX_REMOTE_E, 1);
+ }
}
/* cur_errmask is being cleared once per second via line->ts0.timer */
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26709
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ieb83a2e2e83e334c543bee83726f04f83b19227a
Gerrit-Change-Number: 26709
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: merged
laforge has submitted this change. ( 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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
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(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: merged
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26710 )
Change subject: Add support for icE1usb RAI interrupt error flag
......................................................................
Patch Set 1: Code-Review+2
--
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(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Tue, 04 Jan 2022 13:30:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/26714 )
Change subject: Add TODO-RELEASE
......................................................................
Add TODO-RELEASE
Change-Id: I32acbec597ff8bb79b3576f9d13ab051d5c5b938
---
A TODO-RELEASE
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
new file mode 100644
index 0000000..7ac9302
--- /dev/null
+++ b/TODO-RELEASE
@@ -0,0 +1,9 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
+# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info…
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
+# If any interfaces have been added since the last public release: c:r:a + 1.
+# If any interfaces have been removed or changed since the last public release: c:r:0.
+#library what description / commit summary line
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/26714
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I32acbec597ff8bb79b3576f9d13ab051d5c5b938
Gerrit-Change-Number: 26714
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged