<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20656">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: clarify argument names of lchan_ms_pwr_ctrl()<br><br>Change-Id: I821120bf5c3690f5b4c6b96c879e675b3d271c90<br>---<br>M include/osmo-bts/power_control.h<br>M src/common/power_control.c<br>2 files changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/20656/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/power_control.h b/include/osmo-bts/power_control.h</span><br><span>index 43d4b59..cb566a8 100644</span><br><span>--- a/include/osmo-bts/power_control.h</span><br><span>+++ b/include/osmo-bts/power_control.h</span><br><span>@@ -4,4 +4,5 @@</span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> </span><br><span> int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-                 const uint8_t ms_power, const int rxLevel);</span><br><span style="color: hsl(120, 100%, 40%);">+                   const uint8_t ms_power_lvl,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const int8_t ul_rssi_dbm);</span><br><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index e9215fc..d36f157 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -39,10 +39,11 @@</span><br><span>  /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.</span><br><span>   *  \param lchan logical channel for which to compute (and in which to store) new power value.</span><br><span>   *  \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block.</span><br><span style="color: hsl(0, 100%, 40%);">-  *  \param[in] rxLevel Signal level of the received SACCH block, in dBm.</span><br><span style="color: hsl(120, 100%, 40%);">+  *  \param[in] ul_rssi_dbm Signal level of the received SACCH block, in dBm.</span><br><span>   */</span><br><span> int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-                     const uint8_t ms_power_lvl, const int rxLevel)</span><br><span style="color: hsl(120, 100%, 40%);">+                const uint8_t ms_power_lvl,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const int8_t ul_rssi_dbm)</span><br><span> {</span><br><span>         int diff;</span><br><span>    struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span>@@ -73,7 +74,7 @@</span><br><span> </span><br><span>      /* How many dBs measured power should be increased (+) or decreased (-)</span><br><span>         to reach expected power. */</span><br><span style="color: hsl(0, 100%, 40%);">-  diff = bts->ul_power_target - rxLevel;</span><br><span style="color: hsl(120, 100%, 40%);">+     diff = bts->ul_power_target - ul_rssi_dbm;</span><br><span> </span><br><span>    /* don't ever change more than MS_{LOWER,RAISE}_MAX_DBM during one loop</span><br><span>     iteration, i.e. reduce the speed at which the MS transmit power can</span><br><span>@@ -107,7 +108,7 @@</span><br><span>                           "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n",</span><br><span>                        new_power_lvl, new_dbm,</span><br><span>                      ms_power_lvl, lchan->ms_power_ctrl.max,</span><br><span style="color: hsl(0, 100%, 40%);">-                      rxLevel, bts->ul_power_target);</span><br><span style="color: hsl(120, 100%, 40%);">+                    ul_rssi_dbm, bts->ul_power_target);</span><br><span>             return 0;</span><br><span>    }</span><br><span> </span><br><span>@@ -117,7 +118,7 @@</span><br><span>            (new_dbm > current_dbm) ? "Raising" : "Lowering",</span><br><span>             lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm,</span><br><span>                ms_power_lvl, lchan->ms_power_ctrl.max,</span><br><span style="color: hsl(0, 100%, 40%);">-              rxLevel, bts->ul_power_target);</span><br><span style="color: hsl(120, 100%, 40%);">+            ul_rssi_dbm, bts->ul_power_target);</span><br><span> </span><br><span>         /* store the resulting new MS power level in the lchan */</span><br><span>    lchan->ms_power_ctrl.current = new_power_lvl;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20656">change 20656</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-bts/+/20656"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I821120bf5c3690f5b4c6b96c879e675b3d271c90 </div>
<div style="display:none"> Gerrit-Change-Number: 20656 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>