phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ 

Make it clear that this event is used for setting *PHY* configuration.

Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3
This commit is contained in:
Vadim Yanitskiy 2022-07-30 03:06:34 +07:00
parent 957661253e
commit a21f85619b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
View File

@ -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;
};

4
src/host/trxcon/src/l1ctl.c
View File

@ -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;

8
src/host/trxcon/src/trxcon_fsm.c
View File

@ -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,
};