Change in osmo-bts[master]: nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled ...

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/.

pespin gerrit-no-reply at lists.osmocom.org
Thu Sep 16 16:51:34 UTC 2021


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25492 )


Change subject: nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled Offline
......................................................................

nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled Offline

TS 12.21 Figure 2 states that Attribute Setting is done when in Disabled
Offline state, and unlocking must be done after attributes are set.
Finally, transition to state Enabled can only be done once attribute
setting, unlocking is done and Opstart is received.
Hence, at the start of this operative+avaialbility state "Disable Offline",
adminsitrative state is Locked by definition.

Change-Id: Ife5fa22f007897db8b0f15b28f3b72c9970d298a
---
M src/common/nm_bb_transc_fsm.c
M src/common/nm_bts_fsm.c
M src/common/nm_bts_sm_fsm.c
M src/common/nm_channel_fsm.c
M src/common/nm_radio_carrier_fsm.c
5 files changed, 5 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/25492/1

diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index c270f7d..1bb78f2 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -100,7 +100,7 @@
 	int i;
 
 	bb_transc->mo.opstart_success = false;
-	oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+	oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);
 
 	if (prev_state == NM_BBTRANSC_ST_OP_ENABLED) {
 		for (i = 0; i < TRX_NR_TS; i++) {
diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c
index 9210e7a..cea7e6d 100644
--- a/src/common/nm_bts_fsm.c
+++ b/src/common/nm_bts_fsm.c
@@ -79,7 +79,7 @@
 {
 	struct gsm_bts *bts = (struct gsm_bts *)fi->priv;
 	bts->mo.opstart_success = false;
-	oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+	oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);
 }
 
 static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)
diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c
index 267341e..d8ae5ff 100644
--- a/src/common/nm_bts_sm_fsm.c
+++ b/src/common/nm_bts_sm_fsm.c
@@ -77,7 +77,7 @@
 {
 	struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv;
 	site_mgr->mo.opstart_success = false;
-	oml_mo_state_chg(&site_mgr->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+	oml_mo_state_chg(&site_mgr->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);
 }
 
 static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)
diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c
index e6c296f..7c13915 100644
--- a/src/common/nm_channel_fsm.c
+++ b/src/common/nm_channel_fsm.c
@@ -117,7 +117,7 @@
 {
 	struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;
 	ts->mo.opstart_success = false;
-	oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+	oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);
 }
 
 static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)
diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c
index 2772f19..61feca3 100644
--- a/src/common/nm_radio_carrier_fsm.c
+++ b/src/common/nm_radio_carrier_fsm.c
@@ -82,7 +82,7 @@
 	unsigned int i;
 
 	trx->mo.opstart_success = false;
-	oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+	oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);
 
 	if (prev_state == NM_RCARRIER_ST_OP_ENABLED) {
 		for (i = 0; i < TRX_NR_TS; i++) {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25492
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ife5fa22f007897db8b0f15b28f3b72c9970d298a
Gerrit-Change-Number: 25492
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210916/70c247c9/attachment.htm>


More information about the gerrit-log mailing list