From a369e24cb9a583ef9906a8ef9125f6ca8c6f80bf Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Feb 2017 21:57:23 +0100 Subject: cosmetic: rename struct osmo_msc_data to bsc_msc_data With the OsmoMSC program coming up, the name osmo_msc_data becomes even more confusing than it already is. Clearly indicate it as libbsc's data of a remote MSC by prefixing with bsc_. Also, the Osmocom community has in the meantime agreed to have the osmo_ prefix only in libosmocore, to avoid naming conflicts in case things are moved there. So while renaming anyway, also drop the osmo_ prefix. Change-Id: I0dfbcb7d1a579211180f71319982820d8700afab --- openbsc/include/openbsc/bsc_msc_data.h | 8 ++++---- openbsc/include/openbsc/osmo_bsc.h | 10 +++++----- openbsc/include/openbsc/osmo_bsc_grace.h | 4 ++-- openbsc/include/openbsc/signal.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'openbsc/include') diff --git a/openbsc/include/openbsc/bsc_msc_data.h b/openbsc/include/openbsc/bsc_msc_data.h index 3168d911d..38e87cfb9 100644 --- a/openbsc/include/openbsc/bsc_msc_data.h +++ b/openbsc/include/openbsc/bsc_msc_data.h @@ -49,7 +49,7 @@ enum { /*! /brief Information on a remote MSC for libbsc. */ -struct osmo_msc_data { +struct bsc_msc_data { struct llist_head entry; /* Back pointer */ @@ -128,15 +128,15 @@ struct osmo_bsc_data { }; -int osmo_bsc_msc_init(struct osmo_msc_data *msc); +int osmo_bsc_msc_init(struct bsc_msc_data *msc); int osmo_bsc_sccp_init(struct gsm_network *gsmnet); int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto); int msc_queue_write_with_ping(struct bsc_msc_connection *, struct msgb *msg, int proto); int osmo_bsc_audio_init(struct gsm_network *network); -struct osmo_msc_data *osmo_msc_data_find(struct gsm_network *, int); -struct osmo_msc_data *osmo_msc_data_alloc(struct gsm_network *, int); +struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int); +struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int); #endif diff --git a/openbsc/include/openbsc/osmo_bsc.h b/openbsc/include/openbsc/osmo_bsc.h index fd5303dc6..9e688fd59 100644 --- a/openbsc/include/openbsc/osmo_bsc.h +++ b/openbsc/include/openbsc/osmo_bsc.h @@ -16,7 +16,7 @@ enum bsc_con { }; struct sccp_connection; -struct osmo_msc_data; +struct bsc_msc_data; struct bsc_msc_connection; struct osmo_bsc_sccp_con { @@ -33,7 +33,7 @@ struct osmo_bsc_sccp_con { /* SCCP connection realted */ struct sccp_connection *sccp; - struct osmo_msc_data *msc; + struct bsc_msc_data *msc; struct osmo_timer_list sccp_it_timeout; struct osmo_timer_list sccp_cc_timeout; @@ -51,15 +51,15 @@ struct bsc_api *osmo_bsc_api(); int bsc_queue_for_msc(struct osmo_bsc_sccp_con *conn, struct msgb *msg); int bsc_open_connection(struct osmo_bsc_sccp_con *sccp, struct msgb *msg); enum bsc_con bsc_create_new_connection(struct gsm_subscriber_connection *conn, - struct osmo_msc_data *msc, int send_ping); + struct bsc_msc_data *msc, int send_ping); int bsc_delete_connection(struct osmo_bsc_sccp_con *sccp); -struct osmo_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn, struct msgb *); +struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn, struct msgb *); int bsc_scan_bts_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); int bsc_send_welcome_ussd(struct gsm_subscriber_connection *conn); -int bsc_handle_udt(struct osmo_msc_data *msc, struct msgb *msg, unsigned int length); +int bsc_handle_udt(struct bsc_msc_data *msc, struct msgb *msg, unsigned int length); int bsc_handle_dt1(struct osmo_bsc_sccp_con *conn, struct msgb *msg, unsigned int len); int bsc_ctrl_cmds_install(); diff --git a/openbsc/include/openbsc/osmo_bsc_grace.h b/openbsc/include/openbsc/osmo_bsc_grace.h index af77b2f3b..ea5e4e2ab 100644 --- a/openbsc/include/openbsc/osmo_bsc_grace.h +++ b/openbsc/include/openbsc/osmo_bsc_grace.h @@ -23,9 +23,9 @@ #include -struct osmo_msc_data; +struct bsc_msc_data; int bsc_grace_allow_new_connection(struct gsm_network *net, struct gsm_bts *bts); -int bsc_grace_paging_request(struct gsm_subscriber *sub, int type, struct osmo_msc_data *msc); +int bsc_grace_paging_request(struct gsm_subscriber *sub, int type, struct bsc_msc_data *msc); #endif diff --git a/openbsc/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h index c862b2192..d4ccf80da 100644 --- a/openbsc/include/openbsc/signal.h +++ b/openbsc/include/openbsc/signal.h @@ -222,9 +222,9 @@ enum signal_msc { S_MSC_AUTHENTICATED, }; -struct osmo_msc_data; +struct bsc_msc_data; struct msc_signal_data { - struct osmo_msc_data *data; + struct bsc_msc_data *data; }; /* SS_CCCH signals */ -- cgit v1.2.3