osmith submitted this change.

View Change

Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified 
model_init: order features alphabetically

Make it easier to compare the lists of features.

Related: SYS#5922, OS#5538
Change-Id: I67887d89912d963fbbe90590c8467cbbd2566e09
---
M src/osmo-bts-lc15/main.c
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-sysmo/main.c
M src/osmo-bts-trx/main.c
M src/osmo-bts-virtual/main.c
5 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/osmo-bts-lc15/main.c b/src/osmo-bts-lc15/main.c
index 3e119f6..cb2a9ac 100644
--- a/src/osmo-bts-lc15/main.c
+++ b/src/osmo-bts-lc15/main.c
@@ -100,15 +100,16 @@
 		exit(23);
 	}
 
-	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
+	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER);
diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index 9a4bbfe..4484d58 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -101,15 +101,16 @@
 		exit(23);
 	}
 
-	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
+	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER);
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 2bf1068..95492eb 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -66,19 +66,20 @@
 		exit(23);
 	}
 
-	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
+	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
 
-	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);
+	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER);
 
 	return 0;
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index 75b15fe..4bd7f0f 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -138,21 +138,22 @@
 	 */
 	bts->c0->nominal_power = 23;
 
-	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING);
+	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_REP);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_MULTI_TSC);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_BCCH_POWER_RED);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_TEMP_OVP);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_BCCH_POWER_RED);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_MULTI_TSC);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS);
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS);
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index 34020e1..20b480f 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -62,13 +62,14 @@
 	bts->variant = BTS_OSMO_VIRTUAL;
 	bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
 
-	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
-	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
 
 	return 0;
 }

To view, visit change 27887. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I67887d89912d963fbbe90590c8467cbbd2566e09
Gerrit-Change-Number: 27887
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged