diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2018-02-21 13:24:36 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-12 10:18:05 +0000 |
| commit | 8c498fc26b1ce4cf5aa864d6e7d712e946549f2c (patch) | |
| tree | 2bcf5169374a5df6663cef55fb98aeaa614d4951 /src/libbsc/abis_nm.c | |
| parent | d6012ffc196d880bf9b5fb128b6ae005012ef7f1 (diff) | |
gsm_data: use feature list from libosmocore
In order to avoid code duplication the feature list (bit masks) and
the desciptive value strings as well as the function to set and get
the feature bits have been moved to libosmocore.
- use feature list functionality provided by libosmocore
Depends: libosmocore Change-Id Id0c35aef11aa49aa40abe7deef1f9dbd12210776
Change-Id: I3e80517539cc5d0e5d8189d434a5e3cc0fdea1a0
Diffstat (limited to 'src/libbsc/abis_nm.c')
| -rw-r--r-- | src/libbsc/abis_nm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index 435d00453..aa418cac5 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -47,6 +47,7 @@ #include <osmocom/bsc/signal.h> #include <osmocom/abis/e1_input.h> #include <osmocom/bsc/chan_alloc.h> +#include <osmocom/gsm/bts_features.h> #define OM_ALLOC_SIZE 1024 #define OM_HEADROOM_SIZE 128 @@ -501,11 +502,11 @@ static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, adjust = m_id_len + 3; /* adjust for parsed TL16V struct */ for (i = 0; i < _NUM_BTS_FEAT; i++) - if (gsm_bts_has_feature(bts, i) != gsm_btsmodel_has_feature(bts->model, i)) + if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) LOGP(DNM, LOGL_NOTICE, "BTS%u feature '%s' reported via OML does not match statically " "set feature: %u != %u. Please fix.\n", bts->nr, - get_value_string(gsm_bts_features_descs, i), - gsm_bts_has_feature(bts, i), gsm_btsmodel_has_feature(bts->model, i)); + get_value_string(osmo_bts_features_descs, i), + osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); } *data_len -= adjust; |