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/bsc_vty.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/bsc_vty.c')
| -rw-r--r-- | src/osmo-bsc/bsc_vty.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 6252d06e7..6f4e2ecf4 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1691,7 +1691,7 @@ static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, bool all) { struct gsm_lchan *lchan; - ts_for_each_lchan(lchan, ts) { + ts_for_n_lchans(lchan, ts, ts->max_lchans_possible) { if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false) continue; dump_cb(vty, lchan); @@ -1997,7 +1997,7 @@ static struct gsm_lchan *find_used_voice_lchan(struct vty *vty, int random_idx) if (ts->fi->state != TS_ST_IN_USE) continue; - ts_for_each_lchan(lchan, ts) { + ts_for_n_lchans(lchan, ts, ts->max_lchans_possible) { if (lchan_state_is(lchan, LCHAN_ST_ESTABLISHED) && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { @@ -6160,7 +6160,7 @@ static int lchan_act_trx(struct vty *vty, struct gsm_bts_trx *trx, int activate) for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { ts = &trx->ts[ts_nr]; - ts_for_each_potential_lchan(lchan, ts) { + ts_for_n_lchans(lchan, ts, ts->max_lchans_possible) { switch (ts->pchan_on_init) { case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_CCCH_SDCCH4_CBCH: |