diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-05-19 02:28:26 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-05-31 05:20:03 +0000 |
| commit | 27c07690d9ece5c8e752a40b5276934bfa1326e3 (patch) | |
| tree | be095a148a490b92610cb4b75518cc5e0ba60c0e /src/osmo-bsc/lchan_select.c | |
| parent | e262919892ab58fe122ae203d745bd2b6a45626e (diff) | |
replace ts_*_for_each_lchan() with ts_for_n_lchans()
So far we have a couple of macros iterating a specific number of lchans,
depending on dynamic timeslot state etc. With addition of VAMOS lchans,
this would become more complex and bloated.
Instead of separate iteration macros for each situation, only have one
that takes a number of lchans as argument. That allows to more clearly
pick the number of lchans, especially for non-trivial VAMOS scenarios.
Related: SYS#5315 OS#4940
Change-Id: Ib2c6baf73a81ba371143ba5adc912aef6f79238d
Diffstat (limited to 'src/osmo-bsc/lchan_select.c')
| -rw-r--r-- | src/osmo-bsc/lchan_select.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index b494f023e..dba3c3aef 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -65,6 +65,7 @@ _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, } for (j = start; j != stop; j += dir) { + int lchans_as_pchan; ts = &trx->ts[j]; if (!ts_is_usable(ts)) continue; @@ -84,7 +85,8 @@ _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, } /* TS is (going to be) in desired pchan mode. Go ahead and check for an available lchan. */ - ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) { + lchans_as_pchan = pchan_subslots(as_pchan); + ts_for_n_lchans(lchan, ts, lchans_as_pchan) { if (lchan->fi->state == LCHAN_ST_UNUSED) { LOGPLCHANALLOC("%s ss=%d is available%s\n", gsm_ts_and_pchan_name(ts), lchan->nr, |