<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20105">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lib: Move ts_RaCapRec from RLCMAC_CSN1_Templates to L3_Templates<br><br>There is no reason whatsoevery why a L3_Templates.ttcn file should<br>ever include types from RLC/MAC. This creates a dependency nightmare.<br><br>The type for which ts_RaCapRec is written (MSRACapabilityValuesRecord)<br>originates from titan.ProtocolModules.MobileL3 so it's completely<br>unclear how any of that ever related too RLC/MAC.<br><br>Change-Id: Ie1ccef090ad51e26ccae17998e4294c6e27cf9c8<br>---<br>M library/L3_Templates.ttcn<br>M library/RLCMAC_CSN1_Templates.ttcn<br>2 files changed, 52 insertions(+), 53 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/05/20105/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn</span><br><span>index 8c0f494..2ef8773 100644</span><br><span>--- a/library/L3_Templates.ttcn</span><br><span>+++ b/library/L3_Templates.ttcn</span><br><span>@@ -20,7 +20,6 @@</span><br><span> import from MobileL3_CC_Types all;</span><br><span> import from MobileL3_GMM_SM_Types all;</span><br><span> import from MobileL3_SMS_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from RLCMAC_CSN1_Templates all;</span><br><span> </span><br><span> /* TS 24.007 Table 11.3 TI Flag */</span><br><span> const BIT1 c_TIF_ORIG := '0'B;</span><br><span>@@ -2095,6 +2094,58 @@</span><br><span> cnSpecificDRXCycleLength := '0000'B /* SI value used */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_presence_bit_MultislotCap_GPRS(template (omit) MultislotCap_GPRS mscap_gprs) return BIT1 {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(mscap_gprs, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return '0'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return '1'B;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_presence_bit_MultislotCap_EGPRS(template (omit) MultislotCap_EGPRS mscap_egprs) return BIT1 {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(mscap_egprs, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return '0'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return '1'B;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MSRACapabilityValuesRecord ts_RaCapRec(BIT4 att := '0001'B /* E-GSM */, template (omit) MultislotCap_GPRS mscap_gprs := omit, template (omit) MultislotCap_EGPRS mscap_egprs := omit) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mSRACapabilityValues := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mSRACapabilityValuesExclude1111 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ accessTechnType := att, /* E-GSM */</span><br><span style="color: hsl(120, 100%, 40%);">+ accessCapabilities := {</span><br><span style="color: hsl(120, 100%, 40%);">+ lengthIndicator := 0, /* overwritten */</span><br><span style="color: hsl(120, 100%, 40%);">+ accessCapabilities := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rfPowerCapability := '001'B, /* FIXME */</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitA5 := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ a5bits := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ esind := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ psbit := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ vgcs := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ vbs := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitMultislot := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ multislotcap := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitHscsd := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ hscsdmultislotclass := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitGprs := f_presence_bit_MultislotCap_GPRS(mscap_gprs),</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsmultislot := mscap_gprs,</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitSms := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ multislotCap_SMS := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ multislotCapAdditionsAfterRel97 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitEcsdmulti := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ ecsdmultislotclass := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitEgprsmulti := f_presence_bit_MultislotCap_EGPRS(mscap_egprs),</span><br><span style="color: hsl(120, 100%, 40%);">+ multislotCap_EGPRS := mscap_egprs,</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitDtmGprsmulti := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ multislotCapdtmgprsmultislotsubclass := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ accessCapAdditionsAfterRel97 := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ spare_bits := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ presenceBitMSRACap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) MSRadioAccessCapabilityLV ts_MS_RaCapa := {</span><br><span> lengthIndicator := 0, /* overwritten */</span><br><span> msRadioAccessCapabilityV := {</span><br><span>diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>index 0d7de99..21a7c46 100644</span><br><span>--- a/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>@@ -55,58 +55,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- private function f_presence_bit_MultislotCap_GPRS(template (omit) MultislotCap_GPRS mscap_gprs) return BIT1 {</span><br><span style="color: hsl(0, 100%, 40%);">- if (istemplatekind(mscap_gprs, "omit")) {</span><br><span style="color: hsl(0, 100%, 40%);">- return '0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return '1'B;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- private function f_presence_bit_MultislotCap_EGPRS(template (omit) MultislotCap_EGPRS mscap_egprs) return BIT1 {</span><br><span style="color: hsl(0, 100%, 40%);">- if (istemplatekind(mscap_egprs, "omit")) {</span><br><span style="color: hsl(0, 100%, 40%);">- return '0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return '1'B;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) MSRACapabilityValuesRecord ts_RaCapRec(BIT4 att := '0001'B /* E-GSM */, template (omit) MultislotCap_GPRS mscap_gprs := omit, template (omit) MultislotCap_EGPRS mscap_egprs := omit) := {</span><br><span style="color: hsl(0, 100%, 40%);">- mSRACapabilityValues := {</span><br><span style="color: hsl(0, 100%, 40%);">- mSRACapabilityValuesExclude1111 := {</span><br><span style="color: hsl(0, 100%, 40%);">- accessTechnType := att, /* E-GSM */</span><br><span style="color: hsl(0, 100%, 40%);">- accessCapabilities := {</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := 0, /* overwritten */</span><br><span style="color: hsl(0, 100%, 40%);">- accessCapabilities := {</span><br><span style="color: hsl(0, 100%, 40%);">- rfPowerCapability := '001'B, /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitA5 := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- a5bits := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- esind := '1'B,</span><br><span style="color: hsl(0, 100%, 40%);">- psbit := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- vgcs := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- vbs := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitMultislot := '1'B,</span><br><span style="color: hsl(0, 100%, 40%);">- multislotcap := {</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitHscsd := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- hscsdmultislotclass := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitGprs := f_presence_bit_MultislotCap_GPRS(mscap_gprs),</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislot := mscap_gprs,</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitSms := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- multislotCap_SMS := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- multislotCapAdditionsAfterRel97 := {</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitEcsdmulti := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- ecsdmultislotclass := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitEgprsmulti := f_presence_bit_MultislotCap_EGPRS(mscap_egprs),</span><br><span style="color: hsl(0, 100%, 40%);">- multislotCap_EGPRS := mscap_egprs,</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitDtmGprsmulti := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- multislotCapdtmgprsmultislotsubclass := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- accessCapAdditionsAfterRel97 := omit</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- spare_bits := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- presenceBitMSRACap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> private function f_presence_bit_MSRadioAccessCapabilityV(template (omit) MSRadioAccessCapabilityV ms_rac) return BIT1 {</span><br><span> if (istemplatekind(ms_rac, "omit")) {</span><br><span> return '0'B;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20105">change 20105</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/+/20105"/><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: Ie1ccef090ad51e26ccae17998e4294c6e27cf9c8 </div>
<div style="display:none"> Gerrit-Change-Number: 20105 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>