diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-14 00:57:04 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-24 16:58:31 +0100 |
| commit | 2d521a0296fdecc1a8cb337354654123a864015b (patch) | |
| tree | 833481656d3925d530a9d1013016344227b3eeaf /openbsc/include | |
| parent | 27681a3407e2bde5cf3566aeabc7acbe2023f6e2 (diff) | |
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
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/Makefile.am | 1 | ||||
| -rw-r--r-- | openbsc/include/openbsc/abis_nm.h | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/common_bsc.h | 9 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 5 |
4 files changed, 12 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index d9d8e99c8..2b54c4345 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -13,6 +13,7 @@ noinst_HEADERS = \ bss.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ + common_bsc.h \ common_cs.h \ crc24.h \ ctrl.h \ diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index 965f1581e..246545272 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -26,6 +26,8 @@ #include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <openbsc/gsm_data.h> + struct cell_global_id { uint16_t mcc; uint16_t mnc; diff --git a/openbsc/include/openbsc/common_bsc.h b/openbsc/include/openbsc/common_bsc.h new file mode 100644 index 000000000..796038323 --- /dev/null +++ b/openbsc/include/openbsc/common_bsc.h @@ -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); diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index ea450be96..d4a4d6d10 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 */ |