Change in osmo-bts[master]: part 3 of: fix SAPIs for handover, osmo-bts-trx

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/21276 )


Change subject: part 3 of: fix SAPIs for handover, osmo-bts-trx
......................................................................

part 3 of: fix SAPIs for handover, osmo-bts-trx

Change-Id: I0b34855f0374e9ee7071ce14c1472eb3ead50970
---
M src/common/scheduler.c
M src/osmo-bts-trx/l1_if.c
2 files changed, 10 insertions(+), 0 deletions(-)



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

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index b61330d..d959eb0 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -858,6 +858,12 @@
 		return -ENODEV;
 	}
 
+	/* For handover detection, there are cases where the SACCH should remain inactive until the first RACH
+	 * indicating the TA is received. */
+	if (L1SAP_IS_LINK_SACCH(link_id)
+	    && !l1t->ts[tn].chan_state[chan].lchan->dl_sacch.activated)
+		return;
+
 	LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, chan, fn,
 		"PH-RTS.ind: chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id);
 
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index fc8ef76..21445da 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -439,6 +439,10 @@
 		case PRIM_INFO_MODIFY:
 			chan_nr = l1sap->u.info.u.act_req.chan_nr;
 			lchan = get_lchan_by_chan_nr(trx, chan_nr);
+			/* For osmo-bts-trx, the dl_sacch.activated directly has the effect of transmitting the SACCH,
+			 * no need to interact with another entity to activate the SAPI. Just set it to whatever the
+			 * caller wants. */
+			lchan->dl_sacch.activated = lchan->dl_sacch.want_active;
 			if (l1sap->u.info.type == PRIM_INFO_ACTIVATE) {
 				if ((chan_nr & 0xE0) == 0x80) {
 					LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot activate"

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0b34855f0374e9ee7071ce14c1472eb3ead50970
Gerrit-Change-Number: 21276
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201121/0734295f/attachment.htm>