Update tests and headers for FlexRay

modelica · May 24, 2024 · a59ea93 · a59ea93
1 parent 7ef854b
commit a59ea93
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 59 deletions.
diff --git a/headers/fmi3LsBusFlexRay.h b/headers/fmi3LsBusFlexRay.h
@@ -1,7 +1,3 @@
-/**
- * \file fmi3LsBusFlexRay.h
- */
-
 #ifndef fmi3LsBusFlexRay_h
 #define fmi3LsBusFlexRay_h
 

diff --git a/headers/fmi3LsBusUtil.h b/headers/fmi3LsBusUtil.h
@@ -276,7 +276,7 @@ typedef struct
             {                                                                                               \
                 memcpy((BufferInfo)->writePos, &(Operation), (Operation).header.length - (DataLength));     \
                 (BufferInfo)->writePos += (Operation).header.length - (DataLength);                         \
-                if ((DataLength) > 0)                                                                       \
+                if ((DataLength) > 0 && NULL != (Data))                                                                       \
                 {                                                                                           \
                     memcpy((BufferInfo)->writePos, (Data), (DataLength));                                   \
                     (BufferInfo)->writePos += (DataLength);                                                 \

diff --git a/headers/fmi3LsBusUtilFlexRay.h b/headers/fmi3LsBusUtilFlexRay.h
@@ -1,7 +1,3 @@
-/**
- * \file fmi3LsBusUtilFlexRay.h
- */
-
 #ifndef fmi3LsBusUtilFlexRay_h
 #define fmi3LsBusUtilFlexRay_h
 

diff --git a/tests/helper/hdr/fmi_3_ls_bus_header_test_helper_flexray.h b/tests/helper/hdr/fmi_3_ls_bus_header_test_helper_flexray.h
@@ -31,7 +31,7 @@ enum FlexRayOperation { FlexRayTransmit, BusError, ConfigurationGlobal, StartCom
  * \param[in] data                      The data for the FlexRay Transmit operation.
  * \param[in] correctData               Indicator if the method checks for a match of provided and created values or for an overflow of values.
  */
-void CheckFlexRayTransmitOperation(int cycleId, int slotId, int channel, int segment, fmi3UInt8 startUpFrameIndicator,
+void CheckFlexRayTransmitOperation(int cycleId, int slotId, int channel, fmi3UInt8 startUpFrameIndicator,
                                    fmi3UInt8 syncFrameIndicator, fmi3UInt8 nullFrameIndicator,
                                    fmi3UInt8 payloadPreambleIndicator, fmi3UInt64 minislotDuration, size_t dataSize, fmi3UInt8 data[],
                                    bool correctData);

diff --git a/tests/helper/src/fmi_3_ls_bus_header_test_helper_flexray.cpp b/tests/helper/src/fmi_3_ls_bus_header_test_helper_flexray.cpp
@@ -6,7 +6,7 @@
 #pragma warning(disable : 4244)
 #endif
 
-void CheckFlexRayTransmitOperation(int cycleId, int slotId, int channel, int segment, fmi3UInt8 startUpFrameIndicator,
+void CheckFlexRayTransmitOperation(int cycleId, int slotId, int channel, fmi3UInt8 startUpFrameIndicator,
 	fmi3UInt8 syncFrameIndicator, fmi3UInt8 nullFrameIndicator,	fmi3UInt8 payloadPreambleIndicator, fmi3UInt64 minislotDuration, size_t dataSize, fmi3UInt8 data[], bool correctData)
 {
 	// Create data needed for creation.