Change in osmo-bts[master]: rsl: Clarify when autnonoums MS Power Ctrl Loop is used

[pespin]

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

Change subject: rsl: Clarify when autnonoums MS Power Ctrl Loop is used
......................................................................

rsl: Clarify when autnonoums MS Power Ctrl Loop is used

Simplify when the fixed field is set in rsl_rx_chan_activ.

Comment talks about enabling autonoumous control loop, but it is
actually describing it when disabling it, which is confusing.

Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591
---
M src/common/rsl.c
1 file changed, 6 insertions(+), 9 deletions(-)

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



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 67eb622..b315d30 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1100,7 +1100,7 @@
 	/* Initialize channel defaults */
 	lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
 	lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
-	lchan->ms_power_ctrl.fixed = false;
+	lchan->ms_power_ctrl.fixed = true;
 
 	rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
 
@@ -1152,7 +1152,6 @@
 	if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {
 		lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;
 		lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
-		lchan->ms_power_ctrl.fixed = false;
 	}
 	/* 9.3.24 Timing Advance */
 	if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1))
@@ -1160,13 +1159,11 @@
 
 	/* 9.3.32 BS Power Parameters */
 	/* 9.3.31 MS Power Parameters */
-	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM))
-		lchan->ms_power_ctrl.fixed = false;
-	else {
+	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) {
 		/* Spec explicitly states BTS should only perform
 		* autonomous MS power control loop in BTS if 'MS Power
 		* Parameters' IE is present! */
-		lchan->ms_power_ctrl.fixed = true;
+		lchan->ms_power_ctrl.fixed = false;
 	}
 	/* 9.3.16 Physical Context */
 
@@ -1637,12 +1634,12 @@
 	LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Rx MS POWER CONTROL %" PRIu8 "\n", pwr);
 
 	/* 9.3.31 MS Power Parameters (O) */
-	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM))
-		lchan->ms_power_ctrl.fixed = false;
-	else {
+	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) {
 		/* Spec explicitly states BTS should only perform
 		* autonomous MS power control loop in BTS if 'MS Power
 		* Parameters' IE is present! */
+		lchan->ms_power_ctrl.fixed = false;
+	} else {
 		lchan->ms_power_ctrl.fixed = true;
 	}
 

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591
Gerrit-Change-Number: 16438
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
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/20191205/369a829b/attachment.htm>