model_init: order features alphabetically, part 2

Order the ones I've overlooked as well.

Related: SYS#5922, OS#5538
Change-Id: I0aa344de9ea4849de0fcd7b44bfaa70274af594b
This commit is contained in:
Oliver Smith 2022-04-22 16:51:47 +02:00
parent 0f075a1e2d
commit 8630f898b2
3 changed files with 9 additions and 6 deletions

View File

@ -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) {

View File

@ -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);

View File

@ -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;
}