From cc75145131c19a680049ada58462092f952149ab Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 28 Jun 2021 12:19:13 +0200 Subject: Rename osmo dyn ts enums to contain SDCCH8 They will gain support to be activated as SDCCH/8 soon too. Related: OS#5309 Depends: libosmocore.git I56dcfe4d17899630b17f80145c3ced72f1e91e68 Change-Id: Id5b89fe589a52ff88486435ac43809edb4b80f98 --- tests/ctrl_test_runner.py | 2 +- tests/handover/handover_test.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 64f93fc1d..bd2cb1061 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -234,7 +234,7 @@ class TestCtrlBSC(TestCtrlBase): self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' - + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0') + + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_SDCCH8_PDCH,0,0') def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index bcf9019c9..2ff9f31df 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -187,7 +187,7 @@ enum gsm_phys_chan_config pchan_from_str(const char *str) { enum gsm_phys_chan_config pchan; if (!strcmp(str, "dyn")) - return GSM_PCHAN_TCH_F_TCH_H_PDCH; + return GSM_PCHAN_OSMO_DYN; if (!strcmp(str, "c+s4")) return GSM_PCHAN_CCCH_SDCCH4; if (!strcmp(str, "-")) @@ -270,7 +270,7 @@ static struct gsm_bts *_create_bts(int num_trx, const char * const *ts_args, int /* Unused dyn TS start out as used for PDCH */ switch (trx->ts[i].pchan_on_init) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: + case GSM_PCHAN_OSMO_DYN: case GSM_PCHAN_TCH_F_PDCH: ts_set_pchan_is(&trx->ts[i], GSM_PCHAN_PDCH); break; @@ -392,7 +392,7 @@ struct gsm_lchan *lchan_act(struct gsm_lchan *lchan, int full_rate, const char * /* Fake osmo_mgcpc_ep_ci to indicate that the lchan is used for voice */ lchan->mgw_endpoint_ci_bts = (void*)1; - if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH) + if (lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN) ts_set_pchan_is(lchan->ts, full_rate ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H); if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) { OSMO_ASSERT(full_rate); @@ -722,7 +722,7 @@ int __wrap_abis_rsl_sendmsg(struct msgb *msg) /* send dyn TS back to PDCH if unused */ switch (lchan->ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: + case GSM_PCHAN_OSMO_DYN: case GSM_PCHAN_TCH_F_PDCH: switch (lchan->ts->pchan_is) { case GSM_PCHAN_TCH_H: @@ -884,8 +884,8 @@ DEFUN(create_bts, create_bts_cmd, "Create N TRX in the new BTS\n" "TRX count\n" "Timeslot config\n" - "Timeslot types for 8 * trx-count, each being one of CCCH+SDCCH4|SDCCH8|TCH/F|TCH/H|TCH/F_TCH/H_PDCH|...;" - " shorthands: cs+4 = CCCH+SDCCH4; dyn = TCH/F_TCH/H_PDCH\n") + "Timeslot types for 8 * trx-count, each being one of CCCH+SDCCH4|SDCCH8|TCH/F|TCH/H|TCH/F_TCH/H_SDCCH8_PDCH|...;" + " shorthands: cs+4 = CCCH+SDCCH4; dyn = TCH/F_TCH/H_SDCCH8_PDCH\n") { int num_trx = atoi(argv[0]); VTY_ECHO(); -- cgit v1.2.3