cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Neels Hofmeyr 2016-05-14 00:45:26 +02:00
parent 402006dfdf
commit 27681a3407
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/gsm_data.h
View File

@ -415,7 +415,7 @@ struct gsm_sms {
extern void talloc_ctx_init(void *ctx_root);
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);

2
openbsc/src/ipaccess/ipaccess-config.c
View File

@ -986,7 +986,7 @@ int main(int argc, char **argv)
}
libosmo_abis_init(tall_ctx_config);
bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
if (!bsc_gsmnet)
exit(1);

3
openbsc/src/libbsc/bsc_init.c
View File

@ -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;

3
openbsc/src/libbsc/net_init.c
View File

@ -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)

2
openbsc/src/utils/bs11_config.c
View File

@ -897,7 +897,7 @@ int main(int argc, char **argv)
handle_options(argc, argv);
bts_model_bs11_init();
gsmnet = gsm_network_init(tall_bs11cfg_ctx, 1, 1, NULL);
gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1, NULL);
if (!gsmnet) {
fprintf(stderr, "Unable to allocate gsm network\n");
exit(1);

2
openbsc/tests/channel/channel_test.c
View File

@ -66,7 +66,7 @@ void test_request_chan(void)
printf("Testing the gsm_subscriber chan logic\n");
/* Create a dummy network */
network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
network = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
if (!network)
exit(1);
bts = gsm_bts_alloc(network);

4
openbsc/tests/gsm0408/gsm0408_test.c
View File

@ -122,7 +122,7 @@ static inline void _bts_uarfcn_add(struct gsm_bts *bts, uint16_t arfcn,
static inline void test_si2q_u(void)
{
struct gsm_bts *bts;
struct gsm_network *network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
printf("Testing SYSINFO_TYPE_2quater UARFCN generation:\n");
if (!network)
@ -149,7 +149,7 @@ static inline void test_si2q_u(void)
static inline void test_si2q_e(void)
{
struct gsm_bts *bts;
struct gsm_network *network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
struct gsm_network *network = bsc_network_init(tall_bsc_ctx, 1, 1, NULL);
printf("Testing SYSINFO_TYPE_2quater EARFCN generation:\n");
if (!network)