laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?usp=email )
Change subject: bts: as_rsl_meas_res(): do not expect dummy UL SACCH
......................................................................
bts: as_rsl_meas_res(): do not expect dummy UL SACCH
We're now populating the UL SACCH cache before establishing a
decicated channel in f_est_dchan(), so this special case is
no longer needed and can be safely removed.
Change-Id: I6eeee2876a76d41ab453af4c7724173fea773b83
Related: I4781fe7539e64e77d594e84f905646c127f46b64
Related: OS#6933
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 20 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 c3b8f35..fb186b7 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -221,7 +221,6 @@
/* 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 */
@@ -2397,8 +2396,7 @@
/* The following two cases may only happen in the beginning
* of the channel establishment phase. Once we have received
* the "our" measurement report the first time, the channel
- * is established and empty or hardcoded TRXCON reports must
- * not occur anymore. */
+ * is established and empty reports must not occur anymore. */
g_rsl_meas_res_chan_est := true;
repeat;
@@ -2416,22 +2414,6 @@
repeat;
}
- /* Due to the TDMA nature of GSM, TRXCON implements a way to emit dummy
- * measurements if the TTCN3 side does not supply measurement input in
- * time. In those cases TRXCON will either use a cached measurement
- * 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. */
- [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) {
- g_rsl_meas_res_first := false;
- repeat;
- } else {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Received unspecific MEAS RES ", rsl));
- }
- }
[] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Received unexpected MEAS RES ", rsl));
}
@@ -2586,7 +2568,6 @@
}
g_rsl_meas_res_nr := 0;
- g_rsl_meas_res_first := true;
g_rsl_meas_res_chan_est := false;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?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: I6eeee2876a76d41ab453af4c7724173fea773b83
Gerrit-Change-Number: 41938
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
