Solved ticket refs #104.

diff --git a/arch/hc1x/hcs12d/drivers/Dio.c b/arch/hc1x/hcs12d/drivers/Dio.c
index cc61075f908db1b034f456ef835fec7a3ab2c954..74fc0432246396c7b41ec3854b0fe6a68cb6d8a6 100644 (file)
--- a/arch/hc1x/hcs12d/drivers/Dio.c
+++ b/arch/hc1x/hcs12d/drivers/Dio.c
@@ -25,21 +25,6 @@
 #define CHANNEL_GRP_PTR        (&DioConfigData)\r
 #define PORT_PTR               (&DioPortConfigData)\r
 \r
-#if ( DIO_VERSION_INFO_API == STD_ON )\r
-static Std_VersionInfoType _Dio_VersionInfo =\r
-{\r
-       .vendorID   = (uint16)1,\r
-       .moduleID   = (uint16)1,\r
-       .instanceID = (uint8)1,\r
-       .sw_major_version = (uint8)DIO_SW_MAJOR_VERSION,\r
-       .sw_minor_version = (uint8)DIO_SW_MINOR_VERSION,\r
-       .sw_patch_version = (uint8)DIO_SW_PATCH_VERSION,\r
-       .ar_major_version = (uint8)DIO_AR_MAJOR_VERSION,\r
-       .ar_minor_version = (uint8)DIO_AR_MINOR_VERSION,\r
-       .ar_patch_version = (uint8)DIO_AR_PATCH_VERSION,\r
-};\r
-#endif\r
-\r
 #if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
 static int Channel_Config_Contains(Dio_ChannelType channelId)\r
 {\r
@@ -221,11 +206,3 @@ void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,
 \r
        cleanup: return;\r
 }\r
-\r
-#if (DIO_VERSION_INFO_API == STD_ON)\r
-void Dio_GetVersionInfo(Std_VersionInfoType *versionInfo)\r
-{\r
-  memcpy(versionInfo, &_Dio_VersionInfo, sizeof(Std_VersionInfoType));\r
-}\r
-#endif\r
-\r

diff --git a/arch/ppc/mpc55xx/drivers/Dio.c b/arch/ppc/mpc55xx/drivers/Dio.c
index f8c988bebf2d47d4e0252ae711d970af2072c9ce..9de43cb38cceda6405f8da88d3ee6feaf7c4fd72 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Dio.c
+++ b/arch/ppc/mpc55xx/drivers/Dio.c
@@ -36,21 +36,6 @@
 #define PORT_PTR               (&DioPortConfigData)\r
 \r
 \r
-#if ( DIO_VERSION_INFO_API == STD_ON )\r
-static Std_VersionInfoType _Dio_VersionInfo =\r
-{\r
-  .vendorID   = (uint16)1,\r
-  .moduleID   = (uint16)1,\r
-  .instanceID = (uint8)1,\r
-  .sw_major_version = (uint8)DIO_SW_MAJOR_VERSION,\r
-  .sw_minor_version = (uint8)DIO_SW_MINOR_VERSION,\r
-  .sw_patch_version = (uint8)DIO_SW_PATCH_VERSION,\r
-  .ar_major_version = (uint8)DIO_AR_MAJOR_VERSION,\r
-  .ar_minor_version = (uint8)DIO_AR_MINOR_VERSION,\r
-  .ar_patch_version = (uint8)DIO_AR_PATCH_VERSION,\r
-};\r
-#endif\r
-\r
 #if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
 static int Channel_Config_Contains(Dio_ChannelType channelId)\r
 {\r
@@ -207,10 +192,3 @@ void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,
 #endif\r
 }\r
 \r
-#if (DIO_VERSION_INFO_API == STD_ON)\r
-void Dio_GetVersionInfo(Std_VersionInfoType *versionInfo)\r
-{\r
-  memcpy(versionInfo, &_Dio_VersionInfo, sizeof(Std_VersionInfoType));\r
-}\r
-#endif\r
-\r

diff --git a/communication/ComM/ComM.c b/communication/ComM/ComM.c
index 48564bd42ffa441cc164d24f0ee53e93a66d974d..1a700bd48ab17b8870b192db87dcfa45510b4368 100644 (file)
--- a/communication/ComM/ComM.c
+++ b/communication/ComM/ComM.c
@@ -74,26 +74,6 @@ void ComM_DeInit(){
        ComM_Internal.InitStatus = COMM_UNINIT;\r
 }\r
 \r
-#if (COMM_VERSION_INFO_API == STD_ON)\r
-static Std_VersionInfoType ComM_Internal_VersionInfo = {\r
-  .vendorID   = (uint16)1,\r
-  .moduleID   = (uint16)1,\r
-  .instanceID = (uint8)1,\r
-  .sw_major_version = (uint8)COMM_SW_MAJOR_VERSION,\r
-  .sw_minor_version = (uint8)COMM_SW_MINOR_VERSION,\r
-  .sw_patch_version = (uint8)COMM_SW_PATCH_VERSION,\r
-  .ar_major_version = (uint8)COMM_AR_MAJOR_VERSION,\r
-  .ar_minor_version = (uint8)COMM_AR_MINOR_VERSION,\r
-  .ar_patch_version = (uint8)COMM_AR_PATCH_VERSION,\r
-};\r
-\r
-void ComM_GetVersionInfo( Std_VersionInfoType* VersionInfo ){\r
-       COMM_VALIDATE_INIT(COMM_SERVICEID_GETVERSIONINFO);\r
-       memcpy(VersionInfo, &ComM_Internal_VersionInfo, sizeof(Std_VersionInfoType));\r
-}\r
-#endif\r
-\r
-\r
 Std_ReturnType ComM_GetStatus( ComM_InitStatusType* Status ){\r
        COMM_VALIDATE_PARAMETER( (Status != NULL), COMM_SERVICEID_GETSTATUS, E_NOT_OK);\r
 \r

diff --git a/include/ComM.h b/include/ComM.h
index ce150cb9cf0577ef640fd176b73f1e9b59432b4a..95b427441e73eec2f0aff7764609deecb98a0656 100644 (file)
--- a/include/ComM.h
+++ b/include/ComM.h
@@ -25,6 +25,9 @@
 #include "ComM_ConfigTypes.h"\r
 #include "Modules.h"\r
 \r
+#define COMM_MODULE_ID                 MODULE_ID_COMM\r
+#define COMM_VENDOR_ID                 1\r
+\r
 #define COMM_AR_MAJOR_VERSION  2\r
 #define COMM_AR_MINOR_VERSION  0\r
 #define COMM_AR_PATCH_VERSION  1\r
@@ -89,7 +92,9 @@ void ComM_Init( ComM_ConfigType *);
 /** De-initializes (terminates) the AUTOSAR Communication Manager. */\r
 void ComM_DeInit();\r
 \r
-void ComM_GetVersionInfo( Std_VersionInfoType* versioninfo );\r
+#if (COMM_VERSION_INFO_API == STD_ON)\r
+#define ComM_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,COMM)\r
+#endif\r
 \r
 /** Returns the initialization status of the AUTOSAR Communication Manager. */\r
 Std_ReturnType ComM_GetStatus( ComM_InitStatusType* Status );\r

diff --git a/include/Dio.h b/include/Dio.h
index 02ab74da2d6838d936dbfb6f31348b902971e78c..df771594b2bd5314a57bb75346cf134869c8ff4a 100644 (file)
--- a/include/Dio.h
+++ b/include/Dio.h
@@ -73,6 +73,9 @@ typedef uint16 Dio_PortLevelType;
 #endif\r
 \r
 \r
+#define DIO_MODULE_ID                  MODULE_ID_DIO\r
+#define DIO_VENDOR_ID                  1\r
+\r
 #define DIO_SW_MAJOR_VERSION   1\r
 #define DIO_SW_MINOR_VERSION   0\r
 #define DIO_SW_PATCH_VERSION   0\r
@@ -86,7 +89,7 @@ typedef uint16 Dio_PortLevelType;
 /** @req DIO124 */\r
 #if ( DIO_VERSION_INFO_API == STD_ON)\r
 /** @req DIO139 */\r
-void Dio_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
+#define Dio_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,DIO)\r
 #endif\r
 \r
 /** @req DIO133 */\r

diff --git a/include/EcuM.h b/include/EcuM.h
index e908bb9d390aabc3208666453fcc09746fcf2e82..bfa88400e8ed63778bf4e02d6ddf4fbcdd6e2162 100644 (file)
--- a/include/EcuM.h
+++ b/include/EcuM.h
@@ -132,18 +132,21 @@ typedef enum
 } EcuM_BootTargetType;\r
 \r
 \r
-#define ECUM_SW_MAJOR_VERSION          1\r
-#define ECUM_SW_MINOR_VERSION          0\r
-#define ECUM_SW_PATCH_VERSION          0\r
+#define ECUM_MODULE_ID                 MODULE_ID_ECUM\r
+#define ECUM_VENDOR_ID                 1\r
 \r
-#define ECUM_AR_MAJOR_VERSION     1\r
-#define ECUM_AR_MINOR_VERSION     2\r
-#define ECUM_AR_PATCH_VERSION     2\r
+#define ECUM_SW_MAJOR_VERSION  1\r
+#define ECUM_SW_MINOR_VERSION  0\r
+#define ECUM_SW_PATCH_VERSION  0\r
+\r
+#define ECUM_AR_MAJOR_VERSION  1\r
+#define ECUM_AR_MINOR_VERSION  2\r
+#define ECUM_AR_PATCH_VERSION  2\r
 \r
 #include "EcuM_Cfg.h"\r
 \r
 #if ( ECUM_VERSION_INFO_API == STD_ON)\r
-void EcuM_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
+#define EcuM_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,ECUM)\r
 #endif\r
 \r
 void EcuM_Init( void );\r

diff --git a/system/EcuM/EcuM.c b/system/EcuM/EcuM.c
index 414d19a4cd270284cd52c97aac649b1bf041b2a3..eb624b74421d46aa31602ea1f2521cb285e98a98 100644 (file)
--- a/system/EcuM/EcuM.c
+++ b/system/EcuM/EcuM.c
@@ -32,21 +32,6 @@
 \r
 EcuM_GobalType internal_data;\r
 \r
-#if ( ECUM_VERSION_INFO_API == STD_ON )\r
-static Std_VersionInfoType _EcuM_VersionInfo =\r
-{\r
-  .vendorID   = (uint16)1,\r
-  .moduleID   = (uint16)1,\r
-  .instanceID = (uint8)1,\r
-  .sw_major_version = (uint8)ECUM_SW_MAJOR_VERSION,\r
-  .sw_minor_version = (uint8)ECUM_SW_MINOR_VERSION,\r
-  .sw_patch_version = (uint8)ECUM_SW_PATCH_VERSION,\r
-  .ar_major_version = (uint8)ECUM_AR_MAJOR_VERSION,\r
-  .ar_minor_version = (uint8)ECUM_AR_MINOR_VERSION,\r
-  .ar_patch_version = (uint8)ECUM_AR_PATCH_VERSION,\r
-};\r
-#endif\r
-\r
 void EcuM_Init( void )\r
 {\r
        internal_data.current_state = ECUM_STATE_STARTUP_ONE;\r
@@ -233,11 +218,3 @@ Std_ReturnType EcuM_GetBootTarget(EcuM_BootTargetType* target)
 \r
        return E_NOT_OK;\r
 }\r
-\r
-#if (ECUM_VERSION_INFO_API == STD_ON)\r
-void EcuM_GetVersionInfo(Std_VersionInfoType *versionInfo)\r
-{\r
-  memcpy(versionInfo, &_EcuM_VersionInfo, sizeof(Std_VersionInfoType));\r
-}\r
-#endif\r
-\r