#include "Mcu.h"\r
#include "Det.h"\r
#include "irq.h"\r
+#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
+#include "Nvm.h"\r
+#endif\r
\r
EcuM_GobalType internal_data;\r
\r
\r
// Set default application mode\r
internal_data.app_mode = internal_data.config->EcuMDefaultAppMode;\r
+#if defined(USE_COMM)\r
+ internal_data.run_comm_requests = 0;\r
+#endif\r
+ internal_data.run_requests = 0;\r
+ internal_data.postrun_requests = 0;\r
\r
internal_data.initiated = TRUE;\r
\r
void EcuM_StartupTwo()\r
{\r
#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
- uint32 timer;\r
+ extern CounterType Os_Arc_OsTickCounter;\r
+ TickType tickTimerStart, tickTimer, tickTimerElapsed;\r
+ StatusType tickTimerStatus;\r
+ static NvM_RequestResultType readAllResult;\r
#endif\r
\r
internal_data.current_state = ECUM_STATE_STARTUP_TWO;\r
\r
#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
// Start timer to wait for NVM job to complete\r
- timer = Os_SysTickGetValue();\r
+ tickTimerStatus = GetCounterValue(Os_Arc_OsTickCounter , &tickTimerStart);\r
+ if (tickTimerStatus != E_OK) {\r
+ // TODO: Generate error?\r
+ }\r
#endif\r
\r
// Prepare the system to startup RTE\r
#endif\r
\r
#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
- // Wait for the NVM job to terminate\r
- while(Os_SysTickGetValue()-timer < internal_data.config.EcuMNvramReadAllTimeout)\r
- {\r
- //TODO\r
- }\r
+ // Wait for the NVM job (NvmReadAll) to terminate\r
+ do {\r
+ NvM_GetErrorStatus(0, &readAllResult); // Read the multiblock status\r
+ tickTimer = tickTimerStart; // Save this because the GetElapsedCounterValue() will destroy it.\r
+ tickTimerStatus = GetElapsedCounterValue(Os_Arc_OsTickCounter, &tickTimer, &tickTimerElapsed);\r
+ if (tickTimerStatus != E_OK) {\r
+ // TODO: Generate error?\r
+ }\r
+ } while( (readAllResult == NVM_REQ_PENDING) && (tickTimerElapsed < internal_data.config->EcuMNvramReadAllTimeout) );\r
#endif\r
\r
// Initialize drivers that need NVRAM data\r
\r
// Indicate mode change to RTE\r
// TODO\r
+\r
+ // If coming from startup sequence, enter Run mode\r
+// if (internal_data.current_state == ECUM_STATE_STARTUP_TWO)\r
+ EcuM_enter_run_mode();\r
+\r
}\r
\r
// Typically called from OS shutdown hook\r
\r
Std_ReturnType EcuM_GetState(EcuM_StateType* state)\r
{\r
-#if (ECUM_DEV_ERROR_DETECT == STD_ON)\r
- if (state == NULL)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_GETSTATE_ID, ECUM_E_NULL_POINTER);\r
- return E_NOT_OK;\r
- }\r
-#endif\r
+ VALIDATE_RV(state != NULL, ECUM_GETSTATE_ID, ECUM_E_NULL_POINTER, E_NOT_OK);\r
\r
*state = internal_data.current_state;\r
\r
\r
Std_ReturnType EcuM_SelectApplicationMode(AppModeType appMode)\r
{\r
-#if (ECUM_DEV_ERROR_DETECT == STD_ON)\r
- if (!internal_data.initiated)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_SELECTAPPMODE_ID, ECUM_E_NOT_INITIATED);\r
- return E_NOT_OK;\r
- }\r
-#endif\r
+ VALIDATE_RV(internal_data.initiated, ECUM_SELECTAPPMODE_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
\r
// TODO Save this application mode for next startup\r
\r
\r
Std_ReturnType EcuM_GetApplicationMode(AppModeType* appMode)\r
{\r
-#if (ECUM_DEV_ERROR_DETECT == STD_ON)\r
- if (!internal_data.initiated)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_GETAPPMODE_ID, ECUM_E_NOT_INITIATED);\r
- return E_NOT_OK;\r
- }\r
-\r
- if (appMode == NULL)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_GETAPPMODE_ID, ECUM_E_NULL_POINTER);\r
- return E_NOT_OK;\r
- }\r
-#endif\r
+ VALIDATE_RV(internal_data.initiated, ECUM_GETAPPMODE_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(appMode != NULL, ECUM_GETAPPMODE_ID, ECUM_E_NULL_POINTER, E_NOT_OK);\r
\r
*appMode = internal_data.app_mode;\r
\r
\r
Std_ReturnType EcuM_SelectBootTarget(EcuM_BootTargetType target)\r
{\r
-#if (ECUM_DEV_ERROR_DETECT == STD_ON)\r
- if (!internal_data.initiated)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_SELECT_BOOTARGET_ID, ECUM_E_NOT_INITIATED);\r
- return E_NOT_OK;\r
- }\r
-#endif\r
+ VALIDATE_RV(internal_data.initiated, ECUM_SELECT_BOOTARGET_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
\r
// TODO Do something great here\r
\r
\r
Std_ReturnType EcuM_GetBootTarget(EcuM_BootTargetType* target)\r
{\r
-#if (ECUM_DEV_ERROR_DETECT == STD_ON)\r
- if (!internal_data.initiated)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_GET_BOOTARGET_ID, ECUM_E_NOT_INITIATED);\r
- return E_NOT_OK;\r
- }\r
-\r
- if (target == NULL)\r
- {\r
- Det_ReportError(MODULE_ID_ECUM, 1, ECUM_GET_BOOTARGET_ID, ECUM_E_NULL_POINTER);\r
- return E_NOT_OK;\r
- }\r
-#endif\r
+ VALIDATE_RV(internal_data.initiated, ECUM_GET_BOOTARGET_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(target != NULL, ECUM_GET_BOOTARGET_ID, ECUM_E_NULL_POINTER, E_NOT_OK);\r
\r
// TODO Return selected boot target here\r
\r
return E_NOT_OK;\r
}\r
+\r
+\r
+Std_ReturnType EcuM_SelectShutdownTarget(EcuM_StateType target, uint8 mode)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_SELECTSHUTDOWNTARGET_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV((target == ECUM_STATE_OFF) || (target == ECUM_STATE_RESET) || (target == ECUM_STATE_SLEEP), ECUM_SELECTSHUTDOWNTARGET_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.shutdown_target = target;\r
+ internal_data.shutdown_mode = mode;\r
+\r
+ return E_OK;\r
+}\r
+\r
+\r
+Std_ReturnType EcuM_GetShutdownTarget(EcuM_StateType *shutdownTarget, uint8 *sleepMode)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_GETSHUTDOWNTARGET_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+\r
+ *shutdownTarget = internal_data.shutdown_target;\r
+ *sleepMode = internal_data.shutdown_mode;\r
+\r
+ return E_OK;\r
+}\r
+\r
+\r
+Std_ReturnType EcuM_RequestRUN(EcuM_UserType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_REQUESTRUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < ECUM_USER_ENDMARK, ECUM_REQUESTRUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.run_requests |= (uint32)1 << user;\r
+\r
+ return E_OK;\r
+}\r
+\r
+Std_ReturnType EcuM_ReleaseRUN(EcuM_UserType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_RELEASERUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < ECUM_USER_ENDMARK, ECUM_RELEASERUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.run_requests &= ~((uint32)1 << user);\r
+\r
+ return E_OK;\r
+}\r
+\r
+#if defined(USE_COMM)\r
+Std_ReturnType EcuM_ComM_RequestRUN(NetworkHandleType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_COMM_REQUESTRUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < 32, ECUM_COMM_REQUESTRUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.run_comm_requests |= (uint32)1 << user;\r
+\r
+ return E_OK;\r
+}\r
+\r
+Std_ReturnType EcuM_ComM_ReleaseRUN(NetworkHandleType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_COMM_RELEASERUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < 32, ECUM_COMM_RELEASERUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.run_comm_requests &= ~((uint32)1 << user);\r
+\r
+ return E_OK;\r
+}\r
+\r
+boolean EcuM_ComM_HasRequestedRUN(NetworkHandleType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_COMM_HASREQUESTEDRUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < 32, ECUM_COMM_HASREQUESTEDRUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ return (internal_data.run_comm_requests &((uint32)1 << user)) != 0;\r
+}\r
+#endif\r
+\r
+Std_ReturnType EcuM_RequestPOST_RUN(EcuM_UserType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_REQUESTPOSTRUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < ECUM_USER_ENDMARK, ECUM_REQUESTPOSTRUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.postrun_requests |= (uint32)1 << user;\r
+\r
+ return E_OK;\r
+}\r
+\r
+Std_ReturnType EcuM_ReleasePOST_RUN(EcuM_UserType user)\r
+{\r
+ VALIDATE_RV(internal_data.initiated, ECUM_RELEASEPOSTRUN_ID, ECUM_E_NOT_INITIATED, E_NOT_OK);\r
+ VALIDATE_RV(user < ECUM_USER_ENDMARK, ECUM_RELEASEPOSTRUN_ID, ECUM_E_INVALID_PAR, E_NOT_OK);\r
+\r
+ internal_data.postrun_requests &= ~((uint32)1 << user);\r
+\r
+ return E_OK;\r
+}\r
+\r