move to libcommon-cs: net init 2: move bsc_network_init decl to new .h
bsc_network_init() is more fit to live in a BSC specific header, move it to new common_bsc.h. It will probably also absorb the BSC-specific part of gsm_network in the future. Adjust header includes across the board. Particularly, fix abis_nm.h by explicitly including gsm_data.h: it so far relied on other headers to do that, which now is no longer always given. Change-Id: I9edfb1e748bb1cb484fadd48b0406f5b3098e89b
This commit is contained in:
parent
27681a3407
commit
2d521a0296
|
@ -13,6 +13,7 @@ noinst_HEADERS = \
|
||||||
bss.h \
|
bss.h \
|
||||||
bts_ipaccess_nanobts_omlattr.h \
|
bts_ipaccess_nanobts_omlattr.h \
|
||||||
chan_alloc.h \
|
chan_alloc.h \
|
||||||
|
common_bsc.h \
|
||||||
common_cs.h \
|
common_cs.h \
|
||||||
crc24.h \
|
crc24.h \
|
||||||
ctrl.h \
|
ctrl.h \
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include <osmocom/gsm/abis_nm.h>
|
#include <osmocom/gsm/abis_nm.h>
|
||||||
#include <osmocom/gsm/protocol/gsm_12_21.h>
|
#include <osmocom/gsm/protocol/gsm_12_21.h>
|
||||||
|
|
||||||
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
||||||
struct cell_global_id {
|
struct cell_global_id {
|
||||||
uint16_t mcc;
|
uint16_t mcc;
|
||||||
uint16_t mnc;
|
uint16_t mnc;
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <openbsc/common_cs.h>
|
||||||
|
|
||||||
|
struct gsm_network *bsc_network_init(void *ctx,
|
||||||
|
uint16_t country_code,
|
||||||
|
uint16_t network_code,
|
||||||
|
mncc_recv_cb_t mncc_recv);
|
|
@ -415,11 +415,6 @@ struct gsm_sms {
|
||||||
|
|
||||||
extern void talloc_ctx_init(void *ctx_root);
|
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);
|
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 */
|
/* Get reference to a neighbor cell on a given BCCH ARFCN */
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#include <osmocom/core/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocom/core/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/common_bsc.h>
|
||||||
#include <osmocom/abis/e1_input.h>
|
#include <osmocom/abis/e1_input.h>
|
||||||
#include <openbsc/abis_nm.h>
|
#include <openbsc/abis_nm.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <osmocom/gsm/sysinfo.h>
|
#include <osmocom/gsm/sysinfo.h>
|
||||||
#include <openbsc/e1_config.h>
|
#include <openbsc/e1_config.h>
|
||||||
#include <openbsc/osmo_bsc.h>
|
#include <openbsc/common_bsc.h>
|
||||||
|
|
||||||
/* global pointer to the gsm network data structure */
|
/* global pointer to the gsm network data structure */
|
||||||
extern struct gsm_network *bsc_gsmnet;
|
extern struct gsm_network *bsc_gsmnet;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/common_bsc.h>
|
||||||
#include <openbsc/abis_nm.h>
|
#include <openbsc/abis_nm.h>
|
||||||
#include <osmocom/core/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocom/core/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <osmocom/core/application.h>
|
#include <osmocom/core/application.h>
|
||||||
#include <osmocom/core/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
|
#include <openbsc/common_bsc.h>
|
||||||
#include <openbsc/abis_rsl.h>
|
#include <openbsc/abis_rsl.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_subscriber.h>
|
#include <openbsc/gsm_subscriber.h>
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
#include <openbsc/common_bsc.h>
|
||||||
#include <openbsc/gsm_04_08.h>
|
#include <openbsc/gsm_04_08.h>
|
||||||
#include <openbsc/gsm_04_11.h>
|
#include <openbsc/gsm_04_11.h>
|
||||||
#include <openbsc/gsm_subscriber.h>
|
#include <openbsc/gsm_subscriber.h>
|
||||||
|
|
Loading…
Reference in New Issue