diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-14 00:45:26 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-24 16:58:31 +0100 |
| commit | 27681a3407e2bde5cf3566aeabc7acbe2023f6e2 (patch) | |
| tree | 983d530d2cd44fd806da1571ff5e9d34eed0d47e /openbsc/src/libbsc | |
| parent | 402006dfdf84c3bf3b22a48ba6ef6922ff6991c7 (diff) | |
move to libcommon-cs: net init 1: rename to bsc_network_init
The gsm_network_init() function initializes a whole lot of BSC specific stuff.
Aiming to move some of it to libcommon-cs, first rename it to bsc_network_init().
This will retain the BSC specific stuff when the move is done.
Adjust all callers.
Future: osmo-cscn will call the more generic part and not the BSC specific
part.
Change-Id: I4816ae19374390fc5c64972f7cad2e9ec3d8bcc3
Diffstat (limited to 'openbsc/src/libbsc')
| -rw-r--r-- | openbsc/src/libbsc/bsc_init.c | 3 | ||||
| -rw-r--r-- | openbsc/src/libbsc/net_init.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index a1becf849..214926b16 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -36,6 +36,7 @@ #include <openbsc/ipaccess.h> #include <osmocom/gsm/sysinfo.h> #include <openbsc/e1_config.h> +#include <openbsc/osmo_bsc.h> /* global pointer to the gsm network data structure */ extern struct gsm_network *bsc_gsmnet; @@ -481,7 +482,7 @@ int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *config_file) int rc; /* initialize our data structures */ - bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, mncc_recv); + bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, mncc_recv); if (!bsc_gsmnet) return -ENOMEM; diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index da13a52f6..07a442356 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -17,13 +17,14 @@ * */ +#include <openbsc/osmo_bsc.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_msc_data.h> #include <openbsc/gsm_subscriber.h> #include <stdbool.h> -struct gsm_network *gsm_network_init(void *ctx, +struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, uint16_t network_code, mncc_recv_cb_t mncc_recv) |