<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12962">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oc2g: Fix compilation error (comment mark inside comment)<br><br>Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c<br>---<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-oc2g/main.c<br>M src/osmo-bts-oc2g/oc2gbts_vty.c<br>M src/osmo-bts-oc2g/oml.c<br>4 files changed, 19 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index d8fdd96..884ce4e 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -1745,7 +1745,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* initialize DSP heart beat alive timer * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * initialize DSP heart beat alive timer * /</span><br><span> fl1h->hw_alive.dsp_alive_timer.cb = dsp_alive_timer_cb;</span><br><span> fl1h->hw_alive.dsp_alive_timer.data = fl1h;</span><br><span> fl1h->hw_alive.dsp_alive_cnt = 0;</span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index 574bc72..e685150 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -94,9 +94,9 @@</span><br><span> </span><br><span> /* TODO(oramadan) MERGE</span><br><span> bts->oc2g.led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;</span><br><span style="color: hsl(0, 100%, 40%);">- /* RTP drift threshold default * /</span><br><span style="color: hsl(0, 100%, 40%);">- bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT;</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RTP drift threshold default */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */</span><br><span> </span><br><span> rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>index 4f7c45a..099698f 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>+++ b/src/osmo-bts-oc2g/oc2gbts_vty.c</span><br><span>@@ -507,16 +507,16 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> /* TODO(oramadan) MERGE</span><br><span style="color: hsl(0, 100%, 40%);">- /* store recorded HO causes * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * store recorded HO causes * /</span><br><span> old_ho_cause = lchan->meas_preproc.rec_ho_causes;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Apply new HO causes * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * Apply new HO causes * /</span><br><span> lchan->meas_preproc.rec_ho_causes = 1 << (ho_cause - 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send measuremnt report to BSC * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * Send measuremnt report to BSC * /</span><br><span> rsl_tx_preproc_meas_res(lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* restore HO cause * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * restore HO cause * /</span><br><span> lchan->meas_preproc.rec_ho_causes = old_ho_cause;</span><br><span> */</span><br><span> </span><br><span>@@ -673,7 +673,7 @@</span><br><span> }</span><br><span> </span><br><span> /* TODO(oramadan) MERGE</span><br><span style="color: hsl(0, 100%, 40%);">-/* OC2G BTS control interface * /</span><br><span style="color: hsl(120, 100%, 40%);">+/ * OC2G BTS control interface * /</span><br><span> CTRL_CMD_DEFINE_WO_NOVRF(oc2g_oml_alert, "oc2g-oml-alert");</span><br><span> static int set_oc2g_oml_alert(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span>@@ -688,10 +688,10 @@</span><br><span> memcpy(alarm_sig_data.spare, &cause, sizeof(int));</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "BTS received MGR alarm cause=%d, text=%s\n", cause, alarm_sig_data.add_text);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* dispatch OML alarm signal * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * dispatch OML alarm signal * /</span><br><span> osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_MGR_ALARM, &alarm_sig_data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* return with same alarm cause to MGR rather than OK string* /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * return with same alarm cause to MGR rather than OK string* /</span><br><span> cmd->reply = talloc_asprintf(cmd, "%d", cause);</span><br><span> return CTRL_CMD_REPLY;</span><br><span> }</span><br><span>@@ -709,11 +709,10 @@</span><br><span> memcpy(alarm_sig_data.spare, &cause, sizeof(int));</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "BTS received MGR ceased alarm cause=%d, text=%s\n", cause, alarm_sig_data.add_text);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* dispatch OML alarm signal * /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * dispatch OML alarm signal * /</span><br><span> osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_MGR_CEASED_ALARM, &alarm_sig_data);</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* return with same alarm cause to MGR rather than OK string* /</span><br><span style="color: hsl(120, 100%, 40%);">+ / * return with same alarm cause to MGR rather than OK string* /</span><br><span> cmd->reply = talloc_asprintf(cmd, "%d", cause);</span><br><span> return CTRL_CMD_REPLY;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 6cf7e1d..3202409 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -354,19 +354,21 @@</span><br><span> if (trx->mo.nm_state.administrative == NM_STATE_LOCKED)</span><br><span> trx_rf_lock(trx, 1, trx_mute_on_init_cb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* apply initial values for Tx power backoff for 8-PSK * /</span><br><span style="color: hsl(0, 100%, 40%);">- trx->max_power_backoff_8psk = fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* apply initial values for Tx power backoff for 8-PSK */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*trx->max_power_backoff_8psk = fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk;</span><br><span> l1if_set_txpower_backoff_8psk(fl1h, fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk);</span><br><span> LOGP(DL1C, LOGL_INFO, "%s Applied initial 8-PSK Tx power backoff of %d dB\n",</span><br><span> gsm_trx_name(fl1h->phy_inst->trx),</span><br><span> fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk);</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* apply initial values for Tx C0 idle slot power reduction * /</span><br><span style="color: hsl(0, 100%, 40%);">- trx->c0_idle_power_red = fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* apply initial values for Tx C0 idle slot power reduction */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*trx->c0_idle_power_red = fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red;</span><br><span> l1if_set_txpower_c0_idle_pwr_red(fl1h, fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red);</span><br><span> LOGP(DL1C, LOGL_INFO, "%s Applied initial C0 idle slot power reduction of %d dB\n",</span><br><span> gsm_trx_name(fl1h->phy_inst->trx),</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red); */</span><br><span style="color: hsl(120, 100%, 40%);">+ fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red);</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> </span><br><span> /* Begin to ramp up the power */</span><br><span> power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12962">change 12962</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/12962"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c </div>
<div style="display:none"> Gerrit-Change-Number: 12962 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>