aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-10-22 12:49:13 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-10-22 12:49:15 +0200
commite6ce1718aea468e1995fd6d6a4048e894d6a7ddb (patch)
treebfe3f96bd2ebe58813cabaf54455b2a4b519b876
parent44bfa4c7fd878eb5c9076184664e1006fe26be20 (diff)
gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN
Previous implementation made no sense, since chan_nr is never read before being set below from lchan_nr. Furthemore, if lcahn_nr=CCH_LCHAN=4, then: cbits = 0x4 + lchan_nr = 0x8 = b1000 which then becomes SDCCH8 according to GSM 08.58 9.3.1, so it's totally wrong: SDCCH/8 + ACCH 0 1 T T T Change-Id: Id1dee716991e6faa406f02c029e998af5780162a
-rw-r--r--src/common/gsm_data_shared.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index 2a1f9c8b..8c3229c3 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -622,7 +622,7 @@ uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
* See osmo-bts-xxx/oml.c:opstart_compl().
*/
if (lchan_nr == CCCH_LCHAN)
- chan_nr = 0;
+ lchan_nr = 0;
else
OSMO_ASSERT(lchan_nr < 4);
cbits = 0x04;