cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

oc2g: Fix compilation error (comment mark inside comment) 

Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
This commit is contained in:
Pau Espin 2019-02-19 23:04:22 +01:00
parent f788aefe6f
commit 3713b59368
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osmo-bts-oc2g/l1_if.c
View File

@ -1745,7 +1745,7 @@ int bts_model_phy_link_open(struct phy_link *plink)
return -EIO;
}
/* initialize DSP heart beat alive timer * /
/ * initialize DSP heart beat alive timer * /
fl1h->hw_alive.dsp_alive_timer.cb = dsp_alive_timer_cb;
fl1h->hw_alive.dsp_alive_timer.data = fl1h;
fl1h->hw_alive.dsp_alive_cnt = 0;

4
src/osmo-bts-oc2g/main.c
View File

@ -94,9 +94,9 @@ int bts_model_init(struct gsm_bts *bts)
/* TODO(oramadan) MERGE
bts->oc2g.led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;
/* RTP drift threshold default * /
bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT;
*/
/* RTP drift threshold default */
/* bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */
rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd);
if (rc < 0) {

19
src/osmo-bts-oc2g/oc2gbts_vty.c
View File

@ -507,16 +507,16 @@ DEFUN(trigger_ho_cause, trigger_ho_cause_cmd, "HIDDEN", TRX_STR)
return CMD_WARNING;
}
/* TODO(oramadan) MERGE
/* store recorded HO causes * /
/ * store recorded HO causes * /
old_ho_cause = lchan->meas_preproc.rec_ho_causes;
/* Apply new HO causes * /
/ * Apply new HO causes * /
lchan->meas_preproc.rec_ho_causes = 1 << (ho_cause - 1);
/* Send measuremnt report to BSC * /
/ * Send measuremnt report to BSC * /
rsl_tx_preproc_meas_res(lchan);
/* restore HO cause * /
/ * restore HO cause * /
lchan->meas_preproc.rec_ho_causes = old_ho_cause;
*/
@ -673,7 +673,7 @@ int bts_model_vty_init(struct gsm_bts *bts)
}
/* TODO(oramadan) MERGE
/* OC2G BTS control interface * /
/ * OC2G BTS control interface * /
CTRL_CMD_DEFINE_WO_NOVRF(oc2g_oml_alert, "oc2g-oml-alert");
static int set_oc2g_oml_alert(struct ctrl_cmd *cmd, void *data)
{
@ -688,10 +688,10 @@ static int set_oc2g_oml_alert(struct ctrl_cmd *cmd, void *data)
memcpy(alarm_sig_data.spare, &cause, sizeof(int));
LOGP(DLCTRL, LOGL_NOTICE, "BTS received MGR alarm cause=%d, text=%s\n", cause, alarm_sig_data.add_text);
/* dispatch OML alarm signal * /
/ * dispatch OML alarm signal * /
osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_MGR_ALARM, &alarm_sig_data);
/* return with same alarm cause to MGR rather than OK string* /
/ * return with same alarm cause to MGR rather than OK string* /
cmd->reply = talloc_asprintf(cmd, "%d", cause);
return CTRL_CMD_REPLY;
}
@ -709,11 +709,10 @@ static int set_oc2g_oml_ceased(struct ctrl_cmd *cmd, void *data)
memcpy(alarm_sig_data.spare, &cause, sizeof(int));
LOGP(DLCTRL, LOGL_NOTICE, "BTS received MGR ceased alarm cause=%d, text=%s\n", cause, alarm_sig_data.add_text);
/* dispatch OML alarm signal * /
/ * dispatch OML alarm signal * /
osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_MGR_CEASED_ALARM, &alarm_sig_data);
*/
/* return with same alarm cause to MGR rather than OK string* /
/ * return with same alarm cause to MGR rather than OK string* /
cmd->reply = talloc_asprintf(cmd, "%d", cause);
return CTRL_CMD_REPLY;
}

12
src/osmo-bts-oc2g/oml.c
View File

@ -354,19 +354,21 @@ static int trx_init_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,
if (trx->mo.nm_state.administrative == NM_STATE_LOCKED)
trx_rf_lock(trx, 1, trx_mute_on_init_cb);
/* apply initial values for Tx power backoff for 8-PSK * /
trx->max_power_backoff_8psk = fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk;
/* apply initial values for Tx power backoff for 8-PSK */
/*trx->max_power_backoff_8psk = fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk;
l1if_set_txpower_backoff_8psk(fl1h, fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk);
LOGP(DL1C, LOGL_INFO, "%s Applied initial 8-PSK Tx power backoff of %d dB\n",
gsm_trx_name(fl1h->phy_inst->trx),
fl1h->phy_inst->u.oc2g.tx_pwr_red_8psk);
*/
/* apply initial values for Tx C0 idle slot power reduction * /
trx->c0_idle_power_red = fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red;
/* apply initial values for Tx C0 idle slot power reduction */
/*trx->c0_idle_power_red = fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red;
l1if_set_txpower_c0_idle_pwr_red(fl1h, fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red);
LOGP(DL1C, LOGL_INFO, "%s Applied initial C0 idle slot power reduction of %d dB\n",
gsm_trx_name(fl1h->phy_inst->trx),
fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red); */
fl1h->phy_inst->u.oc2g.tx_c0_idle_pwr_red);
*/
/* Begin to ramp up the power */
power_ramp_start(trx, get_p_target_mdBm(trx, 0), 0);