Change in osmo-bsc[master]: system_information: publicly declare generate_cell_chan_list()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19110 )

Change subject: system_information: publicly declare generate_cell_chan_list()
......................................................................

system_information: publicly declare generate_cell_chan_list()

Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0
---
M include/osmocom/bsc/system_information.h
M src/osmo-bsc/bts_nokia_site.c
M src/osmo-bsc/osmo_bsc_main.c
M src/osmo-bsc/system_information.c
4 files changed, 4 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h
index 29f639d..35892d9 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 8047682..0d0dbb5 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 @@
 /* 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 5fd02dd..06f0cb1 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 @@
 			/* 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 4a1118e..19ea998 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -569,7 +569,7 @@
 }
 
 /* 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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19110
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0
Gerrit-Change-Number: 19110
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200702/017ec903/attachment.htm>