This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Hoernchen gerrit-no-reply at lists.osmocom.orgHoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19379 ) Change subject: bts-trx: prov_fsm: Fix mess with 1 event having 2 names ...................................................................... bts-trx: prov_fsm: Fix mess with 1 event having 2 names They were both half implemented but named differently, due to myself adding them during the initial FSM implementation. This prevents osmo-bts-trx sending a POWEROFF when OML link is dropped. Related: SYS#4864 Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 3 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved; Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index bc936c0..cd7ecc0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -232,7 +232,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL); + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CLOSE, NULL); /* Set to Operational State: Disabled */ check_transceiver_availability_trx(l1h, 0); diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 420ee24..f075e98 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -583,7 +583,7 @@ }, [TRX_PROV_ST_OPEN_POWERON] = { .in_event_mask = - X(TRX_PROV_EV_POWEROFF) | + X(TRX_PROV_EV_CLOSE) | X(TRX_PROV_EV_CFG_TS), .out_state_mask = X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) | @@ -619,7 +619,6 @@ OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), - OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE), { 0, NULL } diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 1583270..0f80088 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -54,7 +54,6 @@ TRX_PROV_EV_SETTSC_CNF, TRX_PROV_EV_SETFORMAT_CNF, TRX_PROV_EV_POWERON_CNF, - TRX_PROV_EV_POWEROFF, TRX_PROV_EV_POWEROFF_CNF, TRX_PROV_EV_CLOSE, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe Gerrit-Change-Number: 19379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200724/fb284eda/attachment.htm>