fixeria has uploaded this change for review. (
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, 4 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/38/41938/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index efc7127..68db548 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -327,7 +327,6 @@
/* RSL MEASurement RESult params for as_rsl_meas_res() */
uint8_t rsl_meas_res_nr,
- boolean rsl_meas_res_first,
/* Training Sequence Code */
GsmTsc tsc,
@@ -922,7 +921,6 @@
encr := omit,
bts0_band := omit,
rsl_meas_res_nr := 0,
- rsl_meas_res_first := true,
tsc := mp_tsc_def,
fhp := {
enabled := false,
@@ -2393,8 +2391,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. */
chan_est := true;
repeat;
@@ -2412,21 +2409,11 @@
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. */
- [chan_est == false] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr,
g_pars.rsl_meas_res_nr)) -> value rsl {
+ /* XXX */
+ [chan_est == false] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr,
g_pars.rsl_meas_res_nr)) {
/* increment counter of next to-be-expected meas rep */
g_pars.rsl_meas_res_nr := (g_pars.rsl_meas_res_nr + 1) mod 256;
- if (g_pars.rsl_meas_res_first) {
- g_pars.rsl_meas_res_first := false;
- repeat;
- } else {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Received unspecific MEAS RES ", rsl));
- }
+ repeat;
}
[] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Received unexpected MEAS RES ", rsl));
--
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: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6eeee2876a76d41ab453af4c7724173fea773b83
Gerrit-Change-Number: 41938
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
