Change in osmo-bts[master]: Merge branch 'rafael2k/litecell15_missing_features' of ssh://gerrit.o...

[rafael2k]

rafael2k has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/17854 )


Change subject: Merge branch 'rafael2k/litecell15_missing_features' of ssh://gerrit.osmocom.org:29418/osmo-bts into rafael2k/litecell15_missing_features
......................................................................

Merge branch 'rafael2k/litecell15_missing_features' of ssh://gerrit.osmocom.org:29418/osmo-bts into rafael2k/litecell15_missing_features

Change-Id: I7af749a543c840f6e3898f17aaea23a30a0b1989
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-litecell15/oml.c
3 files changed, 6 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/17854/1

diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 1bdc726..6a8cb3c 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -1265,11 +1265,7 @@
 				get_value_string(lc15bts_l1status_names, status));
 			bts_shutdown(trx->bts, "RF-ACT failure");
 		} else {
-<<<<<<< HEAD   (a02d12 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)
 			if (bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
-=======
-			if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
->>>>>>> BRANCH (1d6514 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)
 				bts_update_status(BTS_STATUS_RF_ACTIVE, 1);
                }
 
@@ -1282,11 +1278,7 @@
 		for (i = 0; i < ARRAY_SIZE(trx->ts); i++)
 			oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
 	} else {
-<<<<<<< HEAD   (a02d12 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)
 		if (bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
-=======
-		if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
->>>>>>> BRANCH (1d6514 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)
 			bts_update_status(BTS_STATUS_RF_ACTIVE, 0);
 		oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
 		oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c
index a519b38..51494c2 100644
--- a/src/osmo-bts-litecell15/oml.c
+++ b/src/osmo-bts-litecell15/oml.c
@@ -1179,7 +1179,9 @@
 	{ GsmL1_ConfigParamId_SetTxPowerLevel,	"Set Tx power level" },
 	{ GsmL1_ConfigParamId_SetLogChParams,	"Set logical channel params" },
 	{ GsmL1_ConfigParamId_SetCipheringParams,"Configure ciphering params" },
+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)
 	{ GsmL1_ConfigParamId_Set8pskPowerReduction,	"Set 8PSK Tx power reduction" },
+#endif
 	{ 0, NULL }
 };
 
@@ -1428,6 +1430,7 @@
 	return l1if_gsm_req_compl(fl1h, msg, chmod_txpower_compl_cb, NULL);
 }
 
+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)
 int l1if_set_txpower_backoff_8psk(struct lc15l1_hdl *fl1h, uint8_t backoff)
 {
 	struct msgb *msg = l1p_msgb_alloc();
@@ -1468,6 +1471,7 @@
 
 	return l1if_req_compl(fl1h, msg, chmod_c0_idle_pwr_red_compl_cb, NULL);
 }
+#endif
 
 const enum GsmL1_CipherId_t rsl2l1_ciph[] = {
 	[0]	= GsmL1_CipherId_A50,
@@ -1836,7 +1840,7 @@
 		/* Did we go through MphInit yet? If yes fire and forget */
 		if (fl1h->hLayer1) {
 			power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0);
-
+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)
 			if (fl1h->phy_inst->u.lc15.tx_pwr_red_8psk != trx->max_power_backoff_8psk) {
 				/* update current Tx power backoff for 8-PSK */
 				fl1h->phy_inst->u.lc15.tx_pwr_red_8psk = trx->max_power_backoff_8psk;
@@ -1850,6 +1854,7 @@
 				/* instruct L1 to apply C0 idle slot power reduction */
 				l1if_set_txpower_c0_idle_pwr_red(fl1h, fl1h->phy_inst->u.lc15.tx_c0_idle_pwr_red);
 			}
+#endif
 		}
 	}
 	/* FIXME: we actually need to send a ACK or NACK for the OML message */

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7af749a543c840f6e3898f17aaea23a30a0b1989
Gerrit-Change-Number: 17854
Gerrit-PatchSet: 1
Gerrit-Owner: rafael2k <rafael at rhizomatica.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200418/fc42f206/attachment.htm>