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

4 files changed, 15 insertions, 15 deletions

diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 31f14a195..f58223246 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -594,7 +594,7 @@ struct gsm_bts {
 	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 0e3809e7a..90ceec18a 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -563,8 +563,8 @@ static void top_acch_cap_for_bts(struct gsm_lchan *lchan, struct msgb *msg)
 		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 f1cb44163..0fdb636da 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -399,7 +399,7 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm
 
 	/* 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 ddc57853d..683f2c31e 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -770,15 +770,15 @@ DEFUN_USRATTR(cfg_bts_top_dl_acch,
 		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 @@ DEFUN_USRATTR(cfg_bts_top_no_dl_acch,
 {
 	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 @@ DEFUN_USRATTR(cfg_bts_top_dl_acch_rxqual,
 		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 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
 
 	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)