<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21991">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: vty: re-use cfg_bts_ul_power_target()<br><br>This reduces code duplication by defining an alias.<br><br>Change-Id: I37f51d426fcf008c9d9e933827de70ab7b072a94<br>Related: SYS#4918<br>---<br>M src/common/vty.c<br>1 file changed, 14 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index ff7ec12..52478b8 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -632,29 +632,26 @@</span><br><span>        CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span>  struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+  int rxlev_dbm = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+        int hyst = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       bts->ul_power_ctrl.target_dbm = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-       bts->ul_power_ctrl.hysteresis_db = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+      if (argc > 1) /* optional argument */</span><br><span style="color: hsl(120, 100%, 40%);">+              hyst = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       bts->ul_power_ctrl.target_dbm = rxlev_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->ul_power_ctrl.hysteresis_db = hyst;</span><br><span> </span><br><span>      return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> /* FIXME: libosmovty is unable to handle 'foo <-110-0> [bar <1-25>]' */</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_ul_power_target_hysteresis,</span><br><span style="color: hsl(0, 100%, 40%);">-          cfg_bts_ul_power_target_hysteresis_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-         UL_POWER_TARGET_CMD " hysteresis <1-25>",</span><br><span style="color: hsl(0, 100%, 40%);">-       UL_POWER_TARGET_CMD_DESC</span><br><span style="color: hsl(0, 100%, 40%);">-        "Target Rx Level hysteresis\n"</span><br><span style="color: hsl(0, 100%, 40%);">-        "Tolerable deviation in dBm\n",</span><br><span style="color: hsl(0, 100%, 40%);">-       CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    bts->ul_power_ctrl.target_dbm = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-       bts->ul_power_ctrl.hysteresis_db = atoi(argv[1]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_CMD_ELEMENT(cfg_bts_ul_power_target,</span><br><span style="color: hsl(120, 100%, 40%);">+                cfg_bts_ul_power_target_hysteresis_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+               UL_POWER_TARGET_CMD " hysteresis <1-25>",</span><br><span style="color: hsl(120, 100%, 40%);">+             UL_POWER_TARGET_CMD_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+              "Target Rx Level hysteresis\n"</span><br><span style="color: hsl(120, 100%, 40%);">+              "Tolerable deviation in dBm\n",</span><br><span style="color: hsl(120, 100%, 40%);">+             CMD_ATTR_IMMEDIATE, 0);</span><br><span> </span><br><span> DEFUN_ATTR(cfg_no_bts_ul_power_filter,</span><br><span>         cfg_bts_no_ul_power_filter_cmd,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21991">change 21991</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/+/21991"/><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: I37f51d426fcf008c9d9e933827de70ab7b072a94 </div>
<div style="display:none"> Gerrit-Change-Number: 21991 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>