From 3300c01e8289ef28cf560c3fe87548eeb7051f5b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 5 Jun 2011 13:31:33 +0200 Subject: split gsm_data.c in gsm_data_shared.c and gsm_data.c This facilitates the use of gsm_data.c from osmo-bts --- openbsc/include/openbsc/gsm_data.h | 10 ++++++++++ openbsc/include/openbsc/gsm_data_shared.h | 13 ++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'openbsc/include') diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 4d7263f16..715ff1bdd 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -372,4 +372,14 @@ int gsm_bts_model_register(struct gsm_bts_model *model); struct gsm_subscriber_connection *subscr_con_allocate(struct gsm_lchan *lchan); void subscr_con_free(struct gsm_subscriber_connection *conn); +struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, + enum gsm_bts_type type, + uint8_t tsc, uint8_t bsic); +void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, + uint8_t e1_ts, uint8_t e1_ts_ss); + +void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked); +int gsm_bts_has_feature(struct gsm_bts *bts, enum gsm_bts_features feat); +struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); + #endif /* _GSM_DATA_H */ diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index ea4240d67..81800d5ab 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -14,6 +14,7 @@ #include #include +#include struct osmo_msc_data; struct osmo_bsc_sccp_con; @@ -84,6 +85,8 @@ struct gsm_nm_state { }; struct gsm_abis_mo { + uint8_t obj_class; + struct abis_om_obj_inst obj_inst; const char *name; struct gsm_nm_state nm_state; struct tlv_parsed *nm_attr; @@ -497,12 +500,10 @@ struct gsm_bts { -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, enum gsm_bts_type type, - uint8_t tsc, uint8_t bsic); +struct gsm_bts *gsm_bts_alloc(void *talloc_ctx); struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(struct gsm_bts *bts, int num); -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); @@ -513,11 +514,5 @@ char *gsm_ts_name(struct gsm_bts_trx_ts *ts); char *gsm_lchan_name(struct gsm_lchan *lchan); const char *gsm_lchans_name(enum gsm_lchan_state s); -void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, - uint8_t e1_ts, uint8_t e1_ts_ss); - -void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked); -int gsm_bts_has_feature(struct gsm_bts *bts, enum gsm_bts_features feat); - #endif -- cgit v1.2.3