diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-16 00:01:43 +0800 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-16 00:01:43 +0800 |
commit | 98d949b02f9ebcc50b45158103eb891945d76911 (patch) | |
tree | c4e17ea0639c3b01c0ab6d46c842289eddff1564 | |
parent | 4f5421a482bec60f146a582ae0e94e0b00af2953 (diff) |
bsc: Rename the RF Ctl interface to match master
-rw-r--r-- | openbsc/include/openbsc/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 4 | ||||
-rw-r--r-- | openbsc/include/openbsc/osmo_bsc_rf.h (renamed from openbsc/include/openbsc/bsc_msc_rf.h) | 8 | ||||
-rw-r--r-- | openbsc/src/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/src/bsc_msc_grace.c | 2 | ||||
-rw-r--r-- | openbsc/src/bsc_msc_ip.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo_bsc_rf.c (renamed from openbsc/src/bsc_msc_rf.c) | 22 |
7 files changed, 22 insertions, 22 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index fdf2f42c7..b44c9954e 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ bsc_rll.h mncc.h transaction.h ussd.h gsm_04_80.h \ silent_call.h mgcp.h meas_rep.h rest_octets.h \ system_information.h handover.h mgcp_internal.h \ - vty.h bssap.h bsc_msc.h bsc_nat.h bsc_msc_rf.h \ + vty.h bssap.h bsc_msc.h bsc_nat.h osmo_bsc_rf.h \ bsc_msc_grace.h openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 5d5993364..c52229a81 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -88,7 +88,7 @@ typedef int gsm_cbfn(unsigned int hooknum, struct msgb *msg, void *data, void *param); -struct bsc_msc_rf; +struct osmo_bsc_rf; struct sccp_connection; /* Real authentication information containing Ki */ @@ -700,7 +700,7 @@ struct gsm_network { struct bsc_msc_connection *msc_con; int ping_timeout; int pong_timeout; - struct bsc_msc_rf *rf; + struct osmo_bsc_rf *rf; char *ussd_grace_txt; }; diff --git a/openbsc/include/openbsc/bsc_msc_rf.h b/openbsc/include/openbsc/osmo_bsc_rf.h index f72309923..0c9ba32f5 100644 --- a/openbsc/include/openbsc/bsc_msc_rf.h +++ b/openbsc/include/openbsc/osmo_bsc_rf.h @@ -5,18 +5,18 @@ struct gsm_network; -struct bsc_msc_rf { +struct osmo_bsc_rf { /* the value of signal.h */ int policy; struct bsc_fd listen; struct gsm_network *gsm_network; }; -struct bsc_msc_rf_conn { +struct osmo_bsc_rf_conn { struct write_queue queue; - struct bsc_msc_rf *rf; + struct osmo_bsc_rf *rf; }; -struct bsc_msc_rf *bsc_msc_rf_create(const char *path, struct gsm_network *net); +struct osmo_bsc_rf *osmo_bsc_rf_create(const char *path, struct gsm_network *net); #endif diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index cd38c69a4..cba8832f1 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -30,7 +30,7 @@ bsc_hack_LDADD = libmsc.a libbsc.a libmsc.a libvty.a -ldl -ldbi $(LIBCRYPT) bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c debug.c \ rs232.c bts_siemens_bs11.c bsc_msc_ip_SOURCES = bssap.c bsc_msc_ip.c bsc_init.c vty_interface.c vty_interface_bsc.c \ - bsc_msc.c bsc_msc_rf.c bsc_msc_grace.c gsm_04_80.c + bsc_msc.c osmo_bsc_rf.c bsc_msc_grace.c gsm_04_80.c bsc_msc_ip_LDADD = libbsc.a libvty.a $(LIBOSMOSCCP_LIBS) diff --git a/openbsc/src/bsc_msc_grace.c b/openbsc/src/bsc_msc_grace.c index f8aed7ba9..441cab9f0 100644 --- a/openbsc/src/bsc_msc_grace.c +++ b/openbsc/src/bsc_msc_grace.c @@ -20,7 +20,7 @@ */ #include <openbsc/bsc_msc_grace.h> -#include <openbsc/bsc_msc_rf.h> +#include <openbsc/osmo_bsc_rf.h> #include <openbsc/gsm_04_80.h> #include <openbsc/signal.h> diff --git a/openbsc/src/bsc_msc_ip.c b/openbsc/src/bsc_msc_ip.c index 7cbe9e1a2..002c58152 100644 --- a/openbsc/src/bsc_msc_ip.c +++ b/openbsc/src/bsc_msc_ip.c @@ -45,7 +45,7 @@ #include <openbsc/chan_alloc.h> #include <openbsc/bsc_msc.h> #include <openbsc/bsc_nat.h> -#include <openbsc/bsc_msc_rf.h> +#include <openbsc/osmo_bsc_rf.h> #include <openbsc/bsc_msc_grace.h> #include <osmocore/select.h> @@ -1249,7 +1249,7 @@ int main(int argc, char **argv) } if (rf_ctl) { - bsc_gsmnet->rf = bsc_msc_rf_create(rf_ctl, bsc_gsmnet); + bsc_gsmnet->rf = osmo_bsc_rf_create(rf_ctl, bsc_gsmnet); if (!bsc_gsmnet->rf) { fprintf(stderr, "Failed to create the RF service.\n"); exit(1); diff --git a/openbsc/src/bsc_msc_rf.c b/openbsc/src/osmo_bsc_rf.c index b6901cc53..06c84666c 100644 --- a/openbsc/src/bsc_msc_rf.c +++ b/openbsc/src/osmo_bsc_rf.c @@ -21,7 +21,7 @@ * */ -#include <openbsc/bsc_msc_rf.h> +#include <openbsc/osmo_bsc_rf.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/signal.h> @@ -57,7 +57,7 @@ static int lock_each_trx(struct gsm_network *net, int lock) /* * Send a '1' when one TRX is online, otherwise send 0 */ -static void handle_query(struct bsc_msc_rf_conn *conn) +static void handle_query(struct osmo_bsc_rf_conn *conn) { struct msgb *msg; struct gsm_bts *bts; @@ -92,7 +92,7 @@ static void handle_query(struct bsc_msc_rf_conn *conn) return; } -static void send_signal(struct bsc_msc_rf_conn *conn, int val) +static void send_signal(struct osmo_bsc_rf_conn *conn, int val) { struct rf_signal_data sig; sig.net = conn->rf->gsm_network; @@ -103,7 +103,7 @@ static void send_signal(struct bsc_msc_rf_conn *conn, int val) static int rf_read_cmd(struct bsc_fd *fd) { - struct bsc_msc_rf_conn *conn = fd->data; + struct osmo_bsc_rf_conn *conn = fd->data; char buf[1]; int rc; @@ -155,8 +155,8 @@ static int rf_write_cmd(struct bsc_fd *fd, struct msgb *msg) static int rf_ctl_accept(struct bsc_fd *bfd, unsigned int what) { - struct bsc_msc_rf_conn *conn; - struct bsc_msc_rf *rf = bfd->data; + struct osmo_bsc_rf_conn *conn; + struct osmo_bsc_rf *rf = bfd->data; struct sockaddr_un addr; socklen_t len = sizeof(addr); int fd; @@ -168,7 +168,7 @@ static int rf_ctl_accept(struct bsc_fd *bfd, unsigned int what) return -1; } - conn = talloc_zero(rf, struct bsc_msc_rf_conn); + conn = talloc_zero(rf, struct osmo_bsc_rf_conn); if (!conn) { LOGP(DINP, LOGL_ERROR, "Failed to allocate mem.\n"); close(fd); @@ -192,17 +192,17 @@ static int rf_ctl_accept(struct bsc_fd *bfd, unsigned int what) return 0; } -struct bsc_msc_rf *bsc_msc_rf_create(const char *path, struct gsm_network *net) +struct osmo_bsc_rf *osmo_bsc_rf_create(const char *path, struct gsm_network *net) { unsigned int namelen; struct sockaddr_un local; struct bsc_fd *bfd; - struct bsc_msc_rf *rf; + struct osmo_bsc_rf *rf; int rc; - rf = talloc_zero(NULL, struct bsc_msc_rf); + rf = talloc_zero(NULL, struct osmo_bsc_rf); if (!rf) { - LOGP(DINP, LOGL_ERROR, "Failed to create bsc_msc_rf.\n"); + LOGP(DINP, LOGL_ERROR, "Failed to create osmo_bsc_rf.\n"); return NULL; } |