<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Power Control Loop: Move skip loop logic to function helper<br><br>Let's move duplicate logic to function helper.<br><br>Related: SYS#5371<br>Change-Id: Ic26c17564ec61cdadaab0184c4246b9bf863c69a<br>---<br>M src/common/power_control.c<br>1 file changed, 21 insertions(+), 18 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/57/25357/1</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 0362675..d57c28d 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -139,6 +139,23 @@</span><br><span> return delta;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Shall we skip current block based on configured interval? */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool ctrl_interval_skip_block(const struct gsm_power_ctrl_params *params,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_power_ctrl_state *state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Power control interval: how many blocks do we skip? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->skip_block_num-- > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reset the number of SACCH blocks to be skipped:</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=0 => 0 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=1 => 1 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=2 => 3 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * so basically ctrl_interval * 2 - 1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ state->skip_block_num = params->ctrl_interval * 2 - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct gsm_power_ctrl_meas_params *lchan_get_ci_thresholds(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span> const struct gsm_power_ctrl_params *params = lchan->ms_power_ctrl.dpc_params;</span><br><span>@@ -190,17 +207,10 @@</span><br><span> if (params == NULL)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Power control interval: how many blocks do we skip? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (state->skip_block_num-- > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Shall we skip current block based on configured interval? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctrl_interval_skip_block(params, state))</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset the number of SACCH blocks to be skipped:</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=0 => 0 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=1 => 1 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=2 => 3 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * so basically ctrl_interval * 2 - 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- state->skip_block_num = params->ctrl_interval * 2 - 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ms_dbm = ms_pwr_dbm(band, ms_power_lvl);</span><br><span> if (ms_dbm < 0) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span>@@ -318,17 +328,10 @@</span><br><span> lchan->tch.dtx.dl_active ? "enabled" : "disabled",</span><br><span> lchan->tch.dtx.dl_active ? "SUB" : "FULL");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Power control interval: how many blocks do we skip? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (state->skip_block_num-- > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Shall we skip current block based on configured interval? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctrl_interval_skip_block(params, state))</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset the number of SACCH blocks to be skipped:</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=0 => 0 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=1 => 1 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * ctrl_interval=2 => 3 blocks to skip,</span><br><span style="color: hsl(0, 100%, 40%);">- * so basically ctrl_interval * 2 - 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- state->skip_block_num = params->ctrl_interval * 2 - 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* If DTx is active on Downlink, use the '-SUB' */</span><br><span> if (lchan->tch.dtx.dl_active) {</span><br><span> rxqual = rxqual_sub;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25357">change 25357</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/+/25357"/><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: Ic26c17564ec61cdadaab0184c4246b9bf863c69a </div>
<div style="display:none"> Gerrit-Change-Number: 25357 </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>