<p>rafael2k has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17854">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: I7af749a543c840f6e3898f17aaea23a30a0b1989<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-litecell15/oml.c<br>3 files changed, 6 insertions(+), 9 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/54/17854/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 1bdc726..6a8cb3c 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 (a02d12 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)</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(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (1d6514 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)</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 (a02d12 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)</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(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (1d6514 Merge branch 'rafael2k/litecell15_missing_features' of ssh:/)</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>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c</span><br><span>index a519b38..51494c2 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml.c</span><br><span>@@ -1179,7 +1179,9 @@</span><br><span> { GsmL1_ConfigParamId_SetTxPowerLevel, "Set Tx power level" },</span><br><span> { GsmL1_ConfigParamId_SetLogChParams, "Set logical channel params" },</span><br><span> { GsmL1_ConfigParamId_SetCipheringParams,"Configure ciphering params" },</span><br><span style="color: hsl(120, 100%, 40%);">+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)</span><br><span> { GsmL1_ConfigParamId_Set8pskPowerReduction, "Set 8PSK Tx power reduction" },</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -1428,6 +1430,7 @@</span><br><span> return l1if_gsm_req_compl(fl1h, msg, chmod_txpower_compl_cb, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)</span><br><span> int l1if_set_txpower_backoff_8psk(struct lc15l1_hdl *fl1h, uint8_t backoff)</span><br><span> {</span><br><span> struct msgb *msg = l1p_msgb_alloc();</span><br><span>@@ -1468,6 +1471,7 @@</span><br><span> </span><br><span> return l1if_req_compl(fl1h, msg, chmod_c0_idle_pwr_red_compl_cb, NULL);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> const enum GsmL1_CipherId_t rsl2l1_ciph[] = {</span><br><span> [0] = GsmL1_CipherId_A50,</span><br><span>@@ -1836,7 +1840,7 @@</span><br><span> /* Did we go through MphInit yet? If yes fire and forget */</span><br><span> if (fl1h->hLayer1) {</span><br><span> power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7)</span><br><span> if (fl1h->phy_inst->u.lc15.tx_pwr_red_8psk != trx->max_power_backoff_8psk) {</span><br><span> /* update current Tx power backoff for 8-PSK */</span><br><span> fl1h->phy_inst->u.lc15.tx_pwr_red_8psk = trx->max_power_backoff_8psk;</span><br><span>@@ -1850,6 +1854,7 @@</span><br><span> /* instruct L1 to apply C0 idle slot power reduction */</span><br><span> l1if_set_txpower_c0_idle_pwr_red(fl1h, fl1h->phy_inst->u.lc15.tx_c0_idle_pwr_red);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }</span><br><span> }</span><br><span> /* FIXME: we actually need to send a ACK or NACK for the OML message */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17854">change 17854</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/+/17854"/><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: I7af749a543c840f6e3898f17aaea23a30a0b1989 </div>
<div style="display:none"> Gerrit-Change-Number: 17854 </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>