<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26182">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ts_alloc: rename variable to clarify meaning<br><br>The variable counts reserved slots, not available one. It can easily be<br>seen by checking function count_slots() documentation "Number of<br>reserved TS".<br><br>The previous naming was used probably to indicate "available to reserve"<br>TS, but the naming is misleading.<br><br>Change-Id: Ib58e87d5a067d20d0b331fe32dff61b95ecc3e3f<br>---<br>M src/gprs_rlcmac_ts_alloc.cpp<br>1 file changed, 7 insertions(+), 7 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/82/26182/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>index dc46b84..d86d9c3 100644</span><br><span>--- a/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>+++ b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>@@ -659,12 +659,12 @@</span><br><span>  *  \param[in] slots Timeslots in use</span><br><span>  *  \param[in] reserved_slots Reserved timeslots</span><br><span>  *  \param[out] slotcount Number of TS in use</span><br><span style="color: hsl(0, 100%, 40%);">- *  \param[out] avail_count Number of reserved TS</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[out] reserve_count Number of reserved TS</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void count_slots(uint8_t slots, uint8_t reserved_slots, uint8_t *slotcount, uint8_t *avail_count)</span><br><span style="color: hsl(120, 100%, 40%);">+static void count_slots(uint8_t slots, uint8_t reserved_slots, uint8_t *slotcount, uint8_t *reserve_count)</span><br><span> {</span><br><span>         (*slotcount) = pcu_bitcount(slots);</span><br><span style="color: hsl(0, 100%, 40%);">-     (*avail_count) = pcu_bitcount(reserved_slots);</span><br><span style="color: hsl(120, 100%, 40%);">+        (*reserve_count) = pcu_bitcount(reserved_slots);</span><br><span> }</span><br><span> </span><br><span> /*! Return slot mask with single TS from a given UL/DL set according to TBF's direction, ts pointer is set to that TS</span><br><span>@@ -867,7 +867,7 @@</span><br><span>         uint8_t reserved_ul_slots;</span><br><span>   int8_t first_common_ts;</span><br><span>      uint8_t slotcount = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-  uint8_t avail_count = 0, trx_no;</span><br><span style="color: hsl(120, 100%, 40%);">+      uint8_t reserve_count = 0, trx_no;</span><br><span>   int first_ts = -1;</span><br><span>   int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1};</span><br><span>       int rc;</span><br><span>@@ -910,7 +910,7 @@</span><br><span>        /* Step 3b: Derive the slot set for a given direction */</span><br><span>     if (tbf->direction == GPRS_RLCMAC_DL_TBF) {</span><br><span>               dl_slots = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-          count_slots(dl_slots, reserved_dl_slots, &slotcount, &avail_count);</span><br><span style="color: hsl(120, 100%, 40%);">+           count_slots(dl_slots, reserved_dl_slots, &slotcount, &reserve_count);</span><br><span>        } else {</span><br><span>             rc = allocate_usf(trx, rc, dl_slots, usf);</span><br><span>           if (rc < 0)</span><br><span>@@ -919,7 +919,7 @@</span><br><span>                 ul_slots = rc;</span><br><span>               reserved_ul_slots = ul_slots;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-               count_slots(ul_slots, reserved_ul_slots, &slotcount, &avail_count);</span><br><span style="color: hsl(120, 100%, 40%);">+           count_slots(ul_slots, reserved_ul_slots, &slotcount, &reserve_count);</span><br><span>        }</span><br><span> </span><br><span>        first_ts = ffs(rc) - 1;</span><br><span>@@ -936,7 +936,7 @@</span><br><span>        }</span><br><span> </span><br><span>        if (single && slotcount) {</span><br><span style="color: hsl(0, 100%, 40%);">-              tbf->upgrade_to_multislot = (avail_count > slotcount);</span><br><span style="color: hsl(120, 100%, 40%);">+          tbf->upgrade_to_multislot = (reserve_count > slotcount);</span><br><span>               LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts);</span><br><span>  } else {</span><br><span>             tbf->upgrade_to_multislot = false;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26182">change 26182</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/+/26182"/><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: Ib58e87d5a067d20d0b331fe32dff61b95ecc3e3f </div>
<div style="display:none"> Gerrit-Change-Number: 26182 </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-MessageType: newchange </div>