[MERGED] osmo-bts[master]: fox chan_nr_is_dchan() for RSL_CHAN_OSMO_PDCH

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: fox chan_nr_is_dchan() for RSL_CHAN_OSMO_PDCH
......................................................................


fox chan_nr_is_dchan() for RSL_CHAN_OSMO_PDCH

When writing chan_nr_is_dchan() in Change-Id: I43a78bec63aeb36dd67043d237b27fe880209349,
I apparently only looked at TS 48.058 without considering the osmocom
extension to it for PDCH activation.  The result is complete breakage
for "osmocom style dynamic PDCH" support.

This patch fixes the mistake by making the compare more specific.

Change-Id: I18e0774fdd48966bc95261e715f798464b8b681f
Related: OS#3131, OS#1853
---
M src/common/rsl.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 5f3c17e..6120e0e 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -140,8 +140,8 @@
 /* Is this channel number for a dedicated channel (true) or not (false) */
 static bool chan_nr_is_dchan(uint8_t chan_nr)
 {
-	/* See TS 48.058 9.3.1 */
-	if (chan_nr & 0x80)
+	/* See TS 48.058 9.3.1 + Osmocom extension for RSL_CHAN_OSMO_PDCH */
+	if ((chan_nr & 0xc0) == 0x80)
 		return false;
 	else
 		return true;

-- 
To view, visit https://gerrit.osmocom.org/7632
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I18e0774fdd48966bc95261e715f798464b8b681f
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>