<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21825">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add a bts_model->bts_init() and trx_init() call-back function<br><br>This allows a given BTS model driver to initialize data structures<br>specific cor this BTS instance (or a TRX for this BTS instance).<br><br>Change-Id: Icbad9cdc12221c9ad997267d77e5414edcbac538<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_trx.c<br>3 files changed, 28 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 7d070af..aef0e03 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -178,7 +178,15 @@</span><br><span> const char *name;</span><br><span> </span><br><span> bool started;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* start the model itself */</span><br><span> int (*start)(struct gsm_network *net);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* initialize a single BTS for this model */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*bts_init)(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* initialize a single TRX for this model */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*trx_init)(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int (*oml_rcvmsg)(struct msgb *msg);</span><br><span> char * (*oml_status)(const struct gsm_bts *bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 747e8b7..39122ae 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -503,6 +503,19 @@</span><br><span> model->started = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (model->bts_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = model->bts_init(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* handle those TRX which are already allocated at the time we set the type */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (model->trx_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trx, &bts->trx_list, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ model->trx_init(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (bts->type) {</span><br><span> case GSM_BTS_TYPE_OSMOBTS:</span><br><span> /* Enable dynamic Uplink power control by default */</span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 0e52238..6d98929 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -120,6 +120,13 @@</span><br><span> if (trx->nr != 0)</span><br><span> trx->nominal_power = bts->c0->nominal_power;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model && bts->model->trx_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->trx_init(trx) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add_tail(&trx->list, &bts->trx_list);</span><br><span> </span><br><span> return trx;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21825">change 21825</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/+/21825"/><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: Icbad9cdc12221c9ad997267d77e5414edcbac538 </div>
<div style="display:none"> Gerrit-Change-Number: 21825 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>