<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20795">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RSL_Types: reorder the arguments of ts_RSL_ChanMode_SIGN<br><br>This way it's consistent with ts_RSL_ChanMode, and there is<br>no need to pass dtx_downlink := false as the first param.<br><br>Change-Id: I0b87ef87f8cfff1c96b0beead29d549d5fe0b7c6<br>---<br>M bts/BTS_Tests.ttcn<br>M library/RSL_Types.ttcn<br>2 files changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/20795/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 1a6cca3..376a7d5 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -3010,7 +3010,7 @@</span><br><span> var ConnHdlrPars pars;</span><br><span> f_init();</span><br><span> for (var integer tn := 1; tn <= 4; tn := tn+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN(false, RSL_CHRT_TCH_F)));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_F)));</span><br><span> vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars,</span><br><span> pcu_comp := false, trxc_comp := true);</span><br><span> vc_conn.done;</span><br><span>@@ -3022,7 +3022,7 @@</span><br><span> var ConnHdlrPars pars;</span><br><span> f_init();</span><br><span> for (var integer ss := 0; ss <= 1; ss := ss+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(false, RSL_CHRT_TCH_H)));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_H)));</span><br><span> vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars,</span><br><span> pcu_comp := false, trxc_comp := true);</span><br><span> vc_conn.done;</span><br><span>@@ -3059,7 +3059,7 @@</span><br><span> f_init();</span><br><span> f_vty_config(BTSVTY, "bts 0", "supp-meas-info toa256");</span><br><span> for (var integer ss := 0; ss <= 1; ss := ss+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(false, RSL_CHRT_TCH_H)));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_H)));</span><br><span> pars.l1_pars.toa256_enabled := true;</span><br><span> vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -6514,7 +6514,7 @@</span><br><span> f_unitdata_mo(link_id, l3);</span><br><span> </span><br><span> var RSL_Message rsl;</span><br><span style="color: hsl(0, 100%, 40%);">- rsl := valueof(ts_RSL_MODE_MODIFY_REQ(g_chan_nr, valueof(ts_RSL_ChanMode_SIGN(false))));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl := valueof(ts_RSL_MODE_MODIFY_REQ(g_chan_nr, ts_RSL_ChanMode_SIGN));</span><br><span> </span><br><span> /* modify key to break proper encryption */</span><br><span> g_pars.encr.key := f_rnd_octstring(8);</span><br><span>@@ -6833,12 +6833,14 @@</span><br><span> }</span><br><span> </span><br><span> private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RSL_IE_ChannelMode ch_mode;</span><br><span> var ConnHdlr vc_conn;</span><br><span> var ConnHdlrPars pars;</span><br><span> pars.t_guard := 60.0;</span><br><span> f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_mode := ts_RSL_ChanMode_SIGN(dtx_downlink := dtxd);</span><br><span> for (var integer i := 0; i < sizeof(g_AllChannels); i := i + 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- pars := valueof(t_Pars(g_AllChannels[i], ts_RSL_ChanMode_SIGN(dtxd)));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := valueof(t_Pars(g_AllChannels[i], ch_mode));</span><br><span> if (dtxd) {</span><br><span> if (i >= 4) { /* DTX is only allowed on TCH/F */</span><br><span> break;</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index ff60a37..2bbbd3b 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -397,8 +397,8 @@</span><br><span> RSL_SpeechAlgo coding_alg_rate</span><br><span> } with { variant (len) "LENGTHTO(reserved,dtx_d,dtx_u,spd_ind,ch_rate_type,coding_alg_rate)" }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(boolean dtx_downlink := false,</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_ChanRateType t := RSL_CHRT_SDCCH) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(RSL_ChanRateType t := RSL_CHRT_SDCCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean dtx_downlink := false) := {</span><br><span> len := 0, /* overwritten */</span><br><span> reserved := '000000'B,</span><br><span> dtx_d := dtx_downlink,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20795">change 20795</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20795"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0b87ef87f8cfff1c96b0beead29d549d5fe0b7c6 </div>
<div style="display:none"> Gerrit-Change-Number: 20795 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>