<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19300">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move acc_ramp_init inside gsm_bts_alloc<br><br>The function initializes the struct owned by a bts, so it makes sense to<br>have it done there instead of somewhere else later.<br><br>It was most probably put in bsc_vty when it was initially introduced<br>because of all the data structure and object file mess I untangled<br>during last set of patches.<br><br>Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00<br>---<br>M src/ipaccess/Makefile.am<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M src/utils/Makefile.am<br>M tests/abis/Makefile.am<br>M tests/bsc/Makefile.am<br>M tests/gsm0408/Makefile.am<br>M tests/nanobts_omlattr/Makefile.am<br>8 files changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am</span><br><span>index a1812a9..a11b295 100644</span><br><span>--- a/src/ipaccess/Makefile.am</span><br><span>+++ b/src/ipaccess/Makefile.am</span><br><span>@@ -49,6 +49,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span>@@ -63,6 +64,7 @@</span><br><span> </span><br><span> ipaccess_proxy_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index aa08e8b..11e51be 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -2153,11 +2153,6 @@</span><br><span> bts = bsc_bts_alloc_register(gsmnet, GSM_BTS_TYPE_UNKNOWN,</span><br><span> HARDCODED_BSIC);</span><br><span> osmo_stat_item_inc(gsmnet->bsc_statg->items[BSC_STAT_NUM_BTS_TOTAL], 1);</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Initialize bts->acc_ramp here. Else we could segfault while</span><br><span style="color: hsl(0, 100%, 40%);">- * processing a configuration file with ACC ramping settings.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- acc_ramp_init(&bts->acc_ramp, bts);</span><br><span> } else</span><br><span> bts = gsm_bts_num(gsmnet, bts_nr);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 055cc47..7794024 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -387,6 +387,8 @@</span><br><span> bts_init_cbch_state(&bts->cbch_basic, bts);</span><br><span> bts_init_cbch_state(&bts->cbch_extended, bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ acc_ramp_init(&bts->acc_ramp, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return bts;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am</span><br><span>index 653ed97..683c227 100644</span><br><span>--- a/src/utils/Makefile.am</span><br><span>+++ b/src/utils/Makefile.am</span><br><span>@@ -48,6 +48,7 @@</span><br><span> </span><br><span> bs11_config_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \</span><br><span>@@ -120,6 +121,7 @@</span><br><span> </span><br><span> meas_json_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span>diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am</span><br><span>index 5f81ceb..031d689 100644</span><br><span>--- a/tests/abis/Makefile.am</span><br><span>+++ b/tests/abis/Makefile.am</span><br><span>@@ -26,6 +26,7 @@</span><br><span> </span><br><span> abis_test_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index 012bd79..282f603 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -34,6 +34,7 @@</span><br><span> </span><br><span> bsc_test_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span>diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am</span><br><span>index 790f3aa..4e22392 100644</span><br><span>--- a/tests/gsm0408/Makefile.am</span><br><span>+++ b/tests/gsm0408/Makefile.am</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> gsm0408_test_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span>diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am</span><br><span>index 5a627ff..67d059f 100644</span><br><span>--- a/tests/nanobts_omlattr/Makefile.am</span><br><span>+++ b/tests/nanobts_omlattr/Makefile.am</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> nanobts_omlattr_test_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19300">change 19300</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/+/19300"/><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: I66c4b208583e92070793183b83b3a7b7edf6ba00 </div>
<div style="display:none"> Gerrit-Change-Number: 19300 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>