Merge remote-tracking branch 'origin/main' into 85-missing-macros-in-…

…fmi3lsbusutilh
modelica · Nov 17, 2023 · 4576185 · 4576185
2 parents cd08f0c + 14ba419
commit 4576185
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/ls-bus-guide/headers/fmi3LsBusUtil.h b/ls-bus-guide/headers/fmi3LsBusUtil.h
@@ -126,14 +126,14 @@ typedef struct
     {                                                                    \
         if ((DataLength) <= (BufferInfo)->size)                          \
         {                                                                \
-            memcpy((bufferInfo)->start, (Data), (DataLength));           \
-            (bufferInfo)->writePos = (bufferInfo)->start + (DataLength); \
-            (bufferInfo)->readPos = (bufferInfo)->start;                 \
-            (bufferInfo)->status = fmi3True;                             \
+            memcpy((BufferInfo)->start, (Data), (DataLength));           \
+            (BufferInfo)->writePos = (BufferInfo)->start + (DataLength); \
+            (BufferInfo)->readPos = (BufferInfo)->start;                 \
+            (BufferInfo)->status = fmi3True;                             \
         }                                                                \
         else                                                             \
         {                                                                \
-            (bufferInfo)->status = fmi3False;                            \
+            (BufferInfo)->status = fmi3False;                            \
         }                                                                \
     }                                                                    \
     while (0)
@@ -180,7 +180,7 @@ typedef struct
  * \return                fmi3True if a new operation is available, otherwise fmi3False.
  */
 #define FMI3_LS_BUS_READ_NEXT_OPERATION(BufferInfo, Operation)                                                                    \
-    ((fmi3UInt32)((BufferInfo)->writePos - (BufferInfo)->readPos) > sizeof(fmi3LsBusOperationHeader) &&                           \
+    ((fmi3UInt32)((BufferInfo)->writePos - (BufferInfo)->readPos) >= sizeof(fmi3LsBusOperationHeader) &&                          \
      (fmi3UInt32)((BufferInfo)->writePos - (BufferInfo)->readPos) >= ((fmi3LsBusOperationHeader*)(BufferInfo)->readPos)->length)  \
         ? ((Operation) = (fmi3LsBusOperationHeader*)(BufferInfo)->readPos, (BufferInfo)->readPos += (Operation)->length),         \
         fmi3True : fmi3False\
@@ -210,7 +210,7 @@ typedef struct
   * \return                      fmi3True if a new operation is available, otherwise fmi3False.
   */
 #define FMI3_LS_BUS_READ_NEXT_OPERATION_DIRECT(Buffer, BufferLength, ReadPos, Operation)                       \
-     (((BufferLength) - (ReadPos)) > sizeof(fmi3LsBusOperationHeader) &&                                       \
+     (((BufferLength) - (ReadPos)) >= sizeof(fmi3LsBusOperationHeader) &&                                      \
       ((BufferLength) - (ReadPos)) >= ((fmi3LsBusOperationHeader*)((Buffer) + (ReadPos)))->length)             \
         ? ((Operation) = (fmi3LsBusOperationHeader*)((Buffer) + (ReadPos)), (ReadPos) += (Operation)->length), \
         fmi3True : fmi3False\