fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30316 )
Change subject: trxcon: trxcon_fsm: shorten DCCH related event names ......................................................................
trxcon: trxcon_fsm: shorten DCCH related event names
Purely cosmetic change, making the lines using these events shorter.
Change-Id: Ie388e251677da63306e9e53d98cbcc7c34777980 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/30316/1
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h index bb57d25..162770d 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h @@ -31,8 +31,8 @@ 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_DCCH_EST_REQ, + TRXCON_EV_DCCH_REL_REQ, TRXCON_EV_TX_DATA_REQ, TRXCON_EV_TX_DATA_CNF, TRXCON_EV_RX_DATA_IND, @@ -135,8 +135,8 @@ uint32_t frame_nr; };
-/* param of TRXCON_EV_DEDICATED_ESTABLISH_REQ */ -struct trxcon_param_dedicated_establish_req { +/* param of TRXCON_EV_DCCH_EST_REQ */ +struct trxcon_param_dcch_est_req { uint8_t chan_nr; uint8_t tch_mode; uint8_t tsc; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 47998d6..a56c687 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -542,7 +542,7 @@ }
static int l1ctl_proc_est_req_h0(struct osmo_fsm_inst *fi, - struct trxcon_param_dedicated_establish_req *req, + struct trxcon_param_dcch_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_h1(struct osmo_fsm_inst *fi, - struct trxcon_param_dedicated_establish_req *req, + struct trxcon_param_dcch_est_req *req, const struct l1ctl_h1 *h) { unsigned int i; @@ -597,7 +597,7 @@ 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_dcch_est_req req = { .chan_nr = ul->chan_nr, .tch_mode = est_req->tch_mode, .tsc = est_req->tsc, @@ -617,7 +617,7 @@ if (rc) goto exit;
- osmo_fsm_inst_dispatch(fi, TRXCON_EV_DEDICATED_ESTABLISH_REQ, &req); + osmo_fsm_inst_dispatch(fi, TRXCON_EV_DCCH_EST_REQ, &req);
exit: msgb_free(msg); @@ -630,7 +630,7 @@
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_DCCH_REL_REQ, NULL);
msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 2c59e8d..ba7f429 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -321,9 +321,9 @@ req->applied = true; break; } - case TRXCON_EV_DEDICATED_ESTABLISH_REQ: + case TRXCON_EV_DCCH_EST_REQ: { - const struct trxcon_param_dedicated_establish_req *req = data; + const struct trxcon_param_dcch_est_req *req = data; enum gsm_phys_chan_config config;
config = l1sched_chan_nr2pchan_config(req->chan_nr); @@ -406,7 +406,7 @@ 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_DCCH_REL_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); break; @@ -526,7 +526,7 @@ LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); break; } - case TRXCON_EV_DEDICATED_RELEASE_REQ: + case TRXCON_EV_DCCH_REL_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); break; @@ -591,14 +591,14 @@ | 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_DCCH_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_DCCH_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 @@ .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_DCCH_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 @@ 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_DCCH_EST_REQ), + OSMO_VALUE_STRING(TRXCON_EV_DCCH_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),