diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2020-07-03 03:19:29 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2020-07-03 03:27:17 +0700 |
| commit | f6983f68a9c3740914945c929b4e4d351bdcf3d6 (patch) | |
| tree | e35aa3f1743e380b5803f281328a3c1a3f288da7 | |
| parent | 0626659221f06f978ebcc9a1c416368749f25a91 (diff) | |
system_information: publicly declare generate_cell_chan_list()
Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0
| -rw-r--r-- | include/osmocom/bsc/system_information.h | 1 | ||||
| -rw-r--r-- | src/osmo-bsc/bts_nokia_site.c | 3 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 3 | ||||
| -rw-r--r-- | src/osmo-bsc/system_information.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h index 29f639dca..35892d9d6 100644 --- a/include/osmocom/bsc/system_information.h +++ b/include/osmocom/bsc/system_information.h @@ -7,6 +7,7 @@ struct gsm_bts; +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type type); size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e); unsigned range1024_p(unsigned n); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 804768234..0d0dbb5bd 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -36,6 +36,7 @@ #include <osmocom/abis/e1_input.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/timeslot_fsm.h> +#include <osmocom/bsc/system_information.h> #include <osmocom/core/timer.h> @@ -50,8 +51,6 @@ enum reset_timer_state { /* TODO: put in a separate file ? */ extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg); -/* was static in system_information.c */ -extern int generate_cell_chan_list(uint8_t * chan_list, struct gsm_bts *bts); static void nokia_abis_nm_queue_send_next(struct gsm_bts *bts); static void reset_timer_cb(void *_bts); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5fd02dda6..06f0cb17d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -63,6 +63,7 @@ #include <osmocom/bsc/chan_alloc.h> #include <osmocom/bsc/e1_config.h> #include <osmocom/bsc/codec_pref.h> +#include <osmocom/bsc/system_information.h> #include <osmocom/mgcp_client/mgcp_client.h> @@ -364,8 +365,6 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal, /* TODO: this is required for the Nokia BTS, hopping is configured during OML, other MA is not set. */ struct gsm_bts_trx *cur_trx; - /* was static in system_information.c */ - extern int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); uint8_t ca[20]; /* has to be called before generate_ma_for_ts to set bts->si_common.cell_alloc */ diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 4a1118e4e..19ea998d4 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -569,7 +569,7 @@ static int bitvec2freq_list(uint8_t *chan_list, struct bitvec *bv, } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -/* static*/ int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) { struct gsm_bts_trx *trx; struct bitvec *bv = &bts->si_common.cell_alloc; |