octphy: ensure all BTS models set features

Most of the BTS models do not or do register not all of thier
features to the the feature list.

- Update/extend the feature lists for all BTS-Models

Change-Id: I26765a64153368016921c2ac115b1c4aec9bc5e4

5 files changed, 28 insertions, 0 deletions

diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c
index 97b53593..dcbd9f56 100644
--- a/src/osmo-bts-litecell15/main.c
+++ b/src/osmo-bts-litecell15/main.c
@@ -92,8 +92,14 @@ int bts_model_init(struct gsm_bts *bts)
 	}
 
 	gsm_bts_set_feature(bts, BTS_FEAT_GPRS);
+	gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);
 	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);
 	gsm_bts_set_feature(bts, BTS_FEAT_AGCH_PCH_PROP);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);
 
 	bts_model_vty_init(bts);
 
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index dde993d5..e5fcd98a 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -791,6 +791,11 @@ int bts_model_init(struct gsm_bts *bts)
 
 	gsm_bts_set_feature(bts, BTS_FEAT_GPRS);
 	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);
+#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)
+	gsm_bts_set_feature(bts, BTS_FEAT_CBCH);
+#endif
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);
 
 	bts_model_vty_init(bts);
 
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index f52ecdd5..6118b605 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -94,6 +94,11 @@ int bts_model_init(struct gsm_bts *bts)
 	gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);
 	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);
 	gsm_bts_set_feature(bts, BTS_FEAT_AGCH_PCH_PROP);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);
 
 	bts_model_vty_init(bts);
 
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index 973a611e..38bb881c 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -120,6 +120,11 @@ int bts_model_init(struct gsm_bts *bts)
 
 	gsm_bts_set_feature(bts, BTS_FEAT_GPRS);
 	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);
 
 	bts_model_vty_init(bts);
 
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index 8459107a..7815a343 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -61,6 +61,13 @@ int bts_model_init(struct gsm_bts *bts)
 	btsb = bts_role_bts(bts);
 	btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
 
+	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);
+	gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);
+
 	bts_model_vty_init(bts);
 
 	return 0;