diff options
| author | Harald Welte <laforge@gnumonks.org> | 2014-01-19 17:18:21 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2014-01-19 17:32:59 +0100 |
| commit | 1fe241294960e91057d215ff8260f1047e8a7cd0 (patch) | |
| tree | 906625aedc0476a93f992f062cb13b2cc64552e6 /openbsc/src/libbsc/gsm_04_08_utils.c | |
| parent | 903aaea6689cc08c0e33fb05659c808a5e5f754f (diff) | |
TSC: Add new gsm_ts_tsc() function to resolve TSC of TS
We don't want every caller to check for ts->tsc == -1 and then
using ts->trx->bts->tsc instead. Rather, introduce a new inline
function to retrieve the correct value.
Diffstat (limited to 'openbsc/src/libbsc/gsm_04_08_utils.c')
| -rw-r--r-- | openbsc/src/libbsc/gsm_04_08_utils.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 735997ef1..fe6f2ab71 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -341,21 +341,15 @@ void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; - uint8_t tsc; - - if (lchan->ts->tsc == -1) - tsc = lchan->ts->trx->bts->tsc; - else - tsc = lchan->ts->tsc; cd->chan_nr = gsm_lchan2chan_nr(lchan); if (!lchan->ts->hopping.enabled) { - cd->h0.tsc = tsc; + cd->h0.tsc = gsm_ts_tsc(lchan->ts); cd->h0.h = 0; cd->h0.arfcn_high = arfcn >> 8; cd->h0.arfcn_low = arfcn & 0xff; } else { - cd->h1.tsc = tsc; + cd->h1.tsc = gsm_ts_tsc(lchan->ts); cd->h1.h = 1; cd->h1.maio_high = lchan->ts->hopping.maio >> 2; cd->h1.maio_low = lchan->ts->hopping.maio & 0x03; |