<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15600">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pdch.cpp: Refactor bitvec param passing in rcv_control_block<br><br>Move code in rcv_block_gprs() only needed for rcv_control_block() into<br>the later. This way rcv_block_gprs() is simplified and shows similar<br>code paths with regards to rcv_data_block().<br>It can now be seen that the main difference between both is the meas<br>param no being passed in the control case.<br><br>Change-Id: I2a0133463edced93c72ccc743a0cf00d1d6922cf<br>---<br>M src/pdch.cpp<br>M src/pdch.h<br>2 files changed, 14 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 7488b96..5ae7e63 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -680,10 +680,18 @@</span><br><span> }</span><br><span> </span><br><span> /* Received Uplink RLC control block. */</span><br><span style="color: hsl(0, 100%, 40%);">-int gprs_rlcmac_pdch::rcv_control_block(</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data, uint8_t data_len, bitvec *rlc_block, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+int gprs_rlcmac_pdch::rcv_control_block(const uint8_t *data, uint8_t data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, GprsCodingScheme cs)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- RlcMacUplink_t * ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec *rlc_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ RlcMacUplink_t *ul_control_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned len = cs.maxBytesUL();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(rlc_block = bitvec_alloc(len, tall_pcu_ctx)))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unpack(rlc_block, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++\n");</span><br><span> decode_gsm_rlcmac_uplink(rlc_block, ul_control_block);</span><br><span> LOGPC(DCSN1, LOGL_NOTICE, "\n");</span><br><span>@@ -721,6 +729,7 @@</span><br><span> ul_control_block->u.MESSAGE_TYPE);</span><br><span> }</span><br><span> talloc_free(ul_control_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_free(rlc_block);</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span>@@ -816,21 +825,14 @@</span><br><span> struct pcu_l1_meas *meas, GprsCodingScheme cs)</span><br><span> {</span><br><span> unsigned payload = data[0] >> 6;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec *block;</span><br><span> int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned len = cs.maxBytesUL();</span><br><span> </span><br><span> switch (payload) {</span><br><span> case GPRS_RLCMAC_DATA_BLOCK:</span><br><span> rc = rcv_data_block(data, data_len, fn, meas, cs);</span><br><span> break;</span><br><span> case GPRS_RLCMAC_CONTROL_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- block = bitvec_alloc(len, tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!block)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unpack(block, data);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rcv_control_block(data, data_len, block, fn);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_free(block);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rcv_control_block(data, data_len, fn, cs);</span><br><span> break;</span><br><span> case GPRS_RLCMAC_CONTROL_BLOCK_OPT:</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "GPRS_RLCMAC_CONTROL_BLOCK_OPT block payload is not supported.\n");</span><br><span>@@ -961,4 +963,3 @@</span><br><span> {</span><br><span> return trx->bts->bts_data();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index cf9804d..e23d56f 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -94,7 +94,7 @@</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> private:</span><br><span style="color: hsl(0, 100%, 40%);">- int rcv_control_block(const uint8_t *data, uint8_t data_len, bitvec *rlc_block, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rcv_control_block(const uint8_t *data, uint8_t data_len, uint32_t fn, GprsCodingScheme cs);</span><br><span> </span><br><span> void rcv_control_ack(Packet_Control_Acknowledgement_t *, uint32_t fn);</span><br><span> void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15600">change 15600</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-pcu/+/15600"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2a0133463edced93c72ccc743a0cf00d1d6922cf </div>
<div style="display:none"> Gerrit-Change-Number: 15600 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>