summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-02-02 14:56:18 -0800
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-02-02 14:56:18 -0800
commite2d292afdb43cd7d9391128563384e1edd53c52e (patch)
treee7577826c4a9e94e863556a1e9b721e55680ab88
parent5c70974a399515fe5173c87c1e22c81bbbb2c1ab (diff)
Moving the hooks into the os directory, where they belong.
-rw-r--r--arch/Makefile2
-rw-r--r--os/Makefile1
-rw-r--r--os/src/hooks.c (renamed from arch/arm/lpc17xx/hooks.c)4
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/Makefile b/arch/Makefile
index a326af1..e8fcf20 100644
--- a/arch/Makefile
+++ b/arch/Makefile
@@ -12,7 +12,7 @@ TARGET_SRCS += arm/src/angel.s
ifeq ($(CPU_FLAVOR),lpc1768)
TARGET_SRCS += arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c arm/lpc17xx/Core/CM3/CoreSupport/core_cm3.c
TARGET_SRCS += $(addprefix arm/lpc17xx/Drivers/source/lpc17xx_, spi.c rit.c exti.c wdt.c uart.c dac.c rtc.c i2s.c pwm.c mcpwm.c pinsel.c nvic.c emac.c systick.c ssp.c can.c gpio.c libcfg_default.c i2c.c timer.c gpdma.c clkpwr.c qei.c adc.c)
-TARGET_SRCS += arm/lpc17xx/startup.s arm/lpc17xx/deinit-all.c arm/lpc17xx/handlers.c arm/lpc17xx/hooks.c arm/lpc17xx/Drivers/source/debug_frmwrk.c arm/lpc17xx/mbed/BoardConsole.c arm/lpc17xx/mbed/BoardInit.c
+TARGET_SRCS += arm/lpc17xx/startup.s arm/lpc17xx/deinit-all.c arm/lpc17xx/handlers.c arm/lpc17xx/Drivers/source/debug_frmwrk.c arm/lpc17xx/mbed/BoardConsole.c arm/lpc17xx/mbed/BoardInit.c
endif
endif
diff --git a/os/Makefile b/os/Makefile
index d7d0419..37dbf56 100644
--- a/os/Makefile
+++ b/os/Makefile
@@ -9,6 +9,7 @@ include $(ROOTDIR)/arch/config.mk
TARGET_SRCS = \
src/init.c \
+src/hooks.c \
\
src/filesystem.c \
src/fio.c \
diff --git a/arch/arm/lpc17xx/hooks.c b/os/src/hooks.c
index 1689db9..2e18577 100644
--- a/arch/arm/lpc17xx/hooks.c
+++ b/os/src/hooks.c
@@ -1,5 +1,5 @@
-#include "FreeRTOS.h"
-#include "task.h"
+#include <FreeRTOS.h>
+#include <task.h>
#include "osdebug.h"
void vConfigureTimerForRunTimeStats() {