<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26239">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;">struct gsm_bts: s/temporary_overpower/top_acch_cap/g<br><br>Let's have a short and consistent naming for both ACCH repetition<br>and temporary ACCH overpower structures, like it's done in osmo-bts.<br><br>Change-Id: I39b98dcd14219402959646524315d5afea7c08cf<br>Related: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_vty.c<br>4 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 31f14a1..f582232 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -594,7 +594,7 @@</span><br><span> struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;</span><br><span> </span><br><span> /* ACCH Temporary overpower capabilities */</span><br><span style="color: hsl(0, 100%, 40%);">- struct abis_rsl_osmo_temp_ovp_acch_cap temporary_overpower;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;</span><br><span> </span><br><span> /* MS/BS Power Control parameters */</span><br><span> struct gsm_power_ctrl_params ms_power_ctrl;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 0e3809e..90ceec1 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -563,8 +563,8 @@</span><br><span> return;</span><br><span> </span><br><span> msgb_tlv_put(msg, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(bts->temporary_overpower),</span><br><span style="color: hsl(0, 100%, 40%);">- (void *)&bts->temporary_overpower);</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(bts->top_acch_cap),</span><br><span style="color: hsl(120, 100%, 40%);">+ (void *)&bts->top_acch_cap);</span><br><span> }</span><br><span> </span><br><span> /* Write RSL_IE_OSMO_TRAINING_SEQUENCE to msgb. The tsc_set argument's range is 1-4, tsc argument range is 0-7. */</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index f1cb441..0fdb636 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -399,7 +399,7 @@</span><br><span> </span><br><span> /* Default RxQual threshold for ACCH repetition/overpower */</span><br><span> bts->rep_acch_cap.rxqual = 4;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.rxqual = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.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 ddc5785..683f2c3 100644</span><br><span>--- a/src/osmo-bsc/bts_vty.c</span><br><span>+++ b/src/osmo-bsc/bts_vty.c</span><br><span>@@ -770,15 +770,15 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.sacch_enable = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.facch_enable = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.sacch_enable = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.facch_enable = 0;</span><br><span> </span><br><span> if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-sacch"))</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.sacch_enable = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.sacch_enable = 1;</span><br><span> if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-facch"))</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.facch_enable = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.facch_enable = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.overpower_db = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.overpower_db = atoi(argv[1]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -792,9 +792,9 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.overpower_db = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.sacch_enable = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.facch_enable = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.overpower_db = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.sacch_enable = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.facch_enable = 0;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -813,7 +813,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->temporary_overpower.rxqual = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_cap.rxqual = atoi(argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -4293,9 +4293,9 @@</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(120, 100%, 40%);">+ if (bts->top_acch_cap.overpower_db > 0) {</span><br><span> const struct abis_rsl_osmo_temp_ovp_acch_cap *top = \</span><br><span style="color: hsl(0, 100%, 40%);">- &bts->temporary_overpower;</span><br><span style="color: hsl(120, 100%, 40%);">+ &bts->top_acch_cap;</span><br><span> const char *mode = NULL;</span><br><span> </span><br><span> if (top->sacch_enable && top->facch_enable)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26239">change 26239</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/+/26239"/><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: I39b98dcd14219402959646524315d5afea7c08cf </div>
<div style="display:none"> Gerrit-Change-Number: 26239 </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>