EcuM: Gpt and SchM Fixes.

[arc.git] / include / EcuM_Types.h

diff --git a/include/EcuM_Types.h b/include/EcuM_Types.h
index 27e7929b774175e2df11840b5cc3f2a6ba1ecaf1..99e35a415fcff4dddb81175c03f572930af1aa4f 100644 (file)
--- a/include/EcuM_Types.h
+++ b/include/EcuM_Types.h
@@ -35,58 +35,6 @@
 #include "Rte_Type.h"\r
 #endif\r
 \r
-#if defined(USE_WDGM)\r
-#include "WdgM.h"\r
-#endif\r
-\r
-#include "Mcu.h"\r
-\r
-#if 0\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 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
-       Mcu_ResetType                   EcuMResetReason;\r
-       boolean                                 EcuMWakeupSourcePolling;\r
-       uint8                                   EcuMComMChannel;\r
-} EcuM_WakeupSourceConfigType;\r
-\r
-typedef struct EcuM_SleepMode\r
-{\r
-   uint8                                       EcuMSleepModeId;\r
-   EcuM_WakeupSourceType       EcuMWakeupSourceMask;\r
-   Mcu_ModeType                        EcuMSleepModeMcuMode;\r
-#if defined(USE_WDGM)\r
-   WdgM_ModeType_                      EcuMSleepModeWdgMMode;\r
-#endif\r
- } EcuM_SleepModeType;\r
-\r
 \r
 #if !defined(_DEFINED_TYPEDEF_FOR_EcuM_StateType_)\r
 /** Possible states */\r
@@ -187,5 +135,42 @@ typedef enum
 #define _DEFINED_TYPEDEF_FOR_EcuM_BootTargetType_\r
 #endif\r
 \r
+\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+\r
+#include "Mcu.h"\r
+\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
+\r
+typedef struct EcuM_WakeupSourceConfig {\r
+       EcuM_WakeupSourceType   EcuMWakeupSourceId;\r
+       uint32                                  EcuMValidationTimeout;\r
+       Mcu_ResetType                   EcuMResetReason;\r
+       boolean                                 EcuMWakeupSourcePolling;\r
+       uint8                                   EcuMComMChannel;\r
+} EcuM_WakeupSourceConfigType;\r
+\r
+typedef struct EcuM_SleepMode\r
+{\r
+   uint8                                       EcuMSleepModeId;\r
+   EcuM_WakeupSourceType       EcuMWakeupSourceMask;\r
+   Mcu_ModeType                        EcuMSleepModeMcuMode;\r
+#if defined(USE_WDGM)\r
+   WdgM_ModeType                       EcuMSleepModeWdgMMode;\r
+#endif\r
+ } EcuM_SleepModeType;\r
+\r
+\r
+\r
 #endif /* ECUM_TYPES_H_ */\r
 /** @} */\r