<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18379">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Parse USF from Pkt Ul Ass<br><br>Change-Id: If786d838f24755f3207d57c849ac28e58a7ee1c6<br>---<br>M pcu/GPRS_Components.ttcn<br>1 file changed, 30 insertions(+), 8 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/79/18379/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn</span><br><span>index ca4bcd7..cf5dca8 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -63,9 +63,10 @@</span><br><span> };</span><br><span> </span><br><span> type record UlTbf {</span><br><span style="color: hsl(0, 100%, 40%);">- GsmRrMessage rr_imm_ass,</span><br><span style="color: hsl(0, 100%, 40%);">- PacketUlAssignChan ass,</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmRrMessage rr_imm_ass optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketUlAssignChan ass optional,</span><br><span> uint5_t tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint3_t usf[8],</span><br><span> boolean is_egprs,</span><br><span> uint14_t bsn,</span><br><span> CodingScheme tx_cs_mcs</span><br><span>@@ -92,6 +93,7 @@</span><br><span> </span><br><span> /* One phase packet access (see 3GPP TS 44.018, table 9.1.8.1) */</span><br><span> const BIT8 chan_req_def := '01111000'B;</span><br><span style="color: hsl(120, 100%, 40%);">+const uint3_t USF_UNUSED := 7; /* used to indicate PRACH */</span><br><span> </span><br><span> template (value) GprsMS t_GprsMS_def := {</span><br><span> imsi := f_gen_imsi(42),</span><br><span>@@ -105,6 +107,16 @@</span><br><span> dl_tbf := omit</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template (value) UlTbf t_UlTbf_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_imm_ass := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ ass := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ tfi := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ usf := { USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED, USF_UNUSED },</span><br><span style="color: hsl(120, 100%, 40%);">+ is_egprs := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ bsn := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_cs_mcs := CS_1</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type component MS_BTS_IFACE_CT {</span><br><span> /* Virtual BTS component */</span><br><span> var RAW_PCU_BTS_CT vc_BTS;</span><br><span>@@ -146,10 +158,10 @@</span><br><span> </span><br><span> function f_ultbf_new_from_rr_imm_ass(in GsmRrMessage rr_imm_ass)</span><br><span> runs on MS_BTS_IFACE_CT return UlTbf {</span><br><span style="color: hsl(0, 100%, 40%);">- var UlTbf ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ var UlTbf ul_tbf := valueof(t_UlTbf_def);</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t tn_allocated := rr_imm_ass.payload.imm_ass.pkt_chan_desc.tn;</span><br><span> </span><br><span> ul_tbf.rr_imm_ass := rr_imm_ass;</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf.bsn := 0;</span><br><span> </span><br><span> /* Make sure we received an UL TBF Assignment */</span><br><span> if (match(rr_imm_ass, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {</span><br><span>@@ -158,6 +170,7 @@</span><br><span> ul_tbf.is_egprs := false;</span><br><span> if (match(ul_tbf.ass.ccch, tr_PacketUlDynAssign)) {</span><br><span> ul_tbf.tfi := ul_tbf.ass.ccch.dynamic.tfi_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf.usf[tn_allocated] := ul_tbf.ass.ccch.dynamic.usf;</span><br><span> } else if (match(ul_tbf.ass.ccch, tr_PacketUlSglAssign)) {</span><br><span> /* Nothing to do here yet */</span><br><span> }</span><br><span>@@ -167,6 +180,7 @@</span><br><span> ul_tbf.is_egprs := true;</span><br><span> if (match(ul_tbf.ass.ccch_egprs, tr_EgprsUlAssDynamic)) {</span><br><span> ul_tbf.tfi := ul_tbf.ass.ccch_egprs.dynamic.tfi_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf.usf[tn_allocated] := ul_tbf.ass.ccch_egprs.dynamic.usf;</span><br><span> } else if (match(ul_tbf.ass.ccch_egprs, tr_EgprsUlAssMultiblock)) {</span><br><span> /* Nothing to do here yet */</span><br><span> }</span><br><span>@@ -181,10 +195,9 @@</span><br><span> </span><br><span> function f_ultbf_new_from_ass_pacch(RlcmacDlBlock dl_block)</span><br><span> runs on MS_BTS_IFACE_CT return UlTbf {</span><br><span style="color: hsl(0, 100%, 40%);">- var UlTbf ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ var UlTbf ul_tbf := valueof(t_UlTbf_def);</span><br><span> </span><br><span> ul_tbf.ass.pacch := dl_block.ctrl.payload.u.ul_assignment;</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf.bsn := 0;</span><br><span> ul_tbf.tx_cs_mcs := f_rlcmac_dl_block_get_assigned_ul_cs_mcs(dl_block);</span><br><span> ul_tbf.tfi := f_rlcmac_dl_block_get_tfi(dl_block);</span><br><span> /* TODO: handle GlobalTfiOrTlli tfi_or_tlli from pkt_ul_ass */</span><br><span>@@ -193,10 +206,19 @@</span><br><span> if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS_GPRS(?, tr_PktUlAssGprsDynamic(tr_DynamicAllocation(?))))) {</span><br><span> ul_tbf.tfi := dl_block.ctrl.payload.u.ul_assignment.gprs.dyn_block_alloc.ul_tfi_assignment;</span><br><span> ul_tbf.is_egprs := false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS_EGPRS(?, tr_PktUlAssEgprsDynamic(tr_DynamicAllocation(?))))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < 8; i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dl_block.ctrl.payload.u.ul_assignment.gprs.dyn_block_alloc.ts_allocation.ts[i].presence == '1'B) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf.usf[i] := dl_block.ctrl.payload.u.ul_assignment.gprs.dyn_block_alloc.ts_allocation.ts[i].usf_tn;</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%);">+ } else if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS_EGPRS(?, tr_PktUlAssEgprsDynamic(tr_DynamicAllocation(?))))) {</span><br><span> ul_tbf.tfi := dl_block.ctrl.payload.u.ul_assignment.egprs.dyn_block_alloc.ul_tfi_assignment;</span><br><span> ul_tbf.is_egprs := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < 8; i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dl_block.ctrl.payload.u.ul_assignment.egprs.dyn_block_alloc.ts_allocation.ts[i].presence == '1'B) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf.usf[i] := dl_block.ctrl.payload.u.ul_assignment.egprs.dyn_block_alloc.ts_allocation.ts[i].usf_tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> return ul_tbf;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18379">change 18379</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/+/18379"/><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: If786d838f24755f3207d57c849ac28e58a7ee1c6 </div>
<div style="display:none"> Gerrit-Change-Number: 18379 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>