From 7fefceea711acd54cd3806aeaeed609d3222a528 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 12 Sep 2020 20:04:08 +0700 Subject: BTS_Tests_SMSCB: handle frequency hopping parameters Change-Id: I1fd0a46b3d23afabae81fd1da5d2466e61e4a806 Related: SYS#4868, OS#4708 --- bts/BTS_Tests_SMSCB.ttcn | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 29489fc3..953801bb 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -56,6 +56,8 @@ t_CbchPC(template (value) CbchTestMsgs msgs, template (omit) CbchTestMsg def := type record CbchTestPars { /* Should we execute on SDCCH4 or SDCCH8? */ RslChannelNr chan_nr, + /* Frequency Hopping parameters */ + FreqHopPars fhp, /* Parameters for BASIC CBCH */ CbchTestParsChan basic, /* Parameters for EXTENDED CBCH */ @@ -235,6 +237,12 @@ private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT { mtc.stop; } + /* Obtain frequency hopping parameters for a given timeslot */ + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars.fhp, pars.chan_nr.tn); } + else + { pars.fhp.enabled := false; } + f_cbch_compute_exp_blocks(pars); f_init_vty_bsc(); @@ -249,10 +257,18 @@ private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT { f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); } else { f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED); - /* TODO: also handle frequency hopping parameters */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, - 7 /* TODO: mp_tsc */, - mp_trx0_arfcn)); + + if (pars.fhp.enabled) { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, + 7 /* TODO: mp_tsc */, + pars.fhp.maio_hsn.hsn, + pars.fhp.maio_hsn.maio, + pars.fhp.ma)); + } else { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } } /* send SMSCB[s] via RSL */ -- cgit v1.2.3