struct gsm_bts: move ul_power_{target,hysteresis} to ul_power_ctrl

Change-Id: I3886c7aedf3870536f1750f864cf698302ddf2df
Related: SYS#4918

8 files changed, 19 insertions, 19 deletions

diff --git a/src/common/bts.c b/src/common/bts.c
index a1f9101a..63752411 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -323,8 +323,8 @@ int bts_init(struct gsm_bts *bts)
 
 	/* configurable via VTY */
 	bts->paging_state = paging_init(bts, 200, 0);
-	bts->ul_power_target = -75;	/* dBm default */
-	bts->ul_power_hysteresis = 3;	/* -78 .. -72 dBm */
+	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.ewma.alpha = 50; /* 50% smoothing */
 	bts->rtp_jitter_adaptive = false;
diff --git a/src/common/power_control.c b/src/common/power_control.c
index be6df488..dc5636c1 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -141,15 +141,15 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
 
 	/* How many dBs measured power should be increased (+) or decreased (-)
 	   to reach expected power. */
-	diff = bts->ul_power_target - avg_ul_rssi_dbm;
+	diff = bts->ul_power_ctrl.target - avg_ul_rssi_dbm;
 
 
 	/* Tolerate small deviations from 'rx-target' */
-	if (abs(diff) <= bts->ul_power_hysteresis) {
+	if (abs(diff) <= bts->ul_power_ctrl.hysteresis) {
 		LOGPLCHAN(lchan, DLOOP, LOGL_INFO,
 			  "Keeping MS power at control level %d (%d dBm) because diff %d dBm "
 			  "from 'rx-target' %d dBm is not significant (hysteresis %d dBm)\n",
-			  ms_power_lvl, ms_dbm, diff, bts->ul_power_target, bts->ul_power_hysteresis);
+			  ms_power_lvl, ms_dbm, diff, bts->ul_power_ctrl.target, bts->ul_power_ctrl.hysteresis);
 		/* Keep the current power level in sync (just to be sure) */
 		lchan->ms_power_ctrl.current = ms_power_lvl;
 		bts_model_adjst_ms_pwr(lchan);
@@ -188,7 +188,7 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
 			  "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n",
 			  new_power_lvl, new_dbm,
 			  ms_power_lvl, lchan->ms_power_ctrl.max,
-			  avg_ul_rssi_dbm, bts->ul_power_target);
+			  avg_ul_rssi_dbm, bts->ul_power_ctrl.target);
 		return 0;
 	}
 
@@ -198,7 +198,7 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
 		  (new_dbm > current_dbm) ? "Raising" : "Lowering",
 		  lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm,
 		  ms_power_lvl, lchan->ms_power_ctrl.max,
-		  avg_ul_rssi_dbm, bts->ul_power_target);
+		  avg_ul_rssi_dbm, bts->ul_power_ctrl.target);
 
 	/* store the resulting new MS power level in the lchan */
 	lchan->ms_power_ctrl.current = new_power_lvl;
diff --git a/src/common/vty.c b/src/common/vty.c
index 7baddef7..34e7cfa2 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -255,9 +255,9 @@ static void config_write_bts_single(struct vty *vty, const struct gsm_bts *bts)
 		VTY_NEWLINE);
 	vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state),
 		VTY_NEWLINE);
-	vty_out(vty, " uplink-power-target %d", bts->ul_power_target);
-	if (bts->ul_power_hysteresis > 0)
-		vty_out(vty, " hysteresis %d", bts->ul_power_hysteresis);
+	vty_out(vty, " uplink-power-target %d", bts->ul_power_ctrl.target);
+	if (bts->ul_power_ctrl.hysteresis > 0)
+		vty_out(vty, " hysteresis %d", bts->ul_power_ctrl.hysteresis);
 	vty_out(vty, "%s", VTY_NEWLINE);
 
 	/* MS Tx power filtering algorithm and parameters */
@@ -633,8 +633,8 @@ DEFUN_ATTR(cfg_bts_ul_power_target, cfg_bts_ul_power_target_cmd,
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->ul_power_target = atoi(argv[0]);
-	bts->ul_power_hysteresis = 0;
+	bts->ul_power_ctrl.target = atoi(argv[0]);
+	bts->ul_power_ctrl.hysteresis = 0;
 
 	return CMD_SUCCESS;
 }
@@ -650,8 +650,8 @@ DEFUN_ATTR(cfg_bts_ul_power_target_hysteresis,
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->ul_power_target = atoi(argv[0]);
-	bts->ul_power_hysteresis = atoi(argv[1]);
+	bts->ul_power_ctrl.target = atoi(argv[0]);
+	bts->ul_power_ctrl.hysteresis = atoi(argv[1]);
 
 	return CMD_SUCCESS;
 }
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index dee5feb7..0fb9d00d 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -434,7 +434,7 @@ static int trx_init(struct gsm_bts_trx *trx)
 	dev_par->u16BcchArfcn = trx->bts->c0->arfcn;
 	dev_par->u8NbTsc = trx->bts->bsic & 7;
 	dev_par->fRxPowerLevel = trx_ms_pwr_ctrl_is_osmo(trx)
-					? 0.0 : trx->bts->ul_power_target;
+					? 0.0 : trx->bts->ul_power_ctrl.target;
 
 	dev_par->fTxPowerLevel = 0.0;
 	LOGP(DL1C, LOGL_NOTICE, "Init TRX (Band %d, ARFCN %u, TSC %u, RxPower % 2f dBm, "
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index 9a7751b9..be0ec304 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -449,7 +449,7 @@ static int trx_init(struct gsm_bts_trx *trx)
 	dev_par->u16BcchArfcn = trx->bts->c0->arfcn;
 	dev_par->u8NbTsc = trx->bts->bsic & 7;
 	dev_par->fRxPowerLevel = trx_ms_pwr_ctrl_is_osmo(trx)
-					? 0.0 : trx->bts->ul_power_target;
+					? 0.0 : trx->bts->ul_power_ctrl.target;
 
 	dev_par->fTxPowerLevel = 0.0;
 	LOGP(DL1C, LOGL_NOTICE, "Init TRX (Band %d, ARFCN %u, TSC %u, RxPower % 2f dBm, "
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 4a8a6c22..5f638e6c 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -429,7 +429,7 @@ static int trx_init(struct gsm_bts_trx *trx)
 	dev_par->u16BcchArfcn = trx->bts->c0->arfcn;
 	dev_par->u8NbTsc = trx->bts->bsic & 7;
 	dev_par->fRxPowerLevel = trx_ms_pwr_ctrl_is_osmo(trx)
-					? 0.0 : trx->bts->ul_power_target;
+					? 0.0 : trx->bts->ul_power_ctrl.target;
 
 	dev_par->fTxPowerLevel = ((float) initial_mdBm) / 1000;
 	LOGP(DL1C, LOGL_NOTICE, "Init TRX (ARFCN %u, TSC %u, RxPower % 2f dBm, "
diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c
index f5758843..1f2aefbd 100644
--- a/src/osmo-bts-sysmo/sysmobts_vty.c
+++ b/src/osmo-bts-sysmo/sysmobts_vty.c
@@ -154,7 +154,7 @@ DEFUN_DEPRECATED(cfg_trx_ul_power_target, cfg_trx_ul_power_target_cmd,
 {
 	struct gsm_bts_trx *trx = vty->index;
 
-	trx->bts->ul_power_target = atoi(argv[0]);
+	trx->bts->ul_power_ctrl.target = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }
diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c
index ceca3309..0353064e 100644
--- a/src/osmo-bts-trx/trx_vty.c
+++ b/src/osmo-bts-trx/trx_vty.c
@@ -198,7 +198,7 @@ DEFUN_DEPRECATED(cfg_phy_ms_power_loop, cfg_phy_ms_power_loop_cmd,
 {
 	vty_out (vty, "'osmotrx ms-power-loop' is deprecated, use 'uplink-power-target' instead%s", VTY_NEWLINE);
 
-	g_bts->ul_power_target = atoi(argv[0]);
+	g_bts->ul_power_ctrl.target = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }