model_init: order features alphabetically
Make it easier to compare the lists of features. Related: SYS#5922, OS#5538 Change-Id: I67887d89912d963fbbe90590c8467cbbd2566e09
This commit is contained in:
parent
11fb108221
commit
7d2193b467
|
@ -100,15 +100,16 @@ int bts_model_init(struct gsm_bts *bts)
|
|||
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);
|
||||
|
|
|
@ -101,15 +101,16 @@ int bts_model_init(struct gsm_bts *bts)
|
|||
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);
|
||||
|
|
|
@ -66,19 +66,20 @@ int bts_model_init(struct gsm_bts *bts)
|
|||
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;
|
||||
|
|
|
@ -138,21 +138,22 @@ int bts_model_init(struct gsm_bts *bts)
|
|||
*/
|
||||
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);
|
||||
|
|
|
@ -62,13 +62,14 @@ int bts_model_init(struct gsm_bts *bts)
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue