Change in osmocom-bb[master]: trxcon: trxcon_fsm: disallow invalid state transitions

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30315 ) Change subject: trxcon: trxcon_fsm: disallow invalid state transitions ...................................................................... trxcon: trxcon_fsm: disallow invalid state transitions According to 3GPP TS 44.004, Figure 5.1, transitioning from state 'DCH' directly to state 'BCH' is not permitted. Speaking in terms of the trxcon_fsm, the following state transitions are invalid: * TRXCON_ST_DEDICATED -> TRXCON_ST_BCCH_CCCH, * TRXCON_ST_PACKET_DATA -> TRXCON_ST_BCCH_CCCH. We never do such transitions anyway, so we are good. Change-Id: I14ebfc5c86d37765ad06fa91321a469dea46e50f Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 164d6fb..2c59e8d 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -597,8 +597,7 @@ [TRXCON_ST_DEDICATED] = { .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_BCCH_CCCH), + | S(TRXCON_ST_FBSB_SEARCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) @@ -612,8 +611,7 @@ [TRXCON_ST_PACKET_DATA] = { .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_BCCH_CCCH), + | S(TRXCON_ST_FBSB_SEARCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I14ebfc5c86d37765ad06fa91321a469dea46e50f Gerrit-Change-Number: 30315 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged