March 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: bts: rename as_l1_sacch() -> as_l1_sacch_loop()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36255?usp=email ) Change subject: bts: rename as_l1_sacch() -> as_l1_sacch_loop() ...................................................................... bts: rename as_l1_sacch() -> as_l1_sacch_loop() For the sake of consistency with as_l1_{dcch,tch}_loop(). Change-Id: I076efac80ae08551c1098a6baa15a2ca99213ee2 --- M bts/BTS_Tests.ttcn 1 file changed, 21 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cf8e7ed..05a3349 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -781,7 +781,7 @@ [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout expecting " & id); } - [not ignore_other] as_l1_sacch(); + [not ignore_other] as_l1_sacch_loop(); [not ignore_other] as_meas_res(); [not ignore_other] as_l1_dcch_loop(); [not ignore_other] as_l1_tch_loop(); @@ -2166,7 +2166,7 @@ } /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */ -private altstep as_l1_sacch() runs on ConnHdlr { +private altstep as_l1_sacch_loop() runs on ConnHdlr { var template (value) LapdmFrameAB lb; var L1ctlMessage l1_dl; @@ -2741,7 +2741,7 @@ timer T := 8.0; T.start; alt { - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] as_meas_res(); [] as_l1_dcch_loop(); [] as_l1_tch_loop(); @@ -3039,7 +3039,7 @@ T.start; var RSL_Message rsl; alt { - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] L1CTL.receive { repeat; } [] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, ?, ?, ?)) -> value rsl { if (rsl.ies[3].body.bs_power.power_level == level) { @@ -8290,7 +8290,7 @@ [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr)) -> value l1_dl { setverdict(fail, "Rx unexpected TRAFFIC.ind: ", l1_dl); } - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] T.timeout { setverdict(fail, "Timeout waiting for TRAFFIC.ind"); } @@ -8404,7 +8404,7 @@ "expected (", payload, ")"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] L1CTL.receive { repeat; } [] Td.timeout { setverdict(fail, "Timeout waiting for Downlink speech frames"); @@ -8417,7 +8417,7 @@ Tu.start(2.0); alt { [] as_l1_tch_loop(); - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] RTPEM_DATA.receive(PDU_RTP:?) -> value rtp_pdu { if (rtp_pdu.data != payload) { repeat; } @@ -8522,7 +8522,7 @@ "expected (", exp_rtp_pl, ")"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] L1CTL.receive { repeat; } [] Td.timeout { setverdict(fail, "Timeout waiting for Downlink speech frames"); @@ -8538,7 +8538,7 @@ Tu.start(2.0); alt { [] as_l1_tch_loop(); - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] OsmuxEM_DATA.receive(osmux_pdu_exp) -> value osmux_pdu { var boolean matched := false; for (var integer i := 0; i < osmux_pdu.osmux_amr.header.ctr + 1; i := i + 1) { @@ -8659,7 +8659,7 @@ log("FACCH received: ", ddata); repeat; } - [] as_l1_sacch(); + [] as_l1_sacch_loop(); [] L1CTL.receive { repeat; } [] Td.timeout { setverdict(fail, "Timeout waiting for matching Downlink data frame"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36255?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: I076efac80ae08551c1098a6baa15a2ca99213ee2 Gerrit-Change-Number: 36255 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?usp=email ) Change subject: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop() ...................................................................... bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop() This fixes sporadic failures in testcases using those altsteps. Change-Id: I3538d40ff1a585ccbe37f3a90f3c374c5f0b5767 Related: osmocom-bb.git I0046f9c103bcb9207f0c2643c6a806bd56553d77 --- M bts/BTS_Tests.ttcn 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 05a3349..0103bbc 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2190,6 +2190,8 @@ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); repeat; } + /* dequeue (ignore) L1CTL DATA.cnf for UL SACCH (SAPI=0) */ + [] L1CTL.receive(tr_L1CTL_DATA_CONF(g_chan_nr, tr_RslLinkID_SACCH(0))) { repeat; } } /* handle incoming downlink SACCH, decode the L1 header into the given record */ @@ -2220,6 +2222,8 @@ f_pad_oct(pl, 23, '2B'O))); repeat; } + /* dequeue (ignore) L1CTL DATA.cnf for UL DCCH (SAPI=0) */ + [] L1CTL.receive(tr_L1CTL_DATA_CONF(g_chan_nr, tr_RslLinkID_DCCH(0))) { repeat; } } private altstep as_l1_tch_loop() runs on ConnHdlr { @@ -2240,6 +2244,8 @@ repeat; } + /* dequeue (ignore) L1CTL TRAFFIC.cnf for UL TCH */ + [] L1CTL.receive(tr_L1CTL_TRAFFIC_CONF(g_chan_nr, tr_RslLinkID_DCCH(0))) { repeat; } } private type record MeasElem { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?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: I3538d40ff1a585ccbe37f3a90f3c374c5f0b5767 Gerrit-Change-Number: 36256 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: also test TCH/A[FH]S in TC_speech_no_rtp_tch[fh]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36257?usp=email ) Change subject: bts: also test TCH/A[FH]S in TC_speech_no_rtp_tch[fh] ...................................................................... bts: also test TCH/A[FH]S in TC_speech_no_rtp_tch[fh] Change-Id: I3c7f91034079169c40c4f20966d9f5fb7c855b27 Related: OS#4823, OS#6049 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0103bbc..29879b9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8323,8 +8323,11 @@ vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars); vc_conn.done; - /* TODO: we don't know what's the expected behavior for TCH/AFS, so we don't test it here. - * Current osmo-bts is sending FACCH/F with dummy LAPDm func=UI frames. */ + /* TS1, TCH/F, V3 (AMR codec) */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3))); + pars.mr_conf := valueof(ts_RSL_MultirateCfg); + vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars); + vc_conn.done; Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } @@ -8339,8 +8342,11 @@ vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars); vc_conn.done; - /* TODO: we don't know what's the expected behavior for TCH/AHS, so we don't test it here. - * Current osmo-bts is sending FACCH/H with dummy LAPDm func=UI frames (whenever possible). */ + /* TS5, TCH/H, V3 (AMR codec) */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3))); + pars.mr_conf := valueof(ts_RSL_MultirateCfg); + vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars); + vc_conn.done; Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36257?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: I3c7f91034079169c40c4f20966d9f5fb7c855b27 Gerrit-Change-Number: 36257 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email ) Change subject: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?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: I914555ac8bf2784c14e1b5564b116221ecc7b539 Gerrit-Change-Number: 36254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:41:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop()

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?usp=email ) Change subject: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?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: I3538d40ff1a585ccbe37f3a90f3c374c5f0b5767 Gerrit-Change-Number: 36256 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:39:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-bts[master]: common: Add RTP related rate counters

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36323?usp=email ) Change subject: common: Add RTP related rate counters ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/common/bts.c: https://gerrit.osmocom.org/c/osmo-bts/+/36323/comment/9061c0e0_49e21f9f PS1, Line 110: received > I don't see anything wrong with the language, sorry. […] Makes sense, marking as resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36323?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide674bde10b0e4b501d6a48947b983090342dfec Gerrit-Change-Number: 36323 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:38:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: rename as_l1_sacch() -> as_l1_sacch_loop()

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36255?usp=email ) Change subject: bts: rename as_l1_sacch() -> as_l1_sacch_loop() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36255?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: I076efac80ae08551c1098a6baa15a2ca99213ee2 Gerrit-Change-Number: 36255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:38:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email ) Change subject: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?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: I914555ac8bf2784c14e1b5564b116221ecc7b539 Gerrit-Change-Number: 36254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:37:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bts: also test TCH/A[FH]S in TC_speech_no_rtp_tch[fh]

by osmith

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36257?usp=email ) Change subject: bts: also test TCH/A[FH]S in TC_speech_no_rtp_tch[fh] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36257?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: I3c7f91034079169c40c4f20966d9f5fb7c855b27 Gerrit-Change-Number: 36257 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 16:35:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix up template deduction failure

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36338?usp=email ) Change subject: ms: fix up template deduction failure ...................................................................... ms: fix up template deduction failure clang and gcc disagree, so just use a real var with the right type. Change-Id: I590060d201445ad25cf5eb73c4b1360eaf6a6cea --- M Transceiver52M/ms/bladerf_specific.h 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/ms/bladerf_specific.h b/Transceiver52M/ms/bladerf_specific.h index f4abe57..9db8bf0 100644 --- a/Transceiver52M/ms/bladerf_specific.h +++ b/Transceiver52M/ms/bladerf_specific.h @@ -269,7 +269,8 @@ bool is_locked; blade_check(bladerf_set_pll_enable, dev, true); - blade_check(bladerf_set_pll_refclk, dev, 10000000UL); + uint64_t refclock = 10000000UL; + blade_check(bladerf_set_pll_refclk, dev, refclock); for (int i = 0; i < 20; i++) { usleep(50 * 1000); bladerf_get_pll_lock_state(dev, &is_locked); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I590060d201445ad25cf5eb73c4b1360eaf6a6cea Gerrit-Change-Number: 36338 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024