diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-02-25 16:17:33 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-02-25 16:17:33 +0100 |
commit | 82ccef7c1847af2ba18a4886ee299e1de1137e38 (patch) | |
tree | c78cbe9c087b5964d358ae7b73a5d6b705116dc1 /bts/BTS_Tests.ttcn | |
parent | 3ae11dade50e8f3333b60feef5a812ad8dbaf902 (diff) |
Merge duplicate SI3 in GSM_RR_Types and GSM_SystemInformation
Let's have one SI3 definition rather than multiple...
Change-Id: I3c4754c9a69cb2fa51d88ef6358d5399dbb29860
Diffstat (limited to 'bts/BTS_Tests.ttcn')
-rw-r--r-- | bts/BTS_Tests.ttcn | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cc78057b..ba76cf63 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6,6 +6,7 @@ import from GSM_RR_Types all; import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; +import from GSM_SystemInformation all; import from L1CTL_PortType all; import from L1CTL_Types all; import from LAPDm_Types all; @@ -86,8 +87,16 @@ type record ConnHdlrPars { ConnL1Pars l1_pars } +template (value) RachControlParameters ts_RachCtrl_default := { + max_retrans := RACH_MAX_RETRANS_1, + tx_integer := '0000'B, /* 3 slots */ + cell_barr_access := false, + re_not_allowed := true, + acc := '1111111111111111'B +}; + /* Default SYSTEM INFORMATION 3 */ -template (value) GsmRrMessage ts_SI3_default := { +template (value) SystemInformation ts_SI3_default := { header := t_RrHeader(SYSTEM_INFORMATION_TYPE_3, 0), payload := { si3 := { @@ -101,32 +110,26 @@ template (value) GsmRrMessage ts_SI3_default := { att := true, bs_ag_blks_res := 1, ccch_conf := CCHAN_DESC_1CCCH_COMBINED, - si22_ind := false, + si22ind := false, cbq3 := CBQ3_IU_MODE_NOT_SUPPORTED, spare := '00'B, bs_pa_mfrms := 0, /* 2 multiframes */ t3212 := 1 /* 6 minutes */ }, - cell_opts := { + cell_options := { dn_ind := false, pwrc := false, dtx := MS_MAY_USE_UL_DTX, radio_link_tout_div4 := 4/4 }, - cell_sel_pars := { + cell_sel_par := { cell_resel_hyst_2dB := 0, ms_txpwr_max_cch := 0, acs := '0'B, neci := true, rxlev_access_min := 0 }, - rach_ctrl_pars := { - max_retrans := RACH_MAX_RETRANS_1, - tx_integer := '0000'B, /* 3 slots */ - cell_bar_access := false, - re_not_allowed := true, - acc := '1111111111111111'B - }, + rach_control := ts_RachCtrl_default, rest_octets := ''O } } @@ -139,9 +142,9 @@ function f_init(charstring id := "BTS-Test") runs on test_CT { f_sleep(0.5); /* workaround for OS#3000 */ /* Send SI3 to the BTS, it is needed for various computations */ - var GsmRrMessage si3 := valueof(ts_SI3_default); + var SystemInformation si3 := valueof(ts_SI3_default); log("Sending SI3 ", si3); - var octetstring si3_enc := enc_GsmRrMessage(si3); + var octetstring si3_enc := enc_SystemInformation(si3); RSL_CCHAN.send(ts_RSL_UD(ts_RSL_BCCH_INFO(RSL_SYSTEM_INFO_3, si3_enc))); } |