EcuM: More SchM,Gpt stuff

diff --git a/arch/ppc/mpc55xx/drivers/Gpt.c b/arch/ppc/mpc55xx/drivers/Gpt.c
index 9676cf120ab4158c4df8062593d215c513541588..d71bd69163ee38d81ebd7990ac51841ce59ce1fd 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Gpt.c
+++ b/arch/ppc/mpc55xx/drivers/Gpt.c
@@ -581,82 +581,82 @@ void Gpt_DisableNotification(Gpt_ChannelType channel)
 \r
 #if ( GPT_WAKEUP_FUNCTIONALITY_API == STD_ON )\r
 \r
-       void Gpt_SetMode(Gpt_ModeType mode)\r
-       {\r
-               int i;\r
+void Gpt_SetMode(Gpt_ModeType mode)\r
+{\r
+       int i;\r
 \r
-               VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_SETMODE_SERVIVCE_ID, GPT_E_UNINIT );\r
-               VALIDATE( ( mode <= GPT_MODE_SLEEP ), GPT_SETMODE_SERVIVCE_ID, GPT_E_PARAM_MODE );\r
+       VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_SETMODE_SERVIVCE_ID, GPT_E_UNINIT );\r
+       VALIDATE( ( mode <= GPT_MODE_SLEEP ), GPT_SETMODE_SERVIVCE_ID, GPT_E_PARAM_MODE );\r
 \r
 #if defined(CFG_MPC560X)\r
-               if (mode == GPT_MODE_NORMAL)\r
-               {\r
-                       PIT.PITMCR.B.MDIS = 0;\r
-                       // Do NOT restart channels\r
-               }\r
-               else if (mode == GPT_MODE_SLEEP)\r
+       if (mode == GPT_MODE_NORMAL)\r
+       {\r
+               PIT.PITMCR.B.MDIS = 0;\r
+               // Do NOT restart channels\r
+       }\r
+       else if (mode == GPT_MODE_SLEEP)\r
+       {\r
+               PIT.PITMCR.B.MDIS = 0;\r
+               // Disable all but RTI\r
+               for (i= 0; i <= GPT_CHANNEL_PIT_LAST; i++)\r
                {\r
-                       PIT.PITMCR.B.MDIS = 0;\r
-                       // Disable all but RTI\r
-                       for (i= 0; i <= GPT_CHANNEL_PIT_LAST; i++)\r
-                       {\r
-                               Gpt_StopTimer(i);\r
-                       }\r
+                       Gpt_StopTimer(i);\r
                }\r
+       }\r
 #else\r
-               if (mode == GPT_MODE_NORMAL)\r
-               {\r
-                       PIT.CTRL.B.MDIS = 0;\r
-                       // Do NOT restart channels\r
-               }\r
-               else if (mode == GPT_MODE_SLEEP)\r
-               {\r
-\r
-                       PIT.CTRL.B.MDIS = 1;\r
-                       // Disable all but RTI\r
-                       for (i= 0; i <= GPT_CHANNEL_PIT_LAST; i++)\r
-                       {\r
-                               Gpt_StopTimer(i);\r
-                       }\r
-               }\r
-#endif\r
+       if (mode == GPT_MODE_NORMAL)\r
+       {\r
+               PIT.CTRL.B.MDIS = 0;\r
+               // Do NOT restart channels\r
        }\r
-\r
-       void Gpt_DisableWakeup(Gpt_ChannelType channel)\r
+       else if (mode == GPT_MODE_SLEEP)\r
        {\r
-               VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_DISABLEWAKEUP_SERVICE_ID, GPT_E_UNINIT );\r
-               VALIDATE( VALID_CHANNEL(channel), GPT_DISABLEWAKEUP_SERVICE_ID, GPT_E_PARAM_CHANNEL );\r
-               // Only RTI have system wakeup\r
-               if (channel == GPT_CHANNEL_RTI)\r
-               {\r
-                       Gpt_Global.wakeupEnabled = STD_OFF;\r
-               }\r
-               else\r
+\r
+               PIT.CTRL.B.MDIS = 1;\r
+               // Disable all but RTI\r
+               for (i= 0; i <= GPT_CHANNEL_PIT_LAST; i++)\r
                {\r
-                       // TODO:\r
-                       //assert(0);\r
+                       Gpt_StopTimer(i);\r
                }\r
        }\r
+#endif\r
+}\r
 \r
-       void Gpt_EnableWakeup(Gpt_ChannelType channel)\r
+void Gpt_DisableWakeup(Gpt_ChannelType channel)\r
+{\r
+       VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_DISABLEWAKEUP_SERVICE_ID, GPT_E_UNINIT );\r
+       VALIDATE( VALID_CHANNEL(channel), GPT_DISABLEWAKEUP_SERVICE_ID, GPT_E_PARAM_CHANNEL );\r
+       // Only RTI have system wakeup\r
+       if (channel == GPT_CHANNEL_RTI)\r
        {\r
-               VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_ENABLEWAKEUP_SERVICE_ID, GPT_E_UNINIT );\r
-               VALIDATE( VALID_CHANNEL(channel),GPT_ENABLEWAKEUP_SERVICE_ID, GPT_E_PARAM_CHANNEL );\r
-               if (channel == GPT_CHANNEL_RTI)\r
-               {\r
-                       Gpt_Global.wakeupEnabled = STD_ON;\r
-               }\r
-               else\r
-               {\r
-                       // TODO:\r
-                       //assert(0);\r
-               }\r
+               Gpt_Global.wakeupEnabled = STD_OFF;\r
        }\r
-\r
-       void Gpt_Cbk_CheckWakeup(EcuM_WakeupSourceType wakeupSource)\r
+       else\r
        {\r
+               // TODO:\r
+               //assert(0);\r
+       }\r
+}\r
 \r
+void Gpt_EnableWakeup(Gpt_ChannelType channel)\r
+{\r
+       VALIDATE( (Gpt_Global.initRun == STD_ON), GPT_ENABLEWAKEUP_SERVICE_ID, GPT_E_UNINIT );\r
+       VALIDATE( VALID_CHANNEL(channel),GPT_ENABLEWAKEUP_SERVICE_ID, GPT_E_PARAM_CHANNEL );\r
+       if (channel == GPT_CHANNEL_RTI)\r
+       {\r
+               Gpt_Global.wakeupEnabled = STD_ON;\r
+       }\r
+       else\r
+       {\r
+               // TODO:\r
+               //assert(0);\r
        }\r
+}\r
+\r
+void Gpt_Cbk_CheckWakeup(EcuM_WakeupSourceType wakeupSource)\r
+{\r
+\r
+}\r
 \r
 #endif\r
 \r

diff --git a/include/EcuM_Types.h b/include/EcuM_Types.h
index 99e35a415fcff4dddb81175c03f572930af1aa4f..860044c2161f3963039bb6e6dcb03c3112bac42f 100644 (file)
--- a/include/EcuM_Types.h
+++ b/include/EcuM_Types.h
@@ -142,6 +142,7 @@ typedef enum
 \r
 #include "Mcu.h"\r
 \r
+#if defined(USE_WDGM)\r
 typedef struct EcuM_WdgM\r
 {\r
        WdgM_SupervisedEntityIdType EcuMSupervisedEntity;\r
@@ -151,6 +152,7 @@ typedef struct EcuM_WdgM
        WdgM_ModeType EcuMWdgMPostRunMode;\r
        WdgM_ModeType EcuMWdgMShutdownMode;\r
 } EcuM_WdgMType;\r
+#endif\r
 \r
 typedef struct EcuM_WakeupSourceConfig {\r
        EcuM_WakeupSourceType   EcuMWakeupSourceId;\r

diff --git a/system/EcuM/EcuM.c b/system/EcuM/EcuM.c
index 8cc0886de8337fa1d3c4db38596278f77539eced..a7129716dc5be483c8a296ff6bafa21f0c6667df 100644 (file)
--- a/system/EcuM/EcuM.c
+++ b/system/EcuM/EcuM.c
@@ -497,15 +497,17 @@ EcuM_WakeupSourceType EcuM_GetPendingWakeupEvents( void ) {
 \r
 void EcuM_CheckValidation(EcuM_WakeupSourceType wakeupSource) {\r
        /* Used only if CanIf is used ? CanIf_Checkvalidation(wakeupSource) */\r
+       (void)wakeupSource;\r
 }\r
 \r
 \r
 EcuM_WakeupSourceType EcuM_GetValidatedWakeupEvents( void ) {\r
        // TODO:\r
+       return 0;\r
 }\r
 \r
 EcuM_WakeupStatusType EcuM_GetStatusOfWakeupSource( EcuM_WakeupSourceType sources ) {\r
-\r
+       return 0;\r
 }\r
 \r
 \r

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index a75e7f199e866b4943ea2c23a9db9f3811a581b8..cab78fc70ca956dc146a49a76512508c6f1100d1 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -348,8 +348,6 @@ TASK(SchM_Startup){
 \r
        /* At this point EcuM ==  ECUM_STATE_STARTUP_ONE */\r
 \r
-       /* Schedule memory task more often that usaul so that EcuM_StartupTwo() may return quicker */\r
-       ActivateTask(TASK_ID_SchM_BswService);\r
        /* Set events on TASK_ID_BswService_Mem */\r
        SetRelAlarm(ALARM_ID_Alarm_BswService, 10, 2);\r
 \r
@@ -362,6 +360,7 @@ TASK(SchM_Startup){
        EcuM_StartupTwo();\r
 \r
        /* Start to schedule BSW parts */\r
+       CancelAlarm(ALARM_ID_Alarm_BswService);\r
        SetRelAlarm(ALARM_ID_Alarm_BswService, 10, 5);\r
 \r
        EcuM_RequestRUN(ECUM_USER_User_1);\r