Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP

[fixeria]

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

Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP
......................................................................

[overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP

The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow:

  * selectively enabling SACCH and/or FACCH,
  * setting the RxQual (BER) threshold.

Both features are implemented in the follow-up commits.

Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e
Depends: Ia28293a12de0af71f55e701fb65c46e905dae217
Related: SYS#5319
---
M include/osmo-bts/lchan.h
M src/common/rsl.c
M src/common/scheduler.c
3 files changed, 13 insertions(+), 9 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/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h
index 57999b1..754dc7c 100644
--- a/include/osmo-bts/lchan.h
+++ b/include/osmo-bts/lchan.h
@@ -293,8 +293,8 @@
 	struct gsm_power_ctrl_params ms_dpc_params;
 	struct gsm_power_ctrl_params bs_dpc_params;
 
-	/* Temporary Overpower for SACCH/FACCH */
-	uint8_t bs_acch_overpower_db;
+	/* Temporary ACCH overpower capabilities */
+	struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;
 
 	struct msgb *pending_rel_ind_msg;
 
diff --git a/src/common/rsl.c b/src/common/rsl.c
index c100687..a952d25 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1592,18 +1592,22 @@
 static int parse_temporary_overpower_acch_capability(struct gsm_lchan *lchan,
 						     const struct tlv_parsed *tp)
 {
-	struct abis_rsl_osmo_temp_ovp_acch_cap *top;
+	memset(&lchan->top_acch_cap, 0, sizeof(lchan->top_acch_cap));
 
-	lchan->bs_acch_overpower_db = 0;
-
-	if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(*top)))
+	if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(lchan->top_acch_cap)))
 		return 0;
 
 	if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_TEMP_OVP))
 		return -RSL_ERR_OPT_IE_ERROR;
 
-	top = (struct abis_rsl_osmo_temp_ovp_acch_cap *)TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP);
-	lchan->bs_acch_overpower_db = top->overpower_db;
+	memcpy(&lchan->top_acch_cap,
+	       TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP),
+	       sizeof(lchan->top_acch_cap));
+
+	/* Simplify checking whether the overpower is enabled at all: allow
+	 * testing just one parameter (overpower_db > 0) instead of all three. */
+	if (!lchan->top_acch_cap.sacch_enable && !lchan->top_acch_cap.facch_enable)
+		lchan->top_acch_cap.overpower_db = 0;
 
 	return 0;
 }
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 2a729e4..463a5b8 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1299,7 +1299,7 @@
 				struct trx_dl_burst_req *br)
 {
 	const struct trx_chan_desc *desc = &trx_chan_desc[br->chan];
-	const uint8_t overpower_db = lchan->bs_acch_overpower_db;
+	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;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e
Gerrit-Change-Number: 25897
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-CC: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211025/c2b2429f/attachment.htm>