From: mahi Date: Tue, 18 Sep 2012 13:55:15 +0000 (+0200) Subject: EcuM: More EcuM fixes. X-Git-Url: https://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/05d8d9f8aa3ce197a44e4b6099d6f6eaeabd673d EcuM: More EcuM fixes. --- diff --git a/include/EcuM.h b/include/EcuM.h index 767eb57f..09949578 100644 --- a/include/EcuM.h +++ b/include/EcuM.h @@ -80,6 +80,7 @@ #define ECUM_AR_MINOR_VERSION 2 #define ECUM_AR_PATCH_VERSION 2 + #include "EcuM_Cfg.h" #include "EcuM_Types.h" #include "EcuM_Cbk.h" @@ -92,6 +93,7 @@ #include "ComM.h" #endif + /** @name Error Codes */ //@{ #define ECUM_E_NOT_INITIATED (0x10) diff --git a/include/EcuM_Types.h b/include/EcuM_Types.h index 860044c2..87294d3d 100644 --- a/include/EcuM_Types.h +++ b/include/EcuM_Types.h @@ -172,7 +172,9 @@ typedef struct EcuM_SleepMode #endif } EcuM_SleepModeType; - + /* Defines for illegal modes/channels */ +#define ECUM_SLEEP_MODE_WDGM_MODE_ILL 0xff +#define ECUM_COMM_CHANNEL_ILL 0xff #endif /* ECUM_TYPES_H_ */ /** @} */ diff --git a/include/Os.h b/include/Os.h index 671e9af8..0d9e8e1e 100644 --- a/include/Os.h +++ b/include/Os.h @@ -345,6 +345,8 @@ StatusType GetElapsedCounterValue( CounterType, TickRefType val, TickRefType ela * System timer *-----------------------------------------------------------------*/ typedef const uint32 OsTickType; + +extern OsTickType OsTickFreq; void Os_SysTickInit( void ); void Os_SysTickStart(TickType period_ticks); TickType Os_SysTickGetValue( void ); diff --git a/system/EcuM/EcuM.c b/system/EcuM/EcuM.c index a7129716..d2c009ac 100644 --- a/system/EcuM/EcuM.c +++ b/system/EcuM/EcuM.c @@ -495,12 +495,6 @@ EcuM_WakeupSourceType EcuM_GetPendingWakeupEvents( void ) { } -void EcuM_CheckValidation(EcuM_WakeupSourceType wakeupSource) { - /* Used only if CanIf is used ? CanIf_Checkvalidation(wakeupSource) */ - (void)wakeupSource; -} - - EcuM_WakeupSourceType EcuM_GetValidatedWakeupEvents( void ) { // TODO: return 0; @@ -510,4 +504,27 @@ EcuM_WakeupStatusType EcuM_GetStatusOfWakeupSource( EcuM_WakeupSourceType source return 0; } +/** + * + * @param sources + */ +void EcuM_ValidateWakeupEvent(EcuM_WakeupSourceType sources) { + + /* !req 3.1.5/EcuM2344 */ + /* !req 3.1.5/EcuM2645 */ + /* !req 3.1.5/EcuM2868 */ + /* !req 3.1.5/EcuM2345 */ + +/* +#if defined(USE_COMM) + if( internal_data.config->) + ComM_EcuM_WakeUpIndication() +#endif +*/ + /* !req 3.1.5/EcuM2790 */ + /* !req 3.1.5/EcuM2791 */ + +} + + diff --git a/system/kernel/init.c b/system/kernel/init.c index 62a1ce5e..fe5f9da4 100644 --- a/system/kernel/init.c +++ b/system/kernel/init.c @@ -67,7 +67,6 @@ static void Os_CfgValidate(void ) { /* ----------------------------[public functions]----------------------------*/ extern uint32_t McuE_GetSystemClock( void ); -extern OsTickType OsTickFreq; /**