From 26adddf1bfa37dbeff8e60594141e9fb3afdd46e Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 18 Nov 2019 20:06:19 +0700 Subject: abis_nm.c: replace magic numbers with NM_CHANC_* constants Change-Id: I60b20d617bd8710a95977e41ae32a431af4402a9 --- src/osmo-bsc/abis_nm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 572d76219..ca0df683d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1804,8 +1804,8 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb, /* not on the same TRX that has a BCCH+SDCCH4 * combination */ if (ts->trx != ts->trx->bts->c0 && - (ts->trx->ts[0].nm_chan_comb == 5 || - ts->trx->ts[0].nm_chan_comb == 8)) { + (ts->trx->ts[0].nm_chan_comb == NM_CHANC_BCCHComb || + ts->trx->ts[0].nm_chan_comb == NM_CHANC_SDCCH_CBCH)) { *reason = "SDCCH/8 and BCCH must be on the same TRX."; return -EINVAL; } @@ -1829,7 +1829,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb, return -EINVAL; } break; - case 8: /* this is not like 08.58, but in fact + case NM_CHANC_SDCCH_CBCH: /* this is not like 08.58, but in fact * FCCH+SCH+BCCH+CCCH+SDCCH/4+SACCH/C4+CBCH */ /* FIXME: only one CBCH allowed per cell */ break; -- cgit v1.2.3