cellular-infrastructure/osmo-gbproxy
9
0
Fork 0
mirror of https://gerrit.osmocom.org/osmo-gbproxy synced 2024-08-21 18:36:25 +00:00
Code Issues Releases Wiki Activity

Make gsm48_lchan2chan_desc() reflect a ts-specific TSC

Browse source 
If the TS has a specific, different TSC than the BTS (beacon),
we should use that with preference over the TSC of the BTS.
This commit is contained in:
Harald Welte 2014-01-19 16:55:16 +01:00
parent ed483d190c
commit 82094c33ae
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbsc/src/libbsc/gsm_04_08_utils.c
View file

@ -341,15 +341,21 @@ 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 = lchan->ts->trx->bts->tsc;
cd->h0.tsc = tsc;
cd->h0.h = 0;
cd->h0.arfcn_high = arfcn >> 8;
cd->h0.arfcn_low = arfcn & 0xff;
} else {
cd->h1.tsc = lchan->ts->trx->bts->tsc;
cd->h1.tsc = tsc;
cd->h1.h = 1;
cd->h1.maio_high = lchan->ts->hopping.maio >> 2;
cd->h1.maio_low = lchan->ts->hopping.maio & 0x03;