Change in osmo-bsc[master]: struct gsm_bts: s/repeated_acch_policy/rep_acch_cap/g

[fixeria]

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26238 )

Change subject: struct gsm_bts: s/repeated_acch_policy/rep_acch_cap/g
......................................................................

struct gsm_bts: s/repeated_acch_policy/rep_acch_cap/g

Let's have a short and consistent naming for both ACCH repetition
and temporary ACCH overpower structures, like it's done in osmo-bts.

Change-Id: Ia12c83ad1af4744ce28ba655ac806784f746e88a
Related: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07
---
M include/osmocom/bsc/bts.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_vty.c
4 files changed, 22 insertions(+), 22 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index b42c4ff..31f14a1 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -591,7 +591,7 @@
 	struct llist_head chan_rqd_queue;
 
 	/* ACCH Repetition capabilities */
-	struct abis_rsl_osmo_rep_acch_cap repeated_acch_policy;
+	struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;
 
 	/* ACCH Temporary overpower capabilities */
 	struct abis_rsl_osmo_temp_ovp_acch_cap temporary_overpower;
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index d596fdd..0e3809e 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -540,7 +540,7 @@
 
 	cap = (struct abis_rsl_osmo_rep_acch_cap*) msg->tail;
 	msgb_tlv_put(msg, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(*cap),
-		     (uint8_t *)&bts->repeated_acch_policy);
+		     (uint8_t *)&bts->rep_acch_cap);
 
 	if (!(lchan->conn && lchan->conn->cm3_valid
 	      && lchan->conn->cm3.repeated_acch_capability)) {
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index 71cf4da..f1cb441 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -398,7 +398,7 @@
 	acc_ramp_init(&bts->acc_ramp, bts);
 
 	/* Default RxQual threshold for ACCH repetition/overpower */
-	bts->repeated_acch_policy.rxqual = 4;
+	bts->rep_acch_cap.rxqual = 4;
 	bts->temporary_overpower.rxqual = 4;
 
 	/* MS Power Control parameters (defaults) */
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 1306a03..ddc5785 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -650,11 +650,11 @@
 	}
 
 	if (!strcmp(argv[0], "command")) {
-		bts->repeated_acch_policy.dl_facch_cmd = true;
-		bts->repeated_acch_policy.dl_facch_all = false;
+		bts->rep_acch_cap.dl_facch_cmd = true;
+		bts->rep_acch_cap.dl_facch_all = false;
 	} else {
-		bts->repeated_acch_policy.dl_facch_cmd = true;
-		bts->repeated_acch_policy.dl_facch_all = true;
+		bts->rep_acch_cap.dl_facch_cmd = true;
+		bts->rep_acch_cap.dl_facch_all = true;
 	}
 	return CMD_SUCCESS;
 }
@@ -668,8 +668,8 @@
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->repeated_acch_policy.dl_facch_cmd = false;
-	bts->repeated_acch_policy.dl_facch_all = false;
+	bts->rep_acch_cap.dl_facch_cmd = false;
+	bts->rep_acch_cap.dl_facch_all = false;
 
 	return CMD_SUCCESS;
 }
@@ -691,9 +691,9 @@
 	}
 
 	if (strcmp(argv[0], "ul-sacch") == 0)
-		bts->repeated_acch_policy.ul_sacch = true;
+		bts->rep_acch_cap.ul_sacch = true;
 	else
-		bts->repeated_acch_policy.dl_sacch = true;
+		bts->rep_acch_cap.dl_sacch = true;
 
 	return CMD_SUCCESS;
 }
@@ -709,9 +709,9 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (strcmp(argv[0], "ul-sacch") == 0)
-		bts->repeated_acch_policy.ul_sacch = false;
+		bts->rep_acch_cap.ul_sacch = false;
 	else
-		bts->repeated_acch_policy.dl_sacch = false;
+		bts->rep_acch_cap.dl_sacch = false;
 
 	return CMD_SUCCESS;
 }
@@ -745,7 +745,7 @@
 	}
 
 	/* See also: GSM 05.08, section 8.2.4 */
-	bts->repeated_acch_policy.rxqual = atoi(argv[0]);
+	bts->rep_acch_cap.rxqual = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }
@@ -4313,18 +4313,18 @@
 			top->rxqual, VTY_NEWLINE);
 	}
 
-	if (bts->repeated_acch_policy.dl_facch_all)
+	if (bts->rep_acch_cap.dl_facch_all)
 		vty_out(vty, "  repeat dl-facch all%s", VTY_NEWLINE);
-	else if (bts->repeated_acch_policy.dl_facch_cmd)
+	else if (bts->rep_acch_cap.dl_facch_cmd)
 		vty_out(vty, "  repeat dl-facch command%s", VTY_NEWLINE);
-	if (bts->repeated_acch_policy.dl_sacch)
+	if (bts->rep_acch_cap.dl_sacch)
 		vty_out(vty, "  repeat dl-sacch%s", VTY_NEWLINE);
-	if (bts->repeated_acch_policy.ul_sacch)
+	if (bts->rep_acch_cap.ul_sacch)
 		vty_out(vty, "  repeat ul-sacch%s", VTY_NEWLINE);
-	if (bts->repeated_acch_policy.ul_sacch
-	    || bts->repeated_acch_policy.dl_facch_cmd
-	    || bts->repeated_acch_policy.dl_facch_cmd)
-		vty_out(vty, "  repeat rxqual %u%s", bts->repeated_acch_policy.rxqual, VTY_NEWLINE);
+	if (bts->rep_acch_cap.ul_sacch
+	    || bts->rep_acch_cap.dl_facch_cmd
+	    || bts->rep_acch_cap.dl_facch_cmd)
+		vty_out(vty, "  repeat rxqual %u%s", bts->rep_acch_cap.rxqual, VTY_NEWLINE);
 
 	if (bts->interf_meas_params_cfg.avg_period != interf_meas_params_def.avg_period) {
 		vty_out(vty, "  interference-meas avg-period %u%s",

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26238
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia12c83ad1af4744ce28ba655ac806784f746e88a
Gerrit-Change-Number: 26238
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211115/3d6c1a0e/attachment.htm>