Type changes...

diff --git a/include/EcuM_Types.h b/include/EcuM_Types.h
index 903c916ed5ec6244277408b50599c336d98c6e53..27e7929b774175e2df11840b5cc3f2a6ba1ecaf1 100644 (file)
--- a/include/EcuM_Types.h
+++ b/include/EcuM_Types.h
@@ -41,8 +41,7 @@
 \r
 #include "Mcu.h"\r
 \r
-\r
-#if defined(USE_WDGM)\r
+#if 0\r
 typedef struct EcuM_WdgM\r
 {\r
        WdgM_SupervisedEntityIdType EcuMSupervisedEntity;\r
@@ -54,6 +53,22 @@ typedef struct EcuM_WdgM
 } EcuM_WdgMType;\r
 #endif\r
 \r
+typedef uint8 WdgM_SupervisedEntityIdType_;\r
+typedef uint8 WdgM_ModeType_;\r
+\r
+\r
+#if defined(USE_WDGM)\r
+typedef struct EcuM_WdgM\r
+{\r
+       WdgM_SupervisedEntityIdType_ EcuMSupervisedEntity;\r
+       WdgM_ModeType_ EcuMWdgMWakeupMode;\r
+       WdgM_ModeType_ EcuMWdgMStartupMode;\r
+       WdgM_ModeType_ EcuMWdgMRunMode;\r
+       WdgM_ModeType_ EcuMWdgMPostRunMode;\r
+       WdgM_ModeType_ EcuMWdgMShutdownMode;\r
+} EcuM_WdgMType;\r
+#endif\r
+\r
 typedef struct EcuM_WakeupSourceConfig {\r
        EcuM_WakeupSourceType   EcuMWakeupSourceId;\r
        uint32                                  EcuMValidationTimeout;\r
@@ -68,7 +83,7 @@ typedef struct EcuM_SleepMode
    EcuM_WakeupSourceType       EcuMWakeupSourceMask;\r
    Mcu_ModeType                        EcuMSleepModeMcuMode;\r
 #if defined(USE_WDGM)\r
-   WdgM_ModeType                       EcuMSleepModeWdgMMode;\r
+   WdgM_ModeType_                      EcuMSleepModeWdgMMode;\r
 #endif\r
  } EcuM_SleepModeType;\r
 \r

diff --git a/include/Gpt.h b/include/Gpt.h
index 9879842d593676648b117b854bde1dd497d498bf..ab33f8674b418f9254bd472519ab8d27a711a02c 100644 (file)
--- a/include/Gpt.h
+++ b/include/Gpt.h
@@ -24,7 +24,12 @@
 #define GPT_H_\r
 \r
 #include "Std_Types.h"\r
-//#include "EcuM.h"  mahi: What for ???\r
+\r
+/* "forward" declare types due to circular dependency chain */\r
+/** Channel id type */\r
+typedef uint8_t Gpt_ChannelType;\r
+\r
+#include "EcuM.h"\r
 \r
 /** @name Error Codes */\r
 //@{\r
@@ -54,9 +59,6 @@
 #define GPT_CBK_CHECKWAKEUP_SERVICE_ID      0x0c\r
 //@}\r
 \r
-/** Channel id type */\r
-typedef uint8_t Gpt_ChannelType;\r
-\r
 /** Channel time value type */\r
 typedef uint32_t Gpt_ValueType;\r
 \r

diff --git a/include/WdgM.h b/include/WdgM.h
index ad12445d6f1e7b76f75dde4396e859fb7a99946e..bc8de2cd82460c4c43aac973c3a01a87d2e7af16 100644 (file)
--- a/include/WdgM.h
+++ b/include/WdgM.h
@@ -25,6 +25,10 @@
 #define WDGM_SW_MINOR_VERSION  0
 #define WDGM_SW_PATCH_VERSION  0
 
+/* "forward" declare types due to circular dependency chain */
+typedef uint8 WdgM_SupervisedEntityIdType;
+typedef uint8 WdgM_ModeType;
+
 #include "Std_Types.h"
 #include "WdgM_Cfg.h"
 

diff --git a/system/SchM/SchM_WdgM.h b/system/SchM/SchM_WdgM.h
new file mode 100644 (file)
index 0000000..9c46e76
--- /dev/null
+++ b/system/SchM/SchM_WdgM.h
@@ -0,0 +1,25 @@
+/* -------------------------------- 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
+#ifndef SCHM_WDGM_H_\r
+#define SCHM_WDGM_H_\r
+\r
+#define SCHM_MAINFUNCTION_WDGM_TRIGGER()                       SCHM_MAINFUNCTION(WDGM_TRIGGER,WdgM_MainFunction_Trigger())\r
+#define SCHM_MAINFUNCTION_WDGM_ALIVESUPERVISON()       SCHM_MAINFUNCTION(WDGM_ALIVESUPERVISON,WdgM_MainFunction_AliveSupervision())\r
+\r
+#define SCHM_MAINFUNCTION_WDGM()       SCHM_MAINFUNCTION(WDGM,Dcm_MainFunction())\r
+\r
+#endif /* SCHM_WDGM_H_ */\r