Change in osmo-bts[master]: bts: rename MS_UL_PF_ALGO_{NONE, EWMA} to BTS_PF_ALGO_{NONE, EWMA}

[fixeria]

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

Change subject: bts: rename MS_UL_PF_ALGO_{NONE,EWMA} to BTS_PF_ALGO_{NONE,EWMA}
......................................................................

bts: rename MS_UL_PF_ALGO_{NONE,EWMA} to BTS_PF_ALGO_{NONE,EWMA}

Change-Id: I580512eea1d329a4d25ccbd6fc2ab98b083ec51d
Related: SYS#4918
---
M include/osmo-bts/bts.h
M src/common/bts.c
M src/common/power_control.c
M src/common/vty.c
M tests/power/power_test.c
5 files changed, 12 insertions(+), 12 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/osmo-bts/bts.h b/include/osmo-bts/bts.h
index 66b03e1..37d4c7d 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -96,9 +96,9 @@
 };
 
 /* Tx power filtering algorithm */
-enum ms_ul_pf_algo {
-	MS_UL_PF_ALGO_NONE = 0,
-	MS_UL_PF_ALGO_EWMA,
+enum bts_pf_algo {
+	BTS_PF_ALGO_NONE = 0,
+	BTS_PF_ALGO_EWMA,
 };
 
 /* BTS Site Manager */
@@ -306,7 +306,7 @@
 		/* Tolerated deviation from target */
 		int hysteresis;
 		/* UL RSSI filtering algorithm */
-		enum ms_ul_pf_algo pf_algo;
+		enum bts_pf_algo pf_algo;
 		/* (Optional) filtering parameters */
 		union {
 			/* Exponentially Weighted Moving Average */
diff --git a/src/common/bts.c b/src/common/bts.c
index 6375241..80f4fdd 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -325,7 +325,7 @@
 	bts->paging_state = paging_init(bts, 200, 0);
 	bts->ul_power_ctrl.target = -75;	/* dBm default */
 	bts->ul_power_ctrl.hysteresis = 3;	/* -78 .. -72 dBm */
-	bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;
+	bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;
 	bts->ul_power_ctrl.pf.ewma.alpha = 50; /* 50% smoothing */
 	bts->rtp_jitter_adaptive = false;
 	bts->rtp_port_range_start = 16384;
diff --git a/src/common/power_control.c b/src/common/power_control.c
index dc5636c..e022e59 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -130,10 +130,10 @@
 
 	/* Filter UL RSSI to reduce unnecessary Tx power oscillations */
 	switch (bts->ul_power_ctrl.pf_algo) {
-	case MS_UL_PF_ALGO_EWMA:
+	case BTS_PF_ALGO_EWMA:
 		avg_ul_rssi_dbm = lchan_ul_pf_ewma(bts, lchan, ul_rssi_dbm);
 		break;
-	case MS_UL_PF_ALGO_NONE:
+	case BTS_PF_ALGO_NONE:
 	default:
 		/* No filtering (pass through) */
 		avg_ul_rssi_dbm = ul_rssi_dbm;
diff --git a/src/common/vty.c b/src/common/vty.c
index 34e7cfa..f32f6cd 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -262,11 +262,11 @@
 
 	/* MS Tx power filtering algorithm and parameters */
 	switch (bts->ul_power_ctrl.pf_algo) {
-	case MS_UL_PF_ALGO_EWMA:
+	case BTS_PF_ALGO_EWMA:
 		vty_out(vty, " uplink-power-filtering algo ewma beta %u%s",
 			100 - bts->ul_power_ctrl.pf.ewma.alpha, VTY_NEWLINE);
 		break;
-	case MS_UL_PF_ALGO_NONE:
+	case BTS_PF_ALGO_NONE:
 	default:
 		vty_out(vty, " no uplink-power-filtering%s", VTY_NEWLINE);
 		break;
@@ -664,7 +664,7 @@
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_NONE;
+	bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;
 
 	return CMD_SUCCESS;
 }
@@ -681,7 +681,7 @@
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;
+	bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;
 	bts->ul_power_ctrl.pf.ewma.alpha = 100 - atoi(argv[0]);
 
 	return CMD_SUCCESS;
diff --git a/tests/power/power_test.c b/tests/power/power_test.c
index a686134..14bef08 100644
--- a/tests/power/power_test.c
+++ b/tests/power/power_test.c
@@ -153,7 +153,7 @@
 	lchan = &g_trx->ts[0].lchan[0];
 	avg100 = &lchan->ms_power_ctrl.avg100_ul_rssi;
 
-	g_bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;
+	g_bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;
 	g_bts->ul_power_ctrl.pf.ewma.alpha = 20; /* 80% smoothing */
 
 	lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0);

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I580512eea1d329a4d25ccbd6fc2ab98b083ec51d
Gerrit-Change-Number: 21435
Gerrit-PatchSet: 2
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/20201202/7e9c52d6/attachment.htm>