<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21445">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: lchan_ms_pwr_ctrl(): make use of params/state pointers<br><br>Change-Id: I177d82cd61d59256976007fed2f7da400b814789<br>Related: SYS#4918<br>---<br>M src/common/power_control.c<br>1 file changed, 15 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index 9d17c89..21f7ce5 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -113,7 +113,7 @@</span><br><span> </span><br><span> if (!trx_ms_pwr_ctrl_is_osmo(trx))</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ms_power_ctrl.fixed)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->fixed)</span><br><span> return 0;</span><br><span> </span><br><span> ms_dbm = ms_pwr_dbm(band, ms_power_lvl);</span><br><span>@@ -123,16 +123,16 @@</span><br><span> ms_power_lvl, gsm_band_name(band));</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.max);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_max_dbm = ms_pwr_dbm(band, state->max);</span><br><span> if (bsc_max_dbm < 0) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span> "Failed to calculate dBm for power ctl level %" PRIu8 " on band %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.max, gsm_band_name(band));</span><br><span style="color: hsl(120, 100%, 40%);">+ state->max, gsm_band_name(band));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> /* Filter UL RSSI to reduce unnecessary Tx power oscillations */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (bts->ul_power_ctrl.pf_algo) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (params->pf_algo) {</span><br><span> case BTS_PF_ALGO_EWMA:</span><br><span> avg_ul_rssi_dbm = do_pf_ewma(params, state, ul_rssi_dbm);</span><br><span> break;</span><br><span>@@ -144,17 +144,17 @@</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_ctrl.target - avg_ul_rssi_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ diff = params->target - avg_ul_rssi_dbm;</span><br><span> </span><br><span> </span><br><span> /* Tolerate small deviations from 'rx-target' */</span><br><span style="color: hsl(0, 100%, 40%);">- if (abs(diff) <= bts->ul_power_ctrl.hysteresis) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (abs(diff) <= params->hysteresis) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_INFO,</span><br><span> "Keeping MS power at control level %d (%d dBm) because diff %d dBm "</span><br><span> "from 'rx-target' %d dBm is not significant (hysteresis %d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_lvl, ms_dbm, diff, bts->ul_power_ctrl.target, bts->ul_power_ctrl.hysteresis);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_lvl, ms_dbm, diff, params->target, params->hysteresis);</span><br><span> /* Keep the current power level in sync (just to be sure) */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = ms_power_lvl;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->current = ms_power_lvl;</span><br><span> bts_model_adjst_ms_pwr(lchan);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -186,25 +186,23 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ms_power_ctrl.current == new_power_lvl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->current == new_power_lvl) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d, %d dBm "</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 style="color: hsl(0, 100%, 40%);">- new_power_lvl, new_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_lvl, lchan->ms_power_ctrl.max,</span><br><span style="color: hsl(0, 100%, 40%);">- avg_ul_rssi_dbm, bts->ul_power_ctrl.target);</span><br><span style="color: hsl(120, 100%, 40%);">+ new_power_lvl, new_dbm, ms_power_lvl, state->max,</span><br><span style="color: hsl(120, 100%, 40%);">+ avg_ul_rssi_dbm, params->target);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- current_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.current);</span><br><span style="color: hsl(120, 100%, 40%);">+ current_dbm = ms_pwr_dbm(band, state->current);</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power from control level %d (%d dBm) to %d, %d dBm "</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_dbm > current_dbm) ? "Raising" : "Lowering",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_lvl, lchan->ms_power_ctrl.max,</span><br><span style="color: hsl(0, 100%, 40%);">- avg_ul_rssi_dbm, bts->ul_power_ctrl.target);</span><br><span style="color: hsl(120, 100%, 40%);">+ state->current, current_dbm, new_power_lvl, new_dbm,</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_lvl, state->max, avg_ul_rssi_dbm, params->target);</span><br><span> </span><br><span> /* store the resulting new MS power level in the lchan */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = new_power_lvl;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->current = new_power_lvl;</span><br><span> bts_model_adjst_ms_pwr(lchan);</span><br><span> </span><br><span> return 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21445">change 21445</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/+/21445"/><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: I177d82cd61d59256976007fed2f7da400b814789 </div>
<div style="display:none"> Gerrit-Change-Number: 21445 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>