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

14 files changed, 8 insertions, 4 deletions

diff --git a/os/common/abstractions/nasa_osal/include/common_types.h b/os/common/abstractions/nasa_osal/cfe_osal/include/common_types.h
index 100a9c72e..100a9c72e 100644
--- a/os/common/abstractions/nasa_osal/include/common_types.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/common_types.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-core.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-core.h
index 8c9b13a78..8c9b13a78 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-core.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-core.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-custom.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-custom.h
index 4b9213118..4b9213118 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-custom.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-custom.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-filesys.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-filesys.h
index c46800341..c46800341 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-filesys.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-filesys.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-loader.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-loader.h
index 4f0b21b62..4f0b21b62 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-loader.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-loader.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-net.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-net.h
index b8cc67d69..b8cc67d69 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-net.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-net.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-os-timer.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-timer.h
index 8082c6227..8082c6227 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-os-timer.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-os-timer.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi-version.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-version.h
index 331e96c94..331e96c94 100644
--- a/os/common/abstractions/nasa_osal/include/osapi-version.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi-version.h
diff --git a/os/common/abstractions/nasa_osal/include/osapi.h b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi.h
index 72a7c340a..72a7c340a 100644
--- a/os/common/abstractions/nasa_osal/include/osapi.h
+++ b/os/common/abstractions/nasa_osal/cfe_osal/include/osapi.h
diff --git a/os/common/abstractions/nasa_osal/cfe_osal/nasa_osal.mk b/os/common/abstractions/nasa_osal/cfe_osal/nasa_osal.mk
new file mode 100644
index 000000000..a9eb9ee68
--- /dev/null
+++ b/os/common/abstractions/nasa_osal/cfe_osal/nasa_osal.mk
@@ -0,0 +1,4 @@
+# NASA CFE OSAL files.

+CFEOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_osal/src/osapi.c

+

+CFEOSALINC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_osal/include

diff --git a/os/common/abstractions/nasa_osal/src/osapi.c b/os/common/abstractions/nasa_osal/cfe_osal/src/osapi.c
index 28088165e..28088165e 100644
--- a/os/common/abstractions/nasa_osal/src/osapi.c
+++ b/os/common/abstractions/nasa_osal/cfe_osal/src/osapi.c
diff --git a/os/common/abstractions/nasa_osal/cfe_psp/cfe_psp.mk b/os/common/abstractions/nasa_osal/cfe_psp/cfe_psp.mk
new file mode 100644
index 000000000..510afcfcd
--- /dev/null
+++ b/os/common/abstractions/nasa_osal/cfe_psp/cfe_psp.mk
@@ -0,0 +1,4 @@
+# NASA CFE PSP files.

+CFEOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_support.c

+

+CFEOSALINC = $(CHIBIOS)/os/common/abstractions/nasa_cfe/cfe_psp/include

diff --git a/os/common/abstractions/nasa_osal/lib/cfe_psp_support.c b/os/common/abstractions/nasa_osal/cfe_psp/src/cfe_psp_support.c
index 3eb5d5e6d..3eb5d5e6d 100644
--- a/os/common/abstractions/nasa_osal/lib/cfe_psp_support.c
+++ b/os/common/abstractions/nasa_osal/cfe_psp/src/cfe_psp_support.c
diff --git a/os/common/abstractions/nasa_osal/nasa_osal.mk b/os/common/abstractions/nasa_osal/nasa_osal.mk
deleted file mode 100644
index 8b8ef9daa..000000000
--- a/os/common/abstractions/nasa_osal/nasa_osal.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# NASAOSAL files.

-NASAOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa_osal/src/osapi.c

-

-NASAOSALINC = $(CHIBIOS)/os/common/abstractions/nasa_osal/include