This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25536 ) Change subject: pcu: Allow empty rlcmac blocks in data_req ...................................................................... pcu: Allow empty rlcmac blocks in data_req They are used by osmo-pcu to signal idle blocks. Change-Id: Ied6b133be5bfd181f08c445b76af0f570edfd2a4 --- M pcu/GPRS_Components.ttcn M pcu/PCUIF_Components.ttcn 2 files changed, 19 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 4446b63..1014498 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -1094,7 +1094,7 @@ arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, - tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH)) + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), *) ) -> value data_msg; } @@ -1138,6 +1138,12 @@ runs on MS_BTS_IFACE_CT { var BTS_PDTCH_Block data_msg; f_pcuif_rx_data_req_pdtch(data_msg, nr := nr); + + if (data_msg.dl_block == omit) { + setverdict(fail, "Expected RLCMAC block but received idle block (", data_msg.raw.len, ")"); + f_shutdown(__BFILE__, __LINE__); + } + dl_block := data_msg.dl_block; dl_fn := data_msg.raw.fn; diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 66b2e21..30982da 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -133,12 +133,12 @@ type record BTS_PDTCH_Block { uint8_t bts_nr, PCUIF_data raw, - RlcmacDlBlock dl_block + RlcmacDlBlock dl_block optional }; type record BTS_PTCCH_Block { uint8_t bts_nr, PCUIF_data raw, - PTCCHDownlinkMsg dl_block + PTCCHDownlinkMsg dl_block optional }; type record BTS_CCCH_Block { uint8_t bts_nr, @@ -554,14 +554,22 @@ [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg { pcu_msg_pdtch.bts_nr := bts_nr; pcu_msg_pdtch.raw := pcu_msg.u.data_req; - pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data); + if (pcu_msg_pdtch.raw.len != 0) { + pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data); + } else { + pcu_msg_pdtch.dl_block := omit; + } TC.send(pcu_msg_pdtch); repeat; } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PTCCH)) -> value pcu_msg { pcu_msg_ptcch.bts_nr := bts_nr; pcu_msg_ptcch.raw := pcu_msg.u.data_req; - pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data); + if (pcu_msg_ptcch.raw.len != 0) { + pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data); + } else { + pcu_msg_ptcch.dl_block := omit; + } TC.send(pcu_msg_ptcch); repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied6b133be5bfd181f08c445b76af0f570edfd2a4 Gerrit-Change-Number: 25536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210923/5cc091a0/attachment.htm>