EcuM: Gpt and SchM Fixes.

diff --git a/boards/mpc5516it/build_config.mk b/boards/mpc5516it/build_config.mk
index 880b8279f6e672a15754975abdb3e9fac69ba1bb..c3e5d74b7d5526c9f2f8d025351a40e7723dd1dc 100644 (file)
--- a/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC5516IT
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE J1939TP\r
+MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM EA LINSM\r
 # Additional\r

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

diff --git a/include/Gpt.h b/include/Gpt.h
index ab33f8674b418f9254bd472519ab8d27a711a02c..f0ce66db0b4d9fb2c7dfae2d0ea8cc48d3ac2fe1 100644 (file)
--- a/include/Gpt.h
+++ b/include/Gpt.h
@@ -13,6 +13,19 @@
  * for more details.\r
  * -------------------------------- Arctic Core ------------------------------*/\r
 \r
+\r
+/*\r
+ * Include structure:\r
+ *\r
+ *\r
+ *                    Gpt.h\r
+ *                      ^\r
+ *                      |\r
+ *       `---------- Gpt_xxx.c ---> Memmap.h\r
+ *\r
+ *\r
+ */\r
+\r
 /** @addtogroup Gpt GPT Driver\r
  *  @{ */\r
 \r
@@ -25,11 +38,6 @@
 \r
 #include "Std_Types.h"\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
@@ -75,6 +83,8 @@ typedef enum
   GPT_MODE_SLEEP\r
 } Gpt_ModeType;\r
 \r
+/** Channel id type */\r
+typedef uint8_t Gpt_ChannelType;\r
 \r
 #define GPT_VENDOR_ID             1\r
 #define GPT_MODULE_ID                   1\r
@@ -87,7 +97,14 @@ typedef enum
 #define GPT_AR_MINOR_VERSION     2\r
 #define GPT_AR_PATCH_VERSION     1\r
 \r
-#include "Gpt_Cfg.h"\r
+//#if (GPT_REPORT_WAKEUP_SOURCE==STD_ON)\r
+#include "EcuM_Cbk.h"          /* @req 4.0.3/GPT271 */\r
+//#endif\r
+\r
+/* Needs Gpt_ConfigType */\r
+#include "Gpt_Cfg.h"           /* @req 4.0.3/GPT259 */\r
+\r
+/* The config needs EcuM_WakeupSourceType from EcuM */\r
 \r
 #if (GPT_VERSION_INFO_API == STD_ON)\r
 #define Gpt_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,GPT)\r

diff --git a/include/WdgM.h b/include/WdgM.h
index bc8de2cd82460c4c43aac973c3a01a87d2e7af16..dcafadd6253eeac9e46c52532fe47a64ff9a1445 100644 (file)
--- a/include/WdgM.h
+++ b/include/WdgM.h
@@ -25,11 +25,12 @@
 #define WDGM_SW_MINOR_VERSION  0
 #define WDGM_SW_PATCH_VERSION  0
 
+#include "Std_Types.h"
 /* "forward" declare types due to circular dependency chain */
 typedef uint8 WdgM_SupervisedEntityIdType;
 typedef uint8 WdgM_ModeType;
 
-#include "Std_Types.h"
+
 #include "WdgM_Cfg.h"
 
 // API Service ID's

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index 655b8c74b9ef1860dd5d68980e54ea5db43e21ee..a75e7f199e866b4943ea2c23a9db9f3811a581b8 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -314,6 +314,8 @@ SCHM_DECLARE(NVM);
 SCHM_DECLARE(FEE);\r
 SCHM_DECLARE(EA);\r
 SCHM_DECLARE(FLS);\r
+SCHM_DECLARE(WDGM_TRIGGER);\r
+SCHM_DECLARE(WDGM_ALIVESUPERVISION);\r
 \r
 \r
 \r
@@ -408,7 +410,8 @@ TASK(SchM_BswService) {
                SCHM_MAINFUNCTION_NM();\r
                SCHM_MAINFUNCTION_CANNM();\r
                SCHM_MAINFUNCTION_CANSM();\r
-               SCHM_MAINFUNCTION_WDMG();\r
+               SCHM_MAINFUNCTION_WDGM_TRIGGER();\r
+               SCHM_MAINFUNCTION_WDGM_ALIVESUPERVISION();\r
                break;\r
        }\r
 \r

diff --git a/system/SchM/SchM_WdgM.h b/system/SchM/SchM_WdgM.h
index 9c46e76de874971c55ec2563595a728c9aaf2b65..0fac7f0ae285bc53582284fbb3b43bad27103403 100644 (file)
--- a/system/SchM/SchM_WdgM.h
+++ b/system/SchM/SchM_WdgM.h
@@ -18,7 +18,7 @@
 #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
+#define SCHM_MAINFUNCTION_WDGM_ALIVESUPERVISION()      SCHM_MAINFUNCTION(WDGM_ALIVESUPERVISION,WdgM_MainFunction_AliveSupervision())\r
 \r
 #define SCHM_MAINFUNCTION_WDGM()       SCHM_MAINFUNCTION(WDGM,Dcm_MainFunction())\r
 \r

diff --git a/system/SchM/SchM_cfg.h b/system/SchM/SchM_cfg.h
index 04e8046598198f47be3da1f90169b14558be176a..b45eb9914bbb5c35abd3389ebd8fa4f4c3a07810 100644 (file)
--- a/system/SchM/SchM_cfg.h
+++ b/system/SchM/SchM_cfg.h
@@ -52,6 +52,8 @@
 #define SCHM_MAINFUNCTION_CYCLE_PDUR    SCHM_CYCLE_MAIN\r
 #define SCHM_MAINFUNCTION_CYCLE_SPI     SCHM_CYCLE_MAIN\r
 #define SCHM_MAINFUNCTION_CYCLE_WDGM    SCHM_CYCLE_MAIN\r
+#define SCHM_MAINFUNCTION_CYCLE_WDGM_TRIGGER     SCHM_CYCLE_MAIN\r
+#define SCHM_MAINFUNCTION_CYCLE_WDGM_ALIVESUPERVISION     SCHM_CYCLE_MAIN\r
 \r
 /*\r
  * Schedule BSW memory\r