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

Fix ports stm32f4xx IAR project warnings (#268)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-05-05 13:57:20 -05:00
committed by GitHub
parent 46e838aeb4
commit c9979f48bc
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/stm32f4xx/bacnet.ewp
+4 -4
View File
@@ -32,11 +32,11 @@
</option>
<option>
<name>Input description</name>
<state>Automatic choice of formatter, without multibyte support.</state>
<state>Full formatting, without multibyte support.</state>
</option>
<option>
<name>Output description</name>
<state>Automatic choice of formatter, without multibyte support.</state>
<state>Full formatting, without multibyte support.</state>
</option>
<option>
<name>GOutputBinary</name>
@@ -173,7 +173,7 @@
<option>
<name>OGPrintfVariant</name>
<version>0</version>
<state>0</state>
<state>1</state>
</option>
<option>
<name>OGPrintfMultibyteSupport</name>
@@ -182,7 +182,7 @@
<option>
<name>OGScanfVariant</name>
<version>0</version>
<state>0</state>
<state>1</state>
</option>
<option>
<name>OGScanfMultibyteSupport</name>
ports/stm32f4xx/dlmstp.c
+19 -7
View File
@@ -577,9 +577,13 @@ static void MSTP_Receive_Frame_FSM(void)
/* if a frame-receipt callback was provided, call */
/* it for this frame */
if (Frame_Rx_Callback != NULL) {
Frame_Rx_Callback(SourceAddress,
DestinationAddress, FrameType, InputBuffer,
DataLength);
/* convert from volatile in defined order */
uint8_t source, destination, frame;
source = SourceAddress;
destination = DestinationAddress;
frame = FrameType;
Frame_Rx_Callback(source, destination,
frame, InputBuffer, DataLength);
}
/* wait for the start of the next frame. */
Receive_State = MSTP_RECEIVE_STATE_IDLE;
@@ -587,7 +591,10 @@ static void MSTP_Receive_Frame_FSM(void)
/* receive the data portion of the frame. */
if ((Address == This_Station) ||
(Address == MSTP_BROADCAST_ADDRESS)) {
if (DataLength <= InputBufferSize) {
/* convert from volatile in defined order */
uint32_t length;
length = DataLength;
if (length <= InputBufferSize) {
/* Data */
Receive_State = MSTP_RECEIVE_STATE_DATA;
} else {
@@ -662,8 +669,13 @@ static void MSTP_Receive_Frame_FSM(void)
/* if a frame-receipt callback was provided, call it */
/* for this frame */
if (Frame_Rx_Callback != NULL) {
Frame_Rx_Callback(SourceAddress, DestinationAddress,
FrameType, InputBuffer, DataLength);
/* convert from volatile in defined order */
uint8_t source, destination, frame;
source = SourceAddress;
destination = DestinationAddress;
frame = FrameType;
Frame_Rx_Callback(source, destination,
frame, InputBuffer, DataLength);
}
} else {
@@ -866,7 +878,7 @@ static bool MSTP_Master_Node_FSM(void)
/* ReceivedPFM */
destination = SourceAddress;
source = This_Station;
if (DestinationAddress == This_Station) {
if (DestinationAddress == source) {
MSTP_Send_Frame(FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER,
destination, source, NULL, 0);
}