diff options
Diffstat (limited to 'src/libbsc')
37 files changed, 211 insertions, 211 deletions
diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index cf20d7c49..3a48dee78 100644 --- a/src/libbsc/abis_nm.c +++ b/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 diff --git a/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c index 6ec0a4a21..a0d72c29d 100644 --- a/src/libbsc/abis_nm_vty.c +++ b/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> diff --git a/src/libbsc/abis_om2000.c b/src/libbsc/abis_om2000.c index 82a14b269..756cc89ba 100644 --- a/src/libbsc/abis_om2000.c +++ b/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 */ diff --git a/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c index a6bc4c78c..b75d42074 100644 --- a/src/libbsc/abis_om2000_vty.c +++ b/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> diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 75229a55f..09fb14b79 100644 --- a/src/libbsc/abis_rsl.c +++ b/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 diff --git a/src/libbsc/arfcn_range_encode.c b/src/libbsc/arfcn_range_encode.c index 9ca48407e..ae99fd912 100644 --- a/src/libbsc/arfcn_range_encode.c +++ b/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> diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index a0ba69a91..b42c382cb 100644 --- a/src/libbsc/bsc_api.c +++ b/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> diff --git a/src/libbsc/bsc_ctrl_commands.c b/src/libbsc/bsc_ctrl_commands.c index 641fe2bf6..7c2bfb5bd 100644 --- a/src/libbsc/bsc_ctrl_commands.c +++ b/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) \ diff --git a/src/libbsc/bsc_ctrl_lookup.c b/src/libbsc/bsc_ctrl_lookup.c index a8a8cf526..d1d9b0aae 100644 --- a/src/libbsc/bsc_ctrl_lookup.c +++ b/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; diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index e5422fc5c..aa3c252f4 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/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) { diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index a99eea27f..5b6530d28 100644 --- a/src/libbsc/bsc_init.c +++ b/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 */ diff --git a/src/libbsc/bsc_msc.c b/src/libbsc/bsc_msc.c index 82a572dbe..648b3e641 100644 --- a/src/libbsc/bsc_msc.c +++ b/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> diff --git a/src/libbsc/bsc_rf_ctrl.c b/src/libbsc/bsc_rf_ctrl.c index b7b6fc819..20115e112 100644 --- a/src/libbsc/bsc_rf_ctrl.c +++ b/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> diff --git a/src/libbsc/bsc_rll.c b/src/libbsc/bsc_rll.c index bb488da15..ebf9b8856 100644 --- a/src/libbsc/bsc_rll.c +++ b/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; diff --git a/src/libbsc/bsc_subscriber.c b/src/libbsc/bsc_subscriber.c index 73e61e801..d9d90baa9 100644 --- a/src/libbsc/bsc_subscriber.c +++ b/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) { diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index abfff0cd5..42c16e89b 100644 --- a/src/libbsc/bsc_vty.c +++ b/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> diff --git a/src/libbsc/bts_ericsson_rbs2000.c b/src/libbsc/bts_ericsson_rbs2000.c index 99da4e75f..5ee2760b2 100644 --- a/src/libbsc/bts_ericsson_rbs2000.c +++ b/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> diff --git a/src/libbsc/bts_init.c b/src/libbsc/bts_init.c index d6b152a79..18f1ed4c8 100644 --- a/src/libbsc/bts_init.c +++ b/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) { diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index a1bde778f..1f203f5c3 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/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; diff --git a/src/libbsc/bts_ipaccess_nanobts_omlattr.c b/src/libbsc/bts_ipaccess_nanobts_omlattr.c index 473e1caea..22ae48453 100644 --- a/src/libbsc/bts_ipaccess_nanobts_omlattr.c +++ b/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) { diff --git a/src/libbsc/bts_nokia_site.c b/src/libbsc/bts_nokia_site.c index 3ca76c017..392cd1792 100644 --- a/src/libbsc/bts_nokia_site.c +++ b/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> diff --git a/src/libbsc/bts_siemens_bs11.c b/src/libbsc/bts_siemens_bs11.c index c083b1e06..e01c258d3 100644 --- a/src/libbsc/bts_siemens_bs11.c +++ b/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); diff --git a/src/libbsc/bts_sysmobts.c b/src/libbsc/bts_sysmobts.c index e4b6cdc78..2982074bd 100644 --- a/src/libbsc/bts_sysmobts.c +++ b/src/libbsc/bts_sysmobts.c @@ -23,17 +23,17 @@ #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/abis/ipaccess.h> #include <osmocom/core/logging.h> diff --git a/src/libbsc/bts_unknown.c b/src/libbsc/bts_unknown.c index f1135294f..5ecf875c1 100644 --- a/src/libbsc/bts_unknown.c +++ b/src/libbsc/bts_unknown.c @@ -20,9 +20,9 @@ */ -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/gsm/tlv.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/abis_nm.h> static struct gsm_bts_model model_unknown = { .type = GSM_BTS_TYPE_UNKNOWN, diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 4192d65f7..679ad4203 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -25,14 +25,14 @@ #include <string.h> #include <errno.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> -#include <openbsc/rtp_proxy.h> -#include <openbsc/signal.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/rtp_proxy.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/core/talloc.h> diff --git a/src/libbsc/e1_config.c b/src/libbsc/e1_config.c index d57dec57e..1923efd8b 100644 --- a/src/libbsc/e1_config.c +++ b/src/libbsc/e1_config.c @@ -23,15 +23,15 @@ #include <netinet/in.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/trau_frame.h> -#include <openbsc/trau_mux.h> -#include <openbsc/misdn.h> +#include <osmocom/bsc/trau_mux.h> +#include <osmocom/bsc/misdn.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/talloc.h> -#include <openbsc/debug.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/abis_rsl.h> #define SAPI_L2ML 0 #define SAPI_OML 62 diff --git a/src/libbsc/gsm_04_08_utils.c b/src/libbsc/gsm_04_08_utils.c index 109beda49..7fc696f53 100644 --- a/src/libbsc/gsm_04_08_utils.c +++ b/src/libbsc/gsm_04_08_utils.c @@ -30,13 +30,13 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> -#include <openbsc/transaction.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> -#include <openbsc/bsc_api.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/transaction.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/bsc_api.h> +#include <osmocom/bsc/gsm_04_08_utils.h> /* should ip.access BTS use direct RTP streams between each other (1), * or should OpenBSC always act as RTP relay/proxy in between (0) ? */ diff --git a/src/libbsc/gsm_04_80_utils.c b/src/libbsc/gsm_04_80_utils.c index e0db81edf..d67f3c568 100644 --- a/src/libbsc/gsm_04_80_utils.c +++ b/src/libbsc/gsm_04_80_utils.c @@ -20,7 +20,7 @@ */ #include <osmocom/gsm/gsm0480.h> -#include <openbsc/bsc_api.h> +#include <osmocom/bsc/bsc_api.h> int bsc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level, const char *text) diff --git a/src/libbsc/handover_decision.c b/src/libbsc/handover_decision.c index 8d7e047b7..09c7eaa84 100644 --- a/src/libbsc/handover_decision.c +++ b/src/libbsc/handover_decision.c @@ -25,12 +25,12 @@ #include <errno.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/talloc.h> -#include <openbsc/handover.h> +#include <osmocom/bsc/handover.h> #include <osmocom/gsm/gsm_utils.h> /* Get reference to a neighbor cell on a given BCCH ARFCN */ diff --git a/src/libbsc/handover_logic.c b/src/libbsc/handover_logic.c index 8ced74fd5..ace8ac35b 100644 --- a/src/libbsc/handover_logic.c +++ b/src/libbsc/handover_logic.c @@ -29,18 +29,18 @@ #include <netinet/in.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/talloc.h> -#include <openbsc/transaction.h> -#include <openbsc/trau_mux.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/transaction.h> +#include <osmocom/bsc/trau_mux.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/gsm_04_08_utils.h> struct bsc_handover { struct llist_head list; diff --git a/src/libbsc/meas_proc.c b/src/libbsc/meas_proc.c index 5b97e74ee..efc3fd0ab 100644 --- a/src/libbsc/meas_proc.c +++ b/src/libbsc/meas_proc.c @@ -24,10 +24,10 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/signal.h> /* process an already parsed measurement report */ static int process_meas_rep(struct gsm_meas_rep *mr) diff --git a/src/libbsc/meas_rep.c b/src/libbsc/meas_rep.c index 808103d28..cb8379e0b 100644 --- a/src/libbsc/meas_rep.c +++ b/src/libbsc/meas_rep.c @@ -20,8 +20,8 @@ */ -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> static int get_field(const struct gsm_meas_rep *rep, enum meas_rep_field field) diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index 0dd37534e..a71662c9a 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -17,10 +17,10 @@ * */ -#include <openbsc/common_cs.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/common_cs.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_04_08_utils.h> struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/src/libbsc/paging.c b/src/libbsc/paging.c index 02212a352..b8f904359 100644 --- a/src/libbsc/paging.c +++ b/src/libbsc/paging.c @@ -42,14 +42,14 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm0502.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/paging.h> -#include <openbsc/debug.h> -#include <openbsc/signal.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/gsm_data.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/bsc_api.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/bsc_api.h> void *tall_paging_ctx; diff --git a/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c index 98e12fad4..40dd68d10 100644 --- a/src/libbsc/pcu_sock.c +++ b/src/libbsc/pcu_sock.c @@ -37,12 +37,12 @@ #include <osmocom/gsm/l1sap.h> #include <osmocom/gsm/gsm0502.h> -#include <openbsc/gsm_data.h> -#include <openbsc/pcu_if.h> -#include <openbsc/pcuif_proto.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/pcuif_proto.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/abis_rsl.h> static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx); diff --git a/src/libbsc/rest_octets.c b/src/libbsc/rest_octets.c index fdab70a0c..ae0422568 100644 --- a/src/libbsc/rest_octets.c +++ b/src/libbsc/rest_octets.c @@ -26,13 +26,13 @@ #include <errno.h> #include <stdbool.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/bitvec.h> #include <osmocom/gsm/bitvec_gsm.h> -#include <openbsc/rest_octets.h> -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/system_information.h> +#include <osmocom/bsc/rest_octets.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/system_information.h> /* generate SI1 rest octets */ int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net) diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c index fe0b23d02..c0df8bbc2 100644 --- a/src/libbsc/system_information.c +++ b/src/libbsc/system_information.c @@ -33,12 +33,12 @@ #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/rest_octets.h> -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/rest_octets.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/gsm_04_08_utils.h> /* * DCS1800 and PCS1900 have overlapping ARFCNs. We would need to set the |