move include/openbsc to include/osmocom/bsc

Change-Id: I39e7b882caa98334636d19ccd104fd83d07d5055

configure.ac

@@ -126,8 +126,9 @@ AM_CONFIG_HEADER(bscconfig.h)
 
 AC_OUTPUT(
     osmo-bsc.pc
-    include/openbsc/Makefile
     include/Makefile
+    include/osmocom/Makefile
+    include/osmocom/bsc/Makefile
     src/Makefile
     src/libtrau/Makefile
     src/libbsc/Makefile

include/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = \
-	openbsc \
+	osmocom \
 	$(NULL)
 
 noinst_HEADERS = \

include/osmocom/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = \
+	bsc \
+	$(NULL)

include/osmocom/bsc/abis_nm.h

@@ -26,7 +26,7 @@
 #include <osmocom/gsm/abis_nm.h>
 #include <osmocom/gsm/protocol/gsm_12_21.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 /* max number of attributes represented as 3GPP TS 52.021 §9.4.62 SW Description array */
 #define MAX_BTS_ATTR 5

include/osmocom/bsc/bsc_msc.h

@@ -25,7 +25,7 @@
 #include <osmocom/core/write_queue.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/sigtran/sccp_sap.h>
-#include <openbsc/a_reset.h>
+#include <osmocom/bsc/a_reset.h>
 
 #include <netinet/in.h>
 

include/osmocom/bsc/bsc_rll.h

@@ -1,7 +1,7 @@
 #ifndef _BSC_RLL_H
 #define _BSC_RLL_H
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 enum bsc_rllr_ind {
 	BSC_RLLR_IND_EST_CONF,

include/osmocom/bsc/bss.h

@@ -1,7 +1,7 @@
 #ifndef _BSS_H_
 #define _BSS_H_
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 struct msgb;
 

include/osmocom/bsc/common_bsc.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <openbsc/common_cs.h>
+#include <osmocom/bsc/common_cs.h>
 
 struct gsm_network *bsc_network_init(void *ctx,
 				     uint16_t country_code,

include/osmocom/bsc/e1_config.h

@@ -1,7 +1,7 @@
 #ifndef _E1_CONFIG_H
 #define _E1_CONFIG_H
 
-#include <openbsc/gsm_data_shared.h>
+#include <osmocom/bsc/gsm_data_shared.h>
 
 int e1_reconfig_ts(struct gsm_bts_trx_ts *ts);
 int e1_reconfig_trx(struct gsm_bts_trx *trx);

include/osmocom/bsc/gsm_data.h

@@ -14,9 +14,9 @@
 #include <osmocom/crypt/auth.h>
 #include <osmocom/sigtran/sccp_sap.h>
 
-#include <openbsc/common.h>
-#include <openbsc/rest_octets.h>
-#include <openbsc/common_cs.h>
+#include <osmocom/bsc/common.h>
+#include <osmocom/bsc/rest_octets.h>
+#include <osmocom/bsc/common_cs.h>
 #include <osmocom/legacy_mgcp/mgcpgw_client.h>
 
 

include/osmocom/bsc/gsm_data_shared.h

@@ -24,8 +24,8 @@
 #include <osmocom/gsm/lapdm.h>
 #endif
 
-#include <openbsc/common_cs.h>
-#include <openbsc/meas_rep.h>
+#include <osmocom/bsc/common_cs.h>
+#include <osmocom/bsc/meas_rep.h>
 
 /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1:
    4-bit index is used (2#1111 = 10#15) */

include/osmocom/bsc/gsm_subscriber.h

@@ -6,7 +6,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 #define GSM_NAME_LENGTH 160
 

include/osmocom/bsc/meas_feed.h

@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <openbsc/meas_rep.h>
+#include <osmocom/bsc/meas_rep.h>
 
 struct meas_feed_hdr {
 	uint8_t msg_type;

include/osmocom/bsc/msc_ifaces.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <osmocom/core/msgb.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 /* These are the interfaces of the MSC layer towards (from?) the BSC and RNC,
  * i.e. in the direction towards the mobile device (MS aka UE).

include/osmocom/bsc/network_listen.h

@@ -2,7 +2,7 @@
 #define _OPENBSC_NWL_H
 
 #include <stdint.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 void ipac_nwl_init(void);
 

include/osmocom/bsc/osmo_bsc_grace.h

@@ -21,8 +21,8 @@
 #ifndef OSMO_BSC_GRACE_H
 #define OSMO_BSC_GRACE_H
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/signal.h>
 
 struct bsc_msc_data;
 

include/osmocom/bsc/osmo_bsc_rf.h

@@ -1,7 +1,7 @@
 #ifndef OSMO_BSC_RF
 #define OSMO_BSC_RF
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/core/write_queue.h>
 #include <osmocom/core/timer.h>
 

include/osmocom/bsc/osmo_bsc_sigtran.h

@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_msc_data.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bsc_msc_data.h>
 
 /* Allocate resources to make a new connection oriented sigtran connection
  * (not the connection ittself!) */

include/osmocom/bsc/osmo_msc.h

@@ -6,7 +6,7 @@
 #include <osmocom/core/fsm.h>
 #include <osmocom/gsm/gsup.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 #include "bsc_api.h"
 

include/osmocom/bsc/paging.h

@@ -26,8 +26,8 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/timer.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_subscriber.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bsc_subscriber.h>
 
 /**
  * A pending paging request

include/osmocom/bsc/rtp_proxy.h

@@ -27,7 +27,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/select.h>
 
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/mncc.h>
 
 #define RTP_PT_GSM_FULL 3
 #define RTP_PT_GSM_HALF 96

include/osmocom/bsc/sgsn.h

@@ -5,9 +5,9 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/crypt/gprs_cipher.h>
 #include <osmocom/gprs/gprs_ns.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/oap_client.h>
-#include <openbsc/common.h>
+#include <osmocom/bsc/gprs_sgsn.h>
+#include <osmocom/bsc/oap_client.h>
+#include <osmocom/bsc/common.h>
 
 #include <ares.h>
 

include/osmocom/bsc/signal.h

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 #include <osmocom/core/signal.h>
 

include/osmocom/bsc/system_information.h

@@ -3,7 +3,7 @@
 
 #include <osmocom/gsm/sysinfo.h>
 
-#include <openbsc/arfcn_range_encode.h>
+#include <osmocom/bsc/arfcn_range_encode.h>
 
 struct gsm_bts;
 

include/osmocom/bsc/transaction.h

@@ -1,10 +1,10 @@
 #ifndef _TRANSACT_H
 #define _TRANSACT_H
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_subscriber.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/gsm_subscriber.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/mncc.h>
 #include <osmocom/gsm/gsm0411_smc.h>
 #include <osmocom/gsm/gsm0411_smr.h>
 

include/osmocom/bsc/trau_mux.h

@@ -29,8 +29,8 @@
  */
 
 #include <stdint.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/mncc.h>
 
 struct decoded_trau_frame;
 

src/ipaccess/abisip-find.c

@@ -30,7 +30,7 @@
 #include <osmocom/core/timer.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
 #include <osmocom/gsm/ipa.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 
 static int udp_sock(const char *ifname)
 {

src/ipaccess/ipaccess-config.c

@@ -37,19 +37,19 @@
 #include <osmocom/core/application.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/timer.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/common_bsc.h>
+#include <osmocom/bsc/ipaccess.h>
+#include <osmocom/bsc/common_bsc.h>
 #include <osmocom/abis/e1_input.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/network_listen.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/network_listen.h>
 #include <osmocom/abis/ipaccess.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/network_listen.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/network_listen.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/gsm/protocol/gsm_12_21.h>

src/ipaccess/ipaccess-firmware.c

@@ -18,8 +18,8 @@
  *
  */
 
-#include <openbsc/debug.h>
-#include <openbsc/ipaccess.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/ipaccess.h>
 #include <osmocom/core/talloc.h>
 
 #include <stdio.h>

src/ipaccess/ipaccess-proxy.c

@@ -37,7 +37,7 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/core/application.h>
 #include <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
@@ -45,9 +45,9 @@
 #include <osmocom/gsm/ipa.h>
 #include <osmocom/abis/ipa.h>
 #include <osmocom/abis/ipaccess.h>
-#include <openbsc/debug.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/socket.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/ipaccess.h>
+#include <osmocom/bsc/socket.h>
 #include <osmocom/core/talloc.h>
 
 /* one instance of an ip.access protocol proxy */

src/ipaccess/network_listen.c

@@ -33,10 +33,10 @@
 #include <osmocom/gsm/rxlev_stat.h>
 #include <osmocom/gsm/gsm48_ie.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/abis/e1_input.h>
 
 #define WHITELIST_MAX_SIZE ((NUM_ARFCNS*2)+2+1)

src/libbsc/abis_nm.c

@@ -34,17 +34,17 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/protocol/gsm_12_21.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/abis_nm.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/misdn.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/misdn.h>
+#include <osmocom/bsc/signal.h>
 #include <osmocom/abis/e1_input.h>
 
 #define OM_ALLOC_SIZE		1024

src/libbsc/abis_nm_vty.c

@@ -28,14 +28,14 @@
 
 #include <osmocom/gsm/abis_nm.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/debug.h>
-#include <openbsc/signal.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/vty.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/vty.h>
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>

src/libbsc/abis_om2000.c

@@ -36,12 +36,12 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/fsm.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/debug.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/abis_om2000.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/abis_om2000.h>
+#include <osmocom/bsc/signal.h>
 #include <osmocom/abis/e1_input.h>
 
 /* FIXME: move to libosmocore */

src/libbsc/abis_om2000_vty.c

@@ -26,14 +26,14 @@
 
 #include <arpa/inet.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/debug.h>
-#include <openbsc/signal.h>
-#include <openbsc/abis_om2000.h>
-#include <openbsc/vty.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_om2000.h>
+#include <osmocom/bsc/vty.h>
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>

src/libbsc/abis_rsl.c

@@ -27,26 +27,26 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_04_08_utils.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/gsm_04_08_utils.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/chan_alloc.h>
-#include <openbsc/bsc_rll.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/bsc_rll.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/protocol/gsm_08_58.h>
-#include <openbsc/paging.h>
-#include <openbsc/signal.h>
-#include <openbsc/meas_rep.h>
-#include <openbsc/rtp_proxy.h>
-#include <openbsc/gsm_subscriber.h>
+#include <osmocom/bsc/paging.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/meas_rep.h>
+#include <osmocom/bsc/rtp_proxy.h>
+#include <osmocom/bsc/gsm_subscriber.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/gsm/rsl.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/pcu_if.h>
-#include <openbsc/bsc_api.h>
+#include <osmocom/bsc/pcu_if.h>
+#include <osmocom/bsc/bsc_api.h>
 
 #define RSL_ALLOC_SIZE		1024
 #define RSL_ALLOC_HEADROOM	128

src/libbsc/arfcn_range_encode.c

@@ -20,8 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/arfcn_range_encode.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/arfcn_range_encode.h>
+#include <osmocom/bsc/debug.h>
 
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 

src/libbsc/bsc_api.c

@@ -21,17 +21,17 @@
  *
  */
 
-#include <openbsc/bsc_api.h>
-#include <openbsc/bsc_rll.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_subscriber.h>
-#include <openbsc/signal.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/chan_alloc.h>
-#include <openbsc/handover.h>
-#include <openbsc/debug.h>
-#include <openbsc/trau_mux.h>
-#include <openbsc/gsm_04_08_utils.h>
+#include <osmocom/bsc/bsc_api.h>
+#include <osmocom/bsc/bsc_rll.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/gsm_subscriber.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/handover.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/trau_mux.h>
+#include <osmocom/bsc/gsm_04_08_utils.h>
 
 #include <osmocom/gsm/protocol/gsm_08_08.h>
 #include <osmocom/gsm/gsm48.h>

src/libbsc/bsc_ctrl_commands.c

@@ -22,13 +22,13 @@
 #include <time.h>
 
 #include <osmocom/ctrl/control_cmd.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/debug.h>
-#include <openbsc/chan_alloc.h>
-#include <openbsc/osmo_bsc_rf.h>
-#include <openbsc/bsc_msc_data.h>
+#include <osmocom/bsc/ipaccess.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/osmo_bsc_rf.h>
+#include <osmocom/bsc/bsc_msc_data.h>
 
 #define CTRL_CMD_VTY_STRING(cmdname, cmdstr, dtype, element) \
 	CTRL_HELPER_GET_STRING(cmdname, dtype, element) \

src/libbsc/bsc_ctrl_lookup.c

@@ -25,8 +25,8 @@
 
 #include <osmocom/vty/command.h>
 #include <osmocom/ctrl/control_if.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
 
 extern vector ctrl_node_vec;
 

src/libbsc/bsc_dyn_ts.c

@@ -19,9 +19,9 @@
  */
 
 #include <osmocom/core/logging.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_rsl.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_rsl.h>
 
 void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts)
 {

src/libbsc/bsc_init.c

@@ -19,25 +19,25 @@
  *
  */
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/gsm/gsm_utils.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/debug.h>
-#include <openbsc/misdn.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/misdn.h>
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/ports.h>
-#include <openbsc/system_information.h>
-#include <openbsc/paging.h>
-#include <openbsc/signal.h>
-#include <openbsc/chan_alloc.h>
+#include <osmocom/bsc/system_information.h>
+#include <osmocom/bsc/paging.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/chan_alloc.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/ipaccess.h>
+#include <osmocom/bsc/ipaccess.h>
 #include <osmocom/gsm/sysinfo.h>
-#include <openbsc/e1_config.h>
-#include <openbsc/common_bsc.h>
-#include <openbsc/pcu_if.h>
-#include <openbsc/osmo_msc.h>
+#include <osmocom/bsc/e1_config.h>
+#include <osmocom/bsc/common_bsc.h>
+#include <osmocom/bsc/pcu_if.h>
+#include <osmocom/bsc/osmo_msc.h>
 #include <limits.h>
 
 /* global pointer to the gsm network data structure */

src/libbsc/bsc_msc.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include <openbsc/bsc_msc.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/bsc_msc.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/abis/ipaccess.h>
 
 #include <osmocom/core/write_queue.h>

src/libbsc/bsc_rf_ctrl.c

@@ -20,12 +20,12 @@
  *
  */
 
-#include <openbsc/osmo_bsc_rf.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/signal.h>
-#include <openbsc/bsc_msc_data.h>
-#include <openbsc/ipaccess.h>
+#include <osmocom/bsc/osmo_bsc_rf.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/bsc_msc_data.h>
+#include <osmocom/bsc/ipaccess.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>

src/libbsc/bsc_rll.c

@@ -22,15 +22,15 @@
 
 #include <errno.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/bsc_rll.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/chan_alloc.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/bsc_rll.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/signal.h>
 
 struct bsc_rll_req {
 	struct llist_head list;

src/libbsc/bsc_subscriber.c

@@ -29,8 +29,8 @@
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/core/logging.h>
 
-#include <openbsc/bsc_subscriber.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/bsc_subscriber.h>
+#include <osmocom/bsc/debug.h>
 
 static struct bsc_subscr *bsc_subscr_alloc(struct llist_head *list)
 {

src/libbsc/bsc_vty.c

@@ -36,28 +36,28 @@
 #include <arpa/inet.h>
 
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
 #include <osmocom/abis/e1_input.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/abis_om2000.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/abis_om2000.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/abis_nm.h>
-#include <openbsc/chan_alloc.h>
-#include <openbsc/meas_rep.h>
-#include <openbsc/vty.h>
+#include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/meas_rep.h>
+#include <osmocom/bsc/vty.h>
 #include <osmocom/gprs/gprs_ns.h>
-#include <openbsc/system_information.h>
-#include <openbsc/debug.h>
-#include <openbsc/paging.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/bsc_msc_data.h>
-#include <openbsc/osmo_bsc_rf.h>
-#include <openbsc/pcu_if.h>
-#include <openbsc/common_cs.h>
-#include <openbsc/handover.h>
-#include <openbsc/gsm_04_08_utils.h>
+#include <osmocom/bsc/system_information.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/paging.h>
+#include <osmocom/bsc/ipaccess.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/bsc_msc_data.h>
+#include <osmocom/bsc/osmo_bsc_rf.h>
+#include <osmocom/bsc/pcu_if.h>
+#include <osmocom/bsc/common_cs.h>
+#include <osmocom/bsc/handover.h>
+#include <osmocom/bsc/gsm_04_08_utils.h>
 
 #include <inttypes.h>
 

src/libbsc/bts_ericsson_rbs2000.c

@@ -22,12 +22,12 @@
 
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_om2000.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_om2000.h>
+#include <osmocom/bsc/abis_nm.h>
 #include <osmocom/abis/e1_input.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/signal.h>
 
 #include <osmocom/abis/lapd.h>
 

src/libbsc/bts_init.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include <openbsc/bss.h>
+#include <osmocom/bsc/bss.h>
 
 int bts_init(void)
 {

src/libbsc/bts_ipaccess_nanobts.c

@@ -23,23 +23,23 @@
 
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/signal.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_nm.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/debug.h>
 #include <osmocom/abis/subchan_demux.h>
 #include <osmocom/gsm/ipa.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/logging.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/bts_ipaccess_nanobts_omlattr.h>
+#include <osmocom/bsc/ipaccess.h>
+#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h>
 
 extern struct gsm_network *bsc_gsmnet;
 

src/libbsc/bts_ipaccess_nanobts_omlattr.c

@@ -21,8 +21,8 @@
 
 #include <arpa/inet.h>
 #include <osmocom/core/msgb.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
 
 static void patch_16(uint8_t *data, const uint16_t val)
 {

src/libbsc/bts_nokia_site.c

@@ -30,11 +30,11 @@
 
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
 #include <osmocom/abis/e1_input.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/signal.h>
 
 #include <osmocom/core/timer.h>
 

src/libbsc/bts_siemens_bs11.c

@@ -22,11 +22,11 @@
 
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/abis_nm.h>
 #include <osmocom/abis/e1_input.h>
-#include <openbsc/signal.h>
+#include <osmocom/bsc/signal.h>
 
 static int bts_model_bs11_start(struct gsm_network *net);