<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25869">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[overpower] VTY: add more ACCH overpower related parameters<br><br>The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow:<br><br> * selectively enabling SACCH and/or FACCH,<br> * setting the RxQual (BER) threshold.<br><br>Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c<br>Depends: Ia28293a12de0af71f55e701fb65c46e905dae217<br>Related: SYS#5319<br>---<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_vty.c<br>2 files changed, 67 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index fe18b59..21ee01a 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -352,7 +352,9 @@</span><br><span> acc_mgr_init(&bts->acc_mgr, bts);</span><br><span> acc_ramp_init(&bts->acc_ramp, bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Default RxQual threshold for ACCH repetition/overpower */</span><br><span> bts->repeated_acch_policy.rxqual = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.rxqual = 4;</span><br><span> </span><br><span> /* MS Power Control parameters (defaults) */</span><br><span> power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL);</span><br><span>diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c</span><br><span>index 8eae2a4..fe2616a 100644</span><br><span>--- a/src/osmo-bsc/bts_vty.c</span><br><span>+++ b/src/osmo-bsc/bts_vty.c</span><br><span>@@ -716,21 +716,25 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* See 3GPP TS 45.008, section 8.2.4 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define RXQUAL_THRESH_CMD \</span><br><span style="color: hsl(120, 100%, 40%);">+ "rxqual (0|1|2|3|4|5|6|7)"</span><br><span style="color: hsl(120, 100%, 40%);">+#define RXQUAL_THRESH_CMD_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set Uplink RxQual (BER) threshold (default 4)\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 0% (always on)\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 0.2%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 0.4%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 0.8%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 1.6%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 3.2%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 6.4%\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER >= 12.8%\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN_USRATTR(cfg_bts_rep_rxqual,</span><br><span> cfg_bts_rep_rxqual_cmd,</span><br><span> X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(0, 100%, 40%);">- "repeat rxqual (0|1|2|3|4|5|6|7)",</span><br><span style="color: hsl(0, 100%, 40%);">- REP_ACCH_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "Set UL-SACCH/DL-FACCH rxqual threshold-ber\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "0 disabled (always on)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "1 BER >= 0.2%\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "2 BER >= 0.4%\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "3 BER >= 0.8%\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "4 BER >= 1.6% (default)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "5 BER >= 3.2%\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "6 BER >= 6.4%\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "7 BER >= 12.8%\n")</span><br><span style="color: hsl(0, 100%, 40%);">- /* See also: GSM 05.08, section 8.2.4 */</span><br><span style="color: hsl(120, 100%, 40%);">+ "repeat " RXQUAL_THRESH_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ REP_ACCH_STR RXQUAL_THRESH_CMD_DESC)</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span>@@ -751,9 +755,11 @@</span><br><span> DEFUN_USRATTR(cfg_bts_top_dl_acch,</span><br><span> cfg_bts_top_dl_acch_cmd,</span><br><span> X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(0, 100%, 40%);">- "overpower dl-acch <1-4>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "overpower (dl-acch|dl-sacch|dl-facch) <1-4>",</span><br><span> TOP_ACCH_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "Enable ACCH overpower for this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable overpower for both SACCH and FACCH\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable overpower for SACCH only\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable overpower for FACCH only\n"</span><br><span> "Overpower value in dB\n")</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span>@@ -764,7 +770,12 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.overpower_db = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strncmp(argv[0], "dl-acch") || !strncmp(argv[0], "dl-sacch"))</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.sacch = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strncmp(argv[0], "dl-acch") || !strncmp(argv[0], "dl-facch"))</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.facch = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.overpower_db = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -778,6 +789,27 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span> bts->temporary_overpower.overpower_db = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.sacch = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.facch = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_bts_top_dl_acch_rxqual,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_top_dl_acch_rxqual_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "overpower " RXQUAL_THRESH_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ TOP_ACCH_STR RXQUAL_THRESH_CMD_DESC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->temporary_overpower.rxqual = atoi(argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -4257,8 +4289,23 @@</span><br><span> </span><br><span> ho_vty_write_bts(vty, bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->temporary_overpower.overpower_db > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " overpower dl-acch %u%s", bts->temporary_overpower.overpower_db, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->temporary_overpower.overpower_db > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct abis_rsl_osmo_temp_ovp_acch_cap *top = \</span><br><span style="color: hsl(120, 100%, 40%);">+ &bts->temporary_overpower;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *mode = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (top->sacch && top->facch)</span><br><span style="color: hsl(120, 100%, 40%);">+ mode = "dl-acch";</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (top->sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ mode = "dl-sacch";</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (top->facch)</span><br><span style="color: hsl(120, 100%, 40%);">+ mode = "dl-facch";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " overpower %s %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ mode, top->overpower_db, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " overpower rxqual %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ mode, top->rxqual, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (bts->repeated_acch_policy.dl_facch_all)</span><br><span> vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE);</span><br><span>@@ -4477,6 +4524,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_top_dl_acch_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_top_no_dl_acch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_top_dl_acch_rxqual_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25869">change 25869</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-bsc/+/25869"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c </div>
<div style="display:none"> Gerrit-Change-Number: 25869 </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>