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

10 files changed, 15 insertions, 15 deletions

diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/.project b/demos/rt/ARMCM0-STM32F051-DISCOVERY/.project
index 65987fe2c..450539b04 100644
--- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/.project
+++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ARMCM0-STM32F051-DISCOVERY</name>

+	<name>RT-STM32F051-DISCOVERY</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
index f00e5aa5c..a8cd936e4 100644
--- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
@@ -60,10 +60,10 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/ARMCM4-STM32F303-DISCOVERY/.project b/demos/rt/ARMCM4-STM32F303-DISCOVERY/.project
index 34b2fab1a..7370bd916 100644
--- a/demos/rt/ARMCM4-STM32F303-DISCOVERY/.project
+++ b/demos/rt/ARMCM4-STM32F303-DISCOVERY/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ARMCM4-STM32F303-DISCOVERY</name>

+	<name>RT-STM32F303-DISCOVERY</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
index 674ce2218..4aa6ae0a2 100644
--- a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
@@ -66,10 +66,10 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/.project b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
index bb34822a3..a2c101b6b 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ARMCM4-STM32F407-DISCOVERY-MEMS</name>

+	<name>RT-STM32F407-DISCOVERY-MEMS</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
index 08ed3908a..149eee346 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
@@ -66,10 +66,10 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY/.project b/demos/rt/ARMCM4-STM32F407-DISCOVERY/.project
index 785aff973..e24444fb2 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY/.project
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ARMCM4-STM32F407-DISCOVERY</name>

+	<name>RT-STM32F407-DISCOVERY</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
index 119c17090..fbbfe020f 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
@@ -66,10 +66,10 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/os/readme.txt b/os/readme.txt
index d75b5556e..46ff6c7e0 100644
--- a/os/readme.txt
+++ b/os/readme.txt
@@ -8,19 +8,19 @@
   |  |  +--include/     - RT kernel headers.

   |  |  +--src/         - RT kernel sources.

   |  |  +--templates/   - RT kernel port template files.

-  |  |  +--ports        - RT kernel port files for various architectures and

-  |  |                    compilers.

+  |  |  +--ports/       - RT kernel port files.

+  |  |  +--osal/        - RT kernel OSAL module for HAL interface.

   |  +--nil/            - ChibiOS/NIL product.

   |  |  +--include/     - Nil kernel headers.

   |  |  +--src/         - Nil kernel sources.

   |  |  +--templates/   - Nil kernel port template files.

-  |  |  +--ports        - Nil kernel port files for various architectures and

-  |  |                    compilers.

+  |  |  +--ports/       - Nil kernel port files.

+  |  |  +--osal/        - Nil kernel OSAL module for HAL interface.

   |  +--hal/            - ChibiOS/HAL product.

   |  |  +--include/     - HAL high level headers.

   |  |  +--src/         - HAL high level sources.

   |  |  +--templates/   - HAL port template files.

-  |  |  +--ports/       - HAL low level drivers implementations.

+  |  |  +--ports/       - HAL port files (low level drivers implementations).

   |  |  +--boards/      - HAL board files.

   |  +--common/         - Files used by multiple ChibiOS products.

   |  |  +--ports        - Common port files for various architectures and

diff --git a/os/rt/osal/osal.mk b/os/rt/osal/osal.mk
index d80e71931..0c7b70ece 100644
--- a/os/rt/osal/osal.mk
+++ b/os/rt/osal/osal.mk
@@ -1,5 +1,5 @@
 # OSAL files.

-OSALSRC += ${CHIBIOS}/os/hal/osal/chibios/osal.c

+OSALSRC += ${CHIBIOS}/os/rt/osal/osal.c

 

 # Required include directories

-OSALINC += ${CHIBIOS}/os/hal/osal/chibios

+OSALINC += ${CHIBIOS}/os/rt/osal