cosmetic: timeslot_fsm.c: move some code to separate function
Cosmetically prepare for patch I9ea0c53a5e68a51c781ef43bae71f947cdb95678 Change-Id: I2c26d937496211e4b876987bac3803f6b2e6c8be
This commit is contained in:
parent
5ea91cdae4
commit
ee105c57b1
|
@ -323,11 +323,32 @@ static void ts_fsm_not_initialized_onenter(struct osmo_fsm_inst *fi, uint32_t pr
|
||||||
chan_counts_ts_clear(ts);
|
chan_counts_ts_clear(ts);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ts_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
|
static void ts_fsm_unused_pdch_act(struct osmo_fsm_inst *fi)
|
||||||
{
|
{
|
||||||
struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);
|
struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);
|
||||||
struct gsm_bts *bts = ts->trx->bts;
|
struct gsm_bts *bts = ts->trx->bts;
|
||||||
|
|
||||||
|
if (bts->gprs.mode == BTS_GPRS_NONE) {
|
||||||
|
LOG_TS(ts, LOGL_DEBUG, "GPRS mode is 'none': not activating PDCH.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ts->pdch_act_allowed) {
|
||||||
|
LOG_TS(ts, LOGL_DEBUG, "PDCH is disabled for this timeslot,"
|
||||||
|
" either due to a PDCH ACT NACK, or from manual VTY command:"
|
||||||
|
" not activating PDCH. (last error: %s)\n",
|
||||||
|
ts->last_errmsg ? : "-");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
osmo_fsm_inst_state_chg(fi, TS_ST_WAIT_PDCH_ACT, CHAN_ACT_DEACT_TIMEOUT,
|
||||||
|
T_CHAN_ACT_DEACT);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ts_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
|
||||||
|
{
|
||||||
|
struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);
|
||||||
|
|
||||||
chan_counts_ts_update(ts);
|
chan_counts_ts_update(ts);
|
||||||
|
|
||||||
/* We are entering the unused state. There must by definition not be any lchans waiting to be
|
/* We are entering the unused state. There must by definition not be any lchans waiting to be
|
||||||
|
@ -342,19 +363,7 @@ static void ts_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
|
||||||
switch (ts->pchan_on_init) {
|
switch (ts->pchan_on_init) {
|
||||||
case GSM_PCHAN_OSMO_DYN:
|
case GSM_PCHAN_OSMO_DYN:
|
||||||
case GSM_PCHAN_TCH_F_PDCH:
|
case GSM_PCHAN_TCH_F_PDCH:
|
||||||
if (bts->gprs.mode == BTS_GPRS_NONE) {
|
ts_fsm_unused_pdch_act(fi);
|
||||||
LOG_TS(ts, LOGL_DEBUG, "GPRS mode is 'none': not activating PDCH.\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!ts->pdch_act_allowed) {
|
|
||||||
LOG_TS(ts, LOGL_DEBUG, "PDCH is disabled for this timeslot,"
|
|
||||||
" either due to a PDCH ACT NACK, or from manual VTY command:"
|
|
||||||
" not activating PDCH. (last error: %s)\n",
|
|
||||||
ts->last_errmsg ? : "-");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
osmo_fsm_inst_state_chg(fi, TS_ST_WAIT_PDCH_ACT, CHAN_ACT_DEACT_TIMEOUT,
|
|
||||||
T_CHAN_ACT_DEACT);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GSM_PCHAN_CCCH_SDCCH4_CBCH:
|
case GSM_PCHAN_CCCH_SDCCH4_CBCH:
|
||||||
|
|
Loading…
Reference in New Issue