Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/14204
Change subject: L1CTL: Add support for CCCH_MODE_COMBINED_CBCH
......................................................................
L1CTL: Add support for CCCH_MODE_COMBINED_CBCH
In OsmocomBB/trxcon Change-Id Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2
we introduced a new mode CCCH_MODE_COMBINED_CBCH to indicate that the
channel combination is a CCCH+SDCCH/4 with one SDCCH stolen for CBCH.
Let's make sure we actually use that mode in our CBCH related tests
Change-Id: I27ee2c81bec7175c1ea09d4f3f6037f2866fe242
---
M bts/BTS_Tests.ttcn
M bts/BTS_Tests_SMSCB.ttcn
M library/L1CTL_Types.ttcn
3 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/04/14204/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 1c20657..47c16c2 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -451,8 +451,8 @@
}
}
-friend function f_l1_tune(L1CTL_PT L1CTL) {
- f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, CCCH_MODE_COMBINED,
mp_rxlev_exp);
+friend function f_l1_tune(L1CTL_PT L1CTL, L1ctlCcchMode ccch_mode :=
CCCH_MODE_COMBINED) {
+ f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);
}
private function f_trxc_connect() runs on ConnHdlr {
diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn
index 0712a90..c02522b 100644
--- a/bts/BTS_Tests_SMSCB.ttcn
+++ b/bts/BTS_Tests_SMSCB.ttcn
@@ -216,7 +216,7 @@
f_init(testcasename());
f_init_l1ctl();
- f_l1_tune(L1CTL);
+ f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);
/* FIXME: switch to dedicated mode for SDCCH/8 */
/* send SMSCB[s] via RSL */
diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn
index 69e7dbe..87849f5 100644
--- a/library/L1CTL_Types.ttcn
+++ b/library/L1CTL_Types.ttcn
@@ -62,7 +62,8 @@
type enumerated L1ctlCcchMode {
CCCH_MODE_NONE (0),
CCCH_MODE_NON_COMBINED,
- CCCH_MODE_COMBINED
+ CCCH_MODE_COMBINED,
+ CCCH_MODE_COMBINED_CBCH
} with { variant "FIELDLENGTH(8)" };
type enumerated L1ctlNeighMode {
--
To view, visit https://gerrit.osmocom.org/14204
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27ee2c81bec7175c1ea09d4f3f6037f2866fe242
Gerrit-Change-Number: 14204
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <[email protected]>
