]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Fixed stub of Os.h and misstyping of EcuM_GlobalType.
authoreija <devnull@localhost>
Fri, 28 Jan 2011 12:56:19 +0000 (13:56 +0100)
committereija <devnull@localhost>
Fri, 28 Jan 2011 12:56:19 +0000 (13:56 +0100)
include/EcuM.h
system/EcuM/EcuM.c
system/EcuM/EcuM_Internals.h

index 06175a208ad969bd7e5aa17594570512174794e2..3b0eb1adf30f5baeca47c6eb3ec702b574cc4b0b 100644 (file)
@@ -24,7 +24,7 @@
 #define ECUM_H_\r
 \r
 #include "Std_Types.h"\r
-#include "Os.h"\r
+#include <Os.h>\r
 #if defined(USE_COM)\r
 #include "ComStack_Types.h"\r
 #endif\r
index cc586c00ab6a40989c54cce6d2d82f93953a41d0..b0ec45fa9842c31b0193533c978b54c2c77adac3 100644 (file)
@@ -18,7 +18,7 @@
 #include "EcuM.h"\r
 #include "Modules.h"\r
 #include <string.h>\r
-#include "Os.h"\r
+#include <Os.h>\r
 #include "EcuM_Internals.h"\r
 #include "EcuM_Cbk.h"\r
 #include "Mcu.h"\r
@@ -31,7 +31,7 @@
 #include "Rte_Main.h"\r
 #endif\r
 \r
-EcuM_GobalType internal_data;\r
+EcuM_GlobalType internal_data;\r
 \r
 void EcuM_Init( void )\r
 {\r
@@ -117,10 +117,10 @@ void EcuM_StartupTwo(void)
                        // 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
        EcuM_AL_DriverInitThree(internal_data.config);\r
+#endif\r
 \r
        // Indicate mode change to RTE\r
        // TODO\r
index 853a96d734348e2ee1aded246da2b319b7caebf0..1727a884912840fd4d8f21a4f86d7bf32eb5b0b2 100644 (file)
@@ -67,9 +67,9 @@ typedef struct
 #endif\r
        uint32 run_requests;\r
        uint32 postrun_requests;\r
-} EcuM_GobalType;\r
+} EcuM_GlobalType;\r
 \r
-extern EcuM_GobalType internal_data;\r
+extern EcuM_GlobalType internal_data;\r
 \r
 void EcuM_enter_run_mode(void);\r
 \r