diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-07-30 03:06:34 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-08-08 13:53:32 +0700 |
| commit | a21f85619b0648b549c4089c21ee76844819e131 (patch) | |
| tree | 89724bdc6945f04e384758697fa6643c59529f5b | |
| parent | 957661253ed67f3780166d6397a7a7f37f09f9d2 (diff) | |
trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ
Make it clear that this event is used for setting *PHY* configuration.
Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3
| -rw-r--r-- | src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h | 6 | ||||
| -rw-r--r-- | src/host/trxcon/src/l1ctl.c | 4 | ||||
| -rw-r--r-- | src/host/trxcon/src/trxcon_fsm.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 69ac01eb..4478f214 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 @@ enum trxcon_fsm_events { 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 @@ struct trxcon_param_set_ccch_tch_mode_req { 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 5f95e1cd..28086a25 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -666,12 +666,12 @@ static int l1ctl_rx_param_req(struct l1ctl_client *l1c, struct msgb *msg) "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 5329a92b..053cd416 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -61,9 +61,9 @@ static void trxcon_allstate_action(struct osmo_fsm_inst *fi, 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 @@ static const struct value_string trxcon_fsm_event_names[] = { 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 @@ struct osmo_fsm trxcon_fsm_def = { | 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, }; |