Change in osmo-bts[master]: src/common/bts: set features CCN/GPRS/EGPRS

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27926 ) Change subject: src/common/bts: set features CCN/GPRS/EGPRS ...................................................................... src/common/bts: set features CCN/GPRS/EGPRS Report all features that were previously hardcoded in OsmoBSC for OsmoBTS. Related: SYS#5922, OS#5538 Change-Id: Ic407e3be82afe61ed64b1cecf3dc94d2caff380a --- M src/common/bts.c M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c 6 files changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/27926/1 diff --git a/src/common/bts.c b/src/common/bts.c index cbd99db..e4b5148 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -382,8 +382,11 @@ /* 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_CCN); osmo_bts_set_feature(bts->features, BTS_FEAT_DYN_TS_SDCCH8); + osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN); + osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC); osmo_bts_set_feature(bts->features, BTS_FEAT_PAGING_COORDINATION); diff --git a/src/osmo-bts-lc15/main.c b/src/osmo-bts-lc15/main.c index cb2a9ac..cbeaaba 100644 --- a/src/osmo-bts-lc15/main.c +++ b/src/osmo-bts-lc15/main.c @@ -102,8 +102,6 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP); - 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); diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 4484d58..1dc4920 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -103,8 +103,6 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP); - 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); diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 110f8a3..f90fa78 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -777,7 +777,6 @@ #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-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 95492eb..33741a7 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -69,8 +69,6 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP); 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); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 4bd7f0f..aec073b 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -143,8 +143,6 @@ 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); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic407e3be82afe61ed64b1cecf3dc94d2caff380a Gerrit-Change-Number: 27926 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange