<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19387">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix compilation with gcc-10<br><br>/usr/bin/ld: /home/laforge/projects/git/osmo-bts/tests/sysmobts/../../src/osmo-bts-sysmo/tch.c:584: undefined reference to `femtobts_tch_pl_names'<br>/usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: multiple definition of `pdch_msu_size'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: first defined here<br>/usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: multiple definition of `femtobts_l1prim_type'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: first defined here<br><br>see also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000651.html<br><br>Change-Id: I4a9896153876fcda496365776883827746205f00<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M include/osmo-bts/scheduler_backend.h<br>M src/osmo-bts-litecell15/lc15bts.h<br>M src/osmo-bts-oc2g/oc2gbts.h<br>M src/osmo-bts-sysmo/femtobts.h<br>M tests/sysmobts/Makefile.am<br>6 files changed, 43 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/19387/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 41998ad..3943e50 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -342,13 +342,13 @@</span><br><span> return get_value_string(lchan_ciph_state_names, state);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm_bts_trx_ts_flags {</span><br><span> TS_F_PDCH_ACTIVE = 0x1000,</span><br><span> TS_F_PDCH_ACT_PENDING = 0x2000,</span><br><span> TS_F_PDCH_DEACT_PENDING = 0x4000,</span><br><span> TS_F_PDCH_PENDING_MASK = 0x6000 /*<</span><br><span> TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */</span><br><span style="color: hsl(0, 100%, 40%);">-} gsm_bts_trx_ts_flags;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> /* One Timeslot in a TRX */</span><br><span> struct gsm_bts_trx_ts {</span><br><span>@@ -793,8 +793,8 @@</span><br><span> const char *btsvariant2str(enum gsm_bts_type_variant v);</span><br><span> </span><br><span> extern const struct value_string gsm_chreq_descs[];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsm_pchant_names[13];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsm_pchant_descs[13];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm_pchant_names[13];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm_pchant_descs[13];</span><br><span> const char *gsm_pchan_name(enum gsm_phys_chan_config c);</span><br><span> enum gsm_phys_chan_config gsm_pchan_parse(const char *name);</span><br><span> const char *gsm_lchant_name(enum gsm_chan_t c);</span><br><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index 51c957c..c52bc70 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -40,8 +40,8 @@</span><br><span> </span><br><span> extern const ubit_t _sched_tsc[8][26];</span><br><span> extern const ubit_t _sched_egprs_tsc[8][78];</span><br><span style="color: hsl(0, 100%, 40%);">-const ubit_t _sched_fcch_burst[148];</span><br><span style="color: hsl(0, 100%, 40%);">-const ubit_t _sched_sch_train[64];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const ubit_t _sched_fcch_burst[148];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const ubit_t _sched_sch_train[64];</span><br><span> </span><br><span> struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn,</span><br><span> enum trx_chan_type chan);</span><br><span>diff --git a/src/osmo-bts-litecell15/lc15bts.h b/src/osmo-bts-litecell15/lc15bts.h</span><br><span>index 4c40db0..31ca923 100644</span><br><span>--- a/src/osmo-bts-litecell15/lc15bts.h</span><br><span>+++ b/src/osmo-bts-litecell15/lc15bts.h</span><br><span>@@ -23,24 +23,24 @@</span><br><span> };</span><br><span> </span><br><span> enum l1prim_type lc15bts_get_l1prim_type(GsmL1_PrimId_t id);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span> GsmL1_PrimId_t lc15bts_get_l1prim_conf(GsmL1_PrimId_t id);</span><br><span> </span><br><span> enum l1prim_type lc15bts_get_sysprim_type(Litecell15_PrimId_t id);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1];</span><br><span> Litecell15_PrimId_t lc15bts_get_sysprim_conf(Litecell15_PrimId_t id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_tracef_names[29];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_tracef_docs[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_tracef_names[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_tracef_docs[29];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_tch_pl_names[15];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_tch_pl_names[15];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_clksrc_names[10];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_clksrc_names[10];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string lc15bts_dir_names[6];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string lc15bts_dir_names[6];</span><br><span> </span><br><span> enum pdch_cs {</span><br><span> PDCH_CS_1,</span><br><span>@@ -59,6 +59,6 @@</span><br><span> _NUM_PDCH_CS</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span> </span><br><span> #endif /* LC15BTS_H */</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2gbts.h b/src/osmo-bts-oc2g/oc2gbts.h</span><br><span>index 9eb8745..80fd1d5 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2gbts.h</span><br><span>+++ b/src/osmo-bts-oc2g/oc2gbts.h</span><br><span>@@ -39,26 +39,26 @@</span><br><span> };</span><br><span> </span><br><span> enum l1prim_type oc2gbts_get_l1prim_type(GsmL1_PrimId_t id);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span> GsmL1_PrimId_t oc2gbts_get_l1prim_conf(GsmL1_PrimId_t id);</span><br><span> </span><br><span> enum l1prim_type oc2gbts_get_sysprim_type(Oc2g_PrimId_t id);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1];</span><br><span> Oc2g_PrimId_t oc2gbts_get_sysprim_conf(Oc2g_PrimId_t id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_tracef_names[29];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_tracef_docs[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_tracef_names[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_tracef_docs[29];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_tch_pl_names[15];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_tch_pl_names[15];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_clksrc_names[10];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_clksrc_names[10];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_dir_names[6];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_dir_names[6];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX];</span><br><span> </span><br><span> enum pdch_cs {</span><br><span> PDCH_CS_1,</span><br><span>@@ -77,7 +77,7 @@</span><br><span> _NUM_PDCH_CS</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span> </span><br><span> /* OC2G default parameters */</span><br><span> #define OC2G_BTS_MAX_CELL_SIZE_DEFAULT 166 /* 166 qbits is default value */</span><br><span>diff --git a/src/osmo-bts-sysmo/femtobts.h b/src/osmo-bts-sysmo/femtobts.h</span><br><span>index 9163ebb..b048fc4 100644</span><br><span>--- a/src/osmo-bts-sysmo/femtobts.h</span><br><span>+++ b/src/osmo-bts-sysmo/femtobts.h</span><br><span>@@ -68,25 +68,25 @@</span><br><span> };</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span style="color: hsl(0, 100%, 40%);">-const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1];</span><br><span style="color: hsl(0, 100%, 40%);">-const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_tracef_names[29];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_tracef_docs[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_tracef_names[29];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_tracef_docs[29];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_tch_pl_names[15];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_chcomb_names[8];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_clksrc_names[10];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_tch_pl_names[15];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_chcomb_names[8];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_clksrc_names[10];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string femtobts_dir_names[6];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string femtobts_dir_names[6];</span><br><span> </span><br><span> enum pdch_cs {</span><br><span> PDCH_CS_1,</span><br><span>@@ -105,6 +105,6 @@</span><br><span> _NUM_PDCH_CS</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint8_t pdch_msu_size[_NUM_PDCH_CS];</span><br><span> </span><br><span> #endif /* FEMTOBTS_H */</span><br><span>diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am</span><br><span>index 0829ca5..53180d1 100644</span><br><span>--- a/tests/sysmobts/Makefile.am</span><br><span>+++ b/tests/sysmobts/Makefile.am</span><br><span>@@ -13,5 +13,6 @@</span><br><span> $(top_srcdir)/src/osmo-bts-sysmo/calib_file.c \</span><br><span> $(top_srcdir)/src/osmo-bts-sysmo/calib_fixup.c \</span><br><span> $(top_srcdir)/src/osmo-bts-sysmo/misc/sysmobts_par.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_srcdir)/src/osmo-bts-sysmo/femtobts.c \</span><br><span> $(top_srcdir)/src/osmo-bts-sysmo/eeprom.c</span><br><span> sysmobts_test_LDADD = $(top_builddir)/src/common/libbts.a $(LIBOSMOABIS_LIBS) $(LDADD)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19387">change 19387</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-bts/+/19387"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: rel-1.2.1 </div>
<div style="display:none"> Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 </div>
<div style="display:none"> Gerrit-Change-Number: 19387 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>