From 430facf5652c09fee1d77ebad2fb1cca641de544 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 23 Feb 2016 09:31:25 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8931 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile | 2 +- demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile | 2 +- os/common/{ports/ARMCMx => abstractions}/cmsis_os/cmsis_os.c | 0 os/common/{ports/ARMCMx => abstractions}/cmsis_os/cmsis_os.h | 0 os/common/abstractions/cmsis_os/cmsis_os.mk | 4 ++++ .../{ext => abstractions}/nasa-osal/include/common_types.h | 0 .../{ext => abstractions}/nasa-osal/include/osapi-os-core.h | 0 .../nasa-osal/include/osapi-os-filesys.h | 0 .../{ext => abstractions}/nasa-osal/include/osapi-os-loader.h | 0 .../{ext => abstractions}/nasa-osal/include/osapi-os-net.h | 0 .../{ext => abstractions}/nasa-osal/include/osapi-os-timer.h | 0 .../{ext => abstractions}/nasa-osal/include/osapi-version.h | 0 os/common/{ext => abstractions}/nasa-osal/include/osapi.h | 0 os/common/abstractions/nasa-osal/nasa-osal.mk | 4 ++++ os/common/{ext => abstractions}/nasa-osal/src/osapi.c | 0 os/common/ext/nasa-osal/nasa-osal.mk | 4 ---- os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk | 4 ---- readme.txt | 3 +++ 18 files changed, 13 insertions(+), 10 deletions(-) rename os/common/{ports/ARMCMx => abstractions}/cmsis_os/cmsis_os.c (100%) rename os/common/{ports/ARMCMx => abstractions}/cmsis_os/cmsis_os.h (100%) create mode 100644 os/common/abstractions/cmsis_os/cmsis_os.mk rename os/common/{ext => abstractions}/nasa-osal/include/common_types.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-os-core.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-os-filesys.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-os-loader.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-os-net.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-os-timer.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi-version.h (100%) rename os/common/{ext => abstractions}/nasa-osal/include/osapi.h (100%) create mode 100644 os/common/abstractions/nasa-osal/nasa-osal.mk rename os/common/{ext => abstractions}/nasa-osal/src/osapi.c (100%) delete mode 100644 os/common/ext/nasa-osal/nasa-osal.mk delete mode 100644 os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile index ee50b2c53..72731e95e 100644 --- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile +++ b/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 diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile index f22a0062a..9c2e46520 100644 --- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile +++ b/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 diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c similarity index 100% rename from os/common/ports/ARMCMx/cmsis_os/cmsis_os.c rename to os/common/abstractions/cmsis_os/cmsis_os.c diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.h b/os/common/abstractions/cmsis_os/cmsis_os.h similarity index 100% rename from os/common/ports/ARMCMx/cmsis_os/cmsis_os.h rename to os/common/abstractions/cmsis_os/cmsis_os.h diff --git a/os/common/abstractions/cmsis_os/cmsis_os.mk b/os/common/abstractions/cmsis_os/cmsis_os.mk new file mode 100644 index 000000000..eb35bc574 --- /dev/null +++ b/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 diff --git a/os/common/ext/nasa-osal/include/common_types.h b/os/common/abstractions/nasa-osal/include/common_types.h similarity index 100% rename from os/common/ext/nasa-osal/include/common_types.h rename to os/common/abstractions/nasa-osal/include/common_types.h diff --git a/os/common/ext/nasa-osal/include/osapi-os-core.h b/os/common/abstractions/nasa-osal/include/osapi-os-core.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-os-core.h rename to os/common/abstractions/nasa-osal/include/osapi-os-core.h diff --git a/os/common/ext/nasa-osal/include/osapi-os-filesys.h b/os/common/abstractions/nasa-osal/include/osapi-os-filesys.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-os-filesys.h rename to os/common/abstractions/nasa-osal/include/osapi-os-filesys.h diff --git a/os/common/ext/nasa-osal/include/osapi-os-loader.h b/os/common/abstractions/nasa-osal/include/osapi-os-loader.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-os-loader.h rename to os/common/abstractions/nasa-osal/include/osapi-os-loader.h diff --git a/os/common/ext/nasa-osal/include/osapi-os-net.h b/os/common/abstractions/nasa-osal/include/osapi-os-net.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-os-net.h rename to os/common/abstractions/nasa-osal/include/osapi-os-net.h diff --git a/os/common/ext/nasa-osal/include/osapi-os-timer.h b/os/common/abstractions/nasa-osal/include/osapi-os-timer.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-os-timer.h rename to os/common/abstractions/nasa-osal/include/osapi-os-timer.h diff --git a/os/common/ext/nasa-osal/include/osapi-version.h b/os/common/abstractions/nasa-osal/include/osapi-version.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi-version.h rename to os/common/abstractions/nasa-osal/include/osapi-version.h diff --git a/os/common/ext/nasa-osal/include/osapi.h b/os/common/abstractions/nasa-osal/include/osapi.h similarity index 100% rename from os/common/ext/nasa-osal/include/osapi.h rename to os/common/abstractions/nasa-osal/include/osapi.h diff --git a/os/common/abstractions/nasa-osal/nasa-osal.mk b/os/common/abstractions/nasa-osal/nasa-osal.mk new file mode 100644 index 000000000..9562970a0 --- /dev/null +++ b/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 diff --git a/os/common/ext/nasa-osal/src/osapi.c b/os/common/abstractions/nasa-osal/src/osapi.c similarity index 100% rename from os/common/ext/nasa-osal/src/osapi.c rename to os/common/abstractions/nasa-osal/src/osapi.c diff --git a/os/common/ext/nasa-osal/nasa-osal.mk b/os/common/ext/nasa-osal/nasa-osal.mk deleted file mode 100644 index 23b994f87..000000000 --- a/os/common/ext/nasa-osal/nasa-osal.mk +++ /dev/null @@ -1,4 +0,0 @@ -# NASAOSAL files. -NASAOSALSRC = $(CHIBIOS)/os/common/ext/nasa-osal/src/osapi.c - -NASAOSALINC = $(CHIBIOS)/os/common/ext/nasa-osal/include diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk b/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk deleted file mode 100644 index f31566b76..000000000 --- a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk +++ /dev/null @@ -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 diff --git a/readme.txt b/readme.txt index 81b0f1ec4..fffcd622e 100644 --- a/readme.txt +++ b/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.