Change in osmo-bsc[master]: bts_vty: Print C/I power params for osmo-bts only

[pespin]

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

Change subject: bts_vty: Print C/I power params for osmo-bts only
......................................................................

bts_vty: Print C/I power params for osmo-bts only

Those are osmo-bts specific extensions, so there's no point in printing
related VTY config.

Change-Id: Ie85d2aefa1ab7bf943479e18cc79a0f56e54d431
---
M src/osmo-bsc/bts_vty.c
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 7a502d7..0e0285a 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -3932,6 +3932,7 @@
 }
 
 static void config_write_power_ctrl(struct vty *vty, unsigned int indent,
+				    const struct gsm_bts *bts,
 				    const struct gsm_power_ctrl_params *cp)
 {
 	const char *node_name;
@@ -3965,7 +3966,7 @@
 		/* Measurement processing / averaging parameters */
 		config_write_power_ctrl_meas(vty, indent + 1, &cp->rxlev_meas, "rxlev", "");
 		config_write_power_ctrl_meas(vty, indent + 1, &cp->rxqual_meas, "rxqual", "");
-		if (cp->dir == GSM_PWR_CTRL_DIR_UL) {
+		if (cp->dir == GSM_PWR_CTRL_DIR_UL && is_osmobts(bts)) {
 			config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_fr_meas, "ci", " fr-efr");
 			config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_hr_meas, "ci", " hr");
 			config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_amr_fr_meas, "ci", " amr-fr");
@@ -4285,8 +4286,8 @@
 	}
 
 	/* BS/MS Power Control parameters */
-	config_write_power_ctrl(vty, 2, &bts->bs_power_ctrl);
-	config_write_power_ctrl(vty, 2, &bts->ms_power_ctrl);
+	config_write_power_ctrl(vty, 2, bts, &bts->bs_power_ctrl);
+	config_write_power_ctrl(vty, 2, bts, &bts->ms_power_ctrl);
 
 	config_write_bts_model(vty, bts);
 }

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie85d2aefa1ab7bf943479e18cc79a0f56e54d431
Gerrit-Change-Number: 25621
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
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/20210929/2e0c013b/attachment.htm>