laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42011?usp=email )
Change subject: bts: as_rsl_meas_res(): move chan_est to ConnHdlr
......................................................................
bts: as_rsl_meas_res(): move chan_est to ConnHdlr
Altstep local variables are reset when another altstep, executed
among with as_rsl_meas_res(), repeats. Move the chan_est variable
to ConnHdlr, so that it does not get reset.
Change-Id: I3a31532494e123935fb2aede0e67e4271962ab5f
Related: OS#6933
---
M bts/BTS_Tests.ttcn
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 940b409..836b033 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -222,6 +222,7 @@
/* RSL MEASurement RESult params for as_rsl_meas_res() */
var uint8_t g_rsl_meas_res_nr := 0;
var boolean g_rsl_meas_res_first := true;
+ var boolean g_rsl_meas_res_chan_est := false;
/* PCU Interface of BTS */
port PCUIF_CODEC_PT PCU;
@@ -2380,7 +2381,6 @@
/* verify we regularly receive measurement reports on RSL with incrementing numbers */
private altstep as_rsl_meas_res(boolean verify_meas := true) runs on ConnHdlr {
var RSL_Message rsl;
- var boolean chan_est := false;
[not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; }
@@ -2398,7 +2398,7 @@
* the "our" measurement report the first time, the channel
* is established and empty or hardcoded TRXCON reports must
* not occur anymore. */
- chan_est := true;
+ g_rsl_meas_res_chan_est := true;
repeat;
}
@@ -2407,7 +2407,7 @@
* more time to establish the channel and actually start sending. The
* result is then a measurement report that just lacks the measurement
* information of the MS. This is normal and we tolerate this behavior. */
- [chan_est == false] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl {
+ [not g_rsl_meas_res_chan_est] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl {
/* increment counter of next to-be-expected meas rep */
g_rsl_meas_res_nr := (g_rsl_meas_res_nr + 1) mod 256;
/* Re-start the timer expecting the next MEAS RES */
@@ -2421,7 +2421,7 @@
* report or a hardcoded one. If TRXCON picks the hardcoded measurement
* report the templates above will not match. We tolerate this
* behavior, but only once. */
- [chan_est == false] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_rsl_meas_res_nr)) -> value rsl {
+ [not g_rsl_meas_res_chan_est] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_rsl_meas_res_nr)) -> value rsl {
/* increment counter of next to-be-expected meas rep */
g_rsl_meas_res_nr := (g_rsl_meas_res_nr + 1) mod 256;
if (g_rsl_meas_res_first) {
@@ -2582,6 +2582,7 @@
}
g_rsl_meas_res_first := true;
+ g_rsl_meas_res_chan_est := false;
}
private function get_start_amr_ft() runs on ConnHdlr return integer {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42011?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I3a31532494e123935fb2aede0e67e4271962ab5f
Gerrit-Change-Number: 42011
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41936?usp=email )
Change subject: bts: f_est_dchan(): populate UL SACCH cache
......................................................................
bts: f_est_dchan(): populate UL SACCH cache
This ensures that UL SACCH blocks always contain the expected content
and a proper L1 SACCH header, rather than the dummy measurement report
hard-coded in trxcon/firmware. As a result, the BTS receives
consistent and realistic UL SACCH from the very beginning.
Change-Id: I4781fe7539e64e77d594e84f905646c127f46b64
Related: OS#6933
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 9 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 32061e5..5275cff 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2529,6 +2529,9 @@
ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, trx_pars.arfcn, g_pars.tsc));
}
+ /* Populate UL SACCH cache with a Measurement Report */
+ f_send_meas_rep(ts_MeasurementResults);
+
/* enable dedicated mode */
f_l1ctl_est_dchan(L1CTL, g_pars);
@@ -3899,9 +3902,6 @@
g_pars.l1_pars.ms_actual_ta := ta_to_test;
f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta,
g_pars.l1_pars.ms_power_level);
- /* tell trxcon to use a given TA in UL SACCH blocks
- * this is achieved by populating UL SACCH cache before doing f_l1ctl_est_dchan() */
- f_send_meas_rep(ts_MeasurementResults);
f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := ta_to_test}))} );
@@ -8197,9 +8197,6 @@
/* Ensure that 'rx-current' equals 'rx-target' */
f_trxc_fake_rssi(mp_uplink_power_target);
- /* Populate SACCH cache with a Measurement Report */
- f_send_meas_rep(ts_MeasurementResults);
-
/* Establish a dedicated channel */
f_est_dchan(more_ies := valueof(ies));
@@ -8261,9 +8258,6 @@
/* Ensure that 'rx-current' equals 'rx-target' */
f_trxc_fake_rssi(mp_uplink_power_target);
- /* Populate SACCH cache with a Measurement Report */
- f_send_meas_rep(ts_MeasurementResults);
-
/* Establish a dedicated channel */
f_est_dchan(more_ies := valueof(ies));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41936?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4781fe7539e64e77d594e84f905646c127f46b64
Gerrit-Change-Number: 41936
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41937?usp=email )
Change subject: bts: f_build_meas_res_tmpl(): expect specific L3 INFO
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41937?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I1892d3ae3f72443ded6321487e9b191cd1948aac
Gerrit-Change-Number: 41937
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 04 Feb 2026 14:04:32 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes