<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25536">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Allow empty rlcmac blocks in data_req<br><br>They are used by osmo-pcu to signal idle blocks.<br><br>Change-Id: Ied6b133be5bfd181f08c445b76af0f570edfd2a4<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCUIF_Components.ttcn<br>2 files changed, 19 insertions(+), 5 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/36/25536/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 4446b63..1014498 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -1094,7 +1094,7 @@</span><br><span> arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr));</span><br><span> </span><br><span> BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH))</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), *)</span><br><span> ) -> value data_msg;</span><br><span> }</span><br><span> </span><br><span>@@ -1138,6 +1138,12 @@</span><br><span> runs on MS_BTS_IFACE_CT {</span><br><span> var BTS_PDTCH_Block data_msg;</span><br><span> f_pcuif_rx_data_req_pdtch(data_msg, nr := nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (data_msg.dl_block == omit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Expected RLCMAC block but received idle block (", data_msg.raw.len, ")");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> dl_block := data_msg.dl_block;</span><br><span> dl_fn := data_msg.raw.fn;</span><br><span> </span><br><span>diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn</span><br><span>index 66b2e21..30982da 100644</span><br><span>--- a/pcu/PCUIF_Components.ttcn</span><br><span>+++ b/pcu/PCUIF_Components.ttcn</span><br><span>@@ -133,12 +133,12 @@</span><br><span> type record BTS_PDTCH_Block {</span><br><span> uint8_t bts_nr,</span><br><span> PCUIF_data raw,</span><br><span style="color: hsl(0, 100%, 40%);">- RlcmacDlBlock dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+ RlcmacDlBlock dl_block optional</span><br><span> };</span><br><span> type record BTS_PTCCH_Block {</span><br><span> uint8_t bts_nr,</span><br><span> PCUIF_data raw,</span><br><span style="color: hsl(0, 100%, 40%);">- PTCCHDownlinkMsg dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+ PTCCHDownlinkMsg dl_block optional</span><br><span> };</span><br><span> type record BTS_CCCH_Block {</span><br><span> uint8_t bts_nr,</span><br><span>@@ -554,14 +554,22 @@</span><br><span> [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg {</span><br><span> pcu_msg_pdtch.bts_nr := bts_nr;</span><br><span> pcu_msg_pdtch.raw := pcu_msg.u.data_req;</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcu_msg_pdtch.raw.len != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_pdtch.dl_block := omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> TC.send(pcu_msg_pdtch);</span><br><span> repeat;</span><br><span> }</span><br><span> [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PTCCH)) -> value pcu_msg {</span><br><span> pcu_msg_ptcch.bts_nr := bts_nr;</span><br><span> pcu_msg_ptcch.raw := pcu_msg.u.data_req;</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcu_msg_ptcch.raw.len != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_ptcch.dl_block := omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> TC.send(pcu_msg_ptcch);</span><br><span> repeat;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25536">change 25536</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/+/25536"/><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: Ied6b133be5bfd181f08c445b76af0f570edfd2a4 </div>
<div style="display:none"> Gerrit-Change-Number: 25536 </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>