cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC 

Change-Id: Ifd9a3be6189b3288526e12260d68a982b089404e
This commit is contained in:
Harald Welte 2018-09-30 14:57:19 +02:00
parent 173555dab7
commit 3ee09a47c1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osmo-bts-sysmo/l1_if.c
View File

@ -386,7 +386,7 @@ static int ph_data_req(struct gsm_bts_trx *trx, struct msgb *msg,
/* The sapi depends on DSP configuration, not
* on the actual SYSTEM INFORMATION 3. */
u8BlockNbr = l1sap_fn2ccch_block(u32Fn);
if (u8BlockNbr >= 1)
if (u8BlockNbr >= num_agch(trx, "PH-DATA-REQ"))
sapi = GsmL1_Sapi_Pch;
else
sapi = GsmL1_Sapi_Agch;

3
src/osmo-bts-virtual/scheduler_virtbts.c
View File

@ -79,7 +79,8 @@ static void tx_to_virt_um(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
timeslot = tn;
/* in Osmocom, AGCH is only sent on ccch block 0. no idea why. this seems to cause false GSMTAP channel
* types for agch and pch. */
if (rsl_chantype == RSL_CHAN_PCH_AGCH && l1sap_fn2ccch_block(fn) == 0)
if (rsl_chantype == RSL_CHAN_PCH_AGCH &&
l1sap_fn2ccch_block(fn) >= num_agch(l1t->trx, "PH-DATA-REQ"))
gsmtap_chantype = GSMTAP_CHANNEL_PCH;
else
gsmtap_chantype = chantype_rsl2gsmtap(rsl_chantype, chdesc->link_id); /* the logical channel type */