This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgNeels Hofmeyr has submitted this change and it was merged. Change subject: move to libcommon-cs: net init 2: move bsc_network_init decl to new .h ...................................................................... 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 --- M openbsc/include/openbsc/Makefile.am M openbsc/include/openbsc/abis_nm.h A openbsc/include/openbsc/common_bsc.h M openbsc/include/openbsc/gsm_data.h M openbsc/src/ipaccess/ipaccess-config.c M openbsc/src/libbsc/bsc_init.c M openbsc/src/utils/bs11_config.c M openbsc/tests/channel/channel_test.c M openbsc/tests/gsm0408/gsm0408_test.c 9 files changed, 17 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index d9d8e99..2b54c43 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -13,6 +13,7 @@ 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 965f158..2465452 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 0000000..7960383 --- /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 ea450be..d4a4d6d 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -415,11 +415,6 @@ 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/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index 06589f7..1ef8e3e 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/common_bsc.h> #include <osmocom/abis/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/signal.h> diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 214926b..917dd73 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -36,7 +36,7 @@ #include <openbsc/ipaccess.h> #include <osmocom/gsm/sysinfo.h> #include <openbsc/e1_config.h> -#include <openbsc/osmo_bsc.h> +#include <openbsc/common_bsc.h> /* global pointer to the gsm network data structure */ extern struct gsm_network *bsc_gsmnet; diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index ee43a40..8b05637 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/common_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 0c730a2..351bb5a 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/common_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 15248f2..0c7b5ce 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/common_bsc.h> #include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_11.h> #include <openbsc/gsm_subscriber.h> -- To view, visit https://gerrit.osmocom.org/1126 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9edfb1e748bb1cb484fadd48b0406f5b3098e89b Gerrit-PatchSet: 4 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>