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

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Mon Nov 18 14:35:16 UTC 2019


fixeria has uploaded this change for review. ( 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(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/16094/1

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: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191118/63ec9084/attachment.htm>


More information about the gerrit-log mailing list