fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28860 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28860/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index dadd42d..3d87bb9 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_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 d51c9d1..af879c1 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -712,7 +712,7 @@ } /* 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 ad86b95..3032764 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -45,7 +45,7 @@ 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 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 @@ .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) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 Gerrit-Change-Number: 28860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange