<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g<br><br>Immediate Assignment is sent on AGCH/PCH, while on PACCH we have<br>Packet Uplink/Downlink Assignment instead (see 11.2.29, 11.2.7).<br><br>Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 9 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/41/19341/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 bba2c97..ee2c38f 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -280,14 +280,15 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_ms_rx_imm_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_imm_ass := ?)</span><br><span style="color: hsl(120, 100%, 40%);">+function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ template RlcmacDlBlock t_pkt_ass := ?)</span><br><span> runs on MS_BTS_IFACE_CT return RlcmacDlBlock {</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var uint32_t dl_fn;</span><br><span> </span><br><span> f_rx_rlcmac_dl_block(dl_block, dl_fn);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not match(dl_block, t_imm_ass)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to match Packet Assignment:", t_imm_ass);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(dl_block, t_pkt_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index d2b4a21..dab87e0 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -819,7 +819,7 @@</span><br><span> (T3192 in MS) was started and until it fires the MS will be available</span><br><span> on PDCH in case new data arrives from SGSN. Let's verify it: */</span><br><span> BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data));</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span> </span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);</span><br><span> </span><br><span>@@ -1141,7 +1141,7 @@</span><br><span> * (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure")</span><br><span> */</span><br><span> f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)), 0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span> if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_cs_mcs)) {</span><br><span> setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_cs_mcs);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>@@ -1159,7 +1159,7 @@</span><br><span> </span><br><span> /* Now SGSN sends some DL data, PCU will page on PACCH */</span><br><span> BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data));</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span> /* DL Ass sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);</span><br><span> </span><br><span>@@ -1260,7 +1260,7 @@</span><br><span> f_dl_block_ack_fn(dl_block, dl_fn));</span><br><span> </span><br><span> /* Expect UL ass */</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span> </span><br><span> /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span> contention resoultion) and make sure it is ACKED fine */</span><br><span>@@ -1638,7 +1638,7 @@</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST to request a new UL TBF */</span><br><span> f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span> /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341">change 19341</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/+/19341"/><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: I56473ae5dfa565d2c9d26984b14685a4163bf69a </div>
<div style="display:none"> Gerrit-Change-Number: 19341 </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-MessageType: newchange </div>