diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-06-29 18:35:38 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-06-29 18:35:38 +0200 |
| commit | b9919bd2a68d7898d56faaa0d15e97fd89bcaec7 (patch) | |
| tree | f3888236e1890b17087bb311b0b2639bd3057e27 /src/common/oml.c | |
| parent | 8188e1949bdd485f1b25ef278fe54170165044b2 (diff) | |
Fix support of SDCCH4
In SDCCH4, we use lchan number 0...3 for the SDCCH/SACCH, and
we statically use lchan[4] as the dummy for activating the CCCH
L1 SAPIs.
In order to make combined and non-combined CCCH orthogonal, we simply
also use lchan[4] in that case. On a 'pure' CCCH, therefore lchan
0..3 are unused and 4 is the actual CCCH.
Diffstat (limited to 'src/common/oml.c')
| -rw-r--r-- | src/common/oml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 92c7848d..f4b0f15b 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -548,12 +548,12 @@ static int conf_lchans_for_pchan(struct gsm_bts_trx_ts *ts) switch (ts->pchan) { case GSM_PCHAN_CCCH_SDCCH4: for (i = 0; i < 4; i++) { - lchan = &ts->lchan[i+1]; + lchan = &ts->lchan[i]; lchan->type = GSM_LCHAN_SDCCH; } /* fallthrough */ case GSM_PCHAN_CCCH: - lchan = &ts->lchan[0]; + lchan = &ts->lchan[4]; lchan->type = GSM_LCHAN_CCCH; break; case GSM_PCHAN_TCH_F: |