<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18547">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu/GPRS_Components: return GsmRrMessage from f_pcuif_rx_imm_ass()<br><br>Change-Id: Ide6a00348b81a637309644be82a523c99f9fd30a<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 8 insertions(+), 16 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/47/18547/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 d576260..a91f8df 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -515,10 +515,10 @@</span><br><span> // OLD APIs</span><br><span> ////////////////////////</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_pcuif_rx_imm_ass(out GsmRrMessage rr_imm_ass,</span><br><span style="color: hsl(0, 100%, 40%);">- template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,</span><br><span style="color: hsl(120, 100%, 40%);">+function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,</span><br><span> template GsmRrMessage t_imm_ass := ?)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on MS_BTS_IFACE_CT return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return GsmRrMessage {</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmRrMessage rr_imm_ass;</span><br><span> var PCUIF_Message pcu_msg;</span><br><span> var octetstring data;</span><br><span> timer T;</span><br><span>@@ -549,7 +549,6 @@</span><br><span> }</span><br><span> </span><br><span> setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span> }</span><br><span> [] BTS.receive { repeat; }</span><br><span> [] T.timeout {</span><br><span>@@ -558,19 +557,18 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rr_imm_ass;</span><br><span> }</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> </span><br><span> /* Establish an Uplink TBF by sending RACH.ind towards the PCU */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_establish_tbf(out GsmRrMessage rr_imm_ass,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ra := bit2int(chan_req_def),</span><br><span style="color: hsl(120, 100%, 40%);">+function f_establish_tbf(uint16_t ra := bit2int(chan_req_def),</span><br><span> uint8_t is_11bit := 0,</span><br><span> PCUIF_BurstType burst_type := BURST_TYPE_0,</span><br><span> TimingAdvance ta := 0)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on MS_BTS_IFACE_CT return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return GsmRrMessage {</span><br><span> var uint32_t fn;</span><br><span> </span><br><span> /* FIXME: ask the BTS component to give us the current TDMA fn */</span><br><span>@@ -590,8 +588,7 @@</span><br><span> if (is_11bit != 0) { ra := 127; }</span><br><span> </span><br><span> /* Expect Immediate (TBF) Assignment on TS0/AGCH */</span><br><span style="color: hsl(0, 100%, 40%);">- return f_pcuif_rx_imm_ass(rr_imm_ass, PCU_IF_SAPI_AGCH,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_IMM_TBF_ASS(false, ra, fn));</span><br><span style="color: hsl(120, 100%, 40%);">+ return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn));</span><br><span> }</span><br><span> </span><br><span> /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index ca37431..ff5da82 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -1635,7 +1635,6 @@</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span> var template ReqRefWaitInd tr_ref;</span><br><span> var GsmRrMessage rr_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- var boolean ok;</span><br><span> </span><br><span> /* Send RACH.ind with malformed EGPRS Packet Channel Request */</span><br><span> BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0,</span><br><span>@@ -1644,11 +1643,7 @@</span><br><span> arfcn := 871));</span><br><span> </span><br><span> /* Abuse f_pcuif_rx_imm_ass(): wait for Immediate Assignment Reject */</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_pcuif_rx_imm_ass(rr_msg, t_imm_ass := tr_IMM_ASS_REJ);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to match Immediate Assignment Reject");</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_msg := f_pcuif_rx_imm_ass(t_imm_ass := tr_IMM_ASS_REJ);</span><br><span> </span><br><span> /* Just to have a short-name reference to the actual message */</span><br><span> var ImmediateAssignmentReject iar := rr_msg.payload.imm_ass_rej;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18547">change 18547</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/+/18547"/><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: Ide6a00348b81a637309644be82a523c99f9fd30a </div>
<div style="display:none"> Gerrit-Change-Number: 18547 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>