<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: move bit counter outside of egprs_window_size()<br><br>As a preparation to moving window size calculation to C code, let's move<br>bit counter call outside. It makes more sense that way as well because<br>egprs_window_size() now deals with actual number of allocated slots<br>instead of raw bitmap.<br><br>Change-Id: I5b59919e7b4c9fd2c91958659bafe470ed8fcff7<br>---<br>M src/tbf.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_ul.cpp<br>3 files changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/12247/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 6792d08..832aa60 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -500,8 +500,6 @@</span><br><span> </span><br><span> uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts_data, uint8_t slots)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t num_pdch = pcu_bitcount(slots);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>      return OSMO_MIN((num_pdch != 1) ? (128 * num_pdch) : 192,</span><br><span>                    OSMO_MAX(64, (bts_data->ws_base + num_pdch * bts_data->ws_pdch) / 32 * 32));</span><br><span> }</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 01331a6..a3fef2c 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -1358,7 +1358,7 @@</span><br><span> void gprs_rlcmac_dl_tbf::set_window_size()</span><br><span> {</span><br><span>      const struct gprs_rlcmac_bts *b = bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">-   uint16_t ws = egprs_window_size(b, dl_slots());</span><br><span style="color: hsl(120, 100%, 40%);">+       uint16_t ws = egprs_window_size(b, pcu_bitcount(dl_slots()));</span><br><span>        LOGPTBFDL(this, LOGL_INFO, "setting EGPRS DL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n",</span><br><span>                   ws, b->ws_base, pcu_bitcount(dl_slots()), b->ws_pdch);</span><br><span>       m_window.set_ws(ws);</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index f877484..9233f2c 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -594,7 +594,7 @@</span><br><span> void gprs_rlcmac_ul_tbf::set_window_size()</span><br><span> {</span><br><span>   const struct gprs_rlcmac_bts *b = bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">-   uint16_t ws = egprs_window_size(b, ul_slots());</span><br><span style="color: hsl(120, 100%, 40%);">+       uint16_t ws = egprs_window_size(b, pcu_bitcount(ul_slots()));</span><br><span>        LOGPTBFUL(this, LOGL_INFO, "setting EGPRS UL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n",</span><br><span>                   ws, b->ws_base, pcu_bitcount(ul_slots()), b->ws_pdch);</span><br><span>       m_window.set_ws(ws);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12247">change 12247</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/12247"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5b59919e7b4c9fd2c91958659bafe470ed8fcff7 </div>
<div style="display:none"> Gerrit-Change-Number: 12247 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>