From 5cef5056ff70da6a06b1225cb744ad09e2c1b277 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 17 Mar 2018 11:37:29 +0100 Subject: gsm_data_shared: Remove unused definitions/members/functions What we remove here is a legacy from sharing this header file with openbsc/osmo-bsc-sccplite, which we stopped to do quite some time ago and hence can remove those parts that are only relevant to the BSC but not to the BTS. Change-Id: Icac1656da68f6a006a28c779e3b563bbdd905b3d --- src/common/gsm_data_shared.c | 50 -------------------------------------------- src/common/oml.c | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) (limited to 'src') diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index e5a5ee64..a7a1725b 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -87,26 +87,6 @@ const char *btsvariant2str(enum gsm_bts_type_variant v) return get_value_string(osmo_bts_variant_names, v); } -const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE + 1] = { - { GSM_BTS_TYPE_UNKNOWN, "unknown" }, - { GSM_BTS_TYPE_BS11, "bs11" }, - { GSM_BTS_TYPE_NANOBTS, "nanobts" }, - { GSM_BTS_TYPE_RBS2000, "rbs2000" }, - { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, - { GSM_BTS_TYPE_OSMOBTS, "sysmobts" }, - { 0, NULL } -}; - -enum gsm_bts_type str2btstype(const char *arg) -{ - return get_string_value(bts_type_names, arg); -} - -const char *btstype2str(enum gsm_bts_type type) -{ - return get_value_string(bts_type_names, type); -} - const struct value_string gsm_bts_features_descs[] = { { BTS_FEAT_HSCSD, "HSCSD" }, { BTS_FEAT_GPRS, "GPRS" }, @@ -360,7 +340,6 @@ struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) bts->rach_b_thresh = -1; bts->rach_ldavg_slots = -1; - bts->paging.free_chans_need = -1; bts->features.data = &bts->_features_data[0]; bts->features.data_len = sizeof(bts->_features_data); @@ -528,35 +507,6 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, case NM_OC_SITE_MANAGER: mo = &bts->site_mgr.mo; break; - case NM_OC_BS11: - switch (obj_inst->bts_nr) { - case BS11_OBJ_CCLK: - mo = &bts->bs11.cclk.mo; - break; - case BS11_OBJ_BBSIG: - if (obj_inst->ts_nr > bts->num_trx) - return NULL; - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bs11.bbsig.mo; - break; - case BS11_OBJ_PA: - if (obj_inst->ts_nr > bts->num_trx) - return NULL; - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bs11.pa.mo; - break; - default: - return NULL; - } - break; - case NM_OC_BS11_RACK: - mo = &bts->bs11.rack.mo; - break; - case NM_OC_BS11_ENVABTSE: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->bs11.envabtse)) - return NULL; - mo = &bts->bs11.envabtse[obj_inst->trx_nr].mo; - break; case NM_OC_GPRS_NSE: mo = &bts->gprs.nse.mo; break; diff --git a/src/common/oml.c b/src/common/oml.c index 75c23477..295d66f6 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -156,7 +156,7 @@ char *gsm_abis_mo_name(const struct gsm_abis_mo *mo) static inline void add_bts_attrs(struct msgb *msg, const struct gsm_bts *bts) { - abis_nm_put_sw_file(msg, btstype2str(GSM_BTS_TYPE_OSMOBTS), PACKAGE_VERSION, true); + abis_nm_put_sw_file(msg, "osmobts", PACKAGE_VERSION, true); abis_nm_put_sw_file(msg, btsatttr2str(BTS_TYPE_VARIANT), btsvariant2str(bts->variant), true); if (strlen(bts->sub_model)) -- cgit v1.2.3