From f8450f40bb12b023c62d594136565871f04ec284 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 17 Oct 2012 22:33:01 +0000 Subject: [PATCH] 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! --- bacnet-stack/ports/at91sam7s/dlmstp.c | 3 ++- bacnet-stack/ports/atmega168/dlmstp.c | 3 ++- bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c | 3 ++- bacnet-stack/ports/dos/dlmstp.c | 3 ++- bacnet-stack/ports/rtos32/mstp.c | 2 +- bacnet-stack/ports/stm32f10x/dlmstp.c | 3 ++- bacnet-stack/src/mstp.c | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bacnet-stack/ports/at91sam7s/dlmstp.c b/bacnet-stack/ports/at91sam7s/dlmstp.c index cb522347..e5cfb9a6 100644 --- a/bacnet-stack/ports/at91sam7s/dlmstp.c +++ b/bacnet-stack/ports/at91sam7s/dlmstp.c @@ -824,7 +824,8 @@ static bool MSTP_Master_Node_FSM( MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_TEST_RESPONSE: - Master_State = MSTP_MASTER_STATE_IDLE; + Master_State = + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/ports/atmega168/dlmstp.c b/bacnet-stack/ports/atmega168/dlmstp.c index 3007d630..5db8e949 100644 --- a/bacnet-stack/ports/atmega168/dlmstp.c +++ b/bacnet-stack/ports/atmega168/dlmstp.c @@ -674,7 +674,8 @@ static bool MSTP_Master_Node_FSM( MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_TEST_RESPONSE: - Master_State = MSTP_MASTER_STATE_IDLE; + Master_State = + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c b/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c index a0a1a4ca..5c8094f3 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c @@ -846,7 +846,8 @@ static bool MSTP_Master_Node_FSM( MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_TEST_RESPONSE: - Master_State = MSTP_MASTER_STATE_IDLE; + Master_State = + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/ports/dos/dlmstp.c b/bacnet-stack/ports/dos/dlmstp.c index 7502dde3..cce00c60 100644 --- a/bacnet-stack/ports/dos/dlmstp.c +++ b/bacnet-stack/ports/dos/dlmstp.c @@ -844,7 +844,8 @@ static bool MSTP_Master_Node_FSM( MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_TEST_RESPONSE: - Master_State = MSTP_MASTER_STATE_IDLE; + Master_State = + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/ports/rtos32/mstp.c b/bacnet-stack/ports/rtos32/mstp.c index 3902203b..3ef1038c 100644 --- a/bacnet-stack/ports/rtos32/mstp.c +++ b/bacnet-stack/ports/rtos32/mstp.c @@ -898,7 +898,7 @@ bool MSTP_Master_Node_FSM( break; case FRAME_TYPE_TEST_RESPONSE: mstp_port->master_state = - MSTP_MASTER_STATE_IDLE; + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/ports/stm32f10x/dlmstp.c b/bacnet-stack/ports/stm32f10x/dlmstp.c index 5f6106e0..86416f11 100644 --- a/bacnet-stack/ports/stm32f10x/dlmstp.c +++ b/bacnet-stack/ports/stm32f10x/dlmstp.c @@ -934,7 +934,8 @@ static bool MSTP_Master_Node_FSM( MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_TEST_RESPONSE: - Master_State = MSTP_MASTER_STATE_IDLE; + Master_State = + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */ diff --git a/bacnet-stack/src/mstp.c b/bacnet-stack/src/mstp.c index e8dc6a64..fe5a7ab2 100644 --- a/bacnet-stack/src/mstp.c +++ b/bacnet-stack/src/mstp.c @@ -760,7 +760,7 @@ bool MSTP_Master_Node_FSM( break; case FRAME_TYPE_TEST_RESPONSE: mstp_port->master_state = - MSTP_MASTER_STATE_IDLE; + MSTP_MASTER_STATE_DONE_WITH_TOKEN; break; case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: /* ReceivedReply */