diff --git a/src/common/bts.c b/src/common/bts.c index 0608df125..610b0722c 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -379,11 +379,12 @@ int bts_init(struct gsm_bts *bts) tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144); osmo_rtp_init(tall_rtp_ctx); - /* features implemented in 'common', available for all models */ - osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN); - osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC); + /* features implemented in 'common', available for all models, + * order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_ABIS_OSMO_PCU); osmo_bts_set_feature(bts->features, BTS_FEAT_DYN_TS_SDCCH8); + osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN); + osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC); rc = bts_model_init(bts); if (rc < 0) { diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index ebd960e36..110f8a3f7 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -773,11 +773,12 @@ int bts_model_init(struct gsm_bts *bts) /* FIXME: what is the nominal transmit power of the PHY/board? */ bts->c0->nominal_power = 15; - osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS); - osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS); + /* order alphabetically */ #if defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_FCCH_SCH_BCCH_CCCH_SDCCH4_CBCH_SACCHC4) && defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_SDCCH8_CBCH_SACCHC8) osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); #endif + 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_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index f5d59a30f..46fa84b59 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -203,9 +203,10 @@ uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx) int bts_model_init(struct gsm_bts *bts) { bts->variant = BTS_OSMO_OMLDUMMY; + /* order alphabetically */ + 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_HOPPING); - osmo_bts_set_feature(bts->features, BTS_FEAT_BCCH_POWER_RED); return 0; }