cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Pau Espin 2020-07-24 17:25:56 +02:00
parent 82a35a1dbf
commit 742590b5df
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osmo-bts-trx/l1_if.c
View File

@ -232,7 +232,7 @@ void bts_model_trx_close(struct gsm_bts_trx *trx)
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);

3
src/osmo-bts-trx/trx_provision_fsm.c
View File

@ -583,7 +583,7 @@ static struct osmo_fsm_state trx_prov_fsm_states[] = {
},
[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 @@ const struct value_string trx_prov_fsm_event_names[] = {
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 }

1
src/osmo-bts-trx/trx_provision_fsm.h
View File

@ -54,7 +54,6 @@ enum trx_provision_fsm_events {
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,
};