<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24199">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-{lc15,oc2g}: drop redundant checks in VTY commands<br><br>Change-Id: I4fea6d661b7193c3a04e88c9399a9e2bc402254f<br>---<br>M src/osmo-bts-lc15/lc15bts_vty.c<br>M src/osmo-bts-oc2g/oc2gbts_vty.c<br>2 files changed, 6 insertions(+), 84 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-lc15/lc15bts_vty.c b/src/osmo-bts-lc15/lc15bts_vty.c</span><br><span>index 4a9d790..be6a4f8 100644</span><br><span>--- a/src/osmo-bts-lc15/lc15bts_vty.c</span><br><span>+++ b/src/osmo-bts-lc15/lc15bts_vty.c</span><br><span>@@ -340,12 +340,6 @@</span><br><span> int nominal_power = atoi(argv[0]);</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( nominal_power > 40 ) || ( nominal_power < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Nominal Tx power level must be between 0 and 40 dBm (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- nominal_power, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> trx->nominal_power = nominal_power;</span><br><span> trx->power_params.trx_p_max_out_mdBm = to_mdB(nominal_power);</span><br><span> </span><br><span>@@ -359,12 +353,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int cell_size = (uint8_t)atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( cell_size > 166 ) || ( cell_size < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Max cell size must be between 0 and 166 qbits (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- cell_size, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.lc15.max_cell_size = (uint8_t)cell_size;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -377,10 +365,7 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = get_string_value(lc15_diversity_mode_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < LC15_DIVERSITY_SISO_A) || (val > LC15_DIVERSITY_MRC)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid reception diversity mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> pinst->u.lc15.diversity_mode = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -394,10 +379,7 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = get_string_value(lc15_pedestal_mode_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < LC15_PEDESTAL_OFF) || (val > LC15_PEDESTAL_ON)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid unused time-slot transmission mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> pinst->u.lc15.pedestal_mode = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -411,10 +393,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> int val = get_string_value(lc15_led_mode_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < LC15_LED_CONTROL_BTS) || (val > LC15_LED_CONTROL_EXT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid LED control mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> struct bts_lc15_priv *bts_lc15 = bts->model_priv;</span><br><span> bts_lc15->led_ctrl_mode = (uint8_t)val;</span><br><span>@@ -429,12 +408,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> uint8_t period = (uint8_t)atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( period > 60 ) || ( period < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "DSP heart beat alive timer period must be between 0 and 60 seconds (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- period, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.lc15.dsp_alive_period = period;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -446,10 +419,7 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = get_string_value(lc15_auto_adj_pwr_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < LC15_TX_PWR_ADJ_NONE) || (val > LC15_TX_PWR_ADJ_AUTO)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid output power adjustment mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> pinst->u.lc15.tx_pwr_adj_mode = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -462,12 +432,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((val > 40) || (val < 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Reduction Tx power level must be between 0 and 40 dB (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.lc15.tx_pwr_red_8psk = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -479,12 +443,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((val > 40) || (val < 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Reduction Tx power level must be between 0 and 40 dB (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.lc15.tx_c0_idle_pwr_red = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>index c3b2a31..d69225a 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>+++ b/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>@@ -333,12 +333,6 @@</span><br><span> int nominal_power = atoi(argv[0]);</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( nominal_power > 25 ) || ( nominal_power < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Nominal Tx power level must be between 0 and 25 dBm (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- nominal_power, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> trx->nominal_power = nominal_power;</span><br><span> trx->power_params.trx_p_max_out_mdBm = to_mdB(nominal_power);</span><br><span> </span><br><span>@@ -352,12 +346,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int cell_size = (uint8_t)atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( cell_size > 166 ) || ( cell_size < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Max cell size must be between 0 and 166 qbits (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- cell_size, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.oc2g.max_cell_size = (uint8_t)cell_size;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -370,10 +358,7 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = get_string_value(oc2g_pedestal_mode_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < OC2G_PEDESTAL_OFF) || (val > OC2G_PEDESTAL_ON)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid unused time-slot transmission mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> pinst->u.oc2g.pedestal_mode = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -386,12 +371,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> uint8_t period = (uint8_t)atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (( period > 60 ) || ( period < 0 )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "DSP heart beat alive timer period must be between 0 and 60 seconds (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- period, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.oc2g.dsp_alive_period = period;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -403,10 +382,7 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = get_string_value(oc2g_auto_adj_pwr_strs, argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if((val < OC2G_TX_PWR_ADJ_NONE) || (val > OC2G_TX_PWR_ADJ_AUTO)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Invalid output power adjustment mode %d%s", val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(val != -EINVAL);</span><br><span> </span><br><span> pinst->u.oc2g.tx_pwr_adj_mode = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -419,12 +395,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((val > 40) || (val < 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Reduction Tx power level must be between 0 and 40 dB (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.oc2g.tx_pwr_red_8psk = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -436,12 +406,6 @@</span><br><span> struct phy_instance *pinst = vty->index;</span><br><span> int val = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((val > 40) || (val < 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Reduction Tx power level must be between 0 and 40 dB (%d) %s",</span><br><span style="color: hsl(0, 100%, 40%);">- val, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pinst->u.oc2g.tx_c0_idle_pwr_red = (uint8_t)val;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24199">change 24199</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/+/24199"/><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: I4fea6d661b7193c3a04e88c9399a9e2bc402254f </div>
<div style="display:none"> Gerrit-Change-Number: 24199 </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-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-MessageType: merged </div>