diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2016-08-29 18:45:42 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-09-23 02:43:12 +0000 |
| commit | 308cb0719dca3ba8eed1eff2a2124d44f34d9a28 (patch) | |
| tree | 6e8352508d66e5f3e6034b8aa5c9d5b87bf49f02 /openbsc/src/libbsc/chan_alloc.c | |
| parent | 7c359eb4b45c382ff3ec5387cbd035a11c8041b4 (diff) | |
bts: extend bts_chan_load to allow counting tch only
Change-Id: I86f1d502649747b6b9aefcb39081b14110e8f494
Diffstat (limited to 'openbsc/src/libbsc/chan_alloc.c')
| -rw-r--r-- | openbsc/src/libbsc/chan_alloc.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 7b0c3e67d..03d44e01f 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -514,7 +514,28 @@ struct gsm_subscriber_connection *connection_for_subscr(struct gsm_subscriber *s return NULL; } -void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts) +static int chan_is_tch(struct gsm_bts_trx_ts *ts) +{ + switch (ts->pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + return 1; + case GSM_PCHAN_TCH_F_PDCH: + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (ts->dyn.pchan_is == GSM_PCHAN_TCH_F || + ts->dyn.pchan_is == GSM_PCHAN_TCH_H) + return 1; + else + return 0; + default: + return 0; + } +} + + + +void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts, + int only_count_tch) { struct gsm_bts_trx *trx; @@ -536,6 +557,9 @@ void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts) if (!nm_is_running(&ts->mo.nm_state)) continue; + if (only_count_tch && !chan_is_tch(ts)) + continue; + subslots = ts_subslots(ts); for (j = 0; j < subslots; j++) { struct gsm_lchan *lchan = &ts->lchan[j]; @@ -561,6 +585,5 @@ void network_chan_load(struct pchan_load *pl, struct gsm_network *net) memset(pl, 0, sizeof(*pl)); llist_for_each_entry(bts, &net->bts_list, list) - bts_chan_load(pl, bts); + bts_chan_load(pl, bts, 0); } - |