-
-# Our object files
-obj-y += blinker_main.o
-obj-y += Tasks.o
-obj-y += Hooks.o
-obj-y += Rte.o
-
-# OS object files.
-obj-y += Os_Cfg.o
-# Board object files
-include $(ROOTDIR)/boards/board_common.mk
-
-ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
-
-# The more precise configuration, the higher preceedance.
-VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
-inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-inc-y += $(ROOTDIR)/system/kernel/include
-
-#TODO: Remove?, Build other way?
-VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
-inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
-VPATH += $(ROOTDIR)/components/blinker
-inc-y += $(ROOTDIR)/components/blinker
-
-
-# libs needed by us
-#libitem-y +=
-
-#linkfile
-ldcmdfile-y = linkscript_gcc.ldp
-vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
-
-# What I want to build
-build-exe-y = blinker_node.elf
-
-
-
-
-
+\r
+# Our object files\r
+obj-y += blinker_main.o\r
+obj-y += Tasks.o\r
+obj-y += Hooks.o\r
+obj-y += Rte.o\r
+\r
- VPATH += ..\r
- \r
+# OS object files.\r
+obj-y += Os_Cfg.o\r
+# Board object files\r
+include $(ROOTDIR)/boards/board_common.mk\r
+\r
+ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))\r
+\r
+# The more precise configuration, the higher preceedance.\r
+VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+\r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+inc-y += $(ROOTDIR)/system/kernel/include\r
+\r
+#TODO: Remove?, Build other way?\r
- VPATH += ../Rte\r
- inc-y += ../Rte\r
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte\r
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte\r
+VPATH += $(ROOTDIR)/components/blinker\r
+inc-y += $(ROOTDIR)/components/blinker\r
+\r
- $(warning ROOTDIR: $(ROOTDIR))\r
- $(warning SUBDIR: $(SUBDIR))\r
- $(warning VPATH: $(VPATH))\r
+\r
+# libs needed by us \r
+#libitem-y +=\r
+\r
+#linkfile\r
+ldcmdfile-y = linkscript_gcc.ldp\r
+vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+\r
+# What I want to build\r
+build-exe-y = blinker_node.elf\r
+\r
+\r
+\r
+\r
+\r
+-include ../config/*.mk\r
+-include ../config/$(BOARDDIR)/*.mk\r
\r
- MOD_USE+=KERNEL MCU PORT PWM\r
+ -include ../config/*.mk\r
+ -include ../config/$(BOARDDIR)/*.mk\r
\r
- SELECT_CONSOLE = RAMLOG\r
- SELECT_OS_CONSOLE = RAMLOG\r
+ MOD_USE+=KERNEL MCU ECUM NEWLIB COMMON DET PORT PWM RAMLOG\r
-
-# Our object files
-obj-y += pwm_sine_main.o
-obj-y += Tasks.o
-obj-y += Hooks.o
-obj-y += Rte.o
-
-# OS object files.
-obj-y += Os_Cfg.o
-# Board object files
-include $(ROOTDIR)/boards/board_common.mk
-
-ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
-
-# The more precise configuration, the higher preceedance.
-VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
-inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
-
-
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-inc-y += $(ROOTDIR)/system/kernel/include
-
-#TODO: Remove?, Build other way?
-VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
-inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
-VPATH += $(ROOTDIR)/components/pwm_sine
-inc-y += $(ROOTDIR)/components/pwm_sine
-
-
-# libs needed by us
-#libitem-y +=
-
-#linkfile
-ldcmdfile-y = linkscript_gcc.ldp
-vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
-
-# What I want to build
-build-exe-y = pwm_node.elf
-
-
-
-
-
+\r
+# Our object files\r
+obj-y += pwm_sine_main.o\r
+obj-y += Tasks.o\r
+obj-y += Hooks.o\r
+obj-y += Rte.o\r
+\r
- VPATH += ..\r
- \r
+# OS object files.\r
+obj-y += Os_Cfg.o\r
+# Board object files\r
+include $(ROOTDIR)/boards/board_common.mk\r
+\r
+ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))\r
+\r
+# The more precise configuration, the higher preceedance.\r
+VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+\r
+\r
+\r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+inc-y += $(ROOTDIR)/system/kernel/include\r
+\r
+#TODO: Remove?, Build other way?\r
- VPATH += ../Rte\r
- inc-y += ../Rte\r
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte\r
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte\r
+VPATH += $(ROOTDIR)/components/pwm_sine\r
+inc-y += $(ROOTDIR)/components/pwm_sine\r
+\r
+\r
+# libs needed by us \r
+#libitem-y +=\r
+\r
+#linkfile\r
+ldcmdfile-y = linkscript_gcc.ldp\r
+vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+\r
+# What I want to build\r
+build-exe-y = pwm_node.elf\r
+\r
+\r
+\r
+\r
+\r
-
-# Our object files
-obj-y += pwm_node2_helpers.o
-obj-y += fading_led.o
-obj-y += Rte.o
-obj-y += Tasks.o
-obj-y += Hooks.o
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-inc-y += $(ROOTDIR)/system/kernel/include
-
-# OS object files.
-obj-y += Os_Cfg.o
-# Board object files
-include $(ROOTDIR)/boards/board_common.mk
-
-ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
-
-# The more precise configuration, the higher preceedance.
-VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
-inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-
-#TODO: Remove?, Build other way?
-VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
-inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
-VPATH += $(ROOTDIR)/components/fading_led
-inc-y += $(ROOTDIR)/components/fading_led
-
-
-# libs needed by us
-#libitem-y +=
-
-#linkfile
-ldcmdfile-y = linkscript_gcc.ldp
-vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
-
-# What I want to build
-build-exe-y = pwm_node2.elf
-
-
-
-
-
+\r
+# Our object files\r
+obj-y += pwm_node2_helpers.o\r
+obj-y += fading_led.o\r
+obj-y += Rte.o\r
+obj-y += Tasks.o\r
+obj-y += Hooks.o\r
+\r
- VPATH += ..\r
- \r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+inc-y += $(ROOTDIR)/system/kernel/include\r
+\r
+# OS object files.\r
+obj-y += Os_Cfg.o\r
+# Board object files\r
+include $(ROOTDIR)/boards/board_common.mk\r
+\r
+ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))\r
+\r
+# The more precise configuration, the higher preceedance.\r
+VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+\r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+\r
+#TODO: Remove?, Build other way?\r
- VPATH += ../Rte\r
- inc-y += ../Rte\r
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte\r
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte\r
+VPATH += $(ROOTDIR)/components/fading_led\r
+inc-y += $(ROOTDIR)/components/fading_led\r
+\r
+\r
+# libs needed by us \r
+#libitem-y +=\r
+\r
+#linkfile\r
+ldcmdfile-y = linkscript_gcc.ldp\r
+vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+\r
+# What I want to build\r
+build-exe-y = pwm_node2.elf\r
+\r
+\r
+\r
+\r
+\r
+-include ../config/*.mk\r
+-include ../config/$(BOARDDIR)/*.mk\r
\r
- MOD_USE+=KERNEL MCU\r
+ -include ../config/*.mk\r
+ -include ../config/$(BOARDDIR)/*.mk\r
\r
- SELECT_CONSOLE = RAMLOG\r
- SELECT_OS_CONSOLE = RAMLOG\r
+ MOD_USE+= COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG \r
\r
- def-y += CFG_RAMLOG_SIZE=1024\r
- def-y += HEAPSIZE=1400
+ #def-y += NDEBUG\r
+ #def-y += HEAPSIZE=1400
-
-# Our object files
-obj-y += switch_node_helpers.o
-obj-y += switch.o
-obj-y += Rte.o
-obj-y += Tasks.o
-obj-y += Hooks.o
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-inc-y += $(ROOTDIR)/system/kernel/include
-
-# OS object files.
-obj-y += Os_Cfg.o
-# Board object files
-include $(ROOTDIR)/boards/board_common.mk
-
-ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
-
-# The more precise configuration, the higher preceedance.
-VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
-inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
-
-inc-y += $(ROOTDIR)/system/kernel/$(objdir)
-
-#TODO: Remove?, Build other way?
-VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
-inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
-VPATH += $(ROOTDIR)/components/switch
-inc-y += $(ROOTDIR)/components/switch
-
-
-# libs needed by us
-#libitem-y +=
-
-#linkfile
-ldcmdfile-y = linkscript_gcc.ldp
-vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
-
-# What I want to build
-build-exe-y = switch_node.elf
-
-
-
-
-
+\r
+# Our object files\r
+obj-y += switch_node_helpers.o\r
+obj-y += switch.o\r
+obj-y += Rte.o\r
+obj-y += Tasks.o\r
+obj-y += Hooks.o\r
+\r
- VPATH += ..\r
- \r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+inc-y += $(ROOTDIR)/system/kernel/include\r
+\r
+# OS object files.\r
+obj-y += Os_Cfg.o\r
+# Board object files\r
+include $(ROOTDIR)/boards/board_common.mk\r
+\r
+ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))\r
+\r
+# The more precise configuration, the higher preceedance.\r
+VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+\r
+inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+\r
+#TODO: Remove?, Build other way?\r
- VPATH += ../Rte\r
- inc-y += ../Rte\r
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte\r
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte\r
+VPATH += $(ROOTDIR)/components/switch\r
+inc-y += $(ROOTDIR)/components/switch\r
+\r
+\r
+# libs needed by us \r
+#libitem-y +=\r
+\r
+#linkfile\r
+ldcmdfile-y = linkscript_gcc.ldp\r
+vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+\r
+# What I want to build\r
+build-exe-y = switch_node.elf\r
+\r
+\r
+\r
+\r
+\r
+-include ../config/*.mk\r
+-include ../config/$(BOARDDIR)/*.mk\r
\r
- MOD_USE+=KERNEL MCU\r
+ -include ../config/*.mk\r
+ -include ../config/$(BOARDDIR)/*.mk\r
+ \r
+ MOD_USE+=COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG \r
\r
SELECT_CONSOLE = RAMLOG\r
SELECT_OS_CONSOLE = RAMLOG\r
\r
def-y += CFG_RAMLOG_SIZE=1024\r
- def-y += HEAPSIZE=400
+ #def-y += HEAPSIZE=400\r
Irq_Disable();\r
Os_IntDisableAllCnt++;\r
/* No nesting allowed */\r
- assert(Os_IntDisableAllCnt>1);\r
+ assert(Os_IntDisableAllCnt==1);\r
}\r
\r
static inline void EnableAllInterrupts( void ) {\r
int OsGptChannelRef;\r
} OsDriver;\r
\r
- /*-------------------------------------------------------------------\r
- * Free running timer\r
- *-----------------------------------------------------------------*/\r
- typedef const uint32 OsTickType;\r
- void Os_SysTickInit( void );\r
- void Os_SysTickStart(uint32_t period_ticks);\r
- uint32_t Os_SysTickGetTimeElapsed( void );\r
+ \r
\r
/*-------------------------------------------------------------------\r
* Counters\r
StatusType GetCounterValue( CounterType, TickRefType );\r
StatusType GetElapsedCounterValue( CounterType, TickRefType val, TickRefType elapsed_val);\r
\r
+ \r
+ /*-------------------------------------------------------------------\r
+ * System timer\r
+ *-----------------------------------------------------------------*/\r
+ typedef const uint32 OsTickType;\r
+ void Os_SysTickInit( void );\r
+ void Os_SysTickStart(TickType period_ticks);\r
+ TickType Os_SysTickGetValue( void );\r
+ TickType Os_SysTickGetElapsedValue( TickType preValue );\r
+ \r
/*-------------------------------------------------------------------\r
* Schedule Tables\r
*-----------------------------------------------------------------*/\r
OSServiceId_GetTaskState,\r
} OsServiceIdType;;\r
\r
- typedef struct os_error_s {\r
+ typedef struct OsError {\r
OsServiceIdType serviceId;\r
uint32_t param1;\r
uint32_t param2;\r
uint32_t param3;\r
- } os_error_t;\r
+ } OsErrorType;\r
\r
- extern os_error_t os_error;\r
+ extern OsErrorType os_error;\r
\r
// TODO: Add the service id to all OS service methods.\r
static inline OsServiceIdType OSErrorGetServiceId(void) {\r
return os_error.serviceId;\r
}\r
\r
- extern os_error_t os_error;\r
+ extern OsErrorType os_error;\r
\r
#define OSError_ActivateTask_TaskID ((TaskType) os_error.param1)\r
#define OSError_ChainTask_TaskID ((TaskType) os_error.param1)\r
* for more details.\r
* -------------------------------- Arctic Core ------------------------------*/\r
\r
- \r
- \r
- \r
- \r
- \r
- \r
- \r
#include "EcuM.h"\r
#include "Modules.h"\r
#include "string.h"\r
\r
#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
// Start timer to wait for NVM job to complete\r
- timer = Os_SysTickGetTimeElapsed();\r
+ timer = Os_SysTickGetValue();\r
#endif\r
\r
// Prepare the system to startup RTE\r
// TODO EcuM_OnRTEStartup();\r
-\r
- //Rte_Start();\r
+#if defined(USE_RTE)\r
+ Rte_Start();\r
+#endif\r
\r
#if (ECUM_INCLUDE_NVRAM_MGR == STD_ON)\r
// Wait for the NVM job to terminate\r
- while(Os_SysTickGetTimeElapsed()-timer < internal_data.config.EcuMNvramReadAllTimeout)\r
+ while(Os_SysTickGetValue()-timer < internal_data.config.EcuMNvramReadAllTimeout)\r
{\r
//TODO\r
}\r
#obj-y += stack.o\r
obj-y += isr.o\r
obj-y += os_arctest.o\r
+#obj-y += application.o\r
\r
\r
# These are VERY cpu dependent.. remove\r
dep-y += asm_offset.h\r
dep-y += kernel_offset.h\r
dep-$(CFG_ARM_CM3) += arch_offset.h\r
- obj-$(CFG_ARM_CM3) += misc.o\r
\r
\r
# ARM assembler generates "define STACK_APA $12". The extra '$' we want to go.\r
projects / arc.git / commitdiff