aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-12-19 11:28:21 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-12-19 11:28:21 +0000
commit4ede72e0aa52fc11f06ef945a96f9843a5a790e4 (patch)
tree1d48c127a5407a855ec73bc75d21401fe3753622
parente3a932e0e64d54c083e534541ac1ab36c4b82046 (diff)
downloadChibiOS-4ede72e0aa52fc11f06ef945a96f9843a5a790e4.tar.gz
ChibiOS-4ede72e0aa52fc11f06ef945a96f9843a5a790e4.tar.bz2
ChibiOS-4ede72e0aa52fc11f06ef945a96f9843a5a790e4.zip
Coverage tool updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2506 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--test/coverage/Makefile7
-rw-r--r--test/coverage/board.h23
-rw-r--r--test/coverage/main.c7
3 files changed, 12 insertions, 25 deletions
diff --git a/test/coverage/Makefile b/test/coverage/Makefile
index 91ceacc01..df99c931c 100644
--- a/test/coverage/Makefile
+++ b/test/coverage/Makefile
@@ -58,6 +58,7 @@ UADEFS =
# Imported source files
CHIBIOS = ../..
+include $(CHIBIOS)/boards/simulator/board.mk
include ${CHIBIOS}/os/hal/hal.mk
include ${CHIBIOS}/os/hal/platforms/Win32/platform.mk
include ${CHIBIOS}/os/ports/GCC/SIMIA32/port.mk
@@ -70,6 +71,7 @@ SRC = ${PORTSRC} \
${TESTSRC} \
${HALSRC} \
${PLATFORMSRC} \
+ $(BOARDSRC) \
${CHIBIOS}/os/hal/platforms/Win32/console.c \
main.c
@@ -77,8 +79,9 @@ SRC = ${PORTSRC} \
ASRC =
# List all user directories here
-UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
- ${CHIBIOS}/os/various
+UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHIBIOS)/os/various
# List the user directory to look for the libraries here
ULIBDIR =
diff --git a/test/coverage/board.h b/test/coverage/board.h
deleted file mode 100644
index 7b89d92d0..000000000
--- a/test/coverage/board.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-#endif /* _BOARD_H_ */
diff --git a/test/coverage/main.c b/test/coverage/main.c
index 2f7613a22..b6f1ee696 100644
--- a/test/coverage/main.c
+++ b/test/coverage/main.c
@@ -34,6 +34,13 @@ int main(int argc, char *argv[]) {
(void)argc;
(void)argv;
+ /*
+ * System initializations.
+ * - HAL initialization, this also initializes the configured device drivers
+ * and performs the board-specific initializations.
+ * - Kernel initialization, the main() function becomes a thread and the
+ * RTOS is active.
+ */
halInit();
conInit();
chSysInit();