Porting of tests to linux.

diff --git a/arch/generic/linux/drivers/McuExtensionsStub.c b/arch/generic/linux/drivers/McuExtensionsStub.c
new file mode 100644 (file)
index 0000000..3483b12
--- /dev/null
+++ b/arch/generic/linux/drivers/McuExtensionsStub.c
@@ -0,0 +1,10 @@
+\r
+#include "McuExtensions.h"\r
+\r
+imask_t McuE_EnterCriticalSection(void) {\r
+       return 0;\r
+}\r
+\r
+void McuE_ExitCriticalSection(imask_t old_state) {\r
+\r
+}\r

diff --git a/boards/linux/build_config.mk b/boards/linux/build_config.mk
index 00c1a9e6bf13e526b39bc881267788eb8182b4f9..16ad7d504276ff2df2f549ab081da9d9a6686f04 100644 (file)
--- a/boards/linux/build_config.mk
+++ b/boards/linux/build_config.mk
@@ -11,7 +11,10 @@ CFG= BRD_LINUX
 \r
 # What buildable modules does this board have, \r
 # default or private\r
-MOD_AVAIL+=COM PDUR NEWLIB DET\r
+MOD_AVAIL+=COM PDUR NEWLIB DET DCM DEM COMM CANSM CANTP CANIF CANNM NM\r
 \r
 # Needed by us\r
 MOD_USE=\r
+\r
+# Stubs\r
+obj-y += McuExtensionsStub.o
\ No newline at end of file

diff --git a/communication/CanTp/CanTp.c b/communication/CanTp/CanTp.c
index 346f5596f03b7c62d65c9a004924f0ec3ff9c98d..f95972cdf700931f35e14e70d7c8ed137a6b9097 100644 (file)
--- a/communication/CanTp/CanTp.c
+++ b/communication/CanTp/CanTp.c
@@ -825,8 +825,10 @@ static INLINE void handleSingleFrame(const CanTp_RxNSduType *rxConfig,
        (void) initRx15765RuntimeData(rxConfig, rxRuntime); /** @req CANTP124 */\r
        pduLength = getPduLength(&rxConfig->CanTpAddressingFormant, SINGLE_FRAME, rxPduData);\r
 \r
-       VALIDATE_NO_RV( rxRuntime->pdurBuffer->SduDataPtr != NULL,\r
+       if (rxRuntime->pdurBuffer != NULL) {\r
+               VALIDATE_NO_RV( rxRuntime->pdurBuffer->SduDataPtr != NULL,\r
                        SERVICE_ID_CANTP_RX_INDICATION, CANTP_E_INVALID_RX_LENGTH );\r
+       }\r
 \r
        if (rxConfig->CanTpAddressingFormant == CANTP_STANDARD) { /** @req CANTP094 *//** @req CANTP095 */\r
                data = &rxPduData->SduDataPtr[1];\r

diff --git a/communication/Com/Com_Com.c b/communication/Com/Com_Com.c
index e254296277b231f1ea72d765ca6642e08ed9e925..5e6aae870706e90d6986ec00b5419191785841c7 100644 (file)
--- a/communication/Com/Com_Com.c
+++ b/communication/Com/Com_Com.c
@@ -29,6 +29,7 @@
 #include "PduR.h"\r
 #include "PduR_Com.h"\r
 #include "Byteorder.h"\r
+#include "Det.h"\r
 \r
 extern Com_Arc_Config_type Com_Arc_Config;\r
 \r

diff --git a/communication/ComM/ComM.c b/communication/ComM/ComM.c
index ebb5794e65dda8fd65cc6b708f8ffb4ef25b11b3..ba7be3b81bebff0f64843b7cd9764399cf564ab9 100644 (file)
--- a/communication/ComM/ComM.c
+++ b/communication/ComM/ComM.c
@@ -73,7 +73,7 @@ static ComM_InternalType ComM_Internal = {
 static ComM_ConfigType * ComM_Config;\r
 \r
 \r
-void ComM_Init( ComM_ConfigType * Config ){\r
+void ComM_Init(const ComM_ConfigType * Config ){\r
        COMM_VALIDATE_PARAMETER( (Config != NULL), COMM_SERVICEID_INIT);\r
        COMM_VALIDATE_PARAMETER( (Config->Channels != NULL), COMM_SERVICEID_INIT);\r
        COMM_VALIDATE_PARAMETER( (Config->Users != NULL), COMM_SERVICEID_INIT);\r

diff --git a/communication/PduR/PduR.c b/communication/PduR/PduR.c
index f9882dd7c235b26b05567e5752cb997671899f7a..c3740e6a5eadb75aa8c6cb56bba1076be1241690 100644 (file)
--- a/communication/PduR/PduR.c
+++ b/communication/PduR/PduR.c
@@ -30,7 +30,7 @@
 #include "Dem.h"\r
 #endif\r
 #include "PduR.h"\r
-#include "Mcu.h"\r
+#include "McuExtensions.h"\r
 #include "debug.h"\r
 \r
 /*\r

diff --git a/diagnostic/Dcm/Dcm.c b/diagnostic/Dcm/Dcm.c
index 8eff7e3353dcb4b180db23ced025c92eea6918e6..a91d83685a0caa118981956cc5abf6debd11def8 100644 (file)
--- a/diagnostic/Dcm/Dcm.c
+++ b/diagnostic/Dcm/Dcm.c
@@ -37,7 +37,7 @@
 #include "ComM_Dcm.h"\r
 #include "PduR_Dcm.h"\r
 #include "ComStack_Types.h"\r
-#include "Mcu.h"\r
+#include "McuExtensions.h"\r
 \r
 // State variable\r
 typedef enum\r

diff --git a/diagnostic/Dcm/Dcm_Dsl.c b/diagnostic/Dcm/Dcm_Dsl.c
index 0d8d8d3ecc43c8338adc3d00783bfd604ac3a4ae..de2297410a81c527ee49354ee4e73fcf856aa73f 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsl.c
+++ b/diagnostic/Dcm/Dcm_Dsl.c
@@ -20,7 +20,7 @@
 \r
 \r
 #include <string.h>\r
-#include "Mcu.h"\r
+#include "McuExtensions.h"\r
 #include "Dcm.h"\r
 #include "Dcm_Internal.h"\r
 #include "Det.h"\r

diff --git a/diagnostic/Dcm/Dcm_Dsp.c b/diagnostic/Dcm/Dcm_Dsp.c
index 63ea9e118cc3428cbb3aa9327f2954a193384dff..a8157556bbc7d5bb62392b334ea6d1dc3d7135aa 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsp.c
+++ b/diagnostic/Dcm/Dcm_Dsp.c
@@ -29,7 +29,9 @@
 #include "Dem.h"\r
 #include "Det.h"\r
 #include "MemMap.h"\r
+#if defined(USE_MCU)\r
 #include "Mcu.h"\r
+#endif\r
 \r
 #define ZERO_SUB_FUNCTION                      0x00\r
 \r
@@ -415,7 +417,7 @@ static Dcm_NegativeResponseCodeType udsReadDtcInfoSub_0x09(const PduInfoType *pd
 static Dcm_NegativeResponseCodeType udsReadDtcInfoSub_0x06_0x10(const PduInfoType *pduRxData, PduInfoType *pduTxData)\r
 {\r
        Dcm_NegativeResponseCodeType responseCode = DCM_E_POSITIVERESPONSE;\r
-       Dem_DTCOriginType dtcOrigin = NULL;\r
+       Dem_DTCOriginType dtcOrigin;\r
        uint8 startRecNum;\r
        uint8 endRecNum;\r
 \r
@@ -432,6 +434,7 @@ static Dcm_NegativeResponseCodeType udsReadDtcInfoSub_0x06_0x10(const PduInfoTyp
 \r
        default:\r
                responseCode = DCM_E_SUBFUNCTIONNOTSUPPORTED;\r
+               dtcOrigin = 0;\r
 #if (DCM_DEV_ERROR_DETECT == STD_ON)\r
                Det_ReportError(MODULE_ID_DCM, 0, DCM_UDS_READ_DTC_INFO, DCM_E_UNEXPECTED_PARAM);\r
 #endif\r
@@ -1093,7 +1096,7 @@ void DspDcmConfirmation(PduIdType confirmPduId)
        if (dspUdsEcuResetData.resetPending) {\r
                if (confirmPduId == dspUdsEcuResetData.resetPduId) {\r
                        dspUdsEcuResetData.resetPending = FALSE;\r
-#if ( MCU_PERFORM_RESET_API == STD_ON )\r
+#if defined(USE_MCU) && ( MCU_PERFORM_RESET_API == STD_ON )\r
                        Mcu_PerformReset();\r
 #else\r
 #if (DCM_DEV_ERROR_DETECT == STD_ON)\r

diff --git a/diagnostic/Dem/Dem_Types.h b/diagnostic/Dem/Dem_Types.h
index 759e7591deac781e9c499dcad708fc31d66f221e..fe1789fba68d1c6e19b0cfbd094789d7ef6e5497 100644 (file)
--- a/diagnostic/Dem/Dem_Types.h
+++ b/diagnostic/Dem/Dem_Types.h
@@ -24,6 +24,8 @@
 #define DEM_TYPES_H_\r
 #include "Std_Types.h" /** @req DEM176.Std */\r
 \r
+#define DEM_EVENT_DESTINATION_END_OF_LIST 0\r
+\r
 /*\r
  * DTC storage types\r
  */\r

diff --git a/include/Can.h b/include/Can.h
index 0b99a6d96938fa1ddcd3288fa965a3dd335209db..f8cf9d5a66c59660f152430c5500cb2ad4541e1a 100644 (file)
--- a/include/Can.h
+++ b/include/Can.h
@@ -46,7 +46,9 @@
 #include "Std_Types.h"\r
 #include "CanIf_Types.h"\r
 #include "ComStack_Types.h"\r
+#if defined(USE_MCU)\r
 #include "Mcu.h"\r
+#endif\r
 \r
 typedef struct {\r
        uint32 txSuccessCnt;\r

diff --git a/include/ComM.h b/include/ComM.h
index e0436470ae9c49e3801ddde6607edbdcdf4c60cb..802e98e042fef7e1765163a956991b8de980fe88 100644 (file)
--- a/include/ComM.h
+++ b/include/ComM.h
@@ -91,7 +91,7 @@ void ComM_MainFunction_##channel (void) { \
 \r
 \r
 /** Initializes the AUTOSAR Communication Manager and restarts the internal state machines.*/\r
-void ComM_Init( ComM_ConfigType *);  /**< @req COMM146 */\r
+void ComM_Init(const ComM_ConfigType *);  /**< @req COMM146 */\r
 \r
 /** De-initializes (terminates) the AUTOSAR Communication Manager. */\r
 void ComM_DeInit();  /**< @req COMM147 */\r

diff --git a/include/Mcu.h b/include/Mcu.h
index 92601e3e61312c9ac243c960d1a535e9b2998210..abb8abc97708c6e40847f96ac23176404fc371e6 100644 (file)
--- a/include/Mcu.h
+++ b/include/Mcu.h
@@ -178,9 +178,8 @@ void Mcu_SetMode( const Mcu_ModeType McuMode );
 #define Mcu_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,MCU)\r
 #endif\r
 \r
-typedef uint32_t imask_t;\r
-\r
 /* ArcCore extensions */\r
+\r
 void Irq_InstallVector(void (*func)(), IrqType vector, uint8_t priority, Cpu_t cpu );\r
 void Irq_GenerateSoftInt( IrqType vector );\r
 uint8_t Irq_GetCurrentPriority( Cpu_t cpu);\r
@@ -188,8 +187,7 @@ uint32_t McuE_GetSystemClock( void );
 #if defined(CFG_MPC55XX)\r
 uint32_t McuE_GetPeripheralClock( McuE_PeriperalClock_t type );\r
 #endif\r
-imask_t McuE_EnterCriticalSection(void);\r
-void McuE_ExitCriticalSection(imask_t old_state);\r
+#include "McuExtensions.h"\r
 \r
 \r
 \r

diff --git a/include/McuExtensions.h b/include/McuExtensions.h
new file mode 100644 (file)
index 0000000..829a851
--- /dev/null
+++ b/include/McuExtensions.h
@@ -0,0 +1,27 @@
+/* -------------------------------- Arctic Core ------------------------------\r
+ * Arctic Core - the open source AUTOSAR platform http://arccore.com\r
+ *\r
+ * Copyright (C) 2009  ArcCore AB <contact@arccore.com>\r
+ *\r
+ * This source code is free software; you can redistribute it and/or modify it\r
+ * under the terms of the GNU General Public License version 2 as published by the\r
+ * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.\r
+ *\r
+ * This program is distributed in the hope that it will be useful, but\r
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\r
+ * for more details.\r
+ * -------------------------------- Arctic Core ------------------------------*/\r
+\r
+\r
+\r
+#ifndef _MCU_EXTENSIONS_H_\r
+#define _MCU_EXTENSIONS_H_\r
+\r
+#include "Std_Types.h"\r
+typedef uint32_t imask_t;\r
+\r
+imask_t McuE_EnterCriticalSection(void);\r
+void McuE_ExitCriticalSection(imask_t old_state);\r
+\r
+#endif\r