trxcon: trxcon_fsm: shorten DCH related event names

Purely cosmetic change, making the lines using these events shorter.

Change-Id: Ie388e251677da63306e9e53d98cbcc7c34777980
Related: OS#5599
This commit is contained in:
Vadim Yanitskiy 2022-11-26 06:41:57 +07:00 committed by fixeria
parent 93b1884914
commit 13cabcb281
3 changed files with 18 additions and 18 deletions

View File

@ -31,8 +31,8 @@ enum trxcon_fsm_events {
TRXCON_EV_TX_ACCESS_BURST_REQ,
TRXCON_EV_TX_ACCESS_BURST_CNF,
TRXCON_EV_UPDATE_SACCH_CACHE_REQ,
TRXCON_EV_DEDICATED_ESTABLISH_REQ,
TRXCON_EV_DEDICATED_RELEASE_REQ,
TRXCON_EV_DCH_EST_REQ,
TRXCON_EV_DCH_REL_REQ,
TRXCON_EV_TX_DATA_REQ,
TRXCON_EV_TX_DATA_CNF,
TRXCON_EV_RX_DATA_IND,
@ -135,8 +135,8 @@ struct trxcon_param_tx_access_burst_cnf {
uint32_t frame_nr;
};
/* param of TRXCON_EV_DEDICATED_ESTABLISH_REQ */
struct trxcon_param_dedicated_establish_req {
/* param of TRXCON_EV_DCH_EST_REQ */
struct trxcon_param_dch_est_req {
uint8_t chan_nr;
uint8_t tch_mode;
uint8_t tsc;

View File

@ -542,7 +542,7 @@ static int l1ctl_rx_rach_req(struct trxcon_inst *trxcon, struct msgb *msg, bool
}
static int l1ctl_proc_est_req_h0(struct osmo_fsm_inst *fi,
struct trxcon_param_dedicated_establish_req *req,
struct trxcon_param_dch_est_req *req,
const struct l1ctl_h0 *h)
{
req->h0.band_arfcn = ntohs(h->band_arfcn);
@ -556,7 +556,7 @@ static int l1ctl_proc_est_req_h0(struct osmo_fsm_inst *fi,
}
static int l1ctl_proc_est_req_h1(struct osmo_fsm_inst *fi,
struct trxcon_param_dedicated_establish_req *req,
struct trxcon_param_dch_est_req *req,
const struct l1ctl_h1 *h)
{
unsigned int i;
@ -597,7 +597,7 @@ static int l1ctl_rx_dm_est_req(struct trxcon_inst *trxcon, struct msgb *msg)
ul = (struct l1ctl_info_ul *) msg->l1h;
est_req = (struct l1ctl_dm_est_req *) ul->payload;
struct trxcon_param_dedicated_establish_req req = {
struct trxcon_param_dch_est_req req = {
.chan_nr = ul->chan_nr,
.tch_mode = est_req->tch_mode,
.tsc = est_req->tsc,
@ -617,7 +617,7 @@ static int l1ctl_rx_dm_est_req(struct trxcon_inst *trxcon, struct msgb *msg)
if (rc)
goto exit;
osmo_fsm_inst_dispatch(fi, TRXCON_EV_DEDICATED_ESTABLISH_REQ, &req);
osmo_fsm_inst_dispatch(fi, TRXCON_EV_DCH_EST_REQ, &req);
exit:
msgb_free(msg);
@ -630,7 +630,7 @@ static int l1ctl_rx_dm_rel_req(struct trxcon_inst *trxcon, struct msgb *msg)
LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ\n");
osmo_fsm_inst_dispatch(fi, TRXCON_EV_DEDICATED_RELEASE_REQ, NULL);
osmo_fsm_inst_dispatch(fi, TRXCON_EV_DCH_REL_REQ, NULL);
msgb_free(msg);
return 0;

View File

@ -321,9 +321,9 @@ static void trxcon_st_bcch_ccch_action(struct osmo_fsm_inst *fi,
req->applied = true;
break;
}
case TRXCON_EV_DEDICATED_ESTABLISH_REQ:
case TRXCON_EV_DCH_EST_REQ:
{
const struct trxcon_param_dedicated_establish_req *req = data;
const struct trxcon_param_dch_est_req *req = data;
enum gsm_phys_chan_config config;
config = l1sched_chan_nr2pchan_config(req->chan_nr);
@ -406,7 +406,7 @@ static void trxcon_st_dedicated_action(struct osmo_fsm_inst *fi,
case TRXCON_EV_TX_ACCESS_BURST_CNF:
l1ctl_tx_rach_conf(trxcon, (const struct trxcon_param_tx_access_burst_cnf *)data);
break;
case TRXCON_EV_DEDICATED_RELEASE_REQ:
case TRXCON_EV_DCH_REL_REQ:
l1sched_reset(trxcon->sched, false);
osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0);
break;
@ -526,7 +526,7 @@ static void trxcon_st_packet_data_action(struct osmo_fsm_inst *fi,
LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n");
break;
}
case TRXCON_EV_DEDICATED_RELEASE_REQ:
case TRXCON_EV_DCH_REL_REQ:
l1sched_reset(trxcon->sched, false);
osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0);
break;
@ -591,14 +591,14 @@ static const struct osmo_fsm_state trxcon_fsm_states[] = {
| S(TRXCON_EV_SET_CCCH_MODE_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_CNF)
| S(TRXCON_EV_DEDICATED_ESTABLISH_REQ),
| S(TRXCON_EV_DCH_EST_REQ),
.action = &trxcon_st_bcch_ccch_action,
},
[TRXCON_ST_DEDICATED] = {
.name = "DEDICATED",
.out_state_mask = S(TRXCON_ST_RESET)
| S(TRXCON_ST_FBSB_SEARCH),
.in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ)
.in_event_mask = S(TRXCON_EV_DCH_REL_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_CNF)
| S(TRXCON_EV_SET_TCH_MODE_REQ)
@ -612,7 +612,7 @@ static const struct osmo_fsm_state trxcon_fsm_states[] = {
.name = "PACKET_DATA",
.out_state_mask = S(TRXCON_ST_RESET)
| S(TRXCON_ST_FBSB_SEARCH),
.in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ)
.in_event_mask = S(TRXCON_EV_DCH_REL_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_REQ)
| S(TRXCON_EV_TX_ACCESS_BURST_CNF)
| S(TRXCON_EV_RX_DATA_IND),
@ -635,8 +635,8 @@ static const struct value_string trxcon_fsm_event_names[] = {
OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ),
OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_CNF),
OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DCH_EST_REQ),
OSMO_VALUE_STRING(TRXCON_EV_DCH_REL_REQ),
OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ),
OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_CNF),
OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND),