diff --git a/build/.gitignore b/build/.gitignore deleted file mode 100644 index 2b8bda14b..000000000 --- a/build/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.o -*.bin -inc/ -*.lis -*_log.txt diff --git a/build/Makefile b/build/Makefile deleted file mode 100644 index c85744e1b..000000000 --- a/build/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -include osal-config.mak - -# -# all: Don't build the unit tests by default, because some targets might not support -# all of the unit tests -# -all:: - make -C tests - make -C examples -# -# unit-tests -# -unit-tests:: - make -C unit-tests - -# -# gcov -# -gcov:: - make -C unit-tests gcov - -# -# Clean all build dirs -# -clean:: - make -C tests clean - make -C examples clean - -clean-unit-tests:: - make -C unit-tests clean - -# -# generate dependancies -# -depend:: - make -C tests depend - make -C examples depend - make -C unit-tests depend - -# -# Do any configuration necessary after defining the target -# in osal-config.mak -# -config:: - test -d inc || mkdir inc - cp -f ../src/bsp/$(BSP)/config/osconfig.h inc/osconfig.h - diff --git a/build/debug-opts.mak b/build/debug-opts.mak deleted file mode 100644 index 8f3fef0a5..000000000 --- a/build/debug-opts.mak +++ /dev/null @@ -1,7 +0,0 @@ -## -## Debug Options for build -## -# DEBUG_OPTS = -g -O0 -DEBUG_OPTS = -O1 -DEBUG_LEVEL = 3 - diff --git a/build/examples/Makefile b/build/examples/Makefile deleted file mode 100644 index 541b7485c..000000000 --- a/build/examples/Makefile +++ /dev/null @@ -1,10 +0,0 @@ - -all: - make -C tasking-example - -clean: - make -C tasking-example clean - -depend: - make -C tasking-example depend - diff --git a/build/examples/tasking-example/Makefile b/build/examples/tasking-example/Makefile deleted file mode 100644 index 18553e8c7..000000000 --- a/build/examples/tasking-example/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = tasking-example - -# -# Object files required to build subsystem. -# -OBJS = tasking-example.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/examples/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/examples/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/gcov-parse.awk b/build/gcov-parse.awk deleted file mode 100755 index 689049d23..000000000 --- a/build/gcov-parse.awk +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/awk -f - -/^File / { - file = $0 - sub(/^File /, "", file) -} - -/^Lines executed:/ { - line = $0 - sub(/^Lines executed:/, "", line) - n = split(line, a) - printf "gcov: %s %s %s\n", file, a[1], a[n] -} diff --git a/build/osal-config.mak b/build/osal-config.mak deleted file mode 100644 index c969c03cf..000000000 --- a/build/osal-config.mak +++ /dev/null @@ -1,48 +0,0 @@ -## -## osal-config.mak -## -## This file specifies the Hardware Architecture ( CPU ), -## Platform ( Board ), OS, and BSP to build. -## -## NOTE: Make sure each selection does not have any spaces -## after it! -## - -##--------------------------------------------------------- -## Operating System -## OS = The operating system selected for the Abstraction implementation -## -## Current selections include: -## -## OS = posix -## OS = rtems -## OS = vxworks6 -##--------------------------------------------------------- -OS = posix - -##--------------------------------------------------------- -## BSP -- BSP/Operating system for the board -## -## Current selections include: -## -## BSP = pc-linux-ut -- Unit test target -## BSP = pc-linux -- Target to run on PC-linux -## BSP = genppc-vxworks6.4 -- vxWorks Power PC target -## BSP = mcf5235-rtems -- RTEMS Coldfire evaluation board -## BSP = sis-rtems -- RTEMS Sparc Instruction Simulator (GDB) -## BSP = sparc-vxworks6.7 -- ut699 SPARC Leon3 development board -##--------------------------------------------------------- -BSP = pc-linux - -##--------------------------------------------------------- -## OSAL_M32 -- optional, build 32-bit images on 64-bit build machines -## -## ** Need 32-bit images ?? ** -## ** Have 64-bit images ?? ** -## ** Uncomment this option. ** -## -## If you are not using GCC, you may need to change -m32 to the -## correct flag for your compiler. This flag may also be specified on -## the "make" command line or in the shell environment. -##--------------------------------------------------------- -# OSAL_M32 = -m32 diff --git a/build/readme.txt b/build/readme.txt deleted file mode 100644 index 31d261fec..000000000 --- a/build/readme.txt +++ /dev/null @@ -1,21 +0,0 @@ -To build and run unit-tests in Linux: -1) $ cd osal -2) $ source setvars.sh --- sets $OSAL_SRC -4) $ cd build -5) You should not need to edit osal-config.mak, it defaults to Linux. - (Note 64-bit Linux systems may need the OSAL_M32 option.) - OS = posix - BSP = pc-linux - -6) $ make config --- copies the target's osconfig.h to the right place to build -7) $ make --- builds the osal -8) $ make clean-unit-tests -9) $ make unit-tests -10) Run unit tests - $ cd unit-tests/test, where test = oscore-test |osfilesys-test | - osfile-test |osloader-test | osnetwork-test | ostimer-test - $ run the .bin file, i.e. for oscore - $ ./oscore-test.bin - - -To build and run unit-tests in VxWorks, see vxworks-target/readme.txt diff --git a/build/tests/Makefile b/build/tests/Makefile deleted file mode 100644 index a65e3c9f0..000000000 --- a/build/tests/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -all: - make -C bin-sem-flush-test - make -C bin-sem-test - make -C bin-sem-timeout-test - make -C count-sem-test - make -C file-api-test - make -C mutex-test - make -C osal-core-test - make -C queue-timeout-test - make -C symbol-api-test - make -C timer-test - -clean: - make -C bin-sem-flush-test clean - make -C bin-sem-test clean - make -C bin-sem-timeout-test clean - make -C count-sem-test clean - make -C file-api-test clean - make -C mutex-test clean - make -C osal-core-test clean - make -C queue-timeout-test clean - make -C symbol-api-test clean - make -C timer-test clean - -depend: - make -C bin-sem-flush-test depend - make -C bin-sem-test depend - make -C bin-sem-timeout-test depend - make -C count-sem-test depend - make -C file-api-test depend - make -C mutex-test depend - make -C osal-core-test depend - make -C queue-timeout-test depend - make -C symbol-api-test depend - make -C timer-test depend - diff --git a/build/tests/bin-sem-flush-test/Makefile b/build/tests/bin-sem-flush-test/Makefile deleted file mode 100644 index 879f8c551..000000000 --- a/build/tests/bin-sem-flush-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = bin-sem-flush-test - -# -# Object files required to build subsystem. -# -OBJS = bin-sem-flush-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/bin-sem-test/Makefile b/build/tests/bin-sem-test/Makefile deleted file mode 100644 index f711176dd..000000000 --- a/build/tests/bin-sem-test/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = bin-sem-test - -# -# Object files required to build subsystem. -# -OBJS = bin-sem-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/bin-sem-timeout-test/Makefile b/build/tests/bin-sem-timeout-test/Makefile deleted file mode 100644 index 1590dd502..000000000 --- a/build/tests/bin-sem-timeout-test/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = bin-sem-timeout-test - -# -# Object files required to build subsystem. -# -OBJS = bin-sem-timeout-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/count-sem-test/Makefile b/build/tests/count-sem-test/Makefile deleted file mode 100644 index 5ea98e31c..000000000 --- a/build/tests/count-sem-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = count-sem-test - -# -# Object files required to build subsystem. -# -OBJS = count-sem-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/file-api-test/Makefile b/build/tests/file-api-test/Makefile deleted file mode 100644 index d10c74e39..000000000 --- a/build/tests/file-api-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = file-api-test - -# -# Object files required to build subsystem. -# -OBJS = file-api-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## cfe-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building a OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/mutex-test/Makefile b/build/tests/mutex-test/Makefile deleted file mode 100644 index 10347ae01..000000000 --- a/build/tests/mutex-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = mutex-test - -# -# Object files required to build subsystem. -# -OBJS = mutex-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/osal-core-test/Makefile b/build/tests/osal-core-test/Makefile deleted file mode 100644 index cfeb4a499..000000000 --- a/build/tests/osal-core-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = osal-core-test - -# -# Object files required to build subsystem. -# -OBJS = osal-core-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary OSAL make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building a OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/queue-timeout-test/Makefile b/build/tests/queue-timeout-test/Makefile deleted file mode 100644 index b151ccad3..000000000 --- a/build/tests/queue-timeout-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = queue-timeout-test - -# -# Object files required to build subsystem. -# -OBJS = queue-timeout-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/symbol-api-test/Makefile b/build/tests/symbol-api-test/Makefile deleted file mode 100644 index 92a72dd09..000000000 --- a/build/tests/symbol-api-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = symbol-api-test - -# -# Object files required to build subsystem. -# -OBJS = symbol-api-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/tests/symbol-api-test/dumpsymtab.c b/build/tests/symbol-api-test/dumpsymtab.c deleted file mode 100644 index 63e74df42..000000000 --- a/build/tests/symbol-api-test/dumpsymtab.c +++ /dev/null @@ -1,63 +0,0 @@ - -/* -** This program is an example of how to parse a symbol table dump file. -** On linux: build with $ gcc -o dumpsymtab dumpsymtab.c -** run with $ ./dumpsymtab | sort > syms.txt -*/ - -#include -#include -#include -#include -#include -#include -#include - - -typedef struct -{ - char name[64]; /* Needs to match OS_MAX_SYM_NAME in osconfig.h */ - unsigned int value; -} symRecord; - -int main (void) -{ - int symfile; - int status; - int keepgoing = 1; - symRecord symrec; - - /* - ** Open file - */ - symfile = open("SymbolTable512k.dat", O_RDONLY); - if ( symfile > 0 ) - { - printf("Symbol file opened\n"); - printf("Size of SymRecord = %d\n",sizeof(symRecord)); - while ( keepgoing == 1 ) - { - /* - ** read symbol entry from file - */ - status = read(symfile, (void *)&symrec, sizeof(symRecord)); - if ( status == sizeof(symRecord)) - { - printf("%s \t: 0x%08X\n",symrec.name, symrec.value); - } - else - { - printf("Size read = %d\n",status); - close(symfile); - keepgoing = 0; - } - } - } - else - { - printf("Can't open file\n"); - } - - return 0; -} - diff --git a/build/tests/timer-test/Makefile b/build/tests/timer-test/Makefile deleted file mode 100644 index 65dab3ee3..000000000 --- a/build/tests/timer-test/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### -# -# Subsystem produced by this makefile. -# -APPTARGET = timer-test - -# -# Object files required to build subsystem. -# -OBJS = timer-test.o - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - - -## -## Specify extra C Flags needed to build this subsystem -## -LOCAL_COPTS = - - -## -## EXEDIR is defined here, just in case it needs to be different for a custom -## build -## -EXEDIR=./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -CORE_OBJS = - -## -## Include all necessary make rules -## Any of these can be copied to a local file and -## changed if needed. -## -## -## osal-config.mak contians arch, BSP, and OS selection -## -include ../../osal-config.mak -## -## debug-opts.mak contains debug switches -## -include ../../debug-opts.mak -## -## compiler-opts.mak contains compiler definitions and switches/defines -## -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -## -## Setup the include path for this subsystem -## The OS specific includes are in the build-rules.make file -## -## If this subsystem needs include files from another app, add the path here. -## -INCLUDE_PATH = \ --I$(OSAL_SRC)/inc \ --I$(OSAL_SRC)/os/inc \ --I$(OSAL_SRC)/tests/$(APPTARGET) \ --I$(OSAL_SRC)/../ut_assert/inc \ --I../../inc - -## -## Define the VPATH make variable. -## This can be modified to include source from another directory. -## If there is no corresponding app in the apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be -## added here as well. -## -VPATH = $(OSAL_SRC)/tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -## -## Include the common make rules for building an OSAL Application -## -include $(OSAL_SRC)/make/app-rules.mak diff --git a/build/unit-tests/Makefile b/build/unit-tests/Makefile deleted file mode 100644 index 65af6dc9b..000000000 --- a/build/unit-tests/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -include ../osal-config.mak - -all: - make -C oscore-test - make -C osloader-test - make -C osloader-test -f Modules.mak - make -C osfilesys-test - make -C osfile-test - make -C osnetwork-test - make -C ostimer-test - -clean: - make -C oscore-test clean - make -C osloader-test clean - make -C osloader-test -f Modules.mak clean - make -C osfilesys-test clean - make -C osfile-test clean - make -C osnetwork-test clean - make -C ostimer-test clean - -depend: - make -C oscore-test depend - make -C osloader-test depend - make -C osfilesys-test depend - make -C osfile-test depend - make -C osnetwork-test depend - make -C ostimer-test depend - -gcov: - make -C oscore-test gcov - make -C ostimer-test gcov - make -C osfilesys-test gcov - make -C osfile-test gcov - make -C osloader-test gcov - make -C osnetwork-test gcov diff --git a/build/unit-tests/oscore-test/Makefile b/build/unit-tests/oscore-test/Makefile deleted file mode 100644 index cc683a9c6..000000000 --- a/build/unit-tests/oscore-test/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -include ../../osal-config.mak - -# -# Subsystem produced by this makefile. -# -APPTARGET = oscore-test - -# -# Unit test object files -# -OBJS = ut_oscore_task_test.o ut_oscore_binsem_test.o ut_oscore_mutex_test.o \ - ut_oscore_countsem_test.o ut_oscore_queue_test.o ut_oscore_misc_test.o - - -ifeq ($(OS), vxworks6) -# -# Unit test object files specific to vxWorks platforms -# - OBJS += ut_oscore_exception_test.o ut_oscore_interrupt_test.o \ - ut_oscore_test_vxworks.o - -else -# assume Linux as the default -# -# Unit test object files specific to Linux platforms -# - OBJS += ut_oscore_test.o - -endif - - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/unit-tests/osfile-test/Makefile b/build/unit-tests/osfile-test/Makefile deleted file mode 100644 index 1f8a86b62..000000000 --- a/build/unit-tests/osfile-test/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -# -# Subsystem produced by this makefile. -# -APPTARGET = osfile-test - -# -# Unit test object files -# -OBJS = ut_osfile_dirio_test.o ut_osfile_fileio_test.o \ - ut_osfile_test.o - -# -# Unit test object files specific to Linux platforms -# -#OBJS += - -# -# Unit test object files specific to vxWorks platforms -# -OBJS += - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/unit-tests/osfilesys-test/Makefile b/build/unit-tests/osfilesys-test/Makefile deleted file mode 100644 index 073506d78..000000000 --- a/build/unit-tests/osfilesys-test/Makefile +++ /dev/null @@ -1,136 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -include ../../osal-config.mak - -# -# Subsystem produced by this makefile. -# -APPTARGET = osfilesys-test - -# -# Unit test object files -# -OBJS = ut_osfilesys_diskio_test.o - -ifeq ($(OS), vxworks6) -# -# Unit test object files specific to vxWorks platforms -# - OBJS += ut_osfilesys_test_vxworks.o - -else -# assume Linux as the default -# -# Unit test object files specific to Linux platforms -# - OBJS += ut_osfilesys_test.o - -endif - - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/unit-tests/osloader-test/Makefile b/build/unit-tests/osloader-test/Makefile deleted file mode 100644 index eda91a5b2..000000000 --- a/build/unit-tests/osloader-test/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -# -# Subsystem produced by this makefile. -# -APPTARGET = osloader-test - -# -# Unit test object files -# -OBJS = ut_osloader_module_test.o ut_osloader_symtable_test.o \ - ut_osloader_test.o - -# -# Unit test object files specific to Linux platforms -# -#OBJS += - -# -# Unit test object files specific to vxWorks platforms -# -OBJS += - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/unit-tests/osloader-test/Modules.mak b/build/unit-tests/osloader-test/Modules.mak deleted file mode 100644 index 43a876ea8..000000000 --- a/build/unit-tests/osloader-test/Modules.mak +++ /dev/null @@ -1,22 +0,0 @@ -# -# MakeModules.mak -# -# This makefile compiles the loadable modules for the os loader unit test -# The compile is OS specific, so it must include a makefile from the bsp directory - -# -# osal-config.mak contians BSP and OS selection -# -include ../../osal-config.mak - -# -# MODULE_SRC sets the path to the source code needed -# -MODULE_SRC = $(OSAL_SRC)/unit-tests/osloader-test - -# -# Include the target OS specific rules -# -include $(OSAL_SRC)/bsp/$(BSP)/make/ut-modules.mak - - diff --git a/build/unit-tests/osnetwork-test/Makefile b/build/unit-tests/osnetwork-test/Makefile deleted file mode 100644 index c94fdcd8b..000000000 --- a/build/unit-tests/osnetwork-test/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -# -# Subsystem produced by this makefile. -# -APPTARGET = osnetwork-test - -# -# Unit test object files -# -OBJS = ut_osnetwork_misc_test.o ut_osnetwork_test.o - -# -# Unit test object files specific to Linux platforms -# -#OBJS += - -# -# Unit test object files specific to vxWorks platforms -# -OBJS += - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/unit-tests/ostimer-test/Makefile b/build/unit-tests/ostimer-test/Makefile deleted file mode 100644 index 0e7e52311..000000000 --- a/build/unit-tests/ostimer-test/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -############################################################################### -# File: OSAL Application Makefile -# -# -# History: -# -############################################################################### - -# -# Subsystem produced by this makefile. -# -APPTARGET = ostimer-test - -# -# Unit test object files -# -OBJS = ut_ostimer_timerio_test.o ut_ostimer_test.o - -# -# Unit test object files specific to Linux platforms -# -#OBJS += - -# -# Unit test object files specific to vxWorks platforms -# -OBJS += - -# -# Core object files -# -OBJS += osapi.o osfileapi.o osfilesys.o osloader.o osnetwork.o ostimer.o - -# -# BSP Object files -# -OBJS += bsp_ut_voltab.o bsp_ut.o - -# -# UT Assert files -# -OBJS += utassert.o utlist.o utstubs.o uttest.o uttools.o - -# -# Unit test shared object files -# -OBJS += ut_os_stubs.o - -# -# Source files required to build subsystem; used to generate dependencies. -# As long as there are no assembly files this can be automated. -# -SOURCES = $(OBJS:.o=.c) - -# -# Specify extra C Flags needed to build this subsystem -# -#LOCAL_COPTS = -DUT_OS_USE_ATA -LOCAL_COPTS = -DUT_OS_USE_RAM - -# -# EXEDIR is defined here, just in case it needs to be different for a custom build -# -EXEDIR =./ - -######################################################################## -# Should not have to change below this line, except for customized -# directory structures -######################################################################## - -# -# no core objects, since all objs for unit tests are built in this directory -# -CORE_OBJS = - -# -# Include all necessary make rules -# Any of these can be copied to a local file and changed if needed. -# - -# -# osal-config.mak contians arch, BSP, and OS selection -# -include ../../osal-config.mak - -# -# debug-opts.mak contains debug switches -# -include ../../debug-opts.mak - -# -# compiler-opts.mak contains compiler definitions and switches/defines -# -include $(OSAL_SRC)/bsp/$(BSP)/make/compiler-opts.mak - -# -# Setup the include path for this subsystem -# The OS specific includes are in the build-rules.make file -# - -# -# If this subsystem needs include files from another app, add the path here. -# -INCLUDE_PATH = -I$(OSAL_SRC)/inc -INCLUDE_PATH += -I$(OSAL_SRC)/os/inc -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/shared -INCLUDE_PATH += -I$(OSAL_SRC)/unit-tests/$(APPTARGET) -INCLUDE_PATH += -I$(OSAL_SRC)/../ut_assert/inc -INCLUDE_PATH += -I../../inc - -# -# Define the VPATH make variable. -# This can be modified to include source from another directory. -# If there is no corresponding app in the apps directory, then this can be discarded, or -# if the mission chooses to put the src in another directory such as "src", then that can be -# added here as well. -# -VPATH = $(OSAL_SRC)/unit-tests/$(APPTARGET) -VPATH += $(OSAL_SRC)/unit-tests/shared -VPATH += $(OSAL_SRC)/os/$(OS) -VPATH += $(OSAL_SRC)/bsp/$(BSP)/ut-src -VPATH += $(OSAL_SRC)/../ut_assert/src - -# -# Include the common make rules for building an OSAL Application -# -include $(OSAL_SRC)/make/app-rules.mak - diff --git a/build/vxworks-target/get_log b/build/vxworks-target/get_log deleted file mode 100755 index 1a90d3863..000000000 --- a/build/vxworks-target/get_log +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -#---------------------------------------------------------------- -# Local to this file -#---------------------------------------------------------------- - -# The IP address of the target board running an ftp server -# ut699-1 board -#HOST='139.169.132.241' -# ut699-2 board -HOST='139.169.132.246' - -USER='target' -PASSWD='password' - -LOCALDIR='.' -#TGTDIR='/ram0/cf/apps' -TGTDIR='/cf/apps' - -#---------------------------------------------------------------- - -function print_usage -{ - echo " " - echo "Usage: $> ./get_log " - echo " " - echo " where = [osal]" - echo " = [oscore | osfilesys | osfile | osloader | osnetwork | osprintf | ostimer] (for osal API tests)" - echo " [oscore_wb | osfilesys_wb | osfile_wb | osloader_wb | osnetwork_wb | osnetwork_nonet_wb | ostimer_wb] (for osal white box tests)" - echo "" - exit 0 -} - -#---------------------------------------------------------------- - -function get_file -{ - ftp -i -n $HOST < ./load_ut " - echo " " - echo " where = [osal]" - echo " = [oscore | osfilesys | osfile | osloader | osnetwork | osprintf | ostimer] (for osal API tests)" - echo " [oscore_wb | osfilesys_wb | osfile_wb | osloader_wb | osnetwork_wb | osnetwork_nonet_wb | ostimer_wb] (for osal white box tests)" - echo "" - exit 0 -} - -#---------------------------------------------------------------- - -function put_files -{ - ftp -i -n $HOST < cd "/ram0/cf/apps" - -> runvx_osal_test, where test = oscore | osfilesys | osfile | osloader | osnetwork | ostimer - -11) After running each test, get the log file - $ ./get_log osal test, where test = oscore | osfilesys | osfile | osloader | osnetwork | ostimer - - - - - diff --git a/build/vxworks-target/runvx_osal-cov_osapi b/build/vxworks-target/runvx_osal-cov_osapi deleted file mode 100644 index e8dbdc8a0..000000000 --- a/build/vxworks-target/runvx_osal-cov_osapi +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osapi-cov_UT.o - -main() - -sleep(5) - -unld "osapi-cov_UT.o" - diff --git a/build/vxworks-target/runvx_osal-cov_osfileapi b/build/vxworks-target/runvx_osal-cov_osfileapi deleted file mode 100644 index 2c93f6c83..000000000 --- a/build/vxworks-target/runvx_osal-cov_osfileapi +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osfileapi-cov_UT.o - -main() - -sleep(5) - -unld "osfileapi-cov_UT.o" - diff --git a/build/vxworks-target/runvx_osal-cov_osloader b/build/vxworks-target/runvx_osal-cov_osloader deleted file mode 100644 index a45e5fe4c..000000000 --- a/build/vxworks-target/runvx_osal-cov_osloader +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osloader-cov_UT.o - -main() - -sleep(5) - -unld "osloader-cov_UT.o" - diff --git a/build/vxworks-target/runvx_osal_oscore b/build/vxworks-target/runvx_osal_oscore deleted file mode 100644 index 054ec03eb..000000000 --- a/build/vxworks-target/runvx_osal_oscore +++ /dev/null @@ -1,9 +0,0 @@ - -ld < oscore-test.o - -UT_main() - -sleep(5) - -unld "oscore-test.o" - diff --git a/build/vxworks-target/runvx_osal_oscore_wb b/build/vxworks-target/runvx_osal_oscore_wb deleted file mode 100644 index 780f3bf61..000000000 --- a/build/vxworks-target/runvx_osal_oscore_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < oscore_wb_UT.o - -main() - -unld "oscore_wb_UT.o" - -ld < oscore_wb_UT.o - -main() > ut_oscore_wb_log.txt - -unld "oscore_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osfile b/build/vxworks-target/runvx_osal_osfile deleted file mode 100644 index dafb88d49..000000000 --- a/build/vxworks-target/runvx_osal_osfile +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osfile-test.o - -UT_main() - -sleep(5) - -unld "osfile-test.o" - diff --git a/build/vxworks-target/runvx_osal_osfile_wb b/build/vxworks-target/runvx_osal_osfile_wb deleted file mode 100644 index c5231cc66..000000000 --- a/build/vxworks-target/runvx_osal_osfile_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < osfile_wb_UT.o - -main() - -unld "osfile_wb_UT.o" - -ld < osfile_wb_UT.o - -main() > ut_osfile_wb_log.txt - -unld "osfile_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osfilesys b/build/vxworks-target/runvx_osal_osfilesys deleted file mode 100644 index e5cf6efa9..000000000 --- a/build/vxworks-target/runvx_osal_osfilesys +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osfilesys-test.o - -UT_main() - -sleep(5) - -unld "osfilesys-test.o" - diff --git a/build/vxworks-target/runvx_osal_osfilesys_wb b/build/vxworks-target/runvx_osal_osfilesys_wb deleted file mode 100644 index 49b0d1ae9..000000000 --- a/build/vxworks-target/runvx_osal_osfilesys_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < osfilesys_wb_UT.o - -main() - -unld "osfilesys_wb_UT.o" - -ld < osfilesys_wb_UT.o - -main() > ut_osfilesys_wb_log.txt - -unld "osfilesys_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osloader b/build/vxworks-target/runvx_osal_osloader deleted file mode 100644 index 74a3fe79f..000000000 --- a/build/vxworks-target/runvx_osal_osloader +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osloader-test.o - -UT_main() - -sleep(5) - -unld "osloader-test.o" - diff --git a/build/vxworks-target/runvx_osal_osloader_wb b/build/vxworks-target/runvx_osal_osloader_wb deleted file mode 100644 index 6f2a9abfd..000000000 --- a/build/vxworks-target/runvx_osal_osloader_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < osloader_wb_UT.o - -main() - -unld "osloader_wb_UT.o" - -ld < osloader_wb_UT.o - -main() > ut_osloader_wb_log.txt - -unld "osloader_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osnetwork b/build/vxworks-target/runvx_osal_osnetwork deleted file mode 100644 index c752d4cd5..000000000 --- a/build/vxworks-target/runvx_osal_osnetwork +++ /dev/null @@ -1,9 +0,0 @@ - -ld < osnetwork-test.o - -UT_main() - -sleep(5) - -unld "osnetwork-test.o" - diff --git a/build/vxworks-target/runvx_osal_osnetwork_nonet_wb b/build/vxworks-target/runvx_osal_osnetwork_nonet_wb deleted file mode 100644 index f22f10238..000000000 --- a/build/vxworks-target/runvx_osal_osnetwork_nonet_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < osnetwork_nonet_wb_UT.o - -main() - -unld "osnetwork_nonet_wb_UT.o" - -ld < osnetwork_nonet_wb_UT.o - -main() > ut_osnetwork_nonet_wb_log.txt - -unld "osnetwork_nonet_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osnetwork_wb b/build/vxworks-target/runvx_osal_osnetwork_wb deleted file mode 100644 index 466633eb4..000000000 --- a/build/vxworks-target/runvx_osal_osnetwork_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < osnetwork_wb_UT.o - -main() - -unld "osnetwork_wb_UT.o" - -ld < osnetwork_wb_UT.o - -main() > ut_osnetwork_wb_log.txt - -unld "osnetwork_wb_UT.o" diff --git a/build/vxworks-target/runvx_osal_osprintf b/build/vxworks-target/runvx_osal_osprintf deleted file mode 100644 index 85b72ce05..000000000 --- a/build/vxworks-target/runvx_osal_osprintf +++ /dev/null @@ -1,7 +0,0 @@ - -ld < osprintf-test.o - -main() - -unld "osprintf-test.o" - diff --git a/build/vxworks-target/runvx_osal_ostimer b/build/vxworks-target/runvx_osal_ostimer deleted file mode 100644 index a03916004..000000000 --- a/build/vxworks-target/runvx_osal_ostimer +++ /dev/null @@ -1,9 +0,0 @@ - -ld < ostimer-test.o - -UT_main() - -sleep(5) - -unld "ostimer-test.o" - diff --git a/build/vxworks-target/runvx_osal_ostimer_wb b/build/vxworks-target/runvx_osal_ostimer_wb deleted file mode 100644 index a3bbcda60..000000000 --- a/build/vxworks-target/runvx_osal_ostimer_wb +++ /dev/null @@ -1,12 +0,0 @@ - -ld < ostimer_wb_UT.o - -main() - -unld "ostimer_wb_UT.o" - -ld < ostimer_wb_UT.o - -main() > ut_ostimer_wb_log.txt - -unld "ostimer_wb_UT.o" diff --git a/setvars.sh b/setvars.sh deleted file mode 100644 index 484124535..000000000 --- a/setvars.sh +++ /dev/null @@ -1,16 +0,0 @@ -# -# setvars.sh -# -# This shell script is used to set the OSAL_SRC environment variable for the makefile -# -cd src -export OSAL_SRC=`pwd` - -# For RTEMS targets, set the location of the RTEMS libraries. -# This allows the OSAL makefiles to remain unchanged. -# Example: standard RTEMS build/install directory: -# export RTEMS_BSP_BASE=/opt/rtems-4.10 -# The following is my personal RTEMS BSP build directory -export RTEMS_BSP_BASE="/home/acudmore/Projects/rtems-devkit/rtems-bsps/rtems-4.10" - -cd .. diff --git a/src/bsp/pc-linux/make/compiler-opts.mak b/src/bsp/pc-linux/make/compiler-opts.mak deleted file mode 100644 index 72c255734..000000000 --- a/src/bsp/pc-linux/make/compiler-opts.mak +++ /dev/null @@ -1,95 +0,0 @@ -############################################################################### -## compiler-opts.mak - compiler definitions and options for building the OSAL -## -## Target: x86 PC Linux -## -## Modifications: -## -############################################################################### -## -## Warning Level Configuration -## -## WARNINGS=-Wall -ansi -pedantic -Wstrict-prototypes -WARNINGS=-Wall -pedantic -std=c99 -Wstrict-prototypes - -## -## Host OS Include Paths ( be sure to put the -I switch in front of each directory ) -## -SYSINCS= - -## -## Target Defines for the OS, Hardware Arch, etc.. -## -TARGET_DEFS=-D__ix86__ -D_ix86_ -D_LINUX_OS_ -D$(OS) -DX86PC -DBUILD=$(BUILD) -D_REENTRANT -D _EMBED_ -D_XOPEN_SOURCE=600 - -## -## Endian Defines -## -ENDIAN_DEFS=-D_EL -DENDIAN=_EL -DSOFTWARE_LITTLE_BIT_ORDER - -## -## Compiler Architecture Switches -## -ARCH_OPTS ?= $(OSAL_M32) - -## -## Application specific compiler switches -## -ifeq ($(BUILD_TYPE),CFE_APP) - APP_COPTS= - APP_ASOPTS= -else - APP_COPTS= - APP_ASOPTS= -endif - -## -## Extra Cflags for Assembly listings, etc. -## -LIST_OPTS = - - -## -## gcc options for dependancy generation -## -COPTS_D = $(APP_COPTS) $(ENDIAN_DEFS) $(TARGET_DEFS) $(ARCH_OPTS) $(SYSINCS) $(WARNINGS) - -## -## General gcc options that apply to compiling and dependency generation. -## -COPTS=$(LIST_OPTS) $(COPTS_D) - -## -## Extra defines and switches for assembly code -## -ASOPTS = $(APP_ASOPTS) -P -xassembler-with-cpp - -## -## Application file extention type -## This is the defined application extention. -## -APP_EXT = bin - -################################################################################# -## Host Development System and Toolchain defintions -## - -## -## Host OS utils -## -RM=rm -f -CP=cp - -## -## Compiler tools -## -COMPILER=gcc -ASSEMBLER=as -LINKER=ld -AR=ar -NM=nm -SIZE=size -OBJCOPY=objcopy -OBJDUMP=objdump - -## End configuration options ## diff --git a/src/bsp/pc-linux/make/link-rules.mak b/src/bsp/pc-linux/make/link-rules.mak deleted file mode 100644 index 0522b6f46..000000000 --- a/src/bsp/pc-linux/make/link-rules.mak +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# File: link-rules.mak -# -# Purpose: -# Makefile for linking code and producing an executable image. -# -# History: -# -############################################################################### - - -## -## Linker flags that are needed -## -LDFLAGS ?= $(OSAL_M32) - -## -## Libraries to link in -## Cygwin cannot use the -lrt switch -## Older versions of linux may not have this as well. -## -OSTYPE := $(shell uname -s) -ifeq ($(OSTYPE),Linux) - LIBS = -lpthread -lrt -ldl -else - LIBS = -lpthread -ldl -endif - - -## -## OSAL Core Link Rule -## -$(APPTARGET).$(APP_EXT): $(OBJS) - $(COMPILER) $(DEBUG_FLAGS) -o $(APPTARGET).$(APP_EXT) $(OBJS) $(CORE_OBJS) $(LDFLAGS) $(LIBS) - - diff --git a/src/bsp/pc-linux/make/ut-modules.mak b/src/bsp/pc-linux/make/ut-modules.mak deleted file mode 100644 index bd13f850e..000000000 --- a/src/bsp/pc-linux/make/ut-modules.mak +++ /dev/null @@ -1,44 +0,0 @@ -# -# MODULE_SRC sets the path to the source code needed -# -MODULE_SRC = $(OSAL_SRC)/unit-tests/osloader-test - -default:: - mkdir -p eeprom1 - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module0 -o eeprom1/MODULE0.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module1 -o eeprom1/MODULE1.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module2 -o eeprom1/MODULE2.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module3 -o eeprom1/MODULE3.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module4 -o eeprom1/MODULE4.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module5 -o eeprom1/MODULE5.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module6 -o eeprom1/MODULE6.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module7 -o eeprom1/MODULE7.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module8 -o eeprom1/MODULE8.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module9 -o eeprom1/MODULE9.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module10 -o eeprom1/MODULE10.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module11 -o eeprom1/MODULE11.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module12 -o eeprom1/MODULE12.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module13 -o eeprom1/MODULE13.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module14 -o eeprom1/MODULE14.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module15 -o eeprom1/MODULE15.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module16 -o eeprom1/MODULE16.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module17 -o eeprom1/MODULE17.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module18 -o eeprom1/MODULE18.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module19 -o eeprom1/MODULE19.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module20 -o eeprom1/MODULE20.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module21 -o eeprom1/MODULE21.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module22 -o eeprom1/MODULE22.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module23 -o eeprom1/MODULE23.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module24 -o eeprom1/MODULE24.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module25 -o eeprom1/MODULE25.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module26 -o eeprom1/MODULE26.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module27 -o eeprom1/MODULE27.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module28 -o eeprom1/MODULE28.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module29 -o eeprom1/MODULE29.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module30 -o eeprom1/MODULE30.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module31 -o eeprom1/MODULE31.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module32 -o eeprom1/MODULE32.so $(MODULE_SRC)/ut_module.c - gcc $(OSAL_M32) -shared -Wall -g -O0 -DMODULE_NAME=module33 -o eeprom1/MODULE33.so $(MODULE_SRC)/ut_module.c - -clean:: - rm -rf eeprom1 diff --git a/src/bsp/pc-linux/src/bsp.mak b/src/bsp/pc-linux/src/bsp.mak deleted file mode 100644 index 7e9dc72c9..000000000 --- a/src/bsp/pc-linux/src/bsp.mak +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################### -# File: bsp.mak -# -# Purpose: -# Compile Board Support Package routines for the Linux desktop build -# -# History: -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = bsp.o - -#============================================================================== -# Object files required to build subsystem. -OBJS = bsp_start.o bsp_voltab.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. -SOURCES = bsp_start.c bsp_voltab.c - - diff --git a/src/make/app-rules.mak b/src/make/app-rules.mak deleted file mode 100644 index 1566cdc4f..000000000 --- a/src/make/app-rules.mak +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# File: app-rules.mak -# -# Purpose: OSAL Application make rules. This file contains common make rules to -# be included by application make files. -# -# -# History: -# -############################################################################### - -## -## Default rule for building the App Loadable file -## -default: $(APPTARGET).$(APP_EXT) - -## -## Default Compiler rule -## -.c.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Default Assembly Code Rule -## -.s.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(ASOPTS) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Rule to generate the dependancy list -## -depend: $(SOURCES) - $(COMPILER) -MM $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS_D) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c $^ > $(APPTARGET).d - -## -## Include the rule for linking the application. -## This is architecture/compiler/os specific, so it must be included from the ARCH directory -## -include $(OSAL_SRC)/bsp/$(BSP)/make/link-rules.mak - -## -## Default rule for installing app -## -install: - $(CP) $(APPTARGET).$(APP_EXT) $(EXEDIR) - -## -## Rule for cleaning -## All of the possible extentions are included here so we can clean up after -## an old build from a different architecture. -## -clean:: - -$(RM) *.o - -$(RM) *.g* - -$(RM) *.lis - -$(RM) *.exe - -$(RM) *.nxe - -$(RM) *.elf - -$(RM) *.bin - -$(RM) *.d - - -## -## gcov rule -## -gcov: - @echo - @echo "Running OSAL unit test: $@" - @echo - ./$(APPTARGET).$(APP_EXT) - @rm -f gmon.out - @echo - @gcov os*.gcda | sed 'N;s/\n/ /' | \ - sed -n '/File/p' | sed '/ads/d' | \ - sed 's/ Lines executed:/ /; s/File/gcov:/; s/of//' - @echo - - -# -# Include the dependancy list -# --include $(APPTARGET).d - - - -# eof diff --git a/src/make/make-rules.mak b/src/make/make-rules.mak deleted file mode 100644 index 879e0a93b..000000000 --- a/src/make/make-rules.mak +++ /dev/null @@ -1,51 +0,0 @@ -## -## -## Common Make Rules for building OSAL core subsystems -## This file is included by the individual Core subsystems ( bsp, os, hal ) -## -## - -## -## The default "make" target is the subsystem object module. -## -default::$(TARGET) - -## -## Compiler rule -## -.c.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Assembly Code Rule -## -.s.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(ASOPTS) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Rule to generate the dependancy list -## -depend: $(SOURCES) - $(COMPILER) -MM $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS_D) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c $^ > $(SUBSYS).d - - -## -## Subsystem Link rule -## -$(TARGET): $(OBJS) - $(LINKER) -o $(TARGET) -r $(OBJS) - -## -## Make clean rule -## -clean: - -$(RM) *.o - -$(RM) *.lis - -$(RM) *.g* - -$(RM) *.d - -# -# Include the dependancy list -# --include $(SUBSYS).d - diff --git a/src/os/posix/os-posix.h b/src/os/posix/os-posix.h index 2321621ca..0fdccf7be 100644 --- a/src/os/posix/os-posix.h +++ b/src/os/posix/os-posix.h @@ -21,6 +21,8 @@ /**************************************************************************************** COMMON INCLUDE FILES ***************************************************************************************/ +#ifndef _os_posix_h_ +#define _os_posix_h_ #include #include @@ -110,4 +112,4 @@ int32 OS_Posix_FileSysAPI_Impl_Init(void); int32 OS_Posix_InternalTaskCreate_Impl (pthread_t *pthr, uint32 priority, size_t stacksz, PthreadFuncPtr_t entry, void *entry_arg); - +#endif /* End of os-posix*/ diff --git a/src/os/shared/osapi-idmap.c b/src/os/shared/osapi-idmap.c index c328fb935..14a23954e 100644 --- a/src/os/shared/osapi-idmap.c +++ b/src/os/shared/osapi-idmap.c @@ -484,11 +484,11 @@ static int32 OS_ObjectIdFindNext(uint32 idtype, uint32 *array_index, OS_common_r { uint32 max_id; uint32 base_id; - uint32 local_id; + uint32 local_id = 0; uint32 idvalue; uint32 i; int32 return_code; - OS_common_record_t *obj; + OS_common_record_t *obj = NULL; base_id = OS_GetBaseForObjectType(idtype); max_id = OS_GetMaxForObjectType(idtype); diff --git a/src/os/shared/osapi-sockets.c b/src/os/shared/osapi-sockets.c index 8a874a9d3..6e1087f0c 100644 --- a/src/os/shared/osapi-sockets.c +++ b/src/os/shared/osapi-sockets.c @@ -211,7 +211,7 @@ int32 OS_SocketAccept(uint32 sock_id, uint32 *connsock_id, OS_SockAddr_t *Addr, OS_common_record_t *record; OS_common_record_t *connrecord; uint32 local_id; - uint32 conn_id; + uint32 conn_id = 0; int32 return_code; /* Check Parameters */ diff --git a/src/os/shared/osapi-time.c b/src/os/shared/osapi-time.c index ea058b572..38b0c4d6d 100644 --- a/src/os/shared/osapi-time.c +++ b/src/os/shared/osapi-time.c @@ -389,7 +389,7 @@ int32 OS_TimerDelete(uint32 timer_id) { OS_timecb_internal_record_t *local; OS_common_record_t *record; - OS_common_record_t *timebase; + OS_common_record_t *timebase = NULL; int32 return_code; uint32 local_id; uint32 dedicated_timebase_id;