Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags

[fixeria]

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

Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags
......................................................................

[overpower] scheduler: handle {sacch,facch}_enabled flags

The new [bit-]fields in the RSL_IE_OSMO_TEMP_OVP_ACCH_CAP allow
more fine-grained control over the overpower feature, which
can be enabled:

  * for both SACCH and FACCH,
  * for SACCH only, or
  * for FACCH only.

Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c
Depends: Ia28293a12de0af71f55e701fb65c46e905dae217
Related: SYS#5319
---
M src/common/scheduler.c
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 463a5b8..a53de09 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1299,17 +1299,17 @@
 				struct trx_dl_burst_req *br)
 {
 	const struct trx_chan_desc *desc = &trx_chan_desc[br->chan];
-	const uint8_t overpower_db = lchan->top_acch_cap.overpower_db;
 
 	/* Current BS power reduction value in dB */
 	br->att = lchan->bs_power_ctrl.current;
 
 	/* Temporary Overpower for SACCH/FACCH bursts */
-	if (overpower_db == 0)
+	if (lchan->top_acch_cap.overpower_db == 0)
 		return;
-	if (desc->link_id == LID_SACCH || br->flags & TRX_BR_F_FACCH) {
-		if (br->att > overpower_db)
-			br->att -= overpower_db;
+	if ((lchan->top_acch_cap.sacch_enable && desc->link_id == LID_SACCH) ||
+	    (lchan->top_acch_cap.facch_enable && br->flags & TRX_BR_F_FACCH)) {
+		if (br->att > lchan->top_acch_cap.overpower_db)
+			br->att -= lchan->top_acch_cap.overpower_db;
 		else
 			br->att = 0;
 	}

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c
Gerrit-Change-Number: 25898
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
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/20211025/bc893b1b/attachment.htm>