Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/14156 )
Change subject: rsl: Implement parsing of BS Power Control message
......................................................................
rsl: Implement parsing of BS Power Control message
Change-Id: Id144a7e468f730e3cdaefa4cf2ad51c6106310a2
---
M doc/manuals/abis/rsl.adoc
M src/common/rsl.c
2 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc
index ec4da67..f66142d 100644
--- a/doc/manuals/abis/rsl.adoc
+++ b/doc/manuals/abis/rsl.adoc
@@ -39,6 +39,7 @@
| 8.4.11 | - | MODE MODIFY NEGATIVE ACKNOWLEDGE | -> | Sent
| 8.4.14 | - | RF CHANNEL RELEASE | <- | Received
| 8.4.15 | <<MS_POWER_CONTROL>> | MS POWER CONTROL | <- | Received
+| 8.4.16 | - | BS POWER CONTROL | <- | Received
| 8.4.19 | - | RF CHANNEL RELEASE ACKNOWLEDGE | -> | Sent
| 8.4.20 | <<SACCH_INFO_MODIFY>> | SACCH INFO MODIFY | <- | Received
5+<| *COMMON CHANNEL MANAGEMENT MESSAGES*
@@ -91,7 +92,6 @@
2+<| *DEDICATED CHANNEL MANAGEMENT MESSAGES*
| 8.4.12 | PHYSICAL CONTEXT REQUEST
| 8.4.13 | PHYSICAL CONTEXT CONFIRM
-| 8.4.16 | BS POWER CONTROL
| 8.4.17 | PREPROCESS CONFIGURE
| 8.4.18 | PREPROCESSED MEASUREMENT RESULT
| 8.4.21 | TALKER DETECTION
diff --git a/src/common/rsl.c b/src/common/rsl.c
index e6fd8b9..25ed279 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1585,6 +1585,47 @@
return 0;
}
+/* See TS 48.058 Section 9.3.4 */
+static int bs_power_attenuation_dB(uint8_t bs_power)
+{
+ /* the lower nibble contains the number of 2dB steps that the BS power
is reduced compared
+ * to its nominal transmit power */
+ return - ((bs_power & 0xF) *2);
+}
+
+/* 8.4.16 BS POWER CONTROL */
+static int rsl_rx_bs_pwr_ctrl(struct msgb *msg)
+{
+ struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
+ struct gsm_lchan *lchan = msg->lchan;
+ struct tlv_parsed tp;
+ uint8_t new_bs_power;
+
+ rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
+
+ /* 9.3.4 BS Power (M) */
+ if (!TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1))
+ return rsl_tx_error_report(msg->trx, RSL_ERR_MAND_IE_ERROR,
&dch->chan_nr, NULL, msg);
+
+ new_bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER);
+
+ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "BS POWER CONTROL Attenuation %d ->
%d dB\n",
+ bs_power_attenuation_dB(lchan->bs_power),
bs_power_attenuation_dB(new_bs_power));
+
+ lchan->bs_power = new_bs_power;
+
+ /* 9.3.31 MS Power Parameters (O) */
+ if (TLVP_PRESENT(&tp, RSL_IE_BS_POWER_PARAM)) {
+ /* Spec explicitly states BTS should perform autonomous
+ * BS power control loop in BTS if 'BS Power Parameters'
+ * IE is present! WE don't support that. */
+ return rsl_tx_error_report(msg->trx, RSL_ERR_OPT_IE_ERROR,
&dch->chan_nr, NULL, msg);
+ }
+
+ return 0;
+}
+
+
/* 8.4.20 SACCH INFO MODify */
static int rsl_rx_sacch_inf_mod(struct msgb *msg)
{
@@ -2926,6 +2967,9 @@
case RSL_MT_MS_POWER_CONTROL:
ret = rsl_rx_ms_pwr_ctrl(msg);
break;
+ case RSL_MT_BS_POWER_CONTROL:
+ ret = rsl_rx_bs_pwr_ctrl(msg);
+ break;
case RSL_MT_IPAC_PDCH_ACT:
case RSL_MT_IPAC_PDCH_DEACT:
rsl_rx_dyn_pdch(msg, dch->c.msg_type == RSL_MT_IPAC_PDCH_ACT);
--
To view, visit https://gerrit.osmocom.org/14156
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id144a7e468f730e3cdaefa4cf2ad51c6106310a2
Gerrit-Change-Number: 14156
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Vadim Yanitskiy <[email protected]>
