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

10 files changed, 128 insertions, 117 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index db19978c8..4622e181f 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -43,16 +43,18 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARM7/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARM7/chcore.c \

-       ../../ports/ARM7-AT91SAM7X/pal_lld.c \

-       ../../ports/ARM7-AT91SAM7X/sam7x_serial.c \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC/ARM7/AT91SAM7X/pal_lld.c \

+       ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_serial.c \

        at91lib/aic.c \

        board.c main.c

 

@@ -81,14 +83,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s \

-         ../../ports/ARM7-AT91SAM7X/vectors.s \

-         ../../ports/ARM7/chcoreasm.s

+ASMSRC = $(PORTASM) \

+         ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s

 

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

-         ../../src/lib \

-         ../../ports/ARM7 \

-         ../../ports/ARM7-AT91SAM7X

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARM7/AT91SAM7X \

+         ../../os/various

 

 #

 # Project, sources and paths

@@ -176,4 +177,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
index 4b0aad5a1..0e881c364 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
@@ -43,7 +43,8 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARM7/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # List of the required uIP source files.

@@ -57,14 +58,15 @@ USRC = ../../ext/uip-1.0/uip/uip_arp.c \
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARM7/chcore.c \

-       ../../ports/ARM7-AT91SAM7X/pal_lld.c \

-       ../../ports/ARM7-AT91SAM7X/sam7x_serial.c \

-       ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

        ${USRC} \

-       ../../src/lib/evtimer.c \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC/ARM7/AT91SAM7X/pal_lld.c \

+       ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_serial.c \

+       ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_emac.c \

+       ../../os/various/evtimer.c \

        at91lib/aic.c \

        web/webthread.c \

        board.c main.c

@@ -94,14 +96,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s \

-         ../../ports/ARM7-AT91SAM7X/vectors.s \

-         ../../ports/ARM7/chcoreasm.s

-

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

-         ../../src/lib \

-         ../../ports/ARM7 \

-         ../../ports/ARM7-AT91SAM7X \

+ASMSRC = $(PORTASM) \

+         ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s

+

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARM7/AT91SAM7X \

+         ../../os/various \

          ./web ../../ext/uip-1.0/uip ../../ext/uip-1.0/apps/webserver

 

 #

@@ -190,4 +191,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile
index 894a37e61..5709a5dd3 100644
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@@ -40,21 +40,23 @@ endif
 PROJECT = ch

 

 # Define linker script file here

-LDSCRIPT= ch.ld

+LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARM7/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARM7/chcore.c \

-       ../../ports/ARM7-LPC214x/vic.c  \

-       ../../ports/ARM7-LPC214x/pal_lld.c  \

-       ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../src/lib/evtimer.c \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC//ARM7/LPC214x/vic.c  \

+       ../../os/ports/GCC/ARM7/LPC214x/pal_lld.c \

+       ../../os/ports/GCC/ARM7/LPC214x/lpc214x_serial.c \

+       ../../os/various/evtimer.c \

        board.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -82,14 +84,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s \

-         ../../ports/ARM7-LPC214x/vectors.s \

-         ../../ports/ARM7/chcoreasm.s

+ASMSRC = $(PORTASM) \

+         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

 

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

-         ../../src/lib \

-         ../../ports/ARM7 \

-         ../../ports/ARM7-LPC214x

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARM7/LPC214x \

+         ../../os/various

 

 #

 # Project, sources and paths

@@ -177,4 +178,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
index a00eb9c65..358b12597 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile
@@ -40,18 +40,21 @@ endif
 PROJECT = ch

 

 # Define linker script file here

-LDSCRIPT= ch.ld

+LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARM7/port.mk

+include ../../os/kernel/kernel.mk

 #include ../../test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARM7/chcore.c \

-       ../../ports/ARM7-LPC214x/vic.c  \

-       ../../ports/ARM7-LPC214x/pal_lld.c  \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

+       ${TESTSRC} \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC//ARM7/LPC214x/vic.c  \

+       ../../os/ports/GCC/ARM7/LPC214x/pal_lld.c \

        board.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -79,14 +82,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s \

-         ../../ports/ARM7-LPC214x/vectors.s \

-         ../../ports/ARM7/chcoreasm.s

+ASMSRC = $(PORTASM) \

+         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

 

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

-         ../../src/lib \

-         ../../ports/ARM7 \

-         ../../ports/ARM7-LPC214x

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARM7/LPC214x \

+         ../../os/various

 

 #

 # Project, sources and paths

@@ -174,4 +176,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 2185bbe94..0b36edb4a 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -40,23 +40,24 @@ endif
 PROJECT = ch

 

 # Define linker script file here

-LDSCRIPT= ch.ld

+LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARM7/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARM7/chcore.c \

-       ../../ports/ARM7-LPC214x/vic.c  \

-       ../../ports/ARM7-LPC214x/pal_lld.c  \

-       ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

-       ../../ports/ARM7-LPC214x/lpc214x_ssp.c  \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../src/lib/evtimer.c \

-       ../../src/lib/pal.c \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC//ARM7/LPC214x/vic.c  \

+       ../../os/ports/GCC/ARM7/LPC214x/pal_lld.c \

+       ../../os/ports/GCC/ARM7/LPC214x/lpc214x_serial.c \

+       ../../os/ports/GCC/ARM7/LPC214x/lpc214x_ssp.c \

+       ../../os/various/evtimer.c \

        board.c buzzer.c mmcsd.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -84,14 +85,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s \

-         ../../ports/ARM7-LPC214x/vectors.s \

-         ../../ports/ARM7/chcoreasm.s

+ASMSRC = $(PORTASM) \

+         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

 

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

-         ../../src/lib \

-         ../../ports/ARM7 \

-         ../../ports/ARM7-LPC214x

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARM7/LPC214x \

+         ../../os/various

 

 #

 # Project, sources and paths

@@ -179,4 +179,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index 3ffda1a1c..59e1fc544 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -56,20 +56,19 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/ARMCM3/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = ../../ports/ARMCM3/cmsis/core_cm3.c \

-       ../../ports/ARMCM3/chcore.c \

-       ../../ports/ARMCM3/nvic.c \

-       ../../ports/ARMCM3-STM32F103/stm32_serial.c \

-       ../../ports/ARMCM3-STM32F103/pal_lld.c \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../src/lib/pal.c \

-       ../../src/lib/evtimer.c \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC/ARMCM3/STM32F103/pal_lld.c \

+       ../../os/ports/GCC/ARMCM3/STM32F103/stm32_serial.c \

+       ../../os/various/evtimer.c \

        board.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -97,14 +96,13 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =  ../../ports/ARMCM3/crt0.s \

-          ../../ports/ARMCM3-STM32F103/vectors.s

-

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

-         ../../src/lib \

-         ../../ports/ARMCM3 \

-         ../../ports/ARMCM3/cmsis \

-         ../../ports/ARMCM3-STM32F103 \

+ASMSRC = $(PORTASM) \

+         ../../ports/ARMCM3-STM32F103/vectors.s

+

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/ports/GCC/ARMCM3/STM32F103 \

+         ../../os/various \

          ./stm32lib/inc

 

 #

@@ -199,4 +197,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include ../../ports/ARM/rules.mk

+include ../../os/ports/GCC/ARM/rules.mk

diff --git a/demos/AVR-AT90CANx-GCC/Makefile b/demos/AVR-AT90CANx-GCC/Makefile
index a72f1f913..7b880f6d9 100644
--- a/demos/AVR-AT90CANx-GCC/Makefile
+++ b/demos/AVR-AT90CANx-GCC/Makefile
@@ -80,15 +80,17 @@ OBJDIR = .
 

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/AVR/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 

 # List C source files here. (C dependencies are automatically generated.)

-SRC = ../../ports/AVR/chcore.c ../../ports/AVR/avr_serial.c \

-       ${KERNSRC} \

-       ${TESTSRC} \

-      ../../src/lib/evtimer.c \

+SRC = ${PORTSRC} \

+      ${KERNSRC} \

+      ${TESTSRC} \

+      ../../os/ports/GCC/AVR/avr_serial.c \

+      ../../os/various/evtimer.c \

       board.c main.c

 

 

@@ -123,7 +125,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.

 #     Use forward slashes for directory separators.

 #     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = ../../src/include ../../src/lib ../../ports/AVR

+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC)e ../../os/various

 

 

 # Compiler flag to set the C Standard level.

diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile
index f291af1fb..c13d60ef9 100644
--- a/demos/AVR-ATmega128-GCC/Makefile
+++ b/demos/AVR-ATmega128-GCC/Makefile
@@ -80,15 +80,17 @@ OBJDIR = .
 

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/AVR/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 

 # List C source files here. (C dependencies are automatically generated.)

-SRC = ../../ports/AVR/chcore.c ../../ports/AVR/avr_serial.c \

-       ${KERNSRC} \

-       ${TESTSRC} \

-      ../../src/lib/evtimer.c \

+SRC = ${PORTSRC} \

+      ${KERNSRC} \

+      ${TESTSRC} \

+      ../../os/ports/GCC/AVR/avr_serial.c \

+      ../../os/various/evtimer.c \

       board.c lcd.c main.c

 

 

@@ -123,7 +125,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.

 #     Use forward slashes for directory separators.

 #     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = ../../src/include ../../src/lib ../../ports/AVR

+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC)e ../../os/various

 

 

 # Compiler flag to set the C Standard level.

diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile
index 8cf693eb1..e316c3fa9 100644
--- a/demos/MSP430-MSP430x1611-GCC/Makefile
+++ b/demos/MSP430-MSP430x1611-GCC/Makefile
@@ -36,30 +36,32 @@ endif
 PROJECT = ch

 

 # Define linker script file here

-LDSCRIPT= mspgcc/msp430x1611.x

+LDSCRIPT = mspgcc/msp430x1611.x

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/ports/GCC/MSP430/port.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # C sources here.

-CSRC = ../../ports/MSP430/chcore.c \

-       ../../ports/MSP430/msp430_serial.c \

-       ../../ports/MSP430/pal_lld.c \

+CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../src/lib/evtimer.c \

+       ../../os/io/pal.c \

+       ../../os/ports/GCC/MSP430/pal_lld.c \

+       ../../os/ports/GCC/MSP430/msp430_serial.c \

+       ../../os/various/evtimer.c \

        board.c main.c

 

 # C++ sources here.

 CPPSRC =

 

 # List ASM source files here

-ASMSRC =

+ASMSRC = $(PORTASM)

 

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

-         ../../src/lib \

-         ../../ports/MSP430

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         ../../os/io \

+         ../../os/various

 

 #

 # Project, sources and paths

diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile
index ed66e51fd..616b46015 100644
--- a/demos/Win32-MinGW/Makefile
+++ b/demos/Win32-MinGW/Makefile
@@ -47,7 +47,7 @@ DLIBS = -lws2_32
 PROJECT = ch

 

 # Define linker script file here

-LDSCRIPT=

+LDSCRIPT =

 

 # List all user C define here, like -D_DEBUG=1

 UDEFS =

@@ -56,19 +56,21 @@ UDEFS =
 UADEFS =

 

 # Imported source files

-include ../../src/kernel.mk

+include ../../os/kernel/kernel.mk

 include ../../test/test.mk

 

 # List C source files here

-SRC  = chcore.c main.c ../../ports/win32/simcom.c \

-       ${KERNSRC} \

-       ${TESTSRC}

+SRC  = ${KERNSRC} \

+       ${TESTSRC} \

+       chcore.c \

+       ../../os/ports/GCC/win32/simcom.c \

+       main.c

 

 # List ASM source files here

 ASRC =

 

 # List all user directories here

-UINCDIR = ../../src/include

+UINCDIR = $(KERNINC) $(TESTINC)

 

 # List the user directory to look for the libraries here

 ULIBDIR =