dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected state transition in WAIT FOR REPLY state.

Browse Source
This commit is contained in:
skarg
2006-09-21 11:17:10 +00:00
parent 0d80e263ea
commit dd9b726b5e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/pic18/mstp.c
+2 -1
View File
@@ -881,6 +881,7 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->ReceivedInvalidFrame = false; mstp_port->ReceivedInvalidFrame = false;
mstp_port->master_state = mstp_port->master_state =
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
transition_now = true;
} else if (mstp_port->ReceivedValidFrame == true) { } else if (mstp_port->ReceivedValidFrame == true) {
if (mstp_port->DestinationAddress == if (mstp_port->DestinationAddress ==
mstp_port->This_Station) { mstp_port->This_Station) {
@@ -918,8 +919,8 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->master_state = MSTP_MASTER_STATE_IDLE; mstp_port->master_state = MSTP_MASTER_STATE_IDLE;
} }
mstp_port->ReceivedValidFrame = false; mstp_port->ReceivedValidFrame = false;
transition_now = true;
} }
transition_now = true;
} }
break; break;
/* The DONE_WITH_TOKEN state either sends another data frame, */ /* The DONE_WITH_TOKEN state either sends another data frame, */
bacnet-stack/ports/rtos32/mstp.c
+2 -1
View File
@@ -881,6 +881,7 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->ReceivedInvalidFrame = false; mstp_port->ReceivedInvalidFrame = false;
mstp_port->master_state = mstp_port->master_state =
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
transition_now = true;
} else if (mstp_port->ReceivedValidFrame == true) { } else if (mstp_port->ReceivedValidFrame == true) {
if (mstp_port->DestinationAddress == if (mstp_port->DestinationAddress ==
mstp_port->This_Station) { mstp_port->This_Station) {
@@ -918,8 +919,8 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->master_state = MSTP_MASTER_STATE_IDLE; mstp_port->master_state = MSTP_MASTER_STATE_IDLE;
} }
mstp_port->ReceivedValidFrame = false; mstp_port->ReceivedValidFrame = false;
transition_now = true;
} }
transition_now = true;
} }
break; break;
/* The DONE_WITH_TOKEN state either sends another data frame, */ /* The DONE_WITH_TOKEN state either sends another data frame, */