diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-07-30 00:44:34 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-08-08 13:55:37 +0700 |
| commit | 12d1b9788efd5cff7714e61f844bc8bdd4f3d388 (patch) | |
| tree | f673b682183cfce7a7519f48255d4917cfbfbeb4 | |
| parent | a21f85619b0648b549c4089c21ee76844819e131 (diff) | |
trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE
Basically, everything below layer 2 is layer 1. Let's clarify the
domain of TRXCON_EV_L1IF_FAILURE by saying 'PHYIF' instead of 'L1IF'.
Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31
| -rw-r--r-- | src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h | 2 | ||||
| -rw-r--r-- | src/host/trxcon/src/trx_if.c | 2 | ||||
| -rw-r--r-- | src/host/trxcon/src/trxcon_fsm.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 4478f214..eed3d614 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -13,7 +13,7 @@ enum trxcon_fsm_states { }; enum trxcon_fsm_events { - TRXCON_EV_L1IF_FAILURE, + TRXCON_EV_PHYIF_FAILURE, TRXCON_EV_L2IF_FAILURE, TRXCON_EV_RESET_FULL_REQ, TRXCON_EV_RESET_SCHED_REQ, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index d51c9d1a..af879c10 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -712,7 +712,7 @@ struct trx_instance *trx_if_open(struct trxcon_inst *trxcon, } /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_L1IF_FAILURE); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); if (trx->fi == NULL) { LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 053cd416..3c30565d 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -45,7 +45,7 @@ static void trxcon_allstate_action(struct osmo_fsm_inst *fi, struct trxcon_inst *trxcon = fi->priv; switch (event) { - case TRXCON_EV_L1IF_FAILURE: + case TRXCON_EV_PHYIF_FAILURE: case TRXCON_EV_L2IF_FAILURE: LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", osmo_fsm_event_name(&trxcon_fsm_def, event)); @@ -439,7 +439,7 @@ static const struct osmo_fsm_state trxcon_fsm_states[] = { }; static const struct value_string trxcon_fsm_event_names[] = { - OSMO_VALUE_STRING(TRXCON_EV_L1IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_PHYIF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_L2IF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_RESET_FULL_REQ), OSMO_VALUE_STRING(TRXCON_EV_RESET_SCHED_REQ), @@ -467,7 +467,7 @@ struct osmo_fsm trxcon_fsm_def = { .num_states = ARRAY_SIZE(trxcon_fsm_states), .log_subsys = DAPP, .event_names = trxcon_fsm_event_names, - .allstate_event_mask = S(TRXCON_EV_L1IF_FAILURE) + .allstate_event_mask = S(TRXCON_EV_PHYIF_FAILURE) | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) |