From e3a932e0e64d54c083e534541ac1ab36c4b82046 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 19 Dec 2010 11:20:30 +0000
Subject: Win32 simulator updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2505 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/Win32-MinGW/Makefile |  5 ++++-
 demos/Win32-MinGW/board.h  | 23 -----------------------
 demos/Win32-MinGW/main.c   | 10 +++++-----
 3 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 demos/Win32-MinGW/board.h

(limited to 'demos')

diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile
index c1a452297..652c60b44 100644
--- a/demos/Win32-MinGW/Makefile
+++ b/demos/Win32-MinGW/Makefile
@@ -57,6 +57,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
@@ -69,6 +70,7 @@ SRC  = ${PORTSRC} \
        ${TESTSRC} \
        ${HALSRC} \
        ${PLATFORMSRC} \
+       $(BOARDSRC) \
        ${CHIBIOS}/os/various/shell.c \
        main.c
 
@@ -76,7 +78,8 @@ SRC  = ${PORTSRC} \
 ASRC =
 
 # List all user directories here
-UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
+UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+          $(HALINC) $(PLATFORMINC) $(BOARDINC) \
           ${CHIBIOS}/os/various
 
 # List the user directory to look for the libraries here
diff --git a/demos/Win32-MinGW/board.h b/demos/Win32-MinGW/board.h
deleted file mode 100644
index 7b89d92d0..000000000
--- a/demos/Win32-MinGW/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/demos/Win32-MinGW/main.c b/demos/Win32-MinGW/main.c
index aa6d29716..9ce9b284a 100644
--- a/demos/Win32-MinGW/main.c
+++ b/demos/Win32-MinGW/main.c
@@ -220,13 +220,13 @@ int main(void) {
   EventListener sd1fel, sd2fel, tel;
 
   /*
-   * HAL initialization.
+   * 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();
-
-  /*
-   * ChibiOS/RT initialization.
-   */
   chSysInit();
 
   /*
-- 
cgit v1.2.3