Preparation for AVR core support.

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

6 files changed, 20 insertions, 38 deletions

diff --git a/demos/LPC214x-GCC/Makefile b/demos/LPC214x-GCC/Makefile
index e96550727..7f75b31b2 100644
--- a/demos/LPC214x-GCC/Makefile
+++ b/demos/LPC214x-GCC/Makefile
@@ -64,9 +64,9 @@ UADEFS =
 # List ARM-mode C source files here

 ASRC = chcore.c main.c buzzer.c \

        ../../ports/ARM7-LPC214x/GCC/lpc214x_serial.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 THUMB-mode C sources here

 # NOTE: If any module is compiled in thumb mode then -mthumb-interwork is

@@ -112,7 +112,7 @@ ADEFS   = $(DADEFS) $(UADEFS)
 AOBJS   = $(ASRC:.c=.o)

 TOBJS   = $(TSRC:.c=.o)

 OBJS	= $(ASMOBJS) $(AOBJS) $(TOBJS)

-ASMOBJS = $(ASMSRC:.s=.o) 

+ASMOBJS = $(ASMSRC:.s=.o)

 LIBS    = $(DLIBS) $(ULIBS)

 MCFLAGS = -mcpu=$(MCU)

 

diff --git a/demos/LPC214x-GCC/chtypes.h b/demos/LPC214x-GCC/chtypes.h
index 49c7c6c38..803b5ead4 100644
--- a/demos/LPC214x-GCC/chtypes.h
+++ b/demos/LPC214x-GCC/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_ */

diff --git a/demos/Win32-MSVS/chtypes.h b/demos/Win32-MSVS/chtypes.h
index f7d05b855..6481c22a8 100644
--- a/demos/Win32-MSVS/chtypes.h
+++ b/demos/Win32-MSVS/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_ */

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_ */