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

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/abstractions/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/nasa-osal/nasa-osal.mk

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

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

readme.txt

@@ -34,14 +34,14 @@
   |  |  +--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.
-  |  +--common/ports/     - RTOS ports usable by both RT and NIL.
-  |  +--common/startup/   - Startup support for all compilers and platforms.
+  |  |  +--abstractions/  - API emulator wrappers.
+  |  |  |  +--cmsis_os/   - CMSIS OS emulation layer for RT (ARMCMx port only).
+  |  |  |  +--nasa_osal/  - NASA Operating System Abstraction Layer for RT.
+  |  |  +--ext/           - Vendor files used by the OS.
+  |  |  +--oslib/         - RTOS modules usable by both RT and NIL.
+  |  |  +--ports/         - RTOS ports usable by both RT and NIL.
+  |  |  +--startup/       - Startup support for all compilers and platforms.
   |  +--hal/              - HAL component.
   |  |  +--boards/        - HAL board support files.
   |  |  +--dox/           - HAL documentation resources.