git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1401 35acf78f-673a-0410-8e92-d51de3d6d3f4

6 files changed, 116 insertions, 372 deletions

diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile
index 3552537ad..e690b7804 100644
--- a/demos/Win32-MinGW/Makefile
+++ b/demos/Win32-MinGW/Makefile
@@ -57,24 +57,26 @@ UADEFS =
 

 # Imported source files

 CHIBIOS = ../..

+include ${CHIBIOS}/os/hal/hal.mk

+include ${CHIBIOS}/os/hal/platforms/Win32/platform.mk

+include ${CHIBIOS}/os/ports/GCC/SIMIA32/port.mk

 include ${CHIBIOS}/os/kernel/kernel.mk

 include ${CHIBIOS}/test/test.mk

 

 # List C source files here

-SRC  = ${KERNSRC} \

+SRC  = ${PORTSRC} \

+       ${KERNSRC} \

        ${TESTSRC} \

-       chcore.c \

-       ${CHIBIOS}/os/io/serial.c \

-       ${CHIBIOS}/os/io/platforms/Win32/serial_lld.c \

+       ${HALSRC} \

+       ${PLATFORMSRC} \

        main.c

 

 # List ASM source files here

 ASRC =

 

 # List all user directories here

-UINCDIR = $(KERNINC) $(TESTINC) \

-          ${CHIBIOS}/os/io \

-          ${CHIBIOS}/os/io/platforms/Win32

+UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \

+          ${CHIBIOS}/os/various

 

 # List the user directory to look for the libraries here

 ULIBDIR =

diff --git a/demos/Win32-MinGW/chtypes.h b/demos/Win32-MinGW/board.h
index 354da269e..a6e056d58 100644
--- a/demos/Win32-MinGW/chtypes.h
+++ b/demos/Win32-MinGW/board.h
@@ -17,31 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#ifndef _CHTYPES_H_

-#define _CHTYPES_H_

+#ifndef _BOARD_H_

+#define _BOARD_H_

 

-#define __need_NULL

-#define __need_size_t

-#define __need_ptrdiff_t

-#include <stddef.h>

-

-#if !defined(_STDINT_H) && !defined(__STDINT_H_)

-#include <stdint.h>

-#endif

-

-typedef int8_t          bool_t;

-typedef uint8_t         tmode_t;

-typedef uint8_t         tstate_t;

-typedef uint32_t        tprio_t;

-typedef int32_t         msg_t;

-typedef int32_t         eventid_t;

-typedef uint32_t        eventmask_t;

-typedef uint32_t        systime_t;

-typedef int32_t         cnt_t;

-

-#define INLINE      inline

-#define PACK_STRUCT_STRUCT __attribute__((packed))

-#define PACK_STRUCT_BEGIN

-#define PACK_STRUCT_END

-

-#endif /* _CHTYPES_H_ */

+#endif /* _BOARD_H_ */

diff --git a/demos/Win32-MinGW/chcore.c b/demos/Win32-MinGW/chcore.c
deleted file mode 100644
index f0555fab5..000000000
--- a/demos/Win32-MinGW/chcore.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2007 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/>.

-*/

-

-#include <windows.h>

-#include <stdio.h>

-

-#undef CDECL

-

-/**

- * @addtogroup WIN32SIM_CORE

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-

-static LARGE_INTEGER nextcnt;

-static LARGE_INTEGER slice;

-

-/*

- * Simulated HW initialization.

- */

-void InitCore(void) {

-  WSADATA wsaData;

-

-  // Initialization.

-  if (WSAStartup(2, &wsaData) != 0) {

-    printf("Unable to locate a winsock DLL\n");

-    exit(1);

-  }

-

-  printf("Win32 ChibiOS/RT simulator\n\n");

-  printf("Thread structure %d bytes\n", sizeof(Thread));

-  if (!QueryPerformanceFrequency(&slice)) {

-    printf("QueryPerformanceFrequency() error");

-    exit(1);

-  }

-  printf("Core Frequency   %u Hz\n", (int)slice.LowPart);

-  slice.QuadPart /= CH_FREQUENCY;

-  QueryPerformanceCounter(&nextcnt);

-  nextcnt.QuadPart += slice.QuadPart;

-

-  sdInit();

-  fflush(stdout);

-}

-

-/*

- * Interrupt simulation.

- */

-void ChkIntSources(void) {

-  LARGE_INTEGER n;

-

-  if (sd_lld_interrupt_pending()) {

-    if (chSchIsRescRequiredExI())

-      chSchDoRescheduleI();

-    return;

-  }

-

-  // Interrupt Timer simulation (10ms interval).

-  QueryPerformanceCounter(&n);

-  if (n.QuadPart > nextcnt.QuadPart) {

-    nextcnt.QuadPart += slice.QuadPart;

-    chSysTimerHandlerI();

-    if (chSchIsRescRequiredExI())

-      chSchDoRescheduleI();

-  }

-}

-

-/**

- * Performs a context switch between two threads.

- * @param otp the thread to be switched out

- * @param ntp the thread to be switched in
- */

-__attribute__((used))

-static void __dummy(Thread *otp, Thread *ntp) {

-  (void)otp; (void)ntp;

-  asm volatile (".globl @port_switch@8                          \n\t" \

-                "@port_switch@8:                                \n\t" \

-                "push    %ebp                                   \n\t" \

-                "push    %esi                                   \n\t" \

-                "push    %edi                                   \n\t" \

-                "push    %ebx                                   \n\t" \

-                "movl    %esp, 16(%ecx)                         \n\t" \

-                "movl    16(%edx), %esp                         \n\t" \

-                "pop     %ebx                                   \n\t" \

-                "pop     %edi                                   \n\t" \

-                "pop     %esi                                   \n\t" \

-                "pop     %ebp                                   \n\t" \

-                "ret");

-}

-

-/**

- * Halts the system. In this implementation it just exits the simulation.
- */

-__attribute__((fastcall))

-void port_halt(void) {

-

-  exit(2);

-}

-

-/**

- * Threads return point, it just invokes @p chThdExit().
- */

-void threadexit(void) {

-

-  asm volatile ("push    %eax                                   \n\t" \

-                "call    _chThdExit");

-}

-

-/** @} */

diff --git a/demos/Win32-MinGW/chcore.h b/demos/Win32-MinGW/chcore.h
deleted file mode 100644
index fdeb245fb..000000000
--- a/demos/Win32-MinGW/chcore.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2007 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/>.

-*/

-

-/**

- * @addtogroup WIN32SIM_CORE

- * @{

- */

-

-#ifndef _CHCORE_H_

-#define _CHCORE_H_

-

-/**

- * Macro defining the a simulated architecture into Win32.

- */

-#define CH_ARCHITECTURE_WIN32SIM

-

-/**

- * Name of the implemented architecture.

- */

-#define CH_ARCHITECTURE_NAME "WIN32 Simulator"

-

-/**

- * 32 bit stack alignment.

- */

-typedef uint32_t stkalign_t;

-

-/**

- * Generic x86 register.
- */

-typedef void *regx86;

-

-/**

- * Interrupt saved context.

- * This structure represents the stack frame saved during a preemption-capable

- * interrupt handler.

- */

-struct extctx {

-};

-

-/**

- * System saved context.

- * @note In this demo the floating point registers are not saved.

- */

-struct intctx {

-  regx86  ebx;

-  regx86  edi;

-  regx86  esi;

-  regx86  ebp;

-  regx86  eip;

-};

-

-/**

- * Platform dependent part of the @p Thread structure.

- * This structure usually contains just the saved stack pointer defined as a

- * pointer to a @p intctx structure.

- */

-struct context {

-  struct intctx volatile *esp;

-};

-

-#define APUSH(p, a) (p) -= sizeof(void *), *(void **)(p) = (void*)(a)

-

-/**

- * Platform dependent part of the @p chThdInit() API.

- * This code usually setup the context switching frame represented by a

- * @p intctx structure.

- */

-#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                      \

-  uint8_t *esp = (uint8_t *)workspace + wsize;                          \

-  APUSH(esp, arg);                                                      \

-  APUSH(esp, threadexit);                                               \

-  esp -= sizeof(struct intctx);                                         \

-  ((struct intctx *)esp)->eip = pf;                                     \

-  ((struct intctx *)esp)->ebx = 0;                                      \

-  ((struct intctx *)esp)->edi = 0;                                      \

-  ((struct intctx *)esp)->esi = 0;                                      \

-  ((struct intctx *)esp)->ebp = 0;                                      \

-  tp->p_ctx.esp = (struct intctx *)esp;                                 \

-}

-

-/**

- * Stack size for the system idle thread.

- */

-#ifndef IDLE_THREAD_STACK_SIZE

-#define IDLE_THREAD_STACK_SIZE 256

-#endif

-

-/**

- * Per-thread stack overhead for interrupts servicing, it is used in the

- * calculation of the correct working area size.

- * It requires stack space because the simulated "interrupt handlers" invoke

- * Win32 APIs inside so it better have a lot of space.

- */

-#ifndef INT_REQUIRED_STACK

-#define INT_REQUIRED_STACK 16384

-#endif

-

-/**

- * Enforces a correct alignment for a stack area size value.

- */

-#define STACK_ALIGN(n) ((((n) - 1) | (sizeof(stkalign_t) - 1)) + 1)

-

- /**

-  * Computes the thread working area global size.

-  */

-#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \

-                                   sizeof(void *) * 2 +                 \

-                                   sizeof(struct intctx) +              \

-                                   sizeof(struct extctx) +              \

-                                  (n) + (INT_REQUIRED_STACK))

-

-/**

- * Macro used to allocate a thread working area aligned as both position and

- * size.

- */

-#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)];

-

-/**

- * IRQ prologue code, inserted at the start of all IRQ handlers enabled to

- * invoke system APIs.
- */

-#define PORT_IRQ_PROLOGUE()

-

-/**

- * IRQ epilogue code, inserted at the end of all IRQ handlers enabled to

- * invoke system APIs.

- */

-#define PORT_IRQ_EPILOGUE()

-

-/**

- * IRQ handler function declaration.

- */

-#define PORT_IRQ_HANDLER(id) void id(void)

-

-/**

- * Simulator initialization.

- */

-#define port_init() InitCore()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_lock()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_unlock()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_lock_from_isr()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_unlock_from_isr()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_disable()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_suspend()

-

-/**

- * Does nothing in this simulator.

- */

-#define port_enable()

-

-/**

- * In the simulator this does a polling pass on the simulated interrupt

- * sources.

- */

-#define port_wait_for_interrupt() ChkIntSources()

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  __attribute__((fastcall)) void port_switch(Thread *otp, Thread *ntp);

-  __attribute__((fastcall)) void port_halt(void);

-  void InitCore(void);

-  void ChkIntSources(void);

-  void threadexit(void);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _CHCORE_H_ */

-

-/** @} */

diff --git a/demos/Win32-MinGW/halconf.h b/demos/Win32-MinGW/halconf.h
new file mode 100644
index 000000000..a3d17a3c9
--- /dev/null
+++ b/demos/Win32-MinGW/halconf.h
@@ -0,0 +1,96 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 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/>.

+*/

+

+/**

+ * @file templates/halconf.h

+ * @brief HAL configuration header.

+ * @addtogroup HAL_CONF

+ * @{

+ */

+

+/*

+ * HAL configuration file, this file allows to enable or disable the various

+ * device drivers from your application. You may also use this file in order

+ * to change the device drivers settings found in the low level drivers

+ * headers, just define here the new settings and those will override the

+ * defaults defined in the LLD headers.
+ */

+

+#ifndef _HALCONF_H_

+#define _HALCONF_H_

+

+/**

+ * @brief Enables the PAL subsystem.
+ */

+#if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

+#define CH_HAL_USE_PAL                  FALSE

+#endif

+

+/**

+ * @brief Enables the ADC subsystem.

+ */

+#if !defined(CH_HAL_USE_ADC) || defined(__DOXYGEN__)

+#define CH_HAL_USE_ADC                  FALSE

+#endif

+

+/**

+ * @brief Enables the CAN subsystem.

+ */

+#if !defined(CH_HAL_USE_CAN) || defined(__DOXYGEN__)

+#define CH_HAL_USE_CAN                  FALSE

+#endif

+

+/**

+ * @brief Enables the MAC subsystem.

+ */

+#if !defined(CH_HAL_USE_MAC) || defined(__DOXYGEN__)

+#define CH_HAL_USE_MAC                  FALSE

+#endif

+

+/**

+ * @brief Enables the PWM subsystem.

+ */

+#if !defined(CH_HAL_USE_PWM) || defined(__DOXYGEN__)

+#define CH_HAL_USE_PWM                  FALSE

+#endif

+

+/**

+ * @brief Enables the SERIAL subsystem.

+ */

+#if !defined(CH_HAL_USE_SERIAL) || defined(__DOXYGEN__)

+#define CH_HAL_USE_SERIAL               TRUE

+#endif

+

+/**

+ * @brief Enables the SPI subsystem.

+ */

+#if !defined(CH_HAL_USE_SPI) || defined(__DOXYGEN__)

+#define CH_HAL_USE_SPI                  FALSE

+#endif

+

+/**

+ * @brief Enables the MMC_SPI subsystem.

+ */

+#if !defined(CH_HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

+#define CH_HAL_USE_MMC_SPI              FALSE

+#endif

+

+#endif /* _HALCONF_H_ */

+

+/** @} */

diff --git a/demos/Win32-MinGW/main.c b/demos/Win32-MinGW/main.c
index 7f081c023..2b0c5ea15 100644
--- a/demos/Win32-MinGW/main.c
+++ b/demos/Win32-MinGW/main.c
@@ -290,7 +290,14 @@ static evhandler_t fhandlers[2] = {
 int main(void) {

   EventListener c1fel, c2fel;

 

-  // Startup ChibiOS/RT.

+  /*

+   * HAL initialization.

+   */

+  halInit();

+

+  /*

+   * ChibiOS/RT initialization.

+   */

   chSysInit();

 

   sdStart(&SD1, NULL);