[PATCH] osmo-bts[master]: dyn PDCH: conf_lchans_for_pchan(): handle TCH/F_PDCH

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/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Jun 17 01:51:23 UTC 2016


Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/293

to look at the new patch set (#2).

dyn PDCH: conf_lchans_for_pchan(): handle TCH/F_PDCH

Depending on the PDCH active flag, handle a TCH/F_PDCH like TCH/F or PDCH.

Change-Id: Ifc5561f8e2db172bb692ba26bdeae2fd675d6ec5
---
M src/common/oml.c
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/293/2

diff --git a/src/common/oml.c b/src/common/oml.c
index bee2f84..9d3c454 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -689,14 +689,19 @@
 {
 	struct gsm_lchan *lchan;
 	unsigned int i;
+	enum gsm_phys_chan_config pchan = ts->pchan;
 
-	switch (ts->pchan) {
+	if (pchan == GSM_PCHAN_TCH_F_PDCH)
+		pchan = ts->flags & TS_F_PDCH_ACTIVE? GSM_PCHAN_PDCH
+						    : GSM_PCHAN_TCH_F;
+
+	switch (pchan) {
 	case GSM_PCHAN_CCCH_SDCCH4_CBCH:
 		/* fallthrough */
 	case GSM_PCHAN_CCCH_SDCCH4:
 		for (i = 0; i < 4; i++) {
 			lchan = &ts->lchan[i];
-			if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH
+			if (pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH
 			    && i == 2) {
 				lchan->type = GSM_LCHAN_CBCH;
 			} else {
@@ -723,7 +728,7 @@
 	case GSM_PCHAN_SDCCH8_SACCH8C:
 		for (i = 0; i < 8; i++) {
 			lchan = &ts->lchan[i];
-			if (ts->pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH
+			if (pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH
 			    && i == 2) {
 				lchan->type = GSM_LCHAN_CBCH;
 			} else {

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

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



More information about the gerrit-log mailing list