aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2016-08-09 19:56:50 +0200
committerHarald Welte <laforge@gnumonks.org>2016-08-30 07:35:48 +0000
commit4dfc3da96bbad9e6a8641233c87a05a46af7d906 (patch)
tree2dd6d930b747c207ed3c2d98fc52454d8f433846
parent9faaf4ecf01322189808901398e06d7e4f14560d (diff)
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
-rw-r--r--src/osmo-bts-litecell15/l1_if.c2
-rw-r--r--src/osmo-bts-sysmo/l1_if.c2
2 files changed, 2 insertions, 2 deletions
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 @@ static int ph_data_req(struct gsm_bts_trx *trx, struct msgb *msg,
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 @@ static int ph_data_req(struct gsm_bts_trx *trx, struct msgb *msg,
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);