Added NM modules to default config EcuM

diff --git a/boards/generic/EcuM_Callout_template.c b/boards/generic/EcuM_Callout_template.c
index 86e4070bf6ce60cb469b523eafb78174369880cc..8ecccc1a417f1d421b0f9b13eb7c8f9f77aa21a6 100644 (file)
--- a/boards/generic/EcuM_Callout_template.c
+++ b/boards/generic/EcuM_Callout_template.c
@@ -1,17 +1,17 @@
-/* 
-* Configuration of module EcuM (EcuM_Callout_template.c)
-* 
-* Created by: 
-* Configured for (MCU):
-* 
-* Module editor vendor:  ArcCore
-* Module editor version: 2.0.0
-* 
-* 
-* Generated by Arctic Studio (http://arccore.com)
-*           on Tue May 25 11:41:52 CEST 2010
-*/
-
+/* -------------------------------- Arctic Core ------------------------------
+ * Arctic Core - the open source AUTOSAR platform http://arccore.com
+ *
+ * Copyright (C) 2009  ArcCore AB <contact@arccore.com>
+ *
+ * This source code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ * -------------------------------- Arctic Core ------------------------------*/
 \r
 #warning "This default file may only be used as an example!"
 
@@ -65,6 +65,21 @@
 #if defined(USE_NVM)
 #include "NvM.h"
 #endif
+#if defined(USE_COMM)
+#include "ComM.h"
+#endif
+#if defined(USE_NM)
+#include "Nm.h"
+#endif
+#if defined(USE_CANNM)
+#include "CanNm.h"
+#endif
+#if defined(USE_CANSM)
+#include "CanSM.h"
+#endif
+#if defined(USE_LINSM)
+#include "LinSM.h"
+#endif
 \r
 void EcuM_AL_DriverInitZero()\r
 {\r
@@ -179,6 +194,10 @@ void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)
        // Setup CAN TP\r
        CanTp_Init();\r
 #endif
+
+#if defined(USE_CANSM)
+        CanSM_Init(ConfigPtr->CanSMConfig);
+#endif
 \r
        // Setup LIN\r
        // TODO\r
@@ -187,6 +206,16 @@ void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)
        // Setup PDU Router\r
        PduR_Init(ConfigPtr->PduRConfig);\r
 #endif\r
+
+#if defined(USE_CANNM)
+        // Setup Can Network Manager
+        CanNm_Init(ConfigPtr->CanNmConfig);
+#endif
+
+#if defined(USE_NM)
+        // Setup Network Management Interface
+        Nm_Init(ConfigPtr->NmConfig);
+#endif
 \r
 #if defined(USE_COM)\r
        // Setup COM layer\r
@@ -212,11 +241,10 @@ void EcuM_AL_DriverInitThree(const EcuM_ConfigType ConfigPtr)
        Dem_Init();\r
 #endif\r
 \r
-#if defined(USE_CANIF)\r
-       // Startup the CAN interafce; due to the missing COM manager\r
-       //CanIf_InitController(CAN_CTRL_A, 0);\r
-       //CanIf_SetControllerMode(CAN_CTRL_A, CANIF_CS_STARTED);\r
-#endif\r
+#if defined(USE_COMM)
+        // Setup Communication Manager
+        ComM_Init(ConfigPtr->ComMConfig);
+#endif
 }\r
 
 void EcuM_OnEnterRUN(void)

diff --git a/boards/generic/EcuM_Cfg.c b/boards/generic/EcuM_Cfg.c
index a9a7f1a51ff34ed821128140d13def04860af244..1d8215e01802b806840a33ab83e1a27980b70c9d 100644 (file)
--- a/boards/generic/EcuM_Cfg.c
+++ b/boards/generic/EcuM_Cfg.c
@@ -1,16 +1,17 @@
-/* 
-* Configuration of module EcuM (EcuM_Cfg.c)
-* 
-* Created by: 
-* Configured for (MCU):
-* 
-* Module editor vendor:  ArcCore
-* Module editor version: 2.0.0
-* 
-* 
-* Generated by Arctic Studio (http://arccore.com)
-*           on Tue May 25 11:41:52 CEST 2010
-*/
+/* -------------------------------- Arctic Core ------------------------------
+ * Arctic Core - the open source AUTOSAR platform http://arccore.com
+ *
+ * Copyright (C) 2009  ArcCore AB <contact@arccore.com>
+ *
+ * This source code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ * -------------------------------- Arctic Core ------------------------------*/
 \r
 #warning "This default file may only be used as an example!"
 
@@ -25,38 +26,49 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,
 \r
-#if defined(USE_MCU)\r
-       .McuConfig = McuConfigData,\r
-#endif\r
-#if defined(USE_PORT)\r
-       .PortConfig = &PortConfigData,\r
-#endif\r
-#if defined(USE_CAN)\r
-       .CanConfig = &CanConfigData,\r
-#endif\r
-#if defined(USE_CANIF)\r
-       .CanIfConfig = &CanIf_Config,\r
-#endif\r
-#if defined(USE_COM)\r
-       .ComConfig = &ComConfiguration,\r
-#endif\r
-#if defined(USE_PDUR)\r
-       .PduRConfig = &PduR_Config,\r
-#endif\r
-#if defined(USE_DMA)\r
-       .DmaConfig = DmaConfig,\r
-#endif\r
-#if defined(USE_ADC)\r
-       .AdcConfig = AdcConfig,\r
-#endif\r
-#if defined(USE_PWM)\r
-       .PwmConfig = &PwmConfig,\r
-#endif\r
-#if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
-#endif\r
+#if defined(USE_MCU)
+        .McuConfig = McuConfigData,
+#endif
+#if defined(USE_PORT)
+        .PortConfig = &PortConfigData,
+#endif
+#if defined(USE_CAN)
+        .CanConfig = &CanConfigData,
+#endif
+#if defined(USE_CANIF)
+        .CanIfConfig = &CanIf_Config,
+#endif
+#if defined(USE_CANSM)
+        .CanSMConfig = &CanSM_Config,
+#endif
+#if defined(USE_CANNM)
+        .CanNmConfig = &CanNm_Config,
+#endif
+#if defined(USE_COM)
+        .ComConfig = &ComConfiguration,
+#endif
+#if defined(USE_COMM)
+        .ComMConfig = &ComM_Config,
+#endif
+#if defined(USE_NM)
+        .NmConfig = &Nm_Config,
+#endif
+#if defined(USE_PDUR)
+        .PduRConfig = &PduR_Config,
+#endif
+#if defined(USE_DMA)
+        .DmaConfig = DmaConfig,
+#endif
+#if defined(USE_ADC)
+        .AdcConfig = AdcConfig,
+#endif
+#if defined(USE_PWM)
+        .PwmConfig = &PwmConfig,
+#endif
+#if defined(USE_GPT)
+        .GptConfig = GptConfigData,
+#endif
 #if defined(USE_FLS)
        .FlashConfig = FlsConfigSet,
 #endif
-
 };\r

diff --git a/boards/generic/EcuM_Generated_Types.h b/boards/generic/EcuM_Generated_Types.h
index 030c2d72246598d1290ff926a40e862af31ac816..0ca50dab4900f6e1f45c0c8494e40a4e9fae05d1 100644 (file)
--- a/boards/generic/EcuM_Generated_Types.h
+++ b/boards/generic/EcuM_Generated_Types.h
@@ -1,16 +1,17 @@
-/* 
-* Configuration of module EcuM (EcuM_Generated_Types.h)
-* 
-* Created by: 
-* Configured for (MCU):
-* 
-* Module editor vendor:  ArcCore
-* Module editor version: 2.0.0
-* 
-* 
-* Generated by Arctic Studio (http://arccore.com)
-*           on Tue May 25 11:41:52 CEST 2010
-*/
+/* -------------------------------- Arctic Core ------------------------------
+ * Arctic Core - the open source AUTOSAR platform http://arccore.com
+ *
+ * Copyright (C) 2009  ArcCore AB <contact@arccore.com>
+ *
+ * This source code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ * -------------------------------- Arctic Core ------------------------------*/
 
 
 #warning "This default file may only be used as an example!"
@@ -23,40 +24,51 @@
 #ifndef _ECUM_GENERATED_TYPES_H_\r
 #define _ECUM_GENERATED_TYPES_H_\r
 \r
-#if defined(USE_MCU)\r
-#include "Mcu.h"\r
-#endif\r
-#if defined(USE_PORT)\r
-#include "Port.h"\r
-#endif\r
-#if defined(USE_CAN)\r
-#include "Can.h"\r
-#endif\r
-#if defined(USE_CANIF)\r
-#include "CanIf.h"\r
-#endif\r
-#if defined(USE_PWM)\r
-#include "Pwm.h"\r
-#endif\r
-#if defined(USE_COM)\r
-#include "Com.h"\r
-#endif\r
-#if defined(USE_PDUR)\r
-#include "PduR.h"\r
-#endif\r
-#if defined(USE_DMA)\r
-#include "Dma.h"\r
-#endif\r
-#if defined(USE_ADC)\r
-#include "Adc.h"\r
-#endif\r
-#if defined(USE_GPT)\r
-#include "Gpt.h"\r
-#endif\r
-#if defined(USE_FLS)
-#include "Fls.h"
+#if defined(USE_MCU)
+#include "Mcu.h"
 #endif
-\r
+#if defined(USE_PORT)
+#include "Port.h"
+#endif
+#if defined(USE_CAN)
+#include "Can.h"
+#endif
+#if defined(USE_CANIF)
+#include "CanIf.h"
+#endif
+#if defined(USE_PWM)
+#include "Pwm.h"
+#endif
+#if defined(USE_COM)
+#include "Com.h"
+#endif
+#if defined(USE_PDUR)
+#include "PduR.h"
+#endif
+#if defined(USE_DMA)
+#include "Dma.h"
+#endif
+#if defined(USE_ADC)
+#include "Adc.h"
+#endif
+#if defined(USE_GPT)
+#include "Gpt.h"
+#endif
+#if defined(USE_COMM)
+#include "ComM.h"
+#endif
+#if defined(USE_NM)
+#include "Nm.h"
+#endif
+#if defined(USE_CANNM)
+#include "CanNm.h"
+#endif
+#if defined(USE_CANSM)
+#include "CanSM.h"
+#endif
+#if defined(USE_LINSM)
+#include "LinSM.h"
+#endif\r
 \r
 typedef struct\r
 {\r
@@ -67,36 +79,48 @@ typedef struct
        uint32 EcuMNvramReadAllTimeout;
        uint32 EcuMNvramWriteAllTimeout;
 \r
-#if defined(USE_MCU)\r
-       const Mcu_ConfigType* McuConfig;\r
-#endif\r
-#if defined(USE_PORT)\r
-       const Port_ConfigType* PortConfig;\r
-#endif\r
-#if defined(USE_CAN)\r
-       const Can_ConfigType* CanConfig;\r
-#endif\r
-#if defined(USE_CANIF)\r
-       const CanIf_ConfigType* CanIfConfig;\r
-#endif\r
-#if defined(USE_COM)\r
-       const Com_ConfigType* ComConfig;\r
-#endif\r
-#if defined(USE_PDUR)\r
-       const PduR_PBConfigType* PduRConfig;\r
-#endif\r
-#if defined(USE_PWM)\r
-       const Pwm_ConfigType* PwmConfig;\r
-#endif\r
-#if defined(USE_DMA)\r
-       const Dma_ConfigType* DmaConfig;\r
-#endif\r
-#if defined(USE_ADC)\r
-    const Adc_ConfigType* AdcConfig;\r
-#endif\r
-#if defined(USE_GPT)\r
-    const Gpt_ConfigType* GptConfig;\r
-#endif\r
+#if defined(USE_MCU)
+        const Mcu_ConfigType* McuConfig;
+#endif
+#if defined(USE_PORT)
+        const Port_ConfigType* PortConfig;
+#endif
+#if defined(USE_CAN)
+        const Can_ConfigType* CanConfig;
+#endif
+#if defined(USE_CANIF)
+        const CanIf_ConfigType* CanIfConfig;
+#endif
+#if defined(USE_CANSM)
+        const CanSM_ConfigType* CanSMConfig;
+#endif
+#if defined(USE_NM)
+        const Nm_ConfigType* NmConfig;
+#endif
+#if defined(USE_CANNM)
+        const CanNm_ConfigType* CanNmConfig;
+#endif
+#if defined(USE_COMM)
+        const ComM_ConfigType* ComMConfig;
+#endif
+#if defined(USE_COM)
+        const Com_ConfigType* ComConfig;
+#endif
+#if defined(USE_PDUR)
+        const PduR_PBConfigType* PduRConfig;
+#endif
+#if defined(USE_PWM)
+        const Pwm_ConfigType* PwmConfig;
+#endif
+#if defined(USE_DMA)
+        const Dma_ConfigType* DmaConfig;
+#endif
+#if defined(USE_ADC)
+    const Adc_ConfigType* AdcConfig;
+#endif
+#if defined(USE_GPT)
+    const Gpt_ConfigType* GptConfig;
+#endif
 #if defined(USE_FLS)
        const Fls_ConfigType* FlashConfig;
 #endif