fixeria has uploaded this change for review.

View Change

trx_sched_ul_burst(): get rid of the 'switch' statement

Both TRXC_RACH and TRXC_PTCCH are handled in the rx_rach_fn(),
so we can eliminate the need of having a 'switch' statement in
the general (perfrmance critical) code path.

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

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

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index b27d7ea..e6a664f 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1546,16 +1546,9 @@
 
 	/* handle NOPE indications */
 	if (bi->flags & TRX_BI_F_NOPE_IND) {
-		switch (bi->chan) {
-		case TRXC_PTCCH:
-		case TRXC_RACH:
-			/* For some logical channel types NOPE.ind is valueless. */
-			return 0;
-		default:
-			/* NOTE: Uplink burst handler must check bi->burst_len before
-			 * accessing bi->burst to avoid uninitialized memory access. */
-			return func(l1ts, bi);
-		}
+		/* NOTE: Uplink burst handler must check bi->burst_len before
+		 * accessing bi->burst to avoid uninitialized memory access. */
+		return func(l1ts, bi);
 	}
 
 	/* decrypt */
diff --git a/src/osmo-bts-trx/sched_lchan_rach.c b/src/osmo-bts-trx/sched_lchan_rach.c
index c3abf32..5d9d0b1 100644
--- a/src/osmo-bts-trx/sched_lchan_rach.c
+++ b/src/osmo-bts-trx/sched_lchan_rach.c
@@ -112,6 +112,10 @@
 	uint8_t ra;
 	int rc;
 
+	/* Ignore NOPE indications, they're of no use here */
+	if (bi->flags & TRX_BI_F_NOPE_IND)
+		return 0;
+
 	/* TSC (Training Sequence Code) is an optional parameter of the UL burst
 	 * indication. We need this information in order to decide whether an
 	 * Access Burst is 11-bit encoded or not (see OS#1854). If this information

To view, visit change 27558. To unsubscribe, or for help writing mail filters, visit settings.