diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-27 00:04:27 +0100 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-27 00:04:27 +0100 |
commit | 30306a42972f6a414e8b23e7942fd77f74af80db (patch) | |
tree | af2e4d41c44af061e1e0b0069ec92e7107499e79 | |
parent | 369a614802c835510bf20ab2b2aa3ce35050c020 (diff) |
Adding the osdebug mechanism into arch and FreeRTOS, essentially closing the circle of dependancy between all 3 libraries. Also, turning the debugging on by default.
-rw-r--r-- | FreeRTOS/Makefile | 1 | ||||
-rw-r--r-- | arch/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/lpc17xx/hooks.c | 20 | ||||
-rw-r--r-- | config/general.mk | 5 |
4 files changed, 23 insertions, 4 deletions
diff --git a/FreeRTOS/Makefile b/FreeRTOS/Makefile index 90a54da..7c8149d 100644 --- a/FreeRTOS/Makefile +++ b/FreeRTOS/Makefile @@ -5,6 +5,7 @@ all: $(TARGET_LIB) include $(ROOTDIR)/common.mk include config.mk include $(ROOTDIR)/arch/config.mk +include $(ROOTDIR)/os/config.mk TARGET_SRCS = Source/croutine.c Source/list.c Source/queue.c Source/tasks.c diff --git a/arch/Makefile b/arch/Makefile index f8e69d4..708476b 100644 --- a/arch/Makefile +++ b/arch/Makefile @@ -5,6 +5,7 @@ all: $(TARGET_LIB) include $(ROOTDIR)/common.mk include config.mk include $(ROOTDIR)/FreeRTOS/config.mk +include $(ROOTDIR)/os/config.mk ifeq ($(CPU),arm) ifeq ($(CPU_FLAVOR),lpc1768) diff --git a/arch/arm/lpc17xx/hooks.c b/arch/arm/lpc17xx/hooks.c index 8230d15..5aeb335 100644 --- a/arch/arm/lpc17xx/hooks.c +++ b/arch/arm/lpc17xx/hooks.c @@ -1,7 +1,19 @@ #include "FreeRTOS.h" #include "task.h" +#include "osdebug.h" -void vConfigureTimerForRunTimeStats() { } -void vApplicationTickHook() { } -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) { } -void vApplicationIdleHook() { } +void vConfigureTimerForRunTimeStats() { + DBGOUT("vConfigureTimerForRunTimeStats()\r\n"); +} + +void vApplicationTickHook() { + DBGOUT("vApplicationTickHook()\r\n"); +} + +void vApplicationStackOverflowHook(xTaskHandle *pxTask, signed portCHAR *pcTaskName) { + DBGOUT("vApplicationStackOverflowHook(%p, %s)\r\n", pxTask, pcTaskName); +} + +void vApplicationIdleHook() { + DBGOUT("vApplicationIdleHook()\r\n"); +} diff --git a/config/general.mk b/config/general.mk index cd50fdc..293db96 100644 --- a/config/general.mk +++ b/config/general.mk @@ -1,5 +1,10 @@ VERBOSE = false +DEBUG = true ifneq ($(VERBOSE),true) MAKE_OPTS = --no-print-directory -s endif + +ifeq ($(DEBUG),true) +TARGET_CPPFLAGS += -DFULLDEBUG +endif
\ No newline at end of file |