diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-14 00:57:04 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-12 15:48:47 +0100 |
| commit | 84013beff1abd2142bbd2ef1e2b057eb24ef7815 (patch) | |
| tree | a1a196cfdcc1df94593723fa4093fedf9584c8d8 /openbsc | |
| parent | 8d1043a10fb85ffa0b20df35e511e1962fa93e10 (diff) | |
move to libxsc: net init 2: move bsc_network_init decl to osmo_bsc.h
bsc_network_init() is more fit to live in a BSC specific header.
Change-Id: I9edfb1e748bb1cb484fadd48b0406f5b3098e89b
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 5 | ||||
| -rw-r--r-- | openbsc/include/openbsc/osmo_bsc.h | 5 | ||||
| -rw-r--r-- | openbsc/src/ipaccess/ipaccess-config.c | 2 | ||||
| -rw-r--r-- | openbsc/src/utils/bs11_config.c | 2 | ||||
| -rw-r--r-- | openbsc/tests/channel/channel_test.c | 1 | ||||
| -rw-r--r-- | openbsc/tests/gsm0408/gsm0408_test.c | 1 |
6 files changed, 9 insertions, 7 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 3474fec42..a2e684c10 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -415,11 +415,6 @@ struct gsm_sms { extern void talloc_ctx_init(void *ctx_root); -struct gsm_network *bsc_network_init(void *ctx, - uint16_t country_code, - uint16_t network_code, - mncc_recv_cb_t mncc_recv); - int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); /* Get reference to a neighbor cell on a given BCCH ARFCN */ diff --git a/openbsc/include/openbsc/osmo_bsc.h b/openbsc/include/openbsc/osmo_bsc.h index fd5303dc6..ada89ea0b 100644 --- a/openbsc/include/openbsc/osmo_bsc.h +++ b/openbsc/include/openbsc/osmo_bsc.h @@ -46,6 +46,11 @@ struct osmo_bsc_sccp_con { struct bsc_filter_state filter_state; }; +struct gsm_network *bsc_network_init(void *ctx, + uint16_t country_code, + uint16_t network_code, + mncc_recv_cb_t mncc_recv); + struct bsc_api *osmo_bsc_api(); int bsc_queue_for_msc(struct osmo_bsc_sccp_con *conn, struct msgb *msg); diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index 06589f7eb..83e42f7eb 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -38,7 +38,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> -#include <openbsc/gsm_data.h> +#include <openbsc/osmo_bsc.h> #include <osmocom/abis/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/signal.h> diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index ee43a4084..0d1f0f309 100644 --- a/openbsc/src/utils/bs11_config.c +++ b/openbsc/src/utils/bs11_config.c @@ -32,7 +32,7 @@ #include <sys/stat.h> -#include <openbsc/gsm_data.h> +#include <openbsc/osmo_bsc.h> #include <openbsc/abis_nm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c index 0c730a249..f0e473231 100644 --- a/openbsc/tests/channel/channel_test.c +++ b/openbsc/tests/channel/channel_test.c @@ -25,6 +25,7 @@ #include <osmocom/core/application.h> #include <osmocom/core/select.h> +#include <openbsc/osmo_bsc.h> #include <openbsc/abis_rsl.h> #include <openbsc/debug.h> #include <openbsc/gsm_subscriber.h> diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c index 15248f219..b63205b98 100644 --- a/openbsc/tests/gsm0408/gsm0408_test.c +++ b/openbsc/tests/gsm0408/gsm0408_test.c @@ -24,6 +24,7 @@ #include <stdbool.h> #include <arpa/inet.h> +#include <openbsc/osmo_bsc.h> #include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_11.h> #include <openbsc/gsm_subscriber.h> |