<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18350">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rlc: Move prepare() function out of gprs_rlc_data struct<br><br>Newer gcc 10.1.0 is erroring due to memset being applied on a complex<br>type, so let's start by removing this only function outside of the<br>struct.<br><br>Change-Id: I20426557d9b3049ab275fadb92e10ea8a860a119<br>---<br>M src/rlc.cpp<br>M src/rlc.h<br>M src/tbf_dl.cpp<br>M tests/types/TypesTest.cpp<br>4 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/rlc.cpp b/src/rlc.cpp</span><br><span>index 6d084b1..5316136 100644</span><br><span>--- a/src/rlc.cpp</span><br><span>+++ b/src/rlc.cpp</span><br><span>@@ -32,16 +32,16 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t *gprs_rlc_data::prepare(size_t block_data_len)</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t *prepare(struct gprs_rlc_data *rlc, size_t block_data_len)</span><br><span> {</span><br><span> /* todo.. only set it once if it turns out to be a bottleneck */</span><br><span style="color: hsl(0, 100%, 40%);">- memset(block, 0x0, sizeof(block));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(block, 0x2b, block_data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(rlc->block, 0x0, sizeof(rlc->block));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(rlc->block, 0x2b, block_data_len);</span><br><span> </span><br><span> /* Initial value of puncturing scheme */</span><br><span style="color: hsl(0, 100%, 40%);">- next_ps = EGPRS_PS_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rlc->next_ps = EGPRS_PS_1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return block;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rlc->block;</span><br><span> }</span><br><span> </span><br><span> void gprs_rlc_v_b::reset()</span><br><span>diff --git a/src/rlc.h b/src/rlc.h</span><br><span>index 135060e..109c5b3 100644</span><br><span>--- a/src/rlc.h</span><br><span>+++ b/src/rlc.h</span><br><span>@@ -177,8 +177,6 @@</span><br><span> };</span><br><span> </span><br><span> struct gprs_rlc_data {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *prepare(size_t block_data_length);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* block data including LI headers */</span><br><span> uint8_t block[RLC_MAX_LEN];</span><br><span> /* block data len including LI headers*/</span><br><span>@@ -211,6 +209,8 @@</span><br><span> union split_block_status spb_status;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t *prepare(struct gprs_rlc_data *rlc, size_t block_data_length);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gprs_rlc_data_info_init_dl(struct gprs_rlc_data_info *rlc,</span><br><span> GprsCodingScheme cs, bool with_padding, const unsigned int spb);</span><br><span> void gprs_rlc_data_info_init_ul(struct gprs_rlc_data_info *rlc,</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index dab1e29..cd4ddb9 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -581,7 +581,7 @@</span><br><span> </span><br><span> /* now we still have untransmitted LLC data, so we fill mac block */</span><br><span> rlc_data = m_rlc.block(bsn);</span><br><span style="color: hsl(0, 100%, 40%);">- data = rlc_data->prepare(block_data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ data = prepare(rlc_data, block_data_len);</span><br><span> rlc_data->cs_last = cs;</span><br><span> rlc_data->cs_current_trans = cs;</span><br><span> </span><br><span>diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp</span><br><span>index b46a82b..e1c894d 100644</span><br><span>--- a/tests/types/TypesTest.cpp</span><br><span>+++ b/tests/types/TypesTest.cpp</span><br><span>@@ -97,7 +97,7 @@</span><br><span> {</span><br><span> struct gprs_rlc_data rlc = { 0, };</span><br><span> memset(rlc.block, 0x23, RLC_MAX_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *p = rlc.prepare(20);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *p = prepare(&rlc, 20);</span><br><span> OSMO_ASSERT(p == rlc.block);</span><br><span> for (int i = 0; i < 20; ++i)</span><br><span> OSMO_ASSERT(p[i] == 0x2B);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18350">change 18350</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/+/18350"/><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: I20426557d9b3049ab275fadb92e10ea8a860a119 </div>
<div style="display:none"> Gerrit-Change-Number: 18350 </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: laforge <laforge@osmocom.org> </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>