aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-06-12 13:26:28 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-06-12 13:26:28 +0000
commite4b51ee2faffa35695ffcfbf3abf4f7f1afb94c7 (patch)
tree9d1b96c46ed9c51d64c704fb2c79d74e1687f473 /demos
parent8dfb201307bbf8502e257952f0d6295c08f41ab6 (diff)
downloadChibiOS-e4b51ee2faffa35695ffcfbf3abf4f7f1afb94c7.tar.gz
ChibiOS-e4b51ee2faffa35695ffcfbf3abf4f7f1afb94c7.tar.bz2
ChibiOS-e4b51ee2faffa35695ffcfbf3abf4f7f1afb94c7.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5841 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/PPC-SPC560D-GCC/Makefile14
-rw-r--r--demos/PPC-SPC560D-GCC/main.c8
2 files changed, 11 insertions, 11 deletions
diff --git a/demos/PPC-SPC560D-GCC/Makefile b/demos/PPC-SPC560D-GCC/Makefile
index 9281f6da3..04251c605 100644
--- a/demos/PPC-SPC560D-GCC/Makefile
+++ b/demos/PPC-SPC560D-GCC/Makefile
@@ -51,12 +51,12 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-#include $(CHIBIOS)/boards/ST_EVB_SPC560D/board.mk
-#include $(CHIBIOS)/os/hal/platforms/SPC560Dxx/platform.mk
-#include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC560D/board.mk
+include $(CHIBIOS)/os/hal/platforms/SPC560Dxx/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Dxx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
-#include $(CHIBIOS)/test/test.mk
+include $(CHIBIOS)/test/test.mk
# Define linker script file here
LDSCRIPT= $(PORTLD)/SPC560D40.ld
@@ -68,10 +68,10 @@ CSRC = $(PORTSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
+ $(CHIBIOS)/os/various/evtimer.c \
+ $(CHIBIOS)/os/various/shell.c \
+ $(CHIBIOS)/os/various/chprintf.c \
main.c
-# $(CHIBIOS)/os/various/evtimer.c \
-# $(CHIBIOS)/os/various/shell.c \
-# $(CHIBIOS)/os/various/chprintf.c \
# C++ sources here.
CPPSRC =
diff --git a/demos/PPC-SPC560D-GCC/main.c b/demos/PPC-SPC560D-GCC/main.c
index 7b2192138..b98716e94 100644
--- a/demos/PPC-SPC560D-GCC/main.c
+++ b/demos/PPC-SPC560D-GCC/main.c
@@ -86,6 +86,7 @@ static const ShellConfig shell_cfg1 = {
(BaseSequentialStream *)&SD1,
commands
};
+#endif
/*
* LEDs blinker thread, times are in milliseconds.
@@ -156,7 +157,6 @@ static msg_t Thread1(void *arg) {
}
return 0;
}
-#endif
/*
* Application entry point.
@@ -171,18 +171,18 @@ int main(void) {
* - Kernel initialization, the main() function becomes a thread and the
* RTOS is active.
*/
-// halInit();
+ halInit();
chSysInit();
/*
* Activates the serial driver 1 using the driver default configuration.
*/
-// sdStart(&SD1, NULL);
+ sdStart(&SD1, NULL);
/*
* Creates the blinker thread.
*/
-// chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
+ chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
/*
* Normal main() thread activity.