<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11147">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">L1CTL_Types: Add support to set L1 Header params during SACCH tx<br><br>Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2<br>---<br>M library/GSM_RR_Types.ttcn<br>M library/L1CTL_Types.ttcn<br>2 files changed, 38 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn</span><br><span>index ef209e4..675271f 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -158,6 +158,21 @@</span><br><span> message_type := msg_type</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TS 44.004 7.2.1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ type record SacchL1Header {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint2_t reserved,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean fpc,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint5_t ms_power_lvl,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t actual_ta</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "FIELDORDER(msb)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) SacchL1Header ts_SacchL1Header(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ reserved := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ fpc := fpc,</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_lvl := ms_power_lvl,</span><br><span style="color: hsl(120, 100%, 40%);">+ actual_ta := actual_ta</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record MaioHsn {</span><br><span> } with { variant "" };</span><br><span> </span><br><span>diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn</span><br><span>index 656f292..39732be 100644</span><br><span>--- a/library/L1CTL_Types.ttcn</span><br><span>+++ b/library/L1CTL_Types.ttcn</span><br><span>@@ -263,6 +263,11 @@</span><br><span> OCT2 padding</span><br><span> } with { variant "" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ type record L1ctlDataReq {</span><br><span style="color: hsl(120, 100%, 40%);">+ SacchL1Header l1header optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring l2_payload</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record L1ctlH1 {</span><br><span> uint8_t hsn,</span><br><span> uint8_t maio,</span><br><span>@@ -320,6 +325,7 @@</span><br><span> L1CtlCryptoReq crypto_req,</span><br><span> L1ctlTrafficReq traffic_req,</span><br><span> L1ctlTbfCfgReq tbf_cfg_req,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1ctlDataReq data_req,</span><br><span> octetstring other</span><br><span> } with {</span><br><span> variant (other) "BYTEORDER(first)"</span><br><span>@@ -351,6 +357,7 @@</span><br><span> crypto_req, header.msg_type = L1CTL_CRYPTO_REQ;</span><br><span> traffic_req, header.msg_type = L1CTL_TRAFFIC_REQ;</span><br><span> tbf_cfg_req, header.msg_type = L1CTL_TBF_CFG_REQ;</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req, header.msg_type = L1CTL_DATA_REQ;</span><br><span> other, OTHERWISE;</span><br><span> )" };</span><br><span> </span><br><span>@@ -542,6 +549,22 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) L1ctlUlMessage ts_L1CTL_DATA_REQ_SACCH(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RslLinkId link_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1ctlDataReq data_req) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ header := ts_L1ctlHeader(L1CTL_DATA_REQ),</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_info := {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_nr := chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ link_id := link_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ padding := '0000'O</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_info_tbf := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_info_abs := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := {</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req := data_req</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> template (value) L1ctlUlMessage ts_L1CTL_TBF_CFG_REQ(boolean is_uplink, TfiUsfArr tfi_usf) := {</span><br><span> header := ts_L1ctlHeader(L1CTL_TBF_CFG_REQ),</span><br><span> ul_info := omit,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11147">change 11147</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/11147"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 </div>
<div style="display:none"> Gerrit-Change-Number: 11147 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>