move configuration definitions in CanTp_Cfg.h.

Sauci · Jul 4, 2019 · a3d2231 · a3d2231
1 parent d0fc644
commit a3d2231
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,12 +28,13 @@ add_subdirectory(generated)
 add_library(${PROJECT_NAME} STATIC source/CanTp.c)
 
 target_compile_definitions(${PROJECT_NAME}
-    PRIVATE CANTP_MAX_NUM_OF_CHANNEL=16
-    PRIVATE CANTP_MAX_NUM_OF_N_SDU=16
     PRIVATE CANTP_DEV_ERROR_DETECT=$<IF:$<BOOL:${ENABLE_DET}>,STD_ON,STD_OFF>
     PRIVATE CANTP_SW_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
     PRIVATE CANTP_SW_VERSION_MINOR=${PROJECT_VERSION_MINOR}
     PRIVATE CANTP_SW_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+    # SWS_BSW_00059
+    PUBLIC CANTP_AR_RELEASE_MAJOR_VERSION=4
+    PUBLIC CANTP_AR_RELEASE_MINOR_VERSION=4
     PUBLIC CANTP_API=STD_ON
     # ECUC_CanTp_00283
     PUBLIC CANTP_GET_VERSION_INFO_API=STD_ON

diff --git a/interface/CanTp_Cfg.h b/interface/CanTp_Cfg.h
@@ -0,0 +1,32 @@
+/**
+ * @file CanTp_Cfg.h
+ * @author Guillaume Sottas
+ * @date 04/07/2019
+ */
+
+#ifndef CANTP_CFG_H
+#define CANTP_CFG_H
+
+/* SWS_BSW_00059 */
+#ifndef CANTP_AR_RELEASE_MAJOR_VERSION
+#error unknown AUTOSAR release major version
+#elif (CANTP_AR_RELEASE_MAJOR_VERSION != 4)
+#error incompatible AUTOSAR release major version
+#endif
+
+/* SWS_BSW_00059 */
+#ifndef CANTP_AR_RELEASE_MINOR_VERSION
+#error unknown AUTOSAR release minor version
+#elif (CANTP_AR_RELEASE_MINOR_VERSION != 4)
+#error incompatible AUTOSAR release minor version
+#endif
+
+#ifndef CANTP_MAX_NUM_OF_CHANNEL
+#define CANTP_MAX_NUM_OF_CHANNEL (0x10u)
+#endif
+
+#ifndef CANTP_MAX_NUM_OF_N_SDU
+#define CANTP_MAX_NUM_OF_N_SDU (0x10u)
+#endif
+
+#endif /* #ifndef CANTP_CFG_H */
diff --git a/script/config.h.jinja2 b/script/config.h.jinja2
@@ -5,14 +5,6 @@
 #include "CanTp_Types.h"
 #endif /* #ifndef CANTP_TYPES_H */
 
-#ifndef CANTP_MAX_NUM_OF_CHANNEL
-#define CANTP_MAX_NUM_OF_CHANNEL (0x10u)
-#endif
-
-#ifndef CANTP_MAX_NUM_OF_N_SDU
-#define CANTP_MAX_NUM_OF_N_SDU (0x10u)
-#endif
-
 #define CanTp_START_SEC_CONST_UNSPECIFIED
 #include "CanTp_MemMap.h"
 

diff --git a/source/CanTp.c b/source/CanTp.c
@@ -41,14 +41,6 @@
  * @{
  */
 
-#ifndef CANTP_MAX_NUM_OF_CHANNEL
-#error CANTP_MAX_NUM_OF_CHANNEL must be defined by the build system.
-#endif /* #ifndef CANTP_MAX_NUM_OF_CHANNEL */
-
-#ifndef CANTP_MAX_NUM_OF_N_SDU
-#error CANTP_MAX_NUM_OF_N_SDU must be defined by the build system.
-#endif /* #ifndef CANTP_MAX_NUM_OF_N_SDU */
-
 #ifdef __cplusplus
 
 extern "C"
@@ -62,6 +54,8 @@ extern "C"
 
 #include "CanTp.h"
 
+#include "CanTp_Cfg.h"
+
 #ifndef CANTP_CBK_H
 #include "CanTp_Cbk.h"
 #endif /* #ifndef CANTP_CBK_H */