Change in osmo-bsc[master]: abis_nm.c: replace magic numbers with NM_CHANC_* constants

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16094 )

Change subject: abis_nm.c: replace magic numbers with NM_CHANC_* constants
......................................................................

abis_nm.c: replace magic numbers with NM_CHANC_* constants

Change-Id: I60b20d617bd8710a95977e41ae32a431af4402a9
---
M src/osmo-bsc/abis_nm.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 572d762..ca0df68 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -1804,8 +1804,8 @@
 			/* 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 @@
 				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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I60b20d617bd8710a95977e41ae32a431af4402a9
Gerrit-Change-Number: 16094
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191119/4a23063f/attachment.htm>