[MERGED] osmo-bts[master]: dyn TS: sysmo, lc15: ph_data_req: fix PDCH mode detection

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: dyn TS: sysmo,lc15: ph_data_req: fix PDCH mode detection
......................................................................


dyn TS: sysmo,lc15: ph_data_req: fix PDCH mode detection

Though this patch theoretically makes a lot of sense, it is not entirely clear
why dyn TS are working without it. Committing due to common sense, not to fix
any actual breakage.

Change-Id: I6136cb42a4d627ebefc963eb5321fadfe63cca4b
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index dcd25ee..3672b8f 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -363,7 +363,7 @@
 		if (!L1SAP_IS_CHAN_TCHF(chan_nr))
 			subCh = l1sap_chan2ss(chan_nr);
 	} else if (L1SAP_IS_CHAN_TCHF(chan_nr)) {
-		if (trx->ts[u8Tn].pchan == GSM_PCHAN_PDCH) {
+		if (ts_is_pdch(&trx->ts[u8Tn])) {
 			if (L1SAP_IS_PTCCH(u32Fn)) {
 				sapi = GsmL1_Sapi_Ptcch;
 				u8BlockNbr = L1SAP_FN2PTCCHBLOCK(u32Fn);
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index fcd3a3e..0880ee9 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -358,7 +358,7 @@
 		if (!L1SAP_IS_CHAN_TCHF(chan_nr))
 			subCh = l1sap_chan2ss(chan_nr);
 	} else if (L1SAP_IS_CHAN_TCHF(chan_nr)) {
-		if (trx->ts[u8Tn].pchan == GSM_PCHAN_PDCH) {
+		if (ts_is_pdch(&trx->ts[u8Tn])) {
 			if (L1SAP_IS_PTCCH(u32Fn)) {
 				sapi = GsmL1_Sapi_Ptcch;
 				u8BlockNbr = L1SAP_FN2PTCCHBLOCK(u32Fn);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6136cb42a4d627ebefc963eb5321fadfe63cca4b
Gerrit-PatchSet: 4
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
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: neels_test_account <neels at hofmeyr.de>