<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18587">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: Rename setpower TRXC functions to describe they use power attenuation<br><br>Change-Id: Iedbe8e76bce990c2330477157cd886a8fc22063c<br>---<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_if.h<br>3 files changed, 7 insertions(+), 7 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 ff8e293..d0eba2b 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>@@ -193,12 +193,12 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void l1if_setpower_cb(struct trx_l1h *l1h, int power_att_db, int rc)</span><br><span style="color: hsl(120, 100%, 40%);">+static void l1if_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc)</span><br><span> {</span><br><span>  struct phy_instance *pinst = l1h->phy_inst;</span><br><span>       struct gsm_bts_trx *trx = pinst->trx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_setpower_cb(power_att_db=%d, rc=%d)\n", power_att_db, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_setpower_att_cb(power_att_db=%d, rc=%d)\n", power_att_db, rc);</span><br><span> </span><br><span>  power_trx_change_compl(trx, get_p_max_out_mdBm(trx) - to_mdB(power_att_db));</span><br><span> }</span><br><span>@@ -818,7 +818,7 @@</span><br><span>      struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span>  struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span>       int power_att = (get_p_max_out_mdBm(trx) - p_trxout_mdBm) / 1000;</span><br><span style="color: hsl(0, 100%, 40%);">-       return trx_if_cmd_setpower(l1h, power_att, l1if_setpower_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_if_cmd_setpower_att(l1h, power_att, l1if_setpower_att_cb);</span><br><span> }</span><br><span> </span><br><span> int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts)</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 5e3bf91..f2e2915 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -303,7 +303,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! Send "SETPOWER" command to TRX */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_cb *cb)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb)</span><br><span> {</span><br><span>       return trx_ctrl_cmd_cb(l1h, 0, cb, "SETPOWER", "%d", power_att_db);</span><br><span> }</span><br><span>@@ -546,7 +546,7 @@</span><br><span> </span><br><span> static int trx_ctrl_rx_rsp_setpower(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       trx_if_cmd_setpower_cb *cb = (trx_if_cmd_setpower_cb*) rsp->cb;</span><br><span style="color: hsl(120, 100%, 40%);">+    trx_if_cmd_setpower_att_cb *cb = (trx_if_cmd_setpower_att_cb*) rsp->cb;</span><br><span>   struct phy_instance *pinst = l1h->phy_inst;</span><br><span>       int power_att;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h</span><br><span>index 0630eb6..300be92 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.h</span><br><span>+++ b/src/osmo-bts-trx/trx_if.h</span><br><span>@@ -15,7 +15,7 @@</span><br><span> </span><br><span> typedef void trx_if_cmd_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc);</span><br><span> typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc);</span><br><span style="color: hsl(0, 100%, 40%);">-typedef void trx_if_cmd_setpower_cb(struct trx_l1h *l1h, int power_att_db, int rc);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void trx_if_cmd_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc);</span><br><span> </span><br><span> void trx_if_init(struct trx_l1h *l1h);</span><br><span> int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb);</span><br><span>@@ -23,7 +23,7 @@</span><br><span> int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc);</span><br><span> int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic);</span><br><span> int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db);</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_cb *cb);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb);</span><br><span> int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly);</span><br><span> int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly);</span><br><span> int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18587">change 18587</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/+/18587"/><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: Iedbe8e76bce990c2330477157cd886a8fc22063c </div>
<div style="display:none"> Gerrit-Change-Number: 18587 </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>