<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18591">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Do not mix public and private BTS features, use libosmocore's API<br><br>It was a very bad idea to mix "public" BTS features, that are<br>reported to the BSC via OML, and those features, that are used<br>locally (and exclusively) in osmo-bts.<br><br>Why? At least because we already have the BTS feature manipulation<br>API in libosmocore, that is used by osmo-bsc, but for some reason<br>not by osmo-bts. New features added to libosmocore would clash<br>with the existing "internal" ones like BTS_FEAT_MS_PWR_CTRL_DSP.<br><br>So what this change does can be described as follows:<br><br> - remove duplicate definition of the "public" features,<br> - use libosmocore's API for the "public" features,<br> - separate both "internal" and "public" features:<br> - the "public" features continue to live in bitvec,<br> - the "internal" features become flags,<br> - s/BTS_FEAT/BTS_INTERNAL_FLAG/g.<br><br>Change-Id: Icf792d02323bb73e3b8d46384c7890cb1eb4731e<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/bts.c<br>M src/common/gsm_data_shared.c<br>M src/common/l1sap.c<br>M src/common/vty.c<br>M src/osmo-bts-litecell15/main.c<br>M src/osmo-bts-oc2g/main.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/main.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-virtual/main.c<br>M tests/misc/misc_test.c<br>12 files changed, 110 insertions(+), 132 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index f3855f7..7cfbfeb 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -14,6 +14,7 @@</span><br><span> #include <osmocom/gsm/rxlev_stat.h></span><br><span> #include <osmocom/gsm/sysinfo.h></span><br><span> #include <osmocom/gsm/meas_rep.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/bts_features.h></span><br><span> #include <osmocom/gsm/gsm48_rest_octets.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> #include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span>@@ -38,8 +39,6 @@</span><br><span> </span><br><span> #define MAX_VERSION_LENGTH 64</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MAX_BTS_FEATURES 128</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct gsm_lchan;</span><br><span> struct osmo_rtp_socket;</span><br><span> struct pcu_sock_state;</span><br><span>@@ -402,35 +401,21 @@</span><br><span> TRX_PHY_VERSION,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* N. B: always add new features to the end of the list (right before _NUM_BTS_FEAT) to avoid breaking compatibility</span><br><span style="color: hsl(0, 100%, 40%);">- with BTS compiled against earlier version of this header. Also make sure that the description strings</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_features_descs[] in gsm_data_shared.c are also updated accordingly! */</span><br><span style="color: hsl(0, 100%, 40%);">-enum gsm_bts_features {</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_HSCSD,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_GPRS,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_EGPRS,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_ECSD,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_HOPPING,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_MULTI_TSC,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_OML_ALERTS,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_AGCH_PCH_PROP,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_CBCH,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_SPEECH_F_V1,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_SPEECH_H_V1,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_SPEECH_F_EFR,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_SPEECH_F_AMR,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_SPEECH_H_AMR,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_ETWS_PN,</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_MS_PWR_CTRL_DSP,</span><br><span style="color: hsl(0, 100%, 40%);">- /* When the feature is set then the measurement data is included in</span><br><span style="color: hsl(0, 100%, 40%);">- * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the</span><br><span style="color: hsl(0, 100%, 40%);">- * measurement data is passed using a separate MPH INFO MEAS IND.</span><br><span style="color: hsl(0, 100%, 40%);">- * (See also ticket: OS#2977) */</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_FEAT_MEAS_PAYLOAD_COMB,</span><br><span style="color: hsl(0, 100%, 40%);">- _NUM_BTS_FEAT</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(120, 100%, 40%);">+/* BTS implementation flags (internal use, not exposed via OML) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define bts_internal_flag_get(bts, flag) \</span><br><span style="color: hsl(120, 100%, 40%);">+ ((bts->flags & (typeof(bts->flags)) flag) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+#define bts_internal_flag_set(bts, flag) \</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->flags |= (typeof(bts->flags)) flag</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern const struct value_string gsm_bts_features_descs[];</span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: add a brief description of this flag */</span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP (1 << 0)</span><br><span style="color: hsl(120, 100%, 40%);">+/* When this flag is set then the measurement data is included in</span><br><span style="color: hsl(120, 100%, 40%);">+ * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the</span><br><span style="color: hsl(120, 100%, 40%);">+ * measurement data is passed using a separate MPH INFO MEAS IND.</span><br><span style="color: hsl(120, 100%, 40%);">+ * (See also ticket: OS#2977) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB (1 << 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string bts_impl_flag_desc[];</span><br><span> </span><br><span> struct gsm_bts_gprs_nsvc {</span><br><span> struct gsm_bts *bts;</span><br><span>@@ -522,8 +507,10 @@</span><br><span> char version[MAX_VERSION_LENGTH];</span><br><span> char sub_model[MAX_VERSION_LENGTH];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* features of a given BTS set/reported via OML */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* public features of a given BTS (set/reported via OML) */</span><br><span> struct bitvec *features;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* implementation flags of a given BTS (not exposed via OML) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t flags;</span><br><span> </span><br><span> /* Connected PCU version (if any) */</span><br><span> char pcu_version[MAX_VERSION_LENGTH];</span><br><span>@@ -740,18 +727,6 @@</span><br><span> return lchan->name;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int gsm_bts_set_feature(struct gsm_bts *bts, enum gsm_bts_features feat)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES);</span><br><span style="color: hsl(0, 100%, 40%);">- return bitvec_set_bit_pos(bts->features, feat, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline bool gsm_bts_has_feature(const struct gsm_bts *bts, enum gsm_bts_features feat)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES);</span><br><span style="color: hsl(0, 100%, 40%);">- return bitvec_get_bit_pos(bts->features, feat);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void gsm_abis_mo_reset(struct gsm_abis_mo *mo);</span><br><span> </span><br><span> struct gsm_abis_mo *</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 9710a2c..d8a6ff2 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -194,7 +194,7 @@</span><br><span> osmo_rtp_init(tall_rtp_ctx);</span><br><span> </span><br><span> /* features implemented in 'common', available for all models */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_ETWS_PN);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN);</span><br><span> </span><br><span> rc = bts_model_init(bts);</span><br><span> if (rc < 0) {</span><br><span>@@ -258,7 +258,7 @@</span><br><span> tpp->ramp.step_interval_sec = 1;</span><br><span> </span><br><span> /* IF BTS model doesn't DSP/HW support MS Power Control Loop, enable osmo algo by default: */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsm_bts_has_feature(trx->bts, BTS_FEAT_MS_PWR_CTRL_DSP))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP))</span><br><span> trx->ms_pwr_ctl_soft = true;</span><br><span> </span><br><span> rc = bts_model_trx_init(trx);</span><br><span>@@ -797,7 +797,7 @@</span><br><span> int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,</span><br><span> enum gsm48_chan_mode cm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_bts_features feature = _NUM_BTS_FEAT;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_bts_features feature = _NUM_BTS_FEAT;</span><br><span> </span><br><span> /* We assume that signalling support is mandatory,</span><br><span> * there is no BTS_FEAT_* definition to check that. */</span><br><span>@@ -845,7 +845,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Check if the feature is supported by this BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_has_feature(bts, feature))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_bts_has_feature(bts->features, feature))</span><br><span> return 1;</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c</span><br><span>index e23b04b..c680001 100644</span><br><span>--- a/src/common/gsm_data_shared.c</span><br><span>+++ b/src/common/gsm_data_shared.c</span><br><span>@@ -92,24 +92,9 @@</span><br><span> return get_value_string(osmo_bts_variant_names, v);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsm_bts_features_descs[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_HSCSD, "HSCSD" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_GPRS, "GPRS" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_EGPRS, "EGPRS" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_ECSD, "ECSD" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_HOPPING, "Frequency Hopping" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_MULTI_TSC, "Multi-TSC" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_OML_ALERTS, "OML Alerts" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_AGCH_PCH_PROP, "AGCH/PCH proportional allocation" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_CBCH, "CBCH" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_SPEECH_F_V1, "Fullrate speech V1" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_SPEECH_H_V1, "Halfrate speech V1" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_SPEECH_F_EFR, "Fullrate speech EFR" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_SPEECH_F_AMR, "Fullrate speech AMR" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_SPEECH_H_AMR, "Halfrate speech AMR" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_ETWS_PN, "ETWS Primary Notification on PCH" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BTS_FEAT_MEAS_PAYLOAD_COMB, "Measurement and Payload data combined"},</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string bts_impl_flag_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB, "Measurement and Payload data combined" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 84d4859..dad1b49 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -757,8 +757,8 @@</span><br><span> break;</span><br><span> case PRIM_INFO_MEAS:</span><br><span> /* We should never get an INFO_IND with PRIM_INFO_MEAS</span><br><span style="color: hsl(0, 100%, 40%);">- * when BTS_FEAT_MEAS_PAYLOAD_COMB is enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB))</span><br><span style="color: hsl(120, 100%, 40%);">+ * when BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB is set */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB))</span><br><span> OSMO_ASSERT(false);</span><br><span> </span><br><span> process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO);</span><br><span>@@ -1279,7 +1279,7 @@</span><br><span> /* The ph_data_param contained in the l1sap primitive may contain</span><br><span> * measurement data. If this data is present, forward it for</span><br><span> * processing */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB))</span><br><span> process_l1sap_meas_data(trx, l1sap, PRIM_PH_DATA);</span><br><span> </span><br><span> if (ts_is_pdch(&trx->ts[tn])) {</span><br><span>@@ -1399,7 +1399,7 @@</span><br><span> /* The ph_tch_param contained in the l1sap primitive may contain</span><br><span> * measurement data. If this data is present, forward it for</span><br><span> * processing */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB))</span><br><span> process_l1sap_meas_data(trx, l1sap, PRIM_TCH);</span><br><span> </span><br><span> msgb_pull_to_l2(msg);</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 1d74b36..3dfd387 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -766,7 +766,7 @@</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> bool soft = !strcmp(argv[0], "osmo");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!soft && !gsm_bts_has_feature(trx->bts, BTS_FEAT_MS_PWR_CTRL_DSP)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!soft && !bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP)) {</span><br><span> /* NOTE: osmo-bts-trx used to have its own (low-level) MS Power Control loop, which</span><br><span> * has been ripped out in favour of the common implementation. Configuration files</span><br><span> * may still contain 'dsp', so let's be tolerant and override 'dsp' by 'osmo'. */</span><br><span>@@ -827,13 +827,27 @@</span><br><span> static void bts_dump_vty_features(struct vty *vty, struct gsm_bts *bts)</span><br><span> {</span><br><span> unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">- bool no_features = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool no_features;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out(vty, " Features:%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < _NUM_BTS_FEAT; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_has_feature(bts, i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0, no_features = true; i < _NUM_BTS_FEAT; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_bts_has_feature(bts->features, i)) {</span><br><span> vty_out(vty, " %03u ", i);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%-40s%s", get_value_string(gsm_bts_features_descs, i), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%-40s%s", osmo_bts_feature_name(i), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ no_features = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (no_features)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " (not available)%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " BTS model specific (internal) flags:%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0, no_features = true; i < sizeof(bts->flags) * 8; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_internal_flag_get(bts, i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %03u ", i);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, i), VTY_NEWLINE);</span><br><span> no_features = false;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c</span><br><span>index ef02135..b48d3ec 100644</span><br><span>--- a/src/osmo-bts-litecell15/main.c</span><br><span>+++ b/src/osmo-bts-litecell15/main.c</span><br><span>@@ -110,16 +110,17 @@</span><br><span> exit(23);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_GPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MS_PWR_CTRL_DSP);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index f9bb0cb..a0f4d4a 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -111,16 +111,17 @@</span><br><span> exit(23);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_GPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MS_PWR_CTRL_DSP);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index fb62f8b..0adc8fe 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -779,13 +779,13 @@</span><br><span> /* FIXME: what is the nominal transmit power of the PHY/board? */</span><br><span> bts->c0->nominal_power = 15;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_GPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span> #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)</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c</span><br><span>index 44c6d5d..51a14c7 100644</span><br><span>--- a/src/osmo-bts-sysmo/main.c</span><br><span>+++ b/src/osmo-bts-sysmo/main.c</span><br><span>@@ -76,18 +76,19 @@</span><br><span> exit(23);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_CBCH);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_GPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MS_PWR_CTRL_DSP);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MEAS_PAYLOAD_COMB);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 3ccd597..bd3d0cb 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -110,16 +110,17 @@</span><br><span> * through TRXC. */</span><br><span> bts->c0->nominal_power = 23;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_GPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_CBCH);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MEAS_PAYLOAD_COMB);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index a6fc290..fb5d357 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -62,13 +62,13 @@</span><br><span> bts->variant = BTS_OSMO_VIRTUAL;</span><br><span> bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>diff --git a/tests/misc/misc_test.c b/tests/misc/misc_test.c</span><br><span>index c4d3a59..439d6b3 100644</span><br><span>--- a/tests/misc/misc_test.c</span><br><span>+++ b/tests/misc/misc_test.c</span><br><span>@@ -166,10 +166,10 @@</span><br><span> </span><br><span> bts = gsm_bts_alloc(ctx, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span> </span><br><span> OSMO_ASSERT(bts_supports_cm</span><br><span> (bts, GSM_PCHAN_TCH_F, GSM48_CMODE_SPEECH_V1) == 1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18591">change 18591</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/18591"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icf792d02323bb73e3b8d46384c7890cb1eb4731e </div>
<div style="display:none"> Gerrit-Change-Number: 18591 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>