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

wip 

Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea
This commit is contained in:
Neels Hofmeyr 2018-04-23 17:06:00 +02:00
parent c7b206e850
commit e9e5b39a01
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/oml.c
View File

@ -941,6 +941,7 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
/* Call into BTS driver to check attribute values */
rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts);
if (rc < 0) {
LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc);
talloc_free(tp_merged);
/* Send NACK */
return oml_fom_ack_nack(msg, -rc);
@ -956,6 +957,9 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
ts->pchan = abis_nm_pchan4chcomb(comb);
rc = conf_lchans(ts);
if (rc < 0) {
LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid Chan Comb 0x%x"
" (pchan=%s, conf_lchans()->%d)\n",
comb, gsm_pchan_name(ts->pchan), rc);
talloc_free(tp_merged);
/* Send NACK */
return oml_fom_ack_nack(msg, -rc);
@ -971,8 +975,8 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
/* If there is no TSC specified, use the BCC */
ts->tsc = BSIC2BCC(bts->bsic);
}
LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC = %u)\n",
gsm_abis_mo_name(&ts->mo), ts->tsc);
LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC=%u pchan=%s)\n",
gsm_abis_mo_name(&ts->mo), ts->tsc, gsm_pchan_name(ts->pchan));
/* call into BTS driver to apply new attributes to hardware */
return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts);

7
src/common/rsl.c
View File

@ -922,6 +922,9 @@ static int rsl_rx_chan_activ(struct msgb *msg)
}
}
LOGP(DRSL, LOGL_DEBUG, "%s: rx Channel Activation in state: %s.\n",
gsm_lchan_name(lchan), gsm_lchans_name(lchan->state));
/* Initialize channel defaults */
lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
lchan->ms_power_ctrl.current = lchan->ms_power;
@ -2124,8 +2127,8 @@ static void osmo_dyn_ts_disconnected(struct gsm_bts_trx_ts *ts)
break;
default:
LOGP(DRSL, LOGL_ERROR,
"%s Dyn TS disconnected, but invalid desired pchan",
gsm_ts_and_pchan_name(ts));
"%s Dyn TS disconnected, but invalid desired pchan: %s\n",
gsm_ts_and_pchan_name(ts), gsm_pchan_name(ts->dyn.pchan_want));
ts->dyn.pchan_want = GSM_PCHAN_NONE;
/* TODO: how would this recover? */
return;