<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21033">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RLCMAC_EncDec: Provide decoded (m)cs in (E)GPRS data blocks<br><br>Let's provide this information to higher layer since CS is mostly<br>discovered by original bitstring size which is available during<br>decoding.<br><br>Call the size2mcs converter in each function to avoid having to pass it<br>as a parameter and have it selfcontained, meaning one can simply call<br>decode(bitstring) from TTCN3 code and be done with it.<br><br>Change-Id: I80ed44e575cc0a11510832e5bbfc07173e7b75b8<br>---<br>M library/RLCMAC_EncDec.cc<br>M library/RLCMAC_Templates.ttcn<br>M library/RLCMAC_Types.ttcn<br>3 files changed, 27 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc</span><br><span>index d25a7e0..6b78064 100644</span><br><span>--- a/library/RLCMAC_EncDec.cc</span><br><span>+++ b/library/RLCMAC_EncDec.cc</span><br><span>@@ -450,6 +450,8 @@</span><br><span> TTCN_Buffer ttcn_buffer(stream);</span><br><span> int num_llc_blocks = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.cs() = payload_len_2_coding_scheme(stream.lengthof());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* use automatic/generated decoder for header */</span><br><span> ret_val.mac__hdr().decode(DlMacDataHeader_descr_, ttcn_buffer, TTCN_EncDec::CT_RAW);</span><br><span> </span><br><span>@@ -541,7 +543,7 @@</span><br><span> }</span><br><span> </span><br><span> static</span><br><span style="color: hsl(0, 100%, 40%);">-RlcmacDlEgprsDataBlock dec__RlcmacDlEgprsDataBlock(const OCTETSTRING& stream, CodingScheme::enum_type mcs)</span><br><span style="color: hsl(120, 100%, 40%);">+RlcmacDlEgprsDataBlock dec__RlcmacDlEgprsDataBlock(const OCTETSTRING& stream)</span><br><span> {</span><br><span> RlcmacDlEgprsDataBlock ret_val;</span><br><span> TTCN_Buffer ttcn_buffer(stream);</span><br><span>@@ -551,7 +553,8 @@</span><br><span> unsigned int num_calls;</span><br><span> const uint8_t *ti_e;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (mcs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.mcs() = payload_len_2_coding_scheme(stream.lengthof());</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ret_val.mcs()) {</span><br><span> case CodingScheme::MCS__0:</span><br><span> case CodingScheme::MCS__1:</span><br><span> case CodingScheme::MCS__2:</span><br><span>@@ -569,7 +572,7 @@</span><br><span> ret_val.mac__hdr() = dec__EgprsDlMacDataHeader_type1(stream);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- setup_rlc_mac_priv(mcs, ret_val.mac__hdr().header__type(), false,</span><br><span style="color: hsl(120, 100%, 40%);">+ setup_rlc_mac_priv(ret_val.mcs(), ret_val.mac__hdr().header__type(), false,</span><br><span> &num_calls, &data_block_bits, data_block_offsets);</span><br><span> get_egprs_data_block(ttcn_buffer, data_block_offsets[0], data_block_bits, aligned_buffer);</span><br><span> </span><br><span>@@ -611,10 +614,10 @@</span><br><span> {</span><br><span> RlcmacDlBlock ret_val;</span><br><span> size_t stream_len = stream.lengthof();</span><br><span style="color: hsl(0, 100%, 40%);">- CodingScheme::enum_type mcs = payload_len_2_coding_scheme(stream_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme::enum_type cs_mcs = payload_len_2_coding_scheme(stream_len);</span><br><span> unsigned char pt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (mcs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cs_mcs) {</span><br><span> case CodingScheme::CS__1:</span><br><span> case CodingScheme::CS__2:</span><br><span> case CodingScheme::CS__3:</span><br><span>@@ -635,7 +638,7 @@</span><br><span> case CodingScheme::MCS__7:</span><br><span> case CodingScheme::MCS__8:</span><br><span> case CodingScheme::MCS__9:</span><br><span style="color: hsl(0, 100%, 40%);">- ret_val.data__egprs() = dec__RlcmacDlEgprsDataBlock(stream, mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.data__egprs() = dec__RlcmacDlEgprsDataBlock(stream);</span><br><span> break;</span><br><span> }</span><br><span> return ret_val;</span><br><span>@@ -655,6 +658,8 @@</span><br><span> stream.log();</span><br><span> TTCN_Logger::end_event();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.cs() = payload_len_2_coding_scheme(stream.lengthof());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* use automatic/generated decoder for header */</span><br><span> ret_val.mac__hdr().decode(UlMacDataHeader_descr_, ttcn_buffer, TTCN_EncDec::CT_RAW);</span><br><span> </span><br><span>@@ -792,7 +797,7 @@</span><br><span> return ret_val;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RlcmacUlEgprsDataBlock dec__RlcmacUlEgprsDataBlock(const OCTETSTRING& stream, CodingScheme::enum_type mcs)</span><br><span style="color: hsl(120, 100%, 40%);">+RlcmacUlEgprsDataBlock dec__RlcmacUlEgprsDataBlock(const OCTETSTRING& stream)</span><br><span> {</span><br><span> RlcmacUlEgprsDataBlock ret_val;</span><br><span> TTCN_Buffer ttcn_buffer(stream);</span><br><span>@@ -802,7 +807,8 @@</span><br><span> unsigned int num_calls;</span><br><span> const uint8_t *ti_e;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (mcs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.mcs() = payload_len_2_coding_scheme(stream.lengthof());</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ret_val.mcs()) {</span><br><span> case CodingScheme::MCS__1:</span><br><span> case CodingScheme::MCS__2:</span><br><span> case CodingScheme::MCS__3:</span><br><span>@@ -819,7 +825,7 @@</span><br><span> ret_val.mac__hdr() = dec__EgprsUlMacDataHeader_type1(stream);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- setup_rlc_mac_priv(mcs, ret_val.mac__hdr().header__type(), true,</span><br><span style="color: hsl(120, 100%, 40%);">+ setup_rlc_mac_priv(ret_val.mcs(), ret_val.mac__hdr().header__type(), true,</span><br><span> &num_calls, &data_block_bits, data_block_offsets);</span><br><span> get_egprs_data_block(ttcn_buffer, data_block_offsets[0], data_block_bits, aligned_buffer);</span><br><span> </span><br><span>@@ -889,10 +895,10 @@</span><br><span> {</span><br><span> RlcmacUlBlock ret_val;</span><br><span> size_t stream_len = stream.lengthof();</span><br><span style="color: hsl(0, 100%, 40%);">- CodingScheme::enum_type mcs = payload_len_2_coding_scheme(stream_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme::enum_type cs_mcs = payload_len_2_coding_scheme(stream_len);</span><br><span> unsigned char pt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (mcs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cs_mcs) {</span><br><span> case CodingScheme::CS__1:</span><br><span> case CodingScheme::CS__2:</span><br><span> case CodingScheme::CS__3:</span><br><span>@@ -912,7 +918,7 @@</span><br><span> case CodingScheme::MCS__7:</span><br><span> case CodingScheme::MCS__8:</span><br><span> case CodingScheme::MCS__9:</span><br><span style="color: hsl(0, 100%, 40%);">- ret_val.data__egprs() = dec__RlcmacUlEgprsDataBlock(stream, mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret_val.data__egprs() = dec__RlcmacUlEgprsDataBlock(stream);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index edf6516..f7bd570 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -374,6 +374,7 @@</span><br><span> template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn,</span><br><span> template LlcBlocks blocks := {}, template boolean stall := false) := {</span><br><span> data := {</span><br><span style="color: hsl(120, 100%, 40%);">+ cs := CS_1, /* TODO: make this available to template */</span><br><span> mac_hdr := {</span><br><span> payload_type := MAC_PT_RLC_DATA,</span><br><span> countdown := cv,</span><br><span>@@ -394,6 +395,7 @@</span><br><span> template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template uint5_t tfi, template uint4_t cv, template uint7_t bsn,</span><br><span> template LlcBlocks blocks := {}, template boolean stall := false, template GprsTlli tlli) := {</span><br><span> data := {</span><br><span style="color: hsl(120, 100%, 40%);">+ cs := CS_1, /* TODO: make this available to template */</span><br><span> mac_hdr := {</span><br><span> payload_type := MAC_PT_RLC_DATA,</span><br><span> countdown := cv,</span><br><span>@@ -417,6 +419,7 @@</span><br><span> template uint5_t tfi, template uint4_t cv,</span><br><span> template uint11_t bsn1, template EgprsLlcBlocks blocks := {}) := {</span><br><span> data_egprs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs := mcs,</span><br><span> mac_hdr := {</span><br><span> header_type := f_rlcmac_mcs2headertype(mcs),</span><br><span> tfi := tfi,</span><br><span>@@ -657,6 +660,7 @@</span><br><span> template (present) MacRrbp rrbp := ?,</span><br><span> template (present) uint3_t usf := ?) := {</span><br><span> data := {</span><br><span style="color: hsl(120, 100%, 40%);">+ cs := ?,</span><br><span> mac_hdr := {</span><br><span> mac_hdr := {</span><br><span> payload_type := MAC_PT_RLC_DATA,</span><br><span>@@ -672,6 +676,7 @@</span><br><span> </span><br><span> template RlcmacDlBlock tr_RLCMAC_DATA_EGPRS := {</span><br><span> data_egprs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs := ?,</span><br><span> mac_hdr := ?,</span><br><span> fbi := ?,</span><br><span> e := ?,</span><br><span>diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn</span><br><span>index 96b8a64..80a9997 100644</span><br><span>--- a/library/RLCMAC_Types.ttcn</span><br><span>+++ b/library/RLCMAC_Types.ttcn</span><br><span>@@ -182,6 +182,7 @@</span><br><span> DlMacHdrDataExt hdr_ext</span><br><span> } with { variant "" };</span><br><span> type record RlcmacDlDataBlock {</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme cs, /* Provided by C++ Decoder */</span><br><span> DlMacDataHeader mac_hdr,</span><br><span> /* Octet 3..M / N: manual C++ Decoder */</span><br><span> LlcBlocks blocks</span><br><span>@@ -230,6 +231,7 @@</span><br><span> } with { variant "" };</span><br><span> /* Manual C++ Decoder: */</span><br><span> type record RlcmacDlEgprsDataBlock {</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme mcs, /* Provided by C++ Decoder */</span><br><span> EgprsDlMacDataHeader mac_hdr,</span><br><span> boolean fbi,</span><br><span> boolean e,</span><br><span>@@ -286,6 +288,7 @@</span><br><span> };</span><br><span> /* Manual C++ Decoder: 10.3a.2.1 EGPRS Uplink RLC data block */</span><br><span> type record RlcmacUlEgprsDataBlock {</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme mcs, /* Provided by C++ Decoder */</span><br><span> EgprsUlMacDataHeader mac_hdr,</span><br><span> boolean tlli_ind,</span><br><span> boolean e,</span><br><span>@@ -300,6 +303,7 @@</span><br><span> </span><br><span> /* TS 44.060 10.2.2 */</span><br><span> type record RlcmacUlDataBlock {</span><br><span style="color: hsl(120, 100%, 40%);">+ CodingScheme cs, /* Provided by C++ Decoder */</span><br><span> /* MAC header */</span><br><span> UlMacDataHeader mac_hdr,</span><br><span> /* Octet 3 ... M (optional): manual C++ Decoder */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21033">change 21033</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/+/21033"/><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: I80ed44e575cc0a11510832e5bbfc07173e7b75b8 </div>
<div style="display:none"> Gerrit-Change-Number: 21033 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>