<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20753">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/L1CTL_PortType: fix indention in alt() statements<br><br>Change-Id: Ic13c2acbe1379558884fa7d11ba0b52ef31544f3<br>---<br>M library/L1CTL_PortType.ttcn<br>1 file changed, 53 insertions(+), 53 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 94f807a..7d69b46 100644</span><br><span>--- a/library/L1CTL_PortType.ttcn</span><br><span>+++ b/library/L1CTL_PortType.ttcn</span><br><span>@@ -90,12 +90,12 @@</span><br><span> T.start</span><br><span> pt.send(ts_L1CTL_RACH_REQ(ra, combined, offset, chan_nr, link_id))</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn := rc.dl_info.frame_nr };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive { repeat; };</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for L1CTL_RACH_CONF");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn := rc.dl_info.frame_nr };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive { repeat; };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for L1CTL_RACH_CONF");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> return fn;</span><br><span> }</span><br><span>@@ -111,12 +111,12 @@</span><br><span> T.start;</span><br><span> pt.send(ts_L1CTL_EXT_RACH_REQ(ra11, seq, combined, offset));</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn := rc.dl_info.frame_nr };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive { repeat; };</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for (extended) L1CTL_RACH_CONF");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn := rc.dl_info.frame_nr };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive { repeat; };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for (extended) L1CTL_RACH_CONF");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> return fn;</span><br><span>@@ -140,20 +140,20 @@</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl {</span><br><span style="color: hsl(0, 100%, 40%);">- rr := dec_GsmRrMessage(dl.payload.data_ind.payload);</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCH/AGCH DL RR: ", rr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(rr, rr_imm_ass)) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received IMM.ASS for our RACH!");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</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%);">- [] pt.receive { repeat };</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for IMM ASS");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ rr := dec_GsmRrMessage(dl.payload.data_ind.payload);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("PCH/AGCH DL RR: ", rr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(rr, rr_imm_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Received IMM.ASS for our RACH!");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</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%);">+ [] pt.receive { repeat };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for IMM ASS");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> T.stop;</span><br><span> return rr.payload.imm_ass;</span><br><span>@@ -167,21 +167,21 @@</span><br><span> timer T := 10.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: use decmatch tr_IaRestOctets_DLAss(...) instead */</span><br><span style="color: hsl(0, 100%, 40%);">- rr := dec_GsmRrMessage(dl.payload.data_ind.payload);</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCH/AGCN DL RR: ", rr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(rr, tr_IMM_TBF_ASS(dl := true, rest := rest))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received IMM.ASS for our TLLI!");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</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%);">- [] pt.receive { repeat };</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for TBF IMM ASS");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: use decmatch tr_IaRestOctets_DLAss(...) instead */</span><br><span style="color: hsl(120, 100%, 40%);">+ rr := dec_GsmRrMessage(dl.payload.data_ind.payload);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("PCH/AGCN DL RR: ", rr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(rr, tr_IMM_TBF_ASS(dl := true, rest := rest))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Received IMM.ASS for our TLLI!");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</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%);">+ [] pt.receive { repeat };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for TBF IMM ASS");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> T.stop;</span><br><span> return rr.payload.imm_ass;</span><br><span>@@ -192,12 +192,12 @@</span><br><span> T.start;</span><br><span> pt.send(ts_L1CTL_TBF_CFG_REQ(is_uplink, tfi_usf));</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_TBF_CFG_CONF(is_uplink)) {}</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive { repeat };</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for L1CTL_TBF_CFG_CONF");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_TBF_CFG_CONF(is_uplink)) {}</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive { repeat };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for L1CTL_TBF_CFG_CONF");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> }</span><br><span> T.stop;</span><br><span> }</span><br><span>@@ -236,12 +236,12 @@</span><br><span> pt.send(t_L1ctlResetReq(res_type));</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(tr_L1CTL_MsgType(L1CTL_RESET_CONF)) { }</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for L1CTL_RESET_CONF");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_MsgType(L1CTL_RESET_CONF)) { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for L1CTL_RESET_CONF");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20753">change 20753</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/+/20753"/><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: Ic13c2acbe1379558884fa7d11ba0b52ef31544f3 </div>
<div style="display:none"> Gerrit-Change-Number: 20753 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>