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/+/17809 )


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: I363656e55fe7828cc452df14c0ff0420180e2af5
---
M src/osmo-bts-litecell15/l1_if.c
2 files changed, 0 insertions(+), 8 deletions(-)



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

diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 000a0f0..75f4fa7 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   (8fd72d osmo-bts-litecell15: Implement missing features.)
 			if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
-=======
-			if(trx->bts->lc15.led_ctrl_mode == LC15_LED_CONTROL_BTS)
->>>>>>> BRANCH (378485 osmo-bts-litecell15: Implement missing features.)
 				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   (8fd72d osmo-bts-litecell15: Implement missing features.)
 		if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)
-=======
-		if(trx->bts->lc15.led_ctrl_mode == LC15_LED_CONTROL_BTS)
->>>>>>> BRANCH (378485 osmo-bts-litecell15: Implement missing features.)
 			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);

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I363656e55fe7828cc452df14c0ff0420180e2af5
Gerrit-Change-Number: 17809
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/20200414/ec5e0c03/attachment.htm>