Change in osmo-bts[master]: bts-trx: Rename setpower TRXC functions to describe they use power at...

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18587 )

Change subject: bts-trx: Rename setpower TRXC functions to describe they use power attenuation
......................................................................

bts-trx: Rename setpower TRXC functions to describe they use power attenuation

Change-Id: Iedbe8e76bce990c2330477157cd886a8fc22063c
---
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/trx_if.c
M src/osmo-bts-trx/trx_if.h
3 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index ff8e293..d0eba2b 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -193,12 +193,12 @@
 	}
 }
 
-static void l1if_setpower_cb(struct trx_l1h *l1h, int power_att_db, int rc)
+static void l1if_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc)
 {
 	struct phy_instance *pinst = l1h->phy_inst;
 	struct gsm_bts_trx *trx = pinst->trx;
 
-	LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_setpower_cb(power_att_db=%d, rc=%d)\n", power_att_db, rc);
+	LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_setpower_att_cb(power_att_db=%d, rc=%d)\n", power_att_db, rc);
 
 	power_trx_change_compl(trx, get_p_max_out_mdBm(trx) - to_mdB(power_att_db));
 }
@@ -818,7 +818,7 @@
 	struct phy_instance *pinst = trx_phy_instance(trx);
 	struct trx_l1h *l1h = pinst->u.osmotrx.hdl;
 	int power_att = (get_p_max_out_mdBm(trx) - p_trxout_mdBm) / 1000;
-	return trx_if_cmd_setpower(l1h, power_att, l1if_setpower_cb);
+	return trx_if_cmd_setpower_att(l1h, power_att, l1if_setpower_att_cb);
 }
 
 int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts)
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 5e3bf91..f2e2915 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -303,7 +303,7 @@
 }
 
 /*! Send "SETPOWER" command to TRX */
-int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_cb *cb)
+int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb)
 {
 	return trx_ctrl_cmd_cb(l1h, 0, cb, "SETPOWER", "%d", power_att_db);
 }
@@ -546,7 +546,7 @@
 
 static int trx_ctrl_rx_rsp_setpower(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp)
 {
-	trx_if_cmd_setpower_cb *cb = (trx_if_cmd_setpower_cb*) rsp->cb;
+	trx_if_cmd_setpower_att_cb *cb = (trx_if_cmd_setpower_att_cb*) rsp->cb;
 	struct phy_instance *pinst = l1h->phy_inst;
 	int power_att;
 
diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h
index 0630eb6..300be92 100644
--- a/src/osmo-bts-trx/trx_if.h
+++ b/src/osmo-bts-trx/trx_if.h
@@ -15,7 +15,7 @@
 
 typedef void trx_if_cmd_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc);
 typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc);
-typedef void trx_if_cmd_setpower_cb(struct trx_l1h *l1h, int power_att_db, int rc);
+typedef void trx_if_cmd_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc);
 
 void trx_if_init(struct trx_l1h *l1h);
 int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb);
@@ -23,7 +23,7 @@
 int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc);
 int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic);
 int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db);
-int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_cb *cb);
+int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb);
 int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly);
 int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly);
 int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18587
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iedbe8e76bce990c2330477157cd886a8fc22063c
Gerrit-Change-Number: 18587
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200612/d04b93c3/attachment.htm>