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

Some MS/TP fixes to the AT91SAM7S port (untested).

Browse Source
This commit is contained in:
skarg
2014-11-12 18:11:20 +00:00
parent ef664ab273
commit 3be7029f40
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/at91sam7s/dlmstp.c
+3 -2
View File
@@ -622,6 +622,8 @@ static void MSTP_Receive_Frame_FSM(
MSTP_Flag.ReceivedInvalidFrame = true; MSTP_Flag.ReceivedInvalidFrame = true;
} }
Receive_State = MSTP_RECEIVE_STATE_IDLE; Receive_State = MSTP_RECEIVE_STATE_IDLE;
MSTP_Flag.ReceivedInvalidFrame = true;
Receive_State = MSTP_RECEIVE_STATE_IDLE;
} }
} }
break; break;
@@ -1118,7 +1120,6 @@ static bool MSTP_Master_Node_FSM(
} }
MSTP_Send_Frame(frame_type, pkt->destination_mac, This_Station, MSTP_Send_Frame(frame_type, pkt->destination_mac, This_Station,
(uint8_t *) & pkt->buffer[0], pkt->length); (uint8_t *) & pkt->buffer[0], pkt->length);
(void) Ringbuf_Pop(&PDU_Queue, NULL);
Master_State = MSTP_MASTER_STATE_IDLE; Master_State = MSTP_MASTER_STATE_IDLE;
/* clear our flag we were holding for comparison */ /* clear our flag we were holding for comparison */
MSTP_Flag.ReceivedValidFrame = false; MSTP_Flag.ReceivedValidFrame = false;
@@ -1279,7 +1280,7 @@ uint16_t dlmstp_receive(
} }
if (Receive_State == MSTP_RECEIVE_STATE_IDLE) { if (Receive_State == MSTP_RECEIVE_STATE_IDLE) {
/* only do master state machine while rx is idle */ /* only do master state machine while rx is idle */
if (This_Station <= DEFAULT_MAX_MASTER) { if (This_Station <= 127) {
while (MSTP_Master_Node_FSM()) { while (MSTP_Master_Node_FSM()) {
/* do nothing while some states fast transition */ /* do nothing while some states fast transition */
}; };