<p>rafael2k has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17809">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Merge branch 'rafael2k/litecell15_missing_features' of ssh://gerrit.osmocom.org:29418/osmo-bts into rafael2k/litecell15_missing_features<br><br>Change-Id: I363656e55fe7828cc452df14c0ff0420180e2af5<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>2 files changed, 0 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/09/17809/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 000a0f0..75f4fa7 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -1265,11 +1265,7 @@</span><br><span>                             get_value_string(lc15bts_l1status_names, status));</span><br><span>                   bts_shutdown(trx->bts, "RF-ACT failure");</span><br><span>               } else {</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD   (8fd72d osmo-bts-litecell15: Implement missing features.)</span><br><span>                        if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">-                   if(trx->bts->lc15.led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (378485 osmo-bts-litecell15: Implement missing features.)</span><br><span>                          bts_update_status(BTS_STATUS_RF_ACTIVE, 1);</span><br><span>                }</span><br><span> </span><br><span>@@ -1282,11 +1278,7 @@</span><br><span>                 for (i = 0; i < ARRAY_SIZE(trx->ts); i++)</span><br><span>                      oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span>         } else {</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD   (8fd72d osmo-bts-litecell15: Implement missing features.)</span><br><span>                if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">-           if(trx->bts->lc15.led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (378485 osmo-bts-litecell15: Implement missing features.)</span><br><span>                  bts_update_status(BTS_STATUS_RF_ACTIVE, 0);</span><br><span>          oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span>                 oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17809">change 17809</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/17809"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I363656e55fe7828cc452df14c0ff0420180e2af5 </div>
<div style="display:none"> Gerrit-Change-Number: 17809 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: rafael2k <rafael@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>