Change in osmo-bts[master]: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Sep 30 12:58:13 UTC 2018


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11164


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

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

Change-Id: Ifd9a3be6189b3288526e12260d68a982b089404e
---
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-virtual/scheduler_virtbts.c
2 files changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/11164/1

diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 247c371..f682ffd 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -386,7 +386,7 @@
 		/* 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;
diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c
index 997ccbc..2248afc 100644
--- a/src/osmo-bts-virtual/scheduler_virtbts.c
+++ b/src/osmo-bts-virtual/scheduler_virtbts.c
@@ -79,7 +79,8 @@
 	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 */

-- 
To view, visit https://gerrit.osmocom.org/11164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd9a3be6189b3288526e12260d68a982b089404e
Gerrit-Change-Number: 11164
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180930/1e1bf5c2/attachment.htm>


More information about the gerrit-log mailing list