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
This commit is contained in:
parent
f3c12228fb
commit
990a36138b
|
@ -451,8 +451,8 @@ private altstep as_Tguard() runs on ConnHdlr {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
friend function f_l1_tune(L1CTL_PT L1CTL) {
|
friend function f_l1_tune(L1CTL_PT L1CTL, L1ctlCcchMode ccch_mode := CCCH_MODE_COMBINED) {
|
||||||
f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, CCCH_MODE_COMBINED, mp_rxlev_exp);
|
f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function f_trxc_connect() runs on ConnHdlr {
|
private function f_trxc_connect() runs on ConnHdlr {
|
||||||
|
|
|
@ -216,7 +216,7 @@ private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT {
|
||||||
f_init(testcasename());
|
f_init(testcasename());
|
||||||
|
|
||||||
f_init_l1ctl();
|
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 */
|
/* FIXME: switch to dedicated mode for SDCCH/8 */
|
||||||
|
|
||||||
/* send SMSCB[s] via RSL */
|
/* send SMSCB[s] via RSL */
|
||||||
|
|
|
@ -62,7 +62,8 @@ module L1CTL_Types {
|
||||||
type enumerated L1ctlCcchMode {
|
type enumerated L1ctlCcchMode {
|
||||||
CCCH_MODE_NONE (0),
|
CCCH_MODE_NONE (0),
|
||||||
CCCH_MODE_NON_COMBINED,
|
CCCH_MODE_NON_COMBINED,
|
||||||
CCCH_MODE_COMBINED
|
CCCH_MODE_COMBINED,
|
||||||
|
CCCH_MODE_COMBINED_CBCH
|
||||||
} with { variant "FIELDLENGTH(8)" };
|
} with { variant "FIELDLENGTH(8)" };
|
||||||
|
|
||||||
type enumerated L1ctlNeighMode {
|
type enumerated L1ctlNeighMode {
|
||||||
|
|
Loading…
Reference in New Issue