<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19110">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">system_information: publicly declare generate_cell_chan_list()<br><br>Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0<br>---<br>M include/osmocom/bsc/system_information.h<br>M src/osmo-bsc/bts_nokia_site.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M src/osmo-bsc/system_information.c<br>4 files changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/19110/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h</span><br><span>index 29f639d..35892d9 100644</span><br><span>--- a/include/osmocom/bsc/system_information.h</span><br><span>+++ b/include/osmocom/bsc/system_information.h</span><br><span>@@ -7,6 +7,7 @@</span><br><span> </span><br><span> struct gsm_bts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts);</span><br><span> int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type type);</span><br><span> size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e);</span><br><span> unsigned range1024_p(unsigned n);</span><br><span>diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c</span><br><span>index 8047682..0d0dbb5 100644</span><br><span>--- a/src/osmo-bsc/bts_nokia_site.c</span><br><span>+++ b/src/osmo-bsc/bts_nokia_site.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/abis/e1_input.h></span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/bsc/timeslot_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/system_information.h></span><br><span> </span><br><span> #include <osmocom/core/timer.h></span><br><span> </span><br><span>@@ -50,8 +51,6 @@</span><br><span> /* TODO: put in a separate file ? */</span><br><span> </span><br><span> extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-/* was static in system_information.c */</span><br><span style="color: hsl(0, 100%, 40%);">-extern int generate_cell_chan_list(uint8_t * chan_list, struct gsm_bts *bts);</span><br><span> </span><br><span> static void nokia_abis_nm_queue_send_next(struct gsm_bts *bts);</span><br><span> static void reset_timer_cb(void *_bts);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 5fd02dd..06f0cb1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -63,6 +63,7 @@</span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/e1_config.h></span><br><span> #include <osmocom/bsc/codec_pref.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/system_information.h></span><br><span> </span><br><span> #include <osmocom/mgcp_client/mgcp_client.h></span><br><span> </span><br><span>@@ -364,8 +365,6 @@</span><br><span>                    /* TODO: this is required for the Nokia BTS, hopping is configured</span><br><span>                      during OML, other MA is not set.  */</span><br><span>                      struct gsm_bts_trx *cur_trx;</span><br><span style="color: hsl(0, 100%, 40%);">-                    /* was static in system_information.c */</span><br><span style="color: hsl(0, 100%, 40%);">-                        extern int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts);</span><br><span>                         uint8_t ca[20];</span><br><span>                      /* has to be called before generate_ma_for_ts to</span><br><span>                       set bts->si_common.cell_alloc */</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 4a1118e..19ea998 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -569,7 +569,7 @@</span><br><span> }</span><br><span> </span><br><span> /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */</span><br><span style="color: hsl(0, 100%, 40%);">-/* static*/ int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts)</span><br><span> {</span><br><span>     struct gsm_bts_trx *trx;</span><br><span>     struct bitvec *bv = &bts->si_common.cell_alloc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19110">change 19110</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/19110"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 </div>
<div style="display:none"> Gerrit-Change-Number: 19110 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>