[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode
tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode .. Patch Set 1: (1 comment) Patchset: PS1: Note that I don't have a working DADHI setup ATM, so don't merge until I either get to try this, or someone else does. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 28 Apr 2024 14:39:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode
tnt has uploaded this change for review. (
https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email )
Change subject: icE1usb: Configure the RX mode according to CRC4 mode
..
icE1usb: Configure the RX mode according to CRC4 mode
Previously only the TX side would be configured for CRC4 enable/disable,
because the RX side hardware didn't support a no-CRC4 mode. Now that it's
implemented, make sure to configure it if requested.
Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e
Signed-off-by: Sylvain Munaut
---
M drivers/dahdi/icE1usb/icE1usb.c
1 file changed, 61 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/55/36655/1
diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c
index 2262deb..06ec443 100644
--- a/drivers/dahdi/icE1usb/icE1usb.c
+++ b/drivers/dahdi/icE1usb/icE1usb.c
@@ -108,6 +108,7 @@
} ep;
struct {
struct ice1usb_tx_config tx;
+ struct ice1usb_rx_config rx;
} cfg;
/* last received error interrupt */
struct ice1usb_irq_err last_err;
@@ -220,10 +221,23 @@
}
}
+static const char *rx_mode_str(enum ice1usb_rx_mode rx_mode)
+{
+ switch (rx_mode) {
+ case ICE1USB_RX_MODE_FRAME:
+ return "FRAME";
+ case ICE1USB_RX_MODE_MULTIFRAME:
+ return "MULTIFRAME";
+ default:
+ return "unknown";
+ }
+}
+
+
#define USB_RT_VEND_IF (USB_TYPE_VENDOR | USB_RECIP_INTERFACE)
#define USB_RT_VEND_DEV (USB_TYPE_VENDOR | USB_RECIP_DEVICE)
-/* synchronous request, may block up to 1s, only called from process context!
*/
+/* synchronous requests, may block up to 1s, only called from process context!
*/
static int ice1usb_tx_config(struct ice1usb *ieu)
{
int rc;
@@ -244,6 +258,25 @@
return 0;
}
+static int ice1usb_rx_config(struct ice1usb *ieu)
+{
+ int rc;
+ uint8_t if_num = ieu->usb_intf->cur_altsetting->desc.bInterfaceNumber;
+
+ ieu_info(ieu, "RX-CONFIG (mode=%s)\n",
+rx_mode_str(ieu->cfg.rx.mode));
+
+ rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0),
+ ICE1USB_INTF_SET_RX_CFG, USB_RT_VEND_IF,
+ 0, if_num, >cfg.rx, sizeof(ieu->cfg.rx),
+ USB_CTRL_SET_TIMEOUT);
+ if (rc < 0)
+ return rc;
+ if (rc != sizeof(ieu->cfg.rx))
+ return -EIO;
+ return 0;
+}
+
/***
* ISOCHRONOUS transfers
@@ -685,10 +718,13 @@
lc->sync = 0;
}
- if (span->lineconfig & DAHDI_CONFIG_CRC4)
+ if (span->lineconfig & DAHDI_CONFIG_CRC4) {
ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E;
- else
+ ieu->cfg.rx.mode = ICE1USB_RX_MODE_MULTIFRAME;
+ } else {
ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0;
+ ieu->cfg.rx.mode = ICE1USB_RX_MODE_FRAME;
+ }
if (lc->sync > 0)
ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_REMOTE;
@@ -713,9 +749,16 @@
rc = ice1usb_tx_config(ieu);
if (rc < 0)
return rc;
+ rc = ice1usb_rx_config(ieu);
+ if (rc < 0)
+ return rc;
rc = e1u_d_startup(file, span);
- } else
+ } else {
rc = ice1usb_tx_config(ieu);
+ if (rc < 0)
+ return rc;
+ rc = ice1usb_rx_config(ieu);
+ }
return rc;
}
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e
Gerrit-Change-Number: 36655
Gerrit-PatchSet: 1
Gerrit-Owner: tnt
Gerrit-MessageType: newchange
[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically
tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically .. icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically We want the hardware to take care of the CRC4 error bit autonomously without us having to do anything ... Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Signed-off-by: Sylvain Munaut --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/54/36654/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 7ab751e..2262deb 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -686,7 +686,7 @@ } if (span->lineconfig & DAHDI_CONFIG_CRC4) - ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4; + ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E; else ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-MessageType: newchange
[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX
Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX .. iCE1usb: Add support to configure CRC4 mode for TX/RX Signed-off-by: Sylvain Munaut Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb --- M src/e1d.h M src/usb.c M src/vty.c 3 files changed, 78 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/36653/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: add API logging_vty_subsys_strip_leading_char()
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36546?usp=email ) Change subject: add API logging_vty_subsys_strip_leading_char() .. Patch Set 1: (1 comment) Patchset: PS1: Yes, the current approach of when or where to strip that 'd' is not logical. It is - like many things - just because it was done a certain way without thinking about long-term implications. But do we really make life easier by offering (now, after probably more than a decade of the existing behavior) multiple behavioral options, increasing the complexity for application developers even further? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36546?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5faedf7d6525d744a734ebe54c185fcc904f763e Gerrit-Change-Number: 36546 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Sun, 28 Apr 2024 12:21:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: formalize log subsys stripping for vty
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36545?usp=email ) Change subject: formalize log subsys stripping for vty .. Patch Set 1: (1 comment) Patchset: PS1: Yes, the current approach of when or where to strip that 'd' is not logical. It is - like many things - just because it was done a certain way without thinking about long-term implications. But do we really make life easier by offering (now, after probably more than a decade of the existing behavior) multiple behavioral options, increasing the complexity for application developers even further? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5f81343e8c7b714a4630e64ba654e391435c4244 Gerrit-Change-Number: 36545 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Sun, 28 Apr 2024 12:20:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX
Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX .. Patch Set 1: (1 comment) File src/vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/36653/comment/012c4c7d_0303d0b1 PS1, Line 434: framing-tx (no-crc4|crc4)", > this could be one command for both rx and tx like "framing (rx|tx) > (no-crc4|crc4)". […] Ack, will change. I was trying to change it to "framing [(tx|rx)] (no-crc4|crc4)" so that you could just do both at once, but that doesn't see to work. Is optional middle argument not supported ? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Sun, 28 Apr 2024 12:19:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: docs: update year to 2024
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email ) Change subject: docs: update year to 2024 .. docs: update year to 2024 Change-Id: I85a987eee470d2040c91289d33c5d97c3e90674d --- M doc/manuals/osmosgsn-usermanual-docinfo.xml 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index f8d43e9..7c7de2c 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -51,7 +51,7 @@ - 2013-2016 + 2013-2024 sysmocom - s.f.m.c. GmbH -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I85a987eee470d2040c91289d33c5d97c3e90674d Gerrit-Change-Number: 36628 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: docs: front page: use https:// instead of http://
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email ) Change subject: docs: front page: use https:// instead of http:// .. docs: front page: use https:// instead of http:// Change-Id: If3c3b8e79f94da7a3bcc9262808da09f6a5a601c --- M doc/manuals/osmosgsn-usermanual-docinfo.xml 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index 7c7de2c..9eea626 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -66,8 +66,8 @@ The Asciidoc source code of this manual can be found at - http://git.osmocom.org/osmo-gsm-manuals/;> - http://git.osmocom.org/osmo-gsm-manuals/ + https://git.osmocom.org/osmo-gsm-manuals/;> + https://git.osmocom.org/osmo-gsm-manuals/ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If3c3b8e79f94da7a3bcc9262808da09f6a5a601c Gerrit-Change-Number: 36629 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: docs: replace legacy NS with new NS2 chapters
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email ) Change subject: docs: replace legacy NS with new NS2 chapters .. docs: replace legacy NS with new NS2 chapters osmo-sgsn already switched to the new NS2 code. Use the correct NS2 chapter Change-Id: I9cc86d234e029b5192e36aeb14b0e39d1496842d --- M doc/manuals/osmosgsn-usermanual-docinfo.xml M doc/manuals/osmosgsn-usermanual.adoc 2 files changed, 32 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index afbf109..f8d43e9 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -15,6 +15,14 @@ Conversion to asciidoc, removal of sysmoBTS specific parts. + +3 +April 2024 +AC + + Replace NS chapter with new NS2 chapter to match the code. + + @@ -29,6 +37,17 @@ Managing Director + +Alexander +Couzens +acouz...@sysmocom.de +AC + + sysmocom + sysmocom - s.f.m.c. GmbH + Developer + + diff --git a/doc/manuals/osmosgsn-usermanual.adoc b/doc/manuals/osmosgsn-usermanual.adoc index 610704a..781e4d3 100644 --- a/doc/manuals/osmosgsn-usermanual.adoc +++ b/doc/manuals/osmosgsn-usermanual.adoc @@ -21,7 +21,7 @@ include::./common/chapters/cs7-config.adoc[] -include::./common/chapters/gb.adoc[] +include::./common/chapters/gb-ns2.adoc[] include::./common/chapters/control_if.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9cc86d234e029b5192e36aeb14b0e39d1496842d Gerrit-Change-Number: 36627 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestE...
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email ) Change subject: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97aa039810ad9fffea4226254fa675fd24647de1 Gerrit-Change-Number: 36647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Sun, 28 Apr 2024 12:16:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Sun, 28 Apr 2024 12:16:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestE...
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email ) Change subject: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97aa039810ad9fffea4226254fa675fd24647de1 Gerrit-Change-Number: 36647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Sun, 28 Apr 2024 12:15:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo
Attention is currently required from: jolly, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo .. Patch Set 1: (1 comment) Patchset: PS1: I'm wondering if we should have this [as a commit] in our forked asterisk.git, so that even manual builds [from our fork/branch] will use and build right/matching pjproject.git So basically make this work not just for the docker container here, but for all builds? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Sun, 28 Apr 2024 12:12:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo
Attention is currently required from: jolly, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Sun, 28 Apr 2024 12:11:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX .. Patch Set 1: Code-Review+1 (1 comment) File src/vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/36653/comment/434e2f31_60b6ae9d PS1, Line 434: framing-tx (no-crc4|crc4)", this could be one command for both rx and tx like "framing (rx|tx) (no-crc4|crc4)". Not critical, just a thought. Especially since both the functions are 99% identical. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: tnt Gerrit-Comment-Date: Sun, 28 Apr 2024 11:24:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX
tnt has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email )
Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX
..
iCE1usb: Add support to configure CRC4 mode for TX/RX
Signed-off-by: Sylvain Munaut
Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb
---
M src/e1d.h
M src/usb.c
M src/vty.c
3 files changed, 84 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/36653/1
diff --git a/src/e1d.h b/src/e1d.h
index bf1cbdf..55e5415 100644
--- a/src/e1d.h
+++ b/src/e1d.h
@@ -78,6 +78,11 @@
};
extern const struct value_string e1_ts_mode_names[];
+enum e1_framing_mode {
+ E1_FRAMING_MODE_CRC4 = 0,
+ E1_FRAMING_MODE_NO_CRC4,
+};
+
struct e1_ts {
struct e1_line *line;
uint8_t id;
@@ -160,6 +165,14 @@
uint32_t rx_bytes;
} watchdog;
+ /* driver specific data */
+ struct {
+ struct {
+ enum e1_framing_mode tx;
+ enum e1_framing_mode rx;
+ } framing;
+ } usb;
+
void *e1gen_priv;
};
diff --git a/src/usb.c b/src/usb.c
index 8d431f5..3b77b94 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -1036,14 +1036,29 @@
goto next_interface;
}
- /* Create data flows and start the line */
+ /* Configure, create data flows and start the line */
/* all supported devices have an IN endpoint */
+ e1_usb_ctrl_set_rx_cfg(line,
+ (line->usb.framing.rx == E1_FRAMING_MODE_CRC4) ?
+ ICE1USB_RX_MODE_MULTIFRAME :
+ ICE1USB_RX_MODE_FRAME
+ );
+
line_data->flow_in = e1uf_create(line, e1_usb_xfer_in,
line_data->ep_in, 4, line_data->pkt_size, 4);
e1uf_start(line_data->flow_in);
/* e1-tracer has no OUT or FEEDBACK endpoint */
if (!is_tracer) {
+ e1_usb_ctrl_set_tx_cfg(line,
+ (line->usb.framing.tx == E1_FRAMING_MODE_CRC4) ?
+ ICE1USB_TX_MODE_TS0_CRC4_E :
+ ICE1USB_TX_MODE_TS0,
+ ICE1USB_TX_TIME_SRC_LOCAL,
+ ICE1USB_TX_EXT_LOOPBACK_OFF,
+ 0x00
+ );
+
line_data->flow_out = e1uf_create(line,
e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4);
e1uf_start(line_data->flow_out);
line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb,
line_data->ep_fb, 2, 3, 1);
diff --git a/src/vty.c b/src/vty.c
index 5b4ca47..5083153 100644
--- a/src/vty.c
+++ b/src/vty.c
@@ -168,6 +168,12 @@
{ 0, NULL }
};
+const struct value_string e1_framing_mode_names[] = {
+ { E1_FRAMING_MODE_CRC4,"crc4"},
+ { E1_FRAMING_MODE_NO_CRC4, "no-crc4" },
+ { 0, NULL }
+};
+
static void vty_dump_line(struct vty *vty, const struct e1_line *line)
{
unsigned int tn;
@@ -424,12 +430,49 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_e1d_if_line_framing_tx, cfg_e1d_if_line_framing_tx_cmd,
+ "framing-tx (no-crc4|crc4)",
+ NO_STR "Sets the transmitted E1 framing mode\n")
+{
+ struct e1_line *line = vty->index;
+
+ if (line->intf->drv != E1_DRIVER_USB)
+ return CMD_WARNING;
+
+ enum e1_framing_mode new_mode = get_string_value(e1_framing_mode_names,
argv[0]);
+ line->usb.framing.tx = new_mode;
+
+ return CMD_SUCCESS;
+
+}
+
+DEFUN(cfg_e1d_if_line_framing_rx, cfg_e1d_if_line_framing_rx_cmd,
+ "framing-rx (no-crc4|crc4)",
+ NO_STR "Sets the expected received E1 framing mode\n")
+{
+ struct e1_line *line = vty->index;
+
+ if (line->intf->drv != E1_DRIVER_USB)
+ return CMD_WARNING;
+
+ enum e1_framing_mode new_mode = get_string_value(e1_framing_mode_names,
argv[0]);
+ line->usb.framing.rx = new_mode;
+
+ return CMD_SUCCESS;
+}
+
+
static int config_write_line(struct vty *vty, struct e1_line *line)
{
vty_out(vty, " line %u%s", line->id, VTY_NEWLINE);
vty_out(vty, " mode %s%s", get_value_string(e1_line_mode_names,
line->mode), VTY_NEWLINE);
+ if (line->intf->drv == E1_DRIVER_USB) {
+ vty_out(vty, " framing-tx %s%s",
get_value_string(e1_framing_mode_names, line->usb.framing.tx), VTY_NEWLINE);
+ vty_out(vty, " framing-rx %s%s",
get_value_string(e1_framing_mode_names, line->usb.framing.tx), VTY_NEWLINE);
+ }
+
return 0;
}
@@ -521,4 +564,6 @@
install_node(_node, NULL);
install_element(LINE_NODE, _e1d_if_line_mode_cmd);
+ install_element(LINE_NODE,
