bsc: Rename to osmo_bsc_grace to prepare putting it into master

5 files changed, 4 insertions, 33 deletions

diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index b44c9954e..e637e1ad7 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.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 osmo_bsc_rf.h \
-		 bsc_msc_grace.h
+		 osmo_bsc_grace.h
 
 openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h
 openbscdir = $(includedir)/openbsc
diff --git a/openbsc/include/openbsc/bsc_msc_grace.h b/openbsc/include/openbsc/bsc_msc_grace.h
deleted file mode 100644
index 31a092533..000000000
--- a/openbsc/include/openbsc/bsc_msc_grace.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by On-Waves
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef BSC_MSC_GRACE_H
-#define BSC_MSC_GRACE_H
-
-#include "gsm_data.h"
-
-int bsc_grace_allow_new_connection(struct gsm_network *network);
-
-#endif
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index cba8832f1..59e67185c 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 osmo_bsc_rf.c bsc_msc_grace.c gsm_04_80.c
+		bsc_msc.c osmo_bsc_rf.c osmo_bsc_grace.c gsm_04_80.c
 bsc_msc_ip_LDADD = libbsc.a libvty.a $(LIBOSMOSCCP_LIBS)
 
 
diff --git a/openbsc/src/bsc_msc_ip.c b/openbsc/src/bsc_msc_ip.c
index 002c58152..e7f2bae5b 100644
--- a/openbsc/src/bsc_msc_ip.c
+++ b/openbsc/src/bsc_msc_ip.c
@@ -46,7 +46,7 @@
 #include <openbsc/bsc_msc.h>
 #include <openbsc/bsc_nat.h>
 #include <openbsc/osmo_bsc_rf.h>
-#include <openbsc/bsc_msc_grace.h>
+#include <openbsc/osmo_bsc_grace.h>
 
 #include <osmocore/select.h>
 #include <osmocore/talloc.h>
diff --git a/openbsc/src/bsc_msc_grace.c b/openbsc/src/osmo_bsc_grace.c
index 441cab9f0..7e72d62df 100644
--- a/openbsc/src/bsc_msc_grace.c
+++ b/openbsc/src/osmo_bsc_grace.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <openbsc/bsc_msc_grace.h>
+#include <openbsc/osmo_bsc_grace.h>
 #include <openbsc/osmo_bsc_rf.h>
 #include <openbsc/gsm_04_80.h>
 #include <openbsc/signal.h>