laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/28859 )
Change subject: trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ
......................................................................
trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ
Make it clear that this event is used for setting *PHY* configuration.
Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3
---
M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
M src/host/trxcon/src/l1ctl.c
M src/host/trxcon/src/trxcon_fsm.c
3 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
index 69ac01e..4478f21 100644
--- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
@@ -23,7 +23,7 @@
TRXCON_EV_FBSB_SEARCH_RES,
TRXCON_EV_SET_CCCH_MODE_REQ,
TRXCON_EV_SET_TCH_MODE_REQ,
- TRXCON_EV_SET_CONFIG_REQ,
+ TRXCON_EV_SET_PHY_CONFIG_REQ,
TRXCON_EV_TX_ACCESS_BURST_REQ,
TRXCON_EV_DEDICATED_ESTABLISH_REQ,
TRXCON_EV_DEDICATED_RELEASE_REQ,
@@ -60,8 +60,8 @@
bool applied;
};
-/* param of TRXCON_EV_SET_CONFIG_REQ */
-struct trxcon_param_set_config_req {
+/* param of TRXCON_EV_SET_PHY_CONFIG_REQ */
+struct trxcon_param_set_phy_config_req {
uint8_t timing_advance;
uint8_t tx_power;
};
diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c
index 5f95e1c..28086a2 100644
--- a/src/host/trxcon/src/l1ctl.c
+++ b/src/host/trxcon/src/l1ctl.c
@@ -666,12 +666,12 @@
"Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n",
par_req->ta, par_req->tx_power);
- struct trxcon_param_set_config_req req = {
+ struct trxcon_param_set_phy_config_req req = {
.timing_advance = par_req->ta,
.tx_power = par_req->tx_power,
};
- osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CONFIG_REQ, &req);
+ osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_PHY_CONFIG_REQ, &req);
msgb_free(msg);
return 0;
diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c
index 5329a92..053cd41 100644
--- a/src/host/trxcon/src/trxcon_fsm.c
+++ b/src/host/trxcon/src/trxcon_fsm.c
@@ -61,9 +61,9 @@
case TRXCON_EV_RESET_SCHED_REQ:
l1sched_reset(trxcon->sched, false);
break;
- case TRXCON_EV_SET_CONFIG_REQ:
+ case TRXCON_EV_SET_PHY_CONFIG_REQ:
{
- const struct trxcon_param_set_config_req *req = data;
+ const struct trxcon_param_set_phy_config_req *req = data;
if (trxcon->l1p.ta != req->timing_advance)
trx_if_cmd_setta(trxcon->phyif, req->timing_advance);
@@ -449,7 +449,7 @@
OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_RES),
OSMO_VALUE_STRING(TRXCON_EV_SET_CCCH_MODE_REQ),
OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ),
- OSMO_VALUE_STRING(TRXCON_EV_SET_CONFIG_REQ),
+ OSMO_VALUE_STRING(TRXCON_EV_SET_PHY_CONFIG_REQ),
OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ),
@@ -471,7 +471,7 @@
| S(TRXCON_EV_L2IF_FAILURE)
| S(TRXCON_EV_RESET_FULL_REQ)
| S(TRXCON_EV_RESET_SCHED_REQ)
- | S(TRXCON_EV_SET_CONFIG_REQ),
+ | S(TRXCON_EV_SET_PHY_CONFIG_REQ),
.allstate_action = &trxcon_allstate_action,
.timer_cb = &trxcon_timer_cb,
};
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28859
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3
Gerrit-Change-Number: 28859
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
