<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26238">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/repeated_acch_policy/rep_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: Ia12c83ad1af4744ce28ba655ac806784f746e88a<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, 22 insertions(+), 22 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 b42c4ff..31f14a1 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -591,7 +591,7 @@</span><br><span> struct llist_head chan_rqd_queue;</span><br><span> </span><br><span> /* ACCH Repetition capabilities */</span><br><span style="color: hsl(0, 100%, 40%);">- struct abis_rsl_osmo_rep_acch_cap repeated_acch_policy;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;</span><br><span> </span><br><span> /* ACCH Temporary overpower capabilities */</span><br><span> struct abis_rsl_osmo_temp_ovp_acch_cap temporary_overpower;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index d596fdd..0e3809e 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -540,7 +540,7 @@</span><br><span> </span><br><span> cap = (struct abis_rsl_osmo_rep_acch_cap*) msg->tail;</span><br><span> msgb_tlv_put(msg, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(*cap),</span><br><span style="color: hsl(0, 100%, 40%);">- (uint8_t *)&bts->repeated_acch_policy);</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint8_t *)&bts->rep_acch_cap);</span><br><span> </span><br><span> if (!(lchan->conn && lchan->conn->cm3_valid</span><br><span> && lchan->conn->cm3.repeated_acch_capability)) {</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 71cf4da..f1cb441 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -398,7 +398,7 @@</span><br><span> acc_ramp_init(&bts->acc_ramp, bts);</span><br><span> </span><br><span> /* Default RxQual threshold for ACCH repetition/overpower */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.rxqual = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.rxqual = 4;</span><br><span> bts->temporary_overpower.rxqual = 4;</span><br><span> </span><br><span> /* MS Power Control parameters (defaults) */</span><br><span>diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c</span><br><span>index 1306a03..ddc5785 100644</span><br><span>--- a/src/osmo-bsc/bts_vty.c</span><br><span>+++ b/src/osmo-bsc/bts_vty.c</span><br><span>@@ -650,11 +650,11 @@</span><br><span> }</span><br><span> </span><br><span> if (!strcmp(argv[0], "command")) {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_facch_cmd = true;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_facch_all = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_cmd = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_all = false;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_facch_cmd = true;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_facch_all = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_cmd = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_all = true;</span><br><span> }</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -668,8 +668,8 @@</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->repeated_acch_policy.dl_facch_cmd = false;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_facch_all = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_cmd = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_facch_all = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -691,9 +691,9 @@</span><br><span> }</span><br><span> </span><br><span> if (strcmp(argv[0], "ul-sacch") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.ul_sacch = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.ul_sacch = true;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_sacch = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_sacch = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -709,9 +709,9 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span> if (strcmp(argv[0], "ul-sacch") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.ul_sacch = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.ul_sacch = false;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.dl_sacch = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.dl_sacch = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -745,7 +745,7 @@</span><br><span> }</span><br><span> </span><br><span> /* See also: GSM 05.08, section 8.2.4 */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->repeated_acch_policy.rxqual = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rep_acch_cap.rxqual = atoi(argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -4313,18 +4313,18 @@</span><br><span> top->rxqual, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->repeated_acch_policy.dl_facch_all)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rep_acch_cap.dl_facch_all)</span><br><span> vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts->repeated_acch_policy.dl_facch_cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (bts->rep_acch_cap.dl_facch_cmd)</span><br><span> vty_out(vty, " repeat dl-facch command%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->repeated_acch_policy.dl_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rep_acch_cap.dl_sacch)</span><br><span> vty_out(vty, " repeat dl-sacch%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->repeated_acch_policy.ul_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rep_acch_cap.ul_sacch)</span><br><span> vty_out(vty, " repeat ul-sacch%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->repeated_acch_policy.ul_sacch</span><br><span style="color: hsl(0, 100%, 40%);">- || bts->repeated_acch_policy.dl_facch_cmd</span><br><span style="color: hsl(0, 100%, 40%);">- || bts->repeated_acch_policy.dl_facch_cmd)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " repeat rxqual %u%s", bts->repeated_acch_policy.rxqual, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rep_acch_cap.ul_sacch</span><br><span style="color: hsl(120, 100%, 40%);">+ || bts->rep_acch_cap.dl_facch_cmd</span><br><span style="color: hsl(120, 100%, 40%);">+ || bts->rep_acch_cap.dl_facch_cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " repeat rxqual %u%s", bts->rep_acch_cap.rxqual, VTY_NEWLINE);</span><br><span> </span><br><span> if (bts->interf_meas_params_cfg.avg_period != interf_meas_params_def.avg_period) {</span><br><span> vty_out(vty, " interference-meas avg-period %u%s",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26238">change 26238</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/+/26238"/><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: Ia12c83ad1af4744ce28ba655ac806784f746e88a </div>
<div style="display:none"> Gerrit-Change-Number: 26238 </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>