<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20857">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Implement enable_egprs() once<br><br>There's no real need for having different copies of this method in each<br>children. Furthermore, having the method implemented in the base class<br>made me shoot my foot while trying to move this to the tbf constructor<br>(see next commit), so let's simplify this and avoid other people<br>following into the same issue.<br><br>enable_egprs() in tbf.h is moved to be public since it needed (as it was<br>for the duplicated children mehtods with same name), but anyway it will<br>be moved to private in next commit.<br><br>Change-Id: Id7de060318201a42e51f277f898463f4b9a84eba<br>---<br>M src/tbf.h<br>M src/tbf_dl.h<br>M src/tbf_ul.h<br>3 files changed, 2 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index bf51a8d..ac6c63c 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -263,6 +263,7 @@</span><br><span> /* EGPRS */</span><br><span> bool is_egprs_enabled() const;</span><br><span> void disable_egprs();</span><br><span style="color: hsl(120, 100%, 40%);">+ void enable_egprs();</span><br><span> </span><br><span> /* attempt to make things a bit more fair */</span><br><span> void rotate_in_list();</span><br><span>@@ -322,7 +323,6 @@</span><br><span> </span><br><span> protected:</span><br><span> gprs_rlcmac_bts *bts_data() const;</span><br><span style="color: hsl(0, 100%, 40%);">- void enable_egprs();</span><br><span> void merge_and_clear_ms(GprsMs *old_ms);</span><br><span> </span><br><span> gprs_llc_queue *llc_queue();</span><br><span>@@ -581,6 +581,7 @@</span><br><span> inline void gprs_rlcmac_tbf::enable_egprs()</span><br><span> {</span><br><span> m_egprs_enabled = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ window()->set_sns(RLC_EGPRS_SNS);</span><br><span> }</span><br><span> </span><br><span> inline void gprs_rlcmac_tbf::disable_egprs()</span><br><span>diff --git a/src/tbf_dl.h b/src/tbf_dl.h</span><br><span>index 51e170a..55306fd 100644</span><br><span>--- a/src/tbf_dl.h</span><br><span>+++ b/src/tbf_dl.h</span><br><span>@@ -42,7 +42,6 @@</span><br><span> gprs_rlcmac_dl_tbf(BTS *bts);</span><br><span> gprs_rlc_window *window();</span><br><span> void cleanup();</span><br><span style="color: hsl(0, 100%, 40%);">- void enable_egprs();</span><br><span> /* dispatch Unitdata.DL messages */</span><br><span> static int handle(struct gprs_rlcmac_bts *bts,</span><br><span> const uint32_t tlli, const uint32_t old_tlli,</span><br><span>@@ -143,12 +142,6 @@</span><br><span> return m_window.ws();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline void gprs_rlcmac_dl_tbf::enable_egprs()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- m_window.set_sns(RLC_EGPRS_SNS);</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_tbf::enable_egprs();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inline gprs_rlcmac_dl_tbf *as_dl_tbf(gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> if (tbf && tbf->direction == GPRS_RLCMAC_DL_TBF)</span><br><span>diff --git a/src/tbf_ul.h b/src/tbf_ul.h</span><br><span>index cbaffa5..a581f27 100644</span><br><span>--- a/src/tbf_ul.h</span><br><span>+++ b/src/tbf_ul.h</span><br><span>@@ -55,7 +55,6 @@</span><br><span> struct msgb *create_ul_ack(uint32_t fn, uint8_t ts);</span><br><span> bool ctrl_ack_to_toggle();</span><br><span> bool handle_ctrl_ack();</span><br><span style="color: hsl(0, 100%, 40%);">- void enable_egprs();</span><br><span> /* blocks were acked */</span><br><span> int rcv_data_block_acknowledged(</span><br><span> const struct gprs_rlc_data_info *rlc,</span><br><span>@@ -123,12 +122,6 @@</span><br><span> return m_window.ws();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline void gprs_rlcmac_ul_tbf::enable_egprs()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- m_window.set_sns(RLC_EGPRS_SNS);</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_tbf::enable_egprs();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inline gprs_rlcmac_ul_tbf *as_ul_tbf(gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> if (tbf && tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20857">change 20857</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/+/20857"/><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: Id7de060318201a42e51f277f898463f4b9a84eba </div>
<div style="display:none"> Gerrit-Change-Number: 20857 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>