<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18588">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;">bts-trx: Introduce helper func l1if_trx_set_nominal_power<br><br>This way we wrap same logic in one place, which will be used more in<br>next commit.<br><br>Change-Id: I929fc50d544a88900d2e22317ec5ced10f15e51c<br>---<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/l1_if.h<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_vty.c<br>4 files changed, 10 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index d0eba2b..97f87a1 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -138,6 +138,13 @@</span><br><span>        return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Sets the nominal power, in dB */</span><br><span style="color: hsl(120, 100%, 40%);">+void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, unsigned int nominal_power)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      trx->nominal_power = nominal_power;</span><br><span style="color: hsl(120, 100%, 40%);">+        trx->power_params.trx_p_max_out_mdBm = to_mdB(nominal_power);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc)</span><br><span> {</span><br><span>     struct phy_instance *pinst = l1h->phy_inst;</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h</span><br><span>index 46f2c18..5f51acb 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.h</span><br><span>+++ b/src/osmo-bts-trx/l1_if.h</span><br><span>@@ -114,6 +114,7 @@</span><br><span> int l1if_provision_transceiver_trx(struct trx_l1h *l1h);</span><br><span> int l1if_provision_transceiver(struct gsm_bts *bts);</span><br><span> int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, unsigned int nominal_power);</span><br><span> </span><br><span> static inline struct l1sched_trx *trx_l1sched_hdl(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 8fb67d2..fbe4c2f 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -129,7 +129,7 @@</span><br><span> </span><br><span> int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power);</span><br><span style="color: hsl(120, 100%, 40%);">+       l1if_trx_set_nominal_power(trx, trx->bts->c0->nominal_power);</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index b920c57..b3214ee 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -169,8 +169,7 @@</span><br><span>        struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span>       int val = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    trx->nominal_power = val;</span><br><span style="color: hsl(0, 100%, 40%);">-    trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->nominal_power);</span><br><span style="color: hsl(120, 100%, 40%);">+      l1if_trx_set_nominal_power(trx, val);</span><br><span>        l1h->config.nominal_power_set_by_vty = true;</span><br><span> </span><br><span>  return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18588">change 18588</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/+/18588"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I929fc50d544a88900d2e22317ec5ced10f15e51c </div>
<div style="display:none"> Gerrit-Change-Number: 18588 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>