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

comments: clarify some dynamic TS comments 

A new type of dynamic channel will be introduced soon, so prepare some comments
to name the dynamic TS kind more specifically.

Change-Id: I51fa8c2ebba507299e55a5cb7e67e48a6c8471f7
This commit is contained in:
Neels Hofmeyr 2016-07-14 02:51:13 +02:00 committed by Neels Hofmeyr
parent 67933a19d6
commit c6926d064d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/src/libbsc/abis_rsl.c
View File

@ -470,7 +470,7 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type,
if (rc < 0) if (rc < 0)
return rc; return rc;
/* if channel is in PDCH mode, deactivate PDCH first */ /* If a TCH_F/PDCH TS is in PDCH mode, deactivate PDCH first. */
if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
&& (lchan->ts->flags & TS_F_PDCH_ACTIVE)) { && (lchan->ts->flags & TS_F_PDCH_ACTIVE)) {
/* store activation type and handover reference */ /* store activation type and handover reference */
@ -772,7 +772,7 @@ static int rsl_rx_rf_chan_rel_ack(struct gsm_lchan *lchan)
* *
* Any state other than LCHAN_S_REL_ERR became LCHAN_S_NONE after above * Any state other than LCHAN_S_REL_ERR became LCHAN_S_NONE after above
* do_lchan_free(). Assert this, because that's what ensures a PDCH ACT * do_lchan_free(). Assert this, because that's what ensures a PDCH ACT
* on a dynamic channel in all cases. * on a TCH/F_PDCH TS in all cases.
* *
* If GPRS is disabled, always skip the PDCH ACT. * If GPRS is disabled, always skip the PDCH ACT.
*/ */

11
openbsc/src/libbsc/chan_alloc.c
View File

@ -43,7 +43,7 @@ static int ts_is_usable(struct gsm_bts_trx_ts *ts)
return 0; return 0;
} }
/* If a dyn PDCH channel is busy changing, it is already taken or not /* If a TCH/F_PDCH TS is busy changing, it is already taken or not
* yet available. */ * yet available. */
if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) { if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) {
if (ts->flags & TS_F_PDCH_PENDING_MASK) if (ts->flags & TS_F_PDCH_PENDING_MASK)
@ -142,9 +142,12 @@ _lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan)
/* Allocate a logical channel. /* Allocate a logical channel.
* *
* For TCH/F, we may return a dynamic TCH/F_PDCH channel (but prefer a pure * Dynamic channel types: we always prefer a dedicated TS, and only pick +
* TCH/F). If we pick a TCH/F_PDCH time slot, PDCH will be disabled later on; * switch a dynamic TS if no pure TS of the requested PCHAN is available.
* there is no need to check whether PDCH mode is currently active, here. *
* TCH_F/PDCH: if we pick a PDCH ACT style dynamic TS as TCH/F channel, PDCH
* will be disabled in rsl_chan_activate_lchan(); there is no need to check
* whether PDCH mode is currently active, here.
*/ */
struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type,
int allow_bigger) int allow_bigger)