<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15458">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/L1CTL_PortType.ttcn: use templates from GSM_RR_Types<br><br>Get rid of template t_IMM_ASS, which is a part of L1CTL_Types.ttcn.<br>Prepare generic (for both CS and PS) template on top of tr_IMM_ASS,<br>and use it in f_L1CTL_WAIT_IMM_ASS().<br><br>Change-Id: I3a410ec3c41e3eefd23071bfb0d80feda82177a5<br>---<br>M library/L1CTL_PortType.ttcn<br>M library/L1CTL_Types.ttcn<br>2 files changed, 9 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn</span><br><span>index 3c83c3d..c595b03 100644</span><br><span>--- a/library/L1CTL_PortType.ttcn</span><br><span>+++ b/library/L1CTL_PortType.ttcn</span><br><span>@@ -127,15 +127,23 @@</span><br><span> }</span><br><span> </span><br><span> function f_L1CTL_WAIT_IMM_ASS(L1CTL_PT pt, uint8_t ra, GsmFrameNumber rach_fn) return ImmediateAssignment {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template GsmRrMessage rr_imm_ass;</span><br><span> var L1ctlDlMessage dl;</span><br><span> var GsmRrMessage rr;</span><br><span> timer T := 10.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prepare generic template (for both CS and PS) */</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_imm_ass := tr_IMM_ASS(ra, rach_fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_imm_ass.payload.imm_ass.ded_or_tbf := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_imm_ass.payload.imm_ass.pkt_chan_desc := *;</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_imm_ass.payload.imm_ass.chan_desc := *;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl {</span><br><span> rr := dec_GsmRrMessage(dl.payload.data_ind.payload);</span><br><span> log("PCH/AGCH DL RR: ", rr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(rr, t_RR_IMM_ASS(ra, rach_fn))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(rr, rr_imm_ass)) {</span><br><span> log("Received IMM.ASS for our RACH!");</span><br><span> } else {</span><br><span> repeat;</span><br><span>diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn</span><br><span>index 77c1f6a..e939f72 100644</span><br><span>--- a/library/L1CTL_Types.ttcn</span><br><span>+++ b/library/L1CTL_Types.ttcn</span><br><span>@@ -780,24 +780,6 @@</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template ImmediateAssignment t_IMM_ASS(uint8_t ra, GsmFrameNumber fn) := {</span><br><span style="color: hsl(0, 100%, 40%);">- ded_or_tbf := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- page_mode := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_desc := *,</span><br><span style="color: hsl(0, 100%, 40%);">- pkt_chan_desc := *,</span><br><span style="color: hsl(0, 100%, 40%);">- req_ref := f_compute_ReqRef(ra, fn),</span><br><span style="color: hsl(0, 100%, 40%);">- timing_advance := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- mobile_allocation := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets:= ?</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%);">- template GsmRrMessage t_RR_IMM_ASS(uint8_t ra, GsmFrameNumber fn) := {</span><br><span style="color: hsl(0, 100%, 40%);">- header := t_RrHeader(IMMEDIATE_ASSIGNMENT, ?),</span><br><span style="color: hsl(0, 100%, 40%);">- payload := {</span><br><span style="color: hsl(0, 100%, 40%);">- imm_ass := t_IMM_ASS(ra, fn)</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> const octetstring c_DummyUI := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O;</span><br><span> </span><br><span> /* We use "BYTEORDER(last)" so we get little-endian integers. Unfortuantely, this also</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15458">change 15458</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/+/15458"/><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: I3a410ec3c41e3eefd23071bfb0d80feda82177a5 </div>
<div style="display:none"> Gerrit-Change-Number: 15458 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>