]> rtime.felk.cvut.cz Git - arc.git/commitdiff
EcuM: More EcuM fixes.
authormahi <devnull@localhost>
Tue, 18 Sep 2012 13:55:15 +0000 (15:55 +0200)
committermahi <devnull@localhost>
Tue, 18 Sep 2012 13:55:15 +0000 (15:55 +0200)
include/EcuM.h
include/EcuM_Types.h
include/Os.h
system/EcuM/EcuM.c
system/kernel/init.c

index 767eb57f5dbd209065b112d6f32afdc0298a5d9a..099495782394d92fa455b22df4168b968e5b56d4 100644 (file)
@@ -80,6 +80,7 @@
 #define ECUM_AR_MINOR_VERSION  2\r
 #define ECUM_AR_PATCH_VERSION  2\r
 \r
+\r
 #include "EcuM_Cfg.h"\r
 #include "EcuM_Types.h"\r
 #include "EcuM_Cbk.h"\r
@@ -92,6 +93,7 @@
 #include "ComM.h"\r
 #endif\r
 \r
+\r
 /** @name Error Codes */\r
 //@{\r
 #define ECUM_E_NOT_INITIATED (0x10)\r
index 860044c2161f3963039bb6e6dcb03c3112bac42f..87294d3de4deef85244d10a685506cb998dfbeb6 100644 (file)
@@ -172,7 +172,9 @@ typedef struct EcuM_SleepMode
 #endif\r
  } EcuM_SleepModeType;\r
 \r
-\r
+ /* Defines for illegal modes/channels */\r
+#define ECUM_SLEEP_MODE_WDGM_MODE_ILL          0xff\r
+#define ECUM_COMM_CHANNEL_ILL                          0xff\r
 \r
 #endif /* ECUM_TYPES_H_ */\r
 /** @} */\r
index 671e9af8eebea8d06cacd389b27ee039a0f9dc36..0d9e8e1edb449157806a8baa6283db60fd015855 100644 (file)
@@ -345,6 +345,8 @@ StatusType GetElapsedCounterValue( CounterType, TickRefType val, TickRefType ela
  * System timer\r
  *-----------------------------------------------------------------*/\r
 typedef const uint32 OsTickType;\r
+\r
+extern OsTickType OsTickFreq;\r
 void Os_SysTickInit( void );\r
 void Os_SysTickStart(TickType period_ticks);\r
 TickType Os_SysTickGetValue( void );\r
index a7129716dc5be483c8a296ff6bafa21f0c6667df..d2c009accdac43edcd4295d0ae4e123d3d5a38b2 100644 (file)
@@ -495,12 +495,6 @@ EcuM_WakeupSourceType EcuM_GetPendingWakeupEvents( void ) {
 }\r
 \r
 \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
@@ -510,4 +504,27 @@ EcuM_WakeupStatusType EcuM_GetStatusOfWakeupSource( EcuM_WakeupSourceType source
        return 0;\r
 }\r
 \r
+/**\r
+ *\r
+ * @param sources\r
+ */\r
+void EcuM_ValidateWakeupEvent(EcuM_WakeupSourceType sources) {\r
+\r
+       /* !req 3.1.5/EcuM2344 */\r
+       /* !req 3.1.5/EcuM2645 */\r
+       /* !req 3.1.5/EcuM2868 */\r
+       /* !req 3.1.5/EcuM2345 */\r
+\r
+/*\r
+#if defined(USE_COMM)\r
+       if( internal_data.config->)\r
+       ComM_EcuM_WakeUpIndication()\r
+#endif\r
+*/\r
+       /* !req 3.1.5/EcuM2790 */\r
+       /* !req 3.1.5/EcuM2791 */\r
+\r
+}\r
+\r
+\r
 \r
index 62a1ce5e4546cc20ddf2a0fdab27c0a375edaf73..fe5f9da4878662cff751d209e7b83d9d903bf205 100644 (file)
@@ -67,7 +67,6 @@ static void Os_CfgValidate(void ) {
 /* ----------------------------[public functions]----------------------------*/\r
 \r
 extern uint32_t McuE_GetSystemClock( void );\r
-extern OsTickType OsTickFreq;\r
 \r
 \r
 /**\r