January 2022 - gerrit-log - lists.osmocom.org

Change in osmo-e1-hardware[master]: icE1usb fw: Use the interface/endpoints #define in usb_e1.c

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26835 ) Change subject: icE1usb fw: Use the interface/endpoints #define in usb_e1.c ...................................................................... icE1usb fw: Use the interface/endpoints #define in usb_e1.c Avoid hardcoded ids everywhere. This also prepares a bit for multi-port support in the future. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I89c86ac6afd52dd19e3383b38c3311276a090d50 --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 56 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/35/26835/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 09b428c..3de6071 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -13,8 +13,9 @@ #include <no2usb/usb_priv.h> #include "console.h" -#include "misc.h" #include "e1.h" +#include "misc.h" +#include "usb_desc_ids.h" #include "ice1usb_proto.h" @@ -40,6 +41,12 @@ }; +static volatile struct usb_ep * +_get_ep_regs(uint8_t ep) +{ + return (ep & 0x80) ? &usb_ep_regs[ep & 0x1f].in : &usb_ep_regs[ep & 0x1f].out; +} + static void _usb_fill_feedback_ep(void) { @@ -47,6 +54,7 @@ uint16_t ticks; uint32_t val = 8192; unsigned int level; + volatile struct usb_ep *ep_regs; /* Compute real E1 tick count (with safety against bad values) */ ticks = e1_tick_read(); @@ -63,21 +71,25 @@ val -= 256; /* Prepare buffer */ - usb_data_write(usb_ep_regs[1].in.bd[0].ptr, &val, 4); - usb_ep_regs[1].in.bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(3); + ep_regs = _get_ep_regs(USB_EP_E1_FB(0)); + usb_data_write(ep_regs->bd[0].ptr, &val, 4); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(3); } void usb_e1_run(void) { + volatile struct usb_ep *ep_regs; int bdi; if (!g_usb_e1.running) return; - /* EP3 IRQ */ - if ((usb_ep_regs[3].in.bd[0].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) { + /* Interrupt endpoint */ + ep_regs = _get_ep_regs(USB_EP_E1_INT(0)); + + if ((ep_regs->bd[0].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) { const struct e1_error_count *cur_err = e1_get_error_count(); if (memcmp(cur_err, &g_usb_e1.last_err, sizeof(*cur_err))) { struct ice1usb_irq errmsg = { @@ -93,24 +105,25 @@ } }; printf("E"); - usb_data_write(usb_ep_regs[3].in.bd[0].ptr, &errmsg, sizeof(errmsg)); - usb_ep_regs[3].in.bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(sizeof(errmsg)); + usb_data_write(ep_regs->bd[0].ptr, &errmsg, sizeof(errmsg)); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(sizeof(errmsg)); g_usb_e1.last_err = *cur_err; } } - /* EP2 IN */ + /* Data IN endpoint */ + ep_regs = _get_ep_regs(USB_EP_E1_IN(0)); bdi = g_usb_e1.in_bdi; - while ((usb_ep_regs[2].in.bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) + while ((ep_regs->bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) { - uint32_t ptr = usb_ep_regs[2].in.bd[bdi].ptr; + uint32_t ptr = ep_regs->bd[bdi].ptr; uint32_t hdr; unsigned int pos; /* Error check */ - if ((usb_ep_regs[2].in.bd[bdi].csr & USB_BD_STATE_MSK) == USB_BD_STATE_DONE_ERR) - puts("Err EP2 IN\n"); + if ((ep_regs->bd[bdi].csr & USB_BD_STATE_MSK) == USB_BD_STATE_DONE_ERR) + puts("Err EP IN\n"); /* Get some data from E1 */ int n = e1_rx_level(); @@ -131,25 +144,26 @@ usb_data_write(ptr, &hdr, 4); /* Resubmit */ - usb_ep_regs[2].in.bd[bdi].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN((n * 32) + 4); + ep_regs->bd[bdi].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN((n * 32) + 4); /* Next BDI */ bdi ^= 1; g_usb_e1.in_bdi = bdi; } - /* EP1 OUT */ + /* Data OUT endpoint */ + ep_regs = _get_ep_regs(USB_EP_E1_OUT(0)); bdi = g_usb_e1.out_bdi; - while ((usb_ep_regs[1].out.bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) + while ((ep_regs->bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) { - uint32_t ptr = usb_ep_regs[1].out.bd[bdi].ptr; - uint32_t csr = usb_ep_regs[1].out.bd[bdi].csr; + uint32_t ptr = ep_regs->bd[bdi].ptr; + uint32_t csr = ep_regs->bd[bdi].csr; uint32_t hdr; /* Error check */ if ((csr & USB_BD_STATE_MSK) == USB_BD_STATE_DONE_ERR) { - puts("Err EP1 OUT\n"); + puts("Err EP OUT\n"); goto refill; } @@ -162,7 +176,7 @@ refill: /* Refill it */ - usb_ep_regs[1].out.bd[bdi].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); + ep_regs->bd[bdi].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); /* Next BDI */ bdi ^= 1; @@ -173,8 +187,10 @@ puts("."); } - /* EP1 IN */ - if ((usb_ep_regs[1].in.bd[0].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) + /* Feedback endpoint */ + ep_regs = _get_ep_regs(USB_EP_E1_FB(0)); + + if ((ep_regs->bd[0].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) { _usb_fill_feedback_ep(); } @@ -189,16 +205,16 @@ if (!conf) return USB_FND_SUCCESS; - intf = usb_desc_find_intf(conf, 0, 0, NULL); + intf = usb_desc_find_intf(conf, USB_INTF_E1(0), 0, NULL); if (!intf) return USB_FND_ERROR; printf("e1 set_conf %08x\n", intf); - usb_ep_boot(intf, 0x01, true); - usb_ep_boot(intf, 0x81, false); - usb_ep_boot(intf, 0x82, true); - usb_ep_boot(intf, 0x83, false); + usb_ep_boot(intf, USB_EP_E1_IN(0), true); + usb_ep_boot(intf, USB_EP_E1_OUT(0), true); + usb_ep_boot(intf, USB_EP_E1_FB(0), false); + usb_ep_boot(intf, USB_EP_E1_INT(0), false); return USB_FND_SUCCESS; } @@ -221,8 +237,10 @@ static enum usb_fnd_resp _e1_set_intf(const struct usb_intf_desc *base, const struct usb_intf_desc *sel) { + volatile struct usb_ep *ep_regs; + /* Validity checks */ - if (base->bInterfaceNumber != 0) + if ((base->bInterfaceClass != 0xff) || (base->bInterfaceSubClass != 0xe1)) return USB_FND_CONTINUE; if (sel->bAlternateSetting > 1) @@ -235,10 +253,10 @@ g_usb_e1.running = (sel->bAlternateSetting != 0); /* Reconfigure the endpoints */ - usb_ep_reconf(sel, 0x01); - usb_ep_reconf(sel, 0x81); - usb_ep_reconf(sel, 0x82); - usb_ep_reconf(sel, 0x83); + usb_ep_reconf(sel, USB_EP_E1_IN(0)); + usb_ep_reconf(sel, USB_EP_E1_OUT(0)); + usb_ep_reconf(sel, USB_EP_E1_FB(0)); + usb_ep_reconf(sel, USB_EP_E1_INT(0)); /* Update E1 and USB state */ switch (g_usb_e1.running) { @@ -257,11 +275,12 @@ g_usb_e1.in_bdi = 0; g_usb_e1.out_bdi = 0; - /* EP1 OUT: Queue two buffers */ - usb_ep_regs[1].out.bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); - usb_ep_regs[1].out.bd[1].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); + /* EP OUT: Queue two buffers */ + ep_regs = _get_ep_regs(USB_EP_E1_FB(0)); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); + ep_regs->bd[1].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); - /* EP1 IN: Queue buffer */ + /* EP Feedback: Pre-fill */ _usb_fill_feedback_ep(); break; @@ -273,7 +292,7 @@ static enum usb_fnd_resp _e1_get_intf(const struct usb_intf_desc *base, uint8_t *alt) { - if (base->bInterfaceNumber != 0) + if ((base->bInterfaceClass != 0xff) || (base->bInterfaceSubClass != 0xe1)) return USB_FND_CONTINUE; *alt = g_usb_e1.running ? 1 : 0; @@ -374,7 +393,7 @@ case USB_REQ_RCPT_DEV: return _e1_ctrl_req_dev(req, xfer); case USB_REQ_RCPT_INTF: - if (req->wIndex != 0) + if (req->wIndex != USB_INTF_E1(0)) return USB_FND_CONTINUE; return _e1_ctrl_req_intf(req, xfer); case USB_REQ_RCPT_EP: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26835 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: I89c86ac6afd52dd19e3383b38c3311276a090d50 Gerrit-Change-Number: 26835 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Fix computation of received E1 frames from USB

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26836 ) Change subject: icE1usb fw: Fix computation of received E1 frames from USB ...................................................................... icE1usb fw: Fix computation of received E1 frames from USB Several issues : - The reported length includes the CRC so it's minus 6 and not minus 4. (2 for CRC, 4 for header) - Cast length to int to make it signed so the minus works - If the packet is empty, this would be negative (no header), underflow, and then try to submit a giant number of frames to the E1 hardware Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ib754e460290fe2e1551a0090e30a51846131d07d --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/36/26836/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 3de6071..ed4826f 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -171,8 +171,9 @@ usb_data_read(&hdr, ptr, 4); /* Empty data into the FIFO */ - int n = ((csr & USB_BD_LEN_MSK) - 4) / 32; - n = e1_tx_feed_data((ptr >> 2) + 1, n); + int n = ((int)(csr & USB_BD_LEN_MSK) - 6) / 32; + if (n > 0) + e1_tx_feed_data((ptr >> 2) + 1, n); refill: /* Refill it */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26836 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: Ib754e460290fe2e1551a0090e30a51846131d07d Gerrit-Change-Number: 26836 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in osmo-upf[master]: initial osmocom boilerplate source tree

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/26691 ) Change subject: initial osmocom boilerplate source tree ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-upf/+/26691/5/README.md File README.md: https://gerrit.osmocom.org/c/osmo-upf/+/26691/5/README.md@37 PS5, Line 37: h URL works (via redirect) but one could use the correct/new URL of mailman3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/26691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I4352dd8738a1a9de6ba2fc250ee8eef69c65ff1e Gerrit-Change-Number: 26691 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jan 2022 15:35:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: ports.h: add osmo-pfcp-tool ports

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26607 ) Change subject: ports.h: add osmo-pfcp-tool ports ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a5f437d934b9bda11ea593b50bd18c7d5d71ce9 Gerrit-Change-Number: 26607 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jan 2022 15:33:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: PFCP: add DLPFCP and osmo-upf port numbers

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26606 ) Change subject: PFCP: add DLPFCP and osmo-upf port numbers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a46b147ec6a76d909df28136cfd2b764b2c75ea Gerrit-Change-Number: 26606 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jan 2022 15:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix TC_rsl_drop_counter due to IPA_Emulation component being ali...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26874 ) Change subject: bsc: Fix TC_rsl_drop_counter due to IPA_Emulation component being alive-type ...................................................................... bsc: Fix TC_rsl_drop_counter due to IPA_Emulation component being alive-type IPA_Emulation component was marked with the "alive" type recently, in order to avoid race conditions leading to errors during tear down of the test. It turns out, the way "alive" keeps the component alive is by means of not closing the sockets when the component is stopped. As a result, TC_rsl_drop_counter test stopped working properly because it was specting a TCP FIN to be sent to osmo-bsc when the component was stopped. In order to fix it, add a new CFG port to the IPA_Emulation component on which one can operate. Add a a new method to tell the component to close the socket. Then, put that in BSC_Tests into a function which was actually unsued until now, and use it in the test in order to have the specific logic enclosed in a function helper. Fixes: 7138913d664c33b2404e3d293ab820fb3516ff73 Change-Id: I68163b053313d9907ba8e40954a5933d14cb7db6 --- M bsc/BSC_Tests.ttcn M library/IPA_Emulation.ttcnpp 2 files changed, 56 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/26874/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c485ec5..7bfc387 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -595,6 +595,8 @@ port IPA_CODEC_PT IPA; /* Required for compilation of TC_rsl_unknown_unit_id() */ /* CTRL muxed over IPA in SCCPlite conn BSC<->MSC (or BSC-NAT) */ port IPA_CTRL_PT SCCPLITE_IPA_CTRL; + /* Configure/manage IPA_Emulation: */ + port IPA_CFG_PT IPA_CFG_PORT; var MGCP_Emulation_CT vc_MGCP; port TELNETasp_PT BSCVTY; @@ -926,6 +928,7 @@ } map(clnt.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); + connect(clnt.vc_IPA:CFG_PORT, self:IPA_CFG_PORT); if (handler_mode) { connect(clnt.vc_IPA:IPA_RSL_PORT, clnt.vc_RSL:IPA_PT); } else { @@ -955,9 +958,22 @@ } function f_ipa_rsl_stop(inout IPA_Client clnt) runs on test_CT { + var IPL4asp_Types.Result res := { + errorCode := omit, + connId := omit, + os_error_code := omit, + os_error_text := omit + }; + if (not isbound(clnt) or not isbound(clnt.vc_IPA)) { return; } + + /* Alive components don't finish sockets (TCP FIN) when they are + * stopped. Hence, we need to manually call close() on them to make sure + * the IUT knows about it. */ + f_ipa_cfg_disconnect(IPA_CFG_PORT, res); + clnt.vc_IPA.stop; if (isbound(clnt.vc_RSL)) { clnt.vc_RSL.stop; @@ -3555,7 +3571,7 @@ rsl_fail := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "rsl_fail"); - bts[0].rsl.vc_IPA.stop; + f_ipa_rsl_stop(bts[0].rsl); f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "rsl_fail", rsl_fail+1); diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 5cdf324..0cd7314 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -206,6 +206,9 @@ type component IPA_Emulation_CT { /* down-facing port to IPA codec port */ port IPA_CODEC_PT IPA_PORT; + /* Down facing port to configure the component */ + port IPA_CFG_PT CFG_PORT; + #ifdef IPA_EMULATION_SCCP /* up-facing port to SCCP */ port MTP3asp_SP_PT MTP3_SP_PORT; @@ -286,6 +289,17 @@ osmo_rand := "" }; +signature IPA_CFG_disconnect(inout IPL4asp_Types.Result res); +type port IPA_CFG_PT procedure { + inout IPA_CFG_disconnect; +} with { extension "internal" }; + +function f_ipa_cfg_disconnect(IPA_CFG_PT pt, inout IPL4asp_Types.Result res) { + pt.call(IPA_CFG_disconnect:{res}) { + [] pt.getreply(IPA_CFG_disconnect:{?}) -> param (res) {}; + } +} + /* Function to use to connect as client to a remote IPA Server */ function f_connect(charstring remote_host, IPL4asp_Types.PortNumber remote_port, charstring local_host, IPL4asp_Types.PortNumber local_port, @@ -318,6 +332,25 @@ g_is_bsc_mgw := false; } +private function f_close() runs on IPA_Emulation_CT return IPL4asp_Types.Result { + var IPL4asp_Types.Result res; + select (g_mode) { + case (IPA_MODE_CLIENT) { + res := IPA_CodecPort_CtrlFunct.f_IPL4_close(IPA_PORT, g_self_conn_id, {tcp := {}}); + g_self_conn_id := -1; + } + case (IPA_MODE_SERVER) { + res := IPA_CodecPort_CtrlFunct.f_IPL4_close(IPA_PORT, g_last_conn_id, {tcp := {}}); + g_last_conn_id := -1; + } + case else { + setverdict(fail, "Unknown mode"); + mtc.stop; + } + } + return res; +} + #ifdef IPA_EMULATION_SCCP template ASP_MTP3_TRANSFERind ts_MTP3_XFER_ind(integer opc, octetstring data) := { sio := { '10'B, '00'B, '0011'B }, @@ -661,6 +694,7 @@ var Socket_API_Definitions.PortEvent port_evt; var octetstring payload; var ASP_IPA_Unitdata ipa_ud; + var IPL4asp_Types.Result res; #ifdef IPA_EMULATION_CTRL var CtrlMessage ctrl_msg; #endif @@ -888,6 +922,11 @@ IPA_PORT.send(f_from_asp(f_ipa_conn_id(), ipa_ud)); } + /* Received call to configure/operate the component */ + [] CFG_PORT.getcall(IPA_CFG_disconnect:{?}) { + res := f_close(); + CFG_PORT.reply(IPA_CFG_disconnect:{res}); + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26874 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: I68163b053313d9907ba8e40954a5933d14cb7db6 Gerrit-Change-Number: 26874 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
4
0 0

Change in osmo-iuh[master]: test_common: use osmo_init_logging2 instead of osmo_init_logging

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26892 ) Change subject: test_common: use osmo_init_logging2 instead of osmo_init_logging ...................................................................... test_common: use osmo_init_logging2 instead of osmo_init_logging osmo_init_logging is deprecated, lets use osmo_init_logging2 Change-Id: I00ff05e27a89f515f0ce874d6f130b2937b8f1cc --- M src/tests/test_common.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/92/26892/1 diff --git a/src/tests/test_common.c b/src/tests/test_common.c index 899c73a..187a269 100644 --- a/src/tests/test_common.c +++ b/src/tests/test_common.c @@ -70,16 +70,18 @@ .num_cat = ARRAY_SIZE(log_cat), }; +static void *tall_hnb_ctx; static void *msgb_ctx; int test_common_init(void) { int rc; + tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); msgb_ctx = msgb_talloc_ctx_init(NULL, 0); talloc_asn1_ctx = talloc_named_const(NULL, 0, "asn1_context"); - rc = osmo_init_logging(&test_log_info); + rc = osmo_init_logging2(tall_hnb_ctx, &test_log_info); if (rc < 0) exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I00ff05e27a89f515f0ce874d6f130b2937b8f1cc Gerrit-Change-Number: 26892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix CC bits expectancies in TC_rll_sapi_n_reject_dlci_cc

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26891 ) Change subject: bsc: Fix CC bits expectancies in TC_rll_sapi_n_reject_dlci_cc ...................................................................... bsc: Fix CC bits expectancies in TC_rll_sapi_n_reject_dlci_cc Change-Id: Ie9d88acd083fa0db35e2addec07b2f810bcc8213 Related: OS#4728 Related: SYS#5047 Fixes: 999ceb66373a93c0ab5adf14b313187789288c53 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/26891/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0dd4440..e97121b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2578,6 +2578,7 @@ var octetstring rnd_data := f_rnd_octstring(16); var RSL_Message rx_rsl; var DchanTuple dt; + var RslLinkId rlid := valueof(ts_RslLinkID_DCCH(3)); f_init(1); @@ -2590,8 +2591,8 @@ rx_rsl := f_exp_ipa_rx(0, tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); /* MS sends unexpected ERROR INDication on DCCH/ACCH SAPI=3 */ - f_ipa_tx(0, ts_RSL_ERROR_IND(dt.rsl_chan_nr, ts_RslLinkID_DCCH(3), ''O)); - f_exp_sapi_n_reject(3, GSM0808_CAUSE_BSS_NOT_EQUIPPED, '10'B); + f_ipa_tx(0, ts_RSL_ERROR_IND(dt.rsl_chan_nr, rlid, ''O)); + f_exp_sapi_n_reject(3, GSM0808_CAUSE_BSS_NOT_EQUIPPED, int2bit(enum2int(rlid.c), 2)); /* Clean up the connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26891 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: Ie9d88acd083fa0db35e2addec07b2f810bcc8213 Gerrit-Change-Number: 26891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-gsm-tester[master]: contrib: Convert trial osmo-iuh->osmo-hnbgw

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/26889 ) Change subject: contrib: Convert trial osmo-iuh->osmo-hnbgw ...................................................................... contrib: Convert trial osmo-iuh->osmo-hnbgw The real target was not osmo-iuh itself but osmo-hnbgw. Since osmo-hnbgw is inits own repository now, let's rename it. Change-Id: I03c0988db5c5d72bcac71b4515e40a099600ce7c --- R contrib/jenkins-build-osmo-hnbgw.sh 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/89/26889/1 diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-hnbgw.sh similarity index 87% rename from contrib/jenkins-build-osmo-iuh.sh rename to contrib/jenkins-build-osmo-hnbgw.sh index 412110e..c495c21 100755 --- a/contrib/jenkins-build-osmo-iuh.sh +++ b/contrib/jenkins-build-osmo-hnbgw.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -x base="$PWD" -name="osmo-iuh" +name="osmo-hnbgw" . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen @@ -9,7 +9,8 @@ build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo libasn1c ${SANITIZE_FLAGS} - build_repo osmo-iuh ${SANITIZE_FLAGS} +build_repo osmo-hnbgw ${SANITIZE_FLAGS} + create_bin_tgz "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/26889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I03c0988db5c5d72bcac71b4515e40a099600ce7c Gerrit-Change-Number: 26889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
3
0 0

Change in osmo-ci[master]: jobs: ogt: Rename osmo-iuh->osmo-hnbgw build jobs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/26888 ) Change subject: jobs: ogt: Rename osmo-iuh->osmo-hnbgw build jobs ...................................................................... jobs: ogt: Rename osmo-iuh->osmo-hnbgw build jobs The real target was not osmo-iuh itself but osmo-hnbgw. Since osmo-hnbgw is inits own repository now, let's rename it. Change-Id: I72e93683ea355cf0886f08a3f31568f58ff42473 --- M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/88/26888/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 16f9419..1855d02 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -11,7 +11,7 @@ - osmo-ggsn - osmo-hlr - osmo-mgw - - osmo-iuh + - osmo-hnbgw - osmo-msc - osmo-pcu - osmo-sgsn @@ -92,6 +92,8 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_iuh - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmo_hnbgw + - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_msc - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_hlr diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index a505629..473f046 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -63,7 +63,7 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmo-mgw - copy_artifact: - repo: osmo-gsm-tester_build-osmo-iuh + repo: osmo-gsm-tester_build-osmo-hnbgw - copy_artifact: repo: osmo-gsm-tester_build-osmo-msc - copy_artifact: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I72e93683ea355cf0886f08a3f31568f58ff42473 Gerrit-Change-Number: 26888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
2
0 0

2025

2024

2023

2022

gerrit-log January 2022