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

In WAIT_FOR_REPLY state of MS/TP, changed next state of frame type TEST_RESPONSE to be DONE_WITH_TOKEN to match standard. Thank you, Eric Xu!

Browse Source
This commit is contained in:
skarg
2012-10-17 22:33:01 +00:00
parent 03a0a23ba6
commit f8450f40bb
7 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/at91sam7s/dlmstp.c
+2 -1
View File
@@ -824,7 +824,8 @@ static bool MSTP_Master_Node_FSM(
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
Master_State = MSTP_MASTER_STATE_IDLE; Master_State =
MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/ports/atmega168/dlmstp.c
+2 -1
View File
@@ -674,7 +674,8 @@ static bool MSTP_Master_Node_FSM(
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
Master_State = MSTP_MASTER_STATE_IDLE; Master_State =
MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c
+2 -1
View File
@@ -846,7 +846,8 @@ static bool MSTP_Master_Node_FSM(
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
Master_State = MSTP_MASTER_STATE_IDLE; Master_State =
MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/ports/dos/dlmstp.c
+2 -1
View File
@@ -844,7 +844,8 @@ static bool MSTP_Master_Node_FSM(
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
Master_State = MSTP_MASTER_STATE_IDLE; Master_State =
MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/ports/rtos32/mstp.c
+1 -1
View File
@@ -898,7 +898,7 @@ bool MSTP_Master_Node_FSM(
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
mstp_port->master_state = mstp_port->master_state =
MSTP_MASTER_STATE_IDLE; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/ports/stm32f10x/dlmstp.c
+2 -1
View File
@@ -934,7 +934,8 @@ static bool MSTP_Master_Node_FSM(
MSTP_MASTER_STATE_DONE_WITH_TOKEN; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
Master_State = MSTP_MASTER_STATE_IDLE; Master_State =
MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */
bacnet-stack/src/mstp.c
+1 -1
View File
@@ -760,7 +760,7 @@ bool MSTP_Master_Node_FSM(
break; break;
case FRAME_TYPE_TEST_RESPONSE: case FRAME_TYPE_TEST_RESPONSE:
mstp_port->master_state = mstp_port->master_state =
MSTP_MASTER_STATE_IDLE; MSTP_MASTER_STATE_DONE_WITH_TOKEN;
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
/* ReceivedReply */ /* ReceivedReply */