[MERGED] osmo-bts[master]: gsm_data_shared: extend bts feature list with speech codecs

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: gsm_data_shared: extend bts feature list with speech codecs
......................................................................


gsm_data_shared: extend bts feature list with speech codecs

The feature list does not cover any speech codec related information.

- Add speech codec related items to feature list.

Change-Id: If6d50c6f4e2348b23f31c3415b0f5577a3f5be50
---
M include/osmo-bts/gsm_data_shared.h
M src/common/gsm_data_shared.c
2 files changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h
index 6c1383f..1571929 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -525,7 +525,8 @@
 };
 
 /* N. B: always add new features to the end of the list (right before _NUM_BTS_FEAT) to avoid breaking compatibility
-   with BTS compiled against earlier version of this header */
+   with BTS compiled against earlier version of this header. Also make sure that the description strings
+   gsm_bts_features_descs[] in gsm_data_shared.c are also updated accordingly! */
 enum gsm_bts_features {
 	BTS_FEAT_HSCSD,
 	BTS_FEAT_GPRS,
@@ -536,6 +537,11 @@
 	BTS_FEAT_OML_ALERTS,
 	BTS_FEAT_AGCH_PCH_PROP,
 	BTS_FEAT_CBCH,
+	BTS_FEAT_SPEECH_F_V1,
+	BTS_FEAT_SPEECH_H_V1,
+	BTS_FEAT_SPEECH_F_EFR,
+	BTS_FEAT_SPEECH_F_AMR,
+	BTS_FEAT_SPEECH_H_AMR,
 	_NUM_BTS_FEAT
 };
 
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index 1ef223c..e5a5ee6 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -117,6 +117,11 @@
 	{ BTS_FEAT_OML_ALERTS,		"OML Alerts" },
 	{ BTS_FEAT_AGCH_PCH_PROP,	"AGCH/PCH proportional allocation" },
 	{ BTS_FEAT_CBCH,		"CBCH" },
+	{ BTS_FEAT_SPEECH_F_V1,		"Fullrate speech V1" },
+	{ BTS_FEAT_SPEECH_H_V1,		"Halfrate speech V1" },
+	{ BTS_FEAT_SPEECH_F_EFR,	"Fullrate speech EFR" },
+	{ BTS_FEAT_SPEECH_F_AMR,	"Fullrate speech AMR" },
+	{ BTS_FEAT_SPEECH_H_AMR,	"Halfrate speech AMR" },
 	{ 0, NULL }
 };
 

-- 
To view, visit https://gerrit.osmocom.org/6641
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6d50c6f4e2348b23f31c3415b0f5577a3f5be50
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>