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

demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile

@@ -99,7 +99,7 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
-include $(CHIBIOS)/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk
+include $(CHIBIOS)/os/common/abstractions/cmsis_os/cmsis_os.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld

demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile

@@ -99,7 +99,7 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
-include $(CHIBIOS)/os/common/ext/nasa-osal/nasa-osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa-osal/nasa-osal.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld

os/common/abstractions/cmsis_os/cmsis_os.mk

@@ -0,0 +1,4 @@
+# List of the ChibiOS/RT CMSIS RTOS wrapper.
+CMSISRTOSSRC = ${CHIBIOS}/os/common/abstractions/cmsis_os/cmsis_os.c
+ 
+CMSISRTOSINC = ${CHIBIOS}/os/common/abstractions/cmsis_os

os/common/abstractions/nasa-osal/nasa-osal.mk

@@ -0,0 +1,4 @@
+# NASAOSAL files.
+NASAOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa-osal/src/osapi.c
+
+NASAOSALINC = $(CHIBIOS)/os/common/abstractions/nasa-osal/include

os/common/ext/nasa-osal/nasa-osal.mk

@@ -1,4 +0,0 @@
-# NASAOSAL files.
-NASAOSALSRC = $(CHIBIOS)/os/common/ext/nasa-osal/src/osapi.c
-
-NASAOSALINC = $(CHIBIOS)/os/common/ext/nasa-osal/include

os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk

@@ -1,4 +0,0 @@
-# List of the ChibiOS/RT CMSIS RTOS wrapper.
-CMSISRTOSSRC = ${CHIBIOS}/os/common/ports/ARMCMx/cmsis_os/cmsis_os.c
- 
-CMSISRTOSINC = ${CHIBIOS}/os/common/ports/ARMCMx/cmsis_os

readme.txt

@@ -34,6 +34,9 @@
   |  |  +--index.html     - Local documentation access (after rebuild).
   +--ext/                 - External libraries, not part of ChibiOS/RT.
   +--os/                  - ChibiOS components.
+  |  +--abstractions/     - API emulator wrappers.
+  |  |  +--cmsis-os       - CMSIS OS emulation layer for RT (ARMCMx port only).
+  |  |  +--nasa-osal      - NASA Operating System Abstraction Layer for RT.
   |  +--common/           - Shared OS modules.
   |  +--common/ext/       - Vendor files used by the OS.
   |  +--common/oslib/     - RTOS modules usable by both RT and NIL.