Change in osmo-bsc[master]: struct gsm_bts: s/temporary_overpower/top_acch_cap/g

[fixeria]

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

Change subject: struct gsm_bts: s/temporary_overpower/top_acch_cap/g
......................................................................

struct gsm_bts: s/temporary_overpower/top_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: I39b98dcd14219402959646524315d5afea7c08cf
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, 15 insertions(+), 15 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 31f14a1..f582232 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -594,7 +594,7 @@
 	struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;
 
 	/* ACCH Temporary overpower capabilities */
-	struct abis_rsl_osmo_temp_ovp_acch_cap temporary_overpower;
+	struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;
 
 	/* MS/BS Power Control parameters */
 	struct gsm_power_ctrl_params ms_power_ctrl;
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index 0e3809e..90ceec1 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -563,8 +563,8 @@
 		return;
 
 	msgb_tlv_put(msg, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP,
-		     sizeof(bts->temporary_overpower),
-		     (void *)&bts->temporary_overpower);
+		     sizeof(bts->top_acch_cap),
+		     (void *)&bts->top_acch_cap);
 }
 
 /* Write RSL_IE_OSMO_TRAINING_SEQUENCE to msgb. The tsc_set argument's range is 1-4, tsc argument range is 0-7. */
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index f1cb441..0fdb636 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -399,7 +399,7 @@
 
 	/* Default RxQual threshold for ACCH repetition/overpower */
 	bts->rep_acch_cap.rxqual = 4;
-	bts->temporary_overpower.rxqual = 4;
+	bts->top_acch_cap.rxqual = 4;
 
 	/* MS Power Control parameters (defaults) */
 	power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL);
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index ddc5785..683f2c3 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -770,15 +770,15 @@
 		return CMD_WARNING;
 	}
 
-	bts->temporary_overpower.sacch_enable = 0;
-	bts->temporary_overpower.facch_enable = 0;
+	bts->top_acch_cap.sacch_enable = 0;
+	bts->top_acch_cap.facch_enable = 0;
 
 	if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-sacch"))
-		bts->temporary_overpower.sacch_enable = 1;
+		bts->top_acch_cap.sacch_enable = 1;
 	if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-facch"))
-		bts->temporary_overpower.facch_enable = 1;
+		bts->top_acch_cap.facch_enable = 1;
 
-	bts->temporary_overpower.overpower_db = atoi(argv[1]);
+	bts->top_acch_cap.overpower_db = atoi(argv[1]);
 
 	return CMD_SUCCESS;
 }
@@ -792,9 +792,9 @@
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->temporary_overpower.overpower_db = 0;
-	bts->temporary_overpower.sacch_enable = 0;
-	bts->temporary_overpower.facch_enable = 0;
+	bts->top_acch_cap.overpower_db = 0;
+	bts->top_acch_cap.sacch_enable = 0;
+	bts->top_acch_cap.facch_enable = 0;
 
 	return CMD_SUCCESS;
 }
@@ -813,7 +813,7 @@
 		return CMD_WARNING;
 	}
 
-	bts->temporary_overpower.rxqual = atoi(argv[0]);
+	bts->top_acch_cap.rxqual = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }
@@ -4293,9 +4293,9 @@
 
 	ho_vty_write_bts(vty, bts);
 
-	if (bts->temporary_overpower.overpower_db > 0) {
+	if (bts->top_acch_cap.overpower_db > 0) {
 		const struct abis_rsl_osmo_temp_ovp_acch_cap *top = \
-			&bts->temporary_overpower;
+			&bts->top_acch_cap;
 		const char *mode = NULL;
 
 		if (top->sacch_enable && top->facch_enable)

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I39b98dcd14219402959646524315d5afea7c08cf
Gerrit-Change-Number: 26239
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/3c3f8fe4/attachment.htm>