<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/14570">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Encoding: drop struct gprs_rlcmac_bts* from all functions<br><br>The bts is not used at all.<br><br>Change-Id: Ia07755e825913a16352ab13f6cf55f2918de8681<br>---<br>M src/encoding.cpp<br>M src/encoding.h<br>M src/tbf.cpp<br>M src/tbf_ul.cpp<br>4 files changed, 12 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index 530cba7..a290c65 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -543,7 +543,6 @@</span><br><span> </span><br><span> /* generate uplink assignment */</span><br><span> void Encoding::write_packet_uplink_assignment(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts,</span><br><span> bitvec * dest, uint8_t old_tfi,</span><br><span> uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli,</span><br><span> struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, uint8_t rrbp, uint8_t alpha,</span><br><span>@@ -787,7 +786,7 @@</span><br><span> }</span><br><span> </span><br><span> static void write_packet_ack_nack_desc_gprs(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest, unsigned& wp,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, unsigned& wp,</span><br><span> gprs_rlc_ul_window *window, bool is_final)</span><br><span> {</span><br><span> char rbb[65];</span><br><span>@@ -809,12 +808,12 @@</span><br><span> }</span><br><span> </span><br><span> static void write_packet_uplink_ack_gprs(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest, unsigned& wp,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, unsigned& wp,</span><br><span> struct gprs_rlcmac_ul_tbf *tbf, bool is_final)</span><br><span> {</span><br><span> </span><br><span> bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND</span><br><span style="color: hsl(0, 100%, 40%);">- write_packet_ack_nack_desc_gprs(bts, dest, wp, tbf->window(), is_final);</span><br><span style="color: hsl(120, 100%, 40%);">+ write_packet_ack_nack_desc_gprs(dest, wp, tbf->window(), is_final);</span><br><span> </span><br><span> bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI</span><br><span> bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI</span><br><span>@@ -830,7 +829,7 @@</span><br><span> };</span><br><span> </span><br><span> static void write_packet_ack_nack_desc_egprs(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest, unsigned& wp,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, unsigned& wp,</span><br><span> gprs_rlc_ul_window *window, bool is_final, unsigned& rest_bits)</span><br><span> {</span><br><span> unsigned int urbb_len = 0;</span><br><span>@@ -988,7 +987,7 @@</span><br><span> }</span><br><span> </span><br><span> static void write_packet_uplink_ack_egprs(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest, unsigned& wp,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, unsigned& wp,</span><br><span> struct gprs_rlcmac_ul_tbf *tbf, bool is_final)</span><br><span> {</span><br><span> bitvec_write_field(dest, &wp, 0, 2); // fixed 00</span><br><span>@@ -1010,15 +1009,14 @@</span><br><span> </span><br><span> /* -2 for last bit 0 mandatory and REL5 not supported */</span><br><span> unsigned bits_ack_nack = dest->data_len * 8 - wp - 2;</span><br><span style="color: hsl(0, 100%, 40%);">- write_packet_ack_nack_desc_egprs(bts, dest, wp, tbf->window(), is_final, bits_ack_nack);</span><br><span style="color: hsl(120, 100%, 40%);">+ write_packet_ack_nack_desc_egprs(dest, wp, tbf->window(), is_final, bits_ack_nack);</span><br><span> </span><br><span> bitvec_write_field(dest, &wp, 0, 1); // fixed 0</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: don't have REL 5</span><br><span> };</span><br><span> </span><br><span> void Encoding::write_packet_uplink_ack(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span> uint8_t rrbp)</span><br><span> {</span><br><span> unsigned wp = 0;</span><br><span>@@ -1039,11 +1037,11 @@</span><br><span> if (tbf->is_egprs_enabled()) {</span><br><span> /* PU_AckNack_EGPRS = on */</span><br><span> bitvec_write_field(dest, &wp, 1, 1); // 1: EGPRS</span><br><span style="color: hsl(0, 100%, 40%);">- write_packet_uplink_ack_egprs(bts, dest, wp, tbf, is_final);</span><br><span style="color: hsl(120, 100%, 40%);">+ write_packet_uplink_ack_egprs(dest, wp, tbf, is_final);</span><br><span> } else {</span><br><span> /* PU_AckNack_GPRS = on */</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: GPRS</span><br><span style="color: hsl(0, 100%, 40%);">- write_packet_uplink_ack_gprs(bts, dest, wp, tbf, is_final);</span><br><span style="color: hsl(120, 100%, 40%);">+ write_packet_uplink_ack_gprs(dest, wp, tbf, is_final);</span><br><span> }</span><br><span> </span><br><span> LOGP(DRLCMACUL, LOGL_DEBUG,</span><br><span>diff --git a/src/encoding.h b/src/encoding.h</span><br><span>index 2309dc3..6dcced0 100644</span><br><span>--- a/src/encoding.h</span><br><span>+++ b/src/encoding.h</span><br><span>@@ -27,7 +27,6 @@</span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_bts;</span><br><span> struct gprs_rlcmac_tbf;</span><br><span> struct bitvec;</span><br><span> struct gprs_llc;</span><br><span>@@ -57,7 +56,6 @@</span><br><span> );</span><br><span> </span><br><span> static void write_packet_uplink_assignment(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts,</span><br><span> bitvec * dest, uint8_t old_tfi,</span><br><span> uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli,</span><br><span> struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, uint8_t rrbp,</span><br><span>@@ -76,8 +74,7 @@</span><br><span> bitvec * dest, uint32_t tlli);</span><br><span> </span><br><span> static void write_packet_uplink_ack(</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts, bitvec * dest,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span> uint8_t rrbp);</span><br><span> </span><br><span> static int write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len);</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index dc90dbb..a099322 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -1365,7 +1365,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span style="color: hsl(0, 100%, 40%);">- Encoding::write_packet_uplink_assignment(bts_data(), ass_vec, m_tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ Encoding::write_packet_uplink_assignment(ass_vec, m_tfi,</span><br><span> (direction == GPRS_RLCMAC_DL_TBF), tlli(),</span><br><span> is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,</span><br><span> bts_data()->gamma, -1, is_egprs_enabled());</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index e1a0fbd..55c83e7 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -153,7 +153,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> bitvec_unhex(ack_vec, DUMMY_VEC);</span><br><span style="color: hsl(0, 100%, 40%);">- Encoding::write_packet_uplink_ack(bts_data(), ack_vec, this, final, rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+ Encoding::write_packet_uplink_ack(ack_vec, this, final, rrbp);</span><br><span> bitvec_pack(ack_vec, msgb_put(msg, 23));</span><br><span> bitvec_free(ack_vec);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/14570">change 14570</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/+/14570"/><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: Ia07755e825913a16352ab13f6cf55f2918de8681 </div>
<div style="display:none"> Gerrit-Change-Number: 14570 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>