From 3a90ab685aaae59f242ae31260e67e9125ae78cd Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 1 Oct 2007 17:42:47 +0000 Subject: Preparation for AVR core support. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@27 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/Win32-MinGW/Makefile | 6 +++--- demos/Win32-MinGW/chcore.h | 2 +- demos/Win32-MinGW/chtypes.h | 14 ++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'demos/Win32-MinGW') diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile index b7dc8b024..4ab603d8e 100644 --- a/demos/Win32-MinGW/Makefile +++ b/demos/Win32-MinGW/Makefile @@ -58,9 +58,9 @@ UADEFS = # List C source files here SRC = chcore.c demo.c \ ../../ports/win32/simcom.c \ - ../../src/chinit.c ../../src/chdelta.c ../../src/chschd.c ../../src/chthreads.c \ - ../../src/chsem.c ../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c \ - ../../src/chqueues.c ../../src/chserial.c + ../../src/chinit.c ../../src/chlists.c ../../src/chdelta.c ../../src/chschd.c \ + ../../src/chthreads.c ../../src/chsem.c ../../src/chevents.c ../../src/chmsg.c \ + ../../src/chsleep.c ../../src/chqueues.c ../../src/chserial.c # List ASM source files here ASRC = chcore2.s diff --git a/demos/Win32-MinGW/chcore.h b/demos/Win32-MinGW/chcore.h index b8872c819..7f0021854 100644 --- a/demos/Win32-MinGW/chcore.h +++ b/demos/Win32-MinGW/chcore.h @@ -63,7 +63,7 @@ typedef struct { #define INT_REQUIRED_STACK 0x0 -#define UserStackSize(n) (sizeof(Thread) + sizeof(PTR_EQ) + sizeof(PTR_EQ) + \ +#define UserStackSize(n) (sizeof(Thread) + sizeof(void *) * 2 + \ sizeof(struct stackregs) + (n) + (INT_REQUIRED_STACK)) __attribute__((fastcall)) void chSysHalt(void); diff --git a/demos/Win32-MinGW/chtypes.h b/demos/Win32-MinGW/chtypes.h index 49c7c6c38..803b5ead4 100644 --- a/demos/Win32-MinGW/chtypes.h +++ b/demos/Win32-MinGW/chtypes.h @@ -25,28 +25,22 @@ */ #define BOOL char #define BYTE8 unsigned char +#define SBYTE8 char #define WORD16 short #define UWORD16 unsigned short #define LONG32 int #define ULONG32 unsigned int -#define PTR_EQ int typedef BYTE8 t_tmode; typedef BYTE8 t_tstate; -typedef LONG32 t_prio; -typedef PTR_EQ t_msg; +typedef ULONG32 t_prio; +typedef LONG32 t_msg; typedef LONG32 t_eventid; typedef ULONG32 t_eventmask; typedef ULONG32 t_time; -typedef LONG32 t_semcnt; +typedef LONG32 t_cnt; typedef ULONG32 t_size; -#define MINPRIO 0x8000 -#define MAXPRIO 0x7fff - -#define MINDELTA 0 -#define MAXDELTA 0xffff - #define INLINE inline #endif /* _CHTYPES_H_ */ -- cgit v1.2.3