From a8c9b364f53f8fcce4d4f5e1f473b1e766344016 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 16 Mar 2021 16:23:54 -0400 Subject: [PATCH] Fix #265, Use quotes for local includes --- fsw/inc/cfe_psp_configdata.h | 4 ++-- fsw/mcp750-vxworks/src/cfe_psp_exception.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_memory.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_start.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_support.c | 2 +- fsw/pc-linux/src/cfe_psp_memory.c | 2 +- fsw/pc-linux/src/cfe_psp_start.c | 2 +- fsw/pc-rtems/src/cfe_psp_memory.c | 2 +- fsw/pc-rtems/src/cfe_psp_start.c | 2 +- fsw/pc-rtems/src/cfe_psp_support.c | 2 +- fsw/shared/inc/cfe_psp_exceptionstorage_api.h | 2 +- fsw/shared/inc/cfe_psp_exceptionstorage_types.h | 4 ++-- fsw/shared/inc/cfe_psp_module.h | 4 ++-- fsw/shared/src/cfe_psp_configdata.c | 8 ++++---- fsw/shared/src/cfe_psp_exceptionstorage.c | 2 +- fsw/shared/src/cfe_psp_module.c | 2 +- fsw/shared/src/cfe_psp_version.c | 4 ++-- .../mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h | 2 +- .../mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c | 4 ++-- .../mcp750-vxworks/src/coveragetest-cfe-psp-start.c | 10 +++++----- .../mcp750-vxworks/src/coveragetest-cfe-psp-support.c | 8 ++++---- .../src/coveragetest-psp-mcp750-vxworks.h | 8 ++++---- .../shared/adaptors/inc/ut-adaptor-exceptions.h | 4 ++-- .../shared/adaptors/src/ut-adaptor-exceptions.c | 4 ++-- .../shared/inc/coveragetest-psp-shared.h | 6 +++--- .../shared/src/coveragetest-cfe-psp-exceptionstorage.c | 10 +++++----- unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h | 2 +- .../ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_blkIo.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h | 8 ++++---- unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_excLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_fppLib.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h | 6 +++--- unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_stdarg.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_stdio.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_stdlib.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_string.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_sysLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_sys_types.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_taskLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_unistd.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_usrLib.h | 4 ++-- unit-test-coverage/ut-stubs/inc/PCS_vxLib.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h | 2 +- unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h | 6 +++--- unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h | 4 ++-- .../ut-stubs/override_inc/arch/ppc/esfPpc.h | 2 +- .../ut-stubs/override_inc/arch/ppc/vxPpcLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/blkIo.h | 2 +- unit-test-coverage/ut-stubs/override_inc/cacheLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/dosFsLib.h | 2 +- .../ut-stubs/override_inc/drv/hdisk/ataDrv.h | 2 +- unit-test-coverage/ut-stubs/override_inc/errnoLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/excLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/fppLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/mcpx750.h | 2 +- unit-test-coverage/ut-stubs/override_inc/moduleLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/ramDrv.h | 2 +- unit-test-coverage/ut-stubs/override_inc/rebootLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/stdarg.h | 2 +- unit-test-coverage/ut-stubs/override_inc/stdio.h | 2 +- unit-test-coverage/ut-stubs/override_inc/stdlib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/string.h | 2 +- unit-test-coverage/ut-stubs/override_inc/sys/types.h | 2 +- unit-test-coverage/ut-stubs/override_inc/sysLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/taskLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/unistd.h | 2 +- unit-test-coverage/ut-stubs/override_inc/usrLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/vxLib.h | 2 +- unit-test-coverage/ut-stubs/override_inc/vxWorks.h | 2 +- unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h | 2 +- unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h | 2 +- unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c | 6 +++--- unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/libc-string-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c | 2 +- .../ut-stubs/src/vxworks-cacheLib-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/vxworks-excLib-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/vxworks-fppLib-stubs.c | 2 +- .../ut-stubs/src/vxworks-mcpx750-stubs.c | 2 +- .../ut-stubs/src/vxworks-moduleLib-stubs.c | 2 +- .../ut-stubs/src/vxworks-rebootLib-stubs.c | 2 +- unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c | 2 +- .../ut-stubs/src/vxworks-taskLib-stubs.c | 4 ++-- unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c | 4 ++-- ut-stubs/ut_psp_stubs.c | 2 +- 94 files changed, 143 insertions(+), 143 deletions(-) diff --git a/fsw/inc/cfe_psp_configdata.h b/fsw/inc/cfe_psp_configdata.h index d7285592..c8c446c0 100644 --- a/fsw/inc/cfe_psp_configdata.h +++ b/fsw/inc/cfe_psp_configdata.h @@ -29,9 +29,9 @@ #define CFE_PSP_CONFIG_H_ /* osapi.h is required for the definition of OS_VolumeInto_t */ -#include +#include "osapi.h" /* cfe_psp.h is required for the definition of CFE_PSP_MemTable_t */ -#include +#include "cfe_psp.h" /* ** PSP software version record diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c index 5caa972e..c546110b 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_exception.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_exception.c @@ -58,7 +58,7 @@ #include "cfe_psp_exceptionstorage_api.h" #include "cfe_psp_memory.h" -#include +#include "target_config.h" /* ** diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c index 34bcd9fa..6af794c5 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c @@ -56,7 +56,7 @@ #include "cfe_psp.h" #include "cfe_psp_memory.h" -#include +#include "target_config.h" /* ** External Declarations diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c index ebf0798d..c8c2484d 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_start.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_start.c @@ -70,7 +70,7 @@ IMPORT void sysPciWrite32(UINT32, UINT32); * the dynamically generated configuration object. This allows a single build * of the PSP to be completely CFE-independent. */ -#include +#include "target_config.h" #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain) #define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile) diff --git a/fsw/mcp750-vxworks/src/cfe_psp_support.c b/fsw/mcp750-vxworks/src/cfe_psp_support.c index 765c61cf..bf9b0110 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_support.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_support.c @@ -61,7 +61,7 @@ #include "cfe_psp.h" #include "cfe_psp_memory.h" -#include +#include "target_config.h" #define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId) #define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName) diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c index 60f9bda0..5c9ddc2f 100644 --- a/fsw/pc-linux/src/cfe_psp_memory.c +++ b/fsw/pc-linux/src/cfe_psp_memory.c @@ -68,7 +68,7 @@ #define CFE_PSP_RESET_KEY_FILE ".resetkeyfile" #define CFE_PSP_RESERVED_KEY_FILE ".reservedkeyfile" -#include +#include "target_config.h" /* * Define the PSP-supported capacities to be the maximum allowed, diff --git a/fsw/pc-linux/src/cfe_psp_start.c b/fsw/pc-linux/src/cfe_psp_start.c index 9630611d..ff0479ea 100644 --- a/fsw/pc-linux/src/cfe_psp_start.c +++ b/fsw/pc-linux/src/cfe_psp_start.c @@ -61,7 +61,7 @@ * the dynamically generated configuration object. This allows a single build * of the PSP to be completely CFE-independent. */ -#include +#include "target_config.h" #include "cfe_psp_module.h" #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain) diff --git a/fsw/pc-rtems/src/cfe_psp_memory.c b/fsw/pc-rtems/src/cfe_psp_memory.c index 53f557d4..559e1a2a 100644 --- a/fsw/pc-rtems/src/cfe_psp_memory.c +++ b/fsw/pc-rtems/src/cfe_psp_memory.c @@ -56,7 +56,7 @@ /* ** Macro Definitions */ -#include +#include "target_config.h" /* * Define the PSP-supported capacities to be the maximum allowed, diff --git a/fsw/pc-rtems/src/cfe_psp_start.c b/fsw/pc-rtems/src/cfe_psp_start.c index 1433fa65..66361c4a 100644 --- a/fsw/pc-rtems/src/cfe_psp_start.c +++ b/fsw/pc-rtems/src/cfe_psp_start.c @@ -55,7 +55,7 @@ extern int rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching) * the dynamically generated configuration object. This allows a single build * of the PSP to be completely CFE-independent. */ -#include +#include "target_config.h" #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain) #define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile) diff --git a/fsw/pc-rtems/src/cfe_psp_support.c b/fsw/pc-rtems/src/cfe_psp_support.c index 9e69c294..29014f31 100644 --- a/fsw/pc-rtems/src/cfe_psp_support.c +++ b/fsw/pc-rtems/src/cfe_psp_support.c @@ -55,7 +55,7 @@ * the dynamically generated configuration object. This allows a single build * of the PSP to be completely CFE-independent. */ -#include +#include "target_config.h" #define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId) #define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName) diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_api.h b/fsw/shared/inc/cfe_psp_exceptionstorage_api.h index 3ecf72ee..da2fc0dc 100644 --- a/fsw/shared/inc/cfe_psp_exceptionstorage_api.h +++ b/fsw/shared/inc/cfe_psp_exceptionstorage_api.h @@ -27,7 +27,7 @@ #ifndef CFE_PSP_EXCEPTIONSTORAGE_API_H_ #define CFE_PSP_EXCEPTIONSTORAGE_API_H_ -#include +#include "cfe_psp.h" /* * Abstract types for exception storage. diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_types.h b/fsw/shared/inc/cfe_psp_exceptionstorage_types.h index 289c0843..062bc725 100644 --- a/fsw/shared/inc/cfe_psp_exceptionstorage_types.h +++ b/fsw/shared/inc/cfe_psp_exceptionstorage_types.h @@ -27,8 +27,8 @@ #ifndef CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_ #define CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_ -#include -#include +#include "cfe_psp.h" +#include "cfe_psp_config.h" /* * The "MetaData" stores ephemeral exception information diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h index ee4e6157..d76689b4 100644 --- a/fsw/shared/inc/cfe_psp_module.h +++ b/fsw/shared/inc/cfe_psp_module.h @@ -30,8 +30,8 @@ #ifndef CFE_PSP_MODULE_H_ #define CFE_PSP_MODULE_H_ -#include -#include +#include "cfe_psp.h" +#include "target_config.h" typedef enum { diff --git a/fsw/shared/src/cfe_psp_configdata.c b/fsw/shared/src/cfe_psp_configdata.c index 1a4374be..4153b588 100644 --- a/fsw/shared/src/cfe_psp_configdata.c +++ b/fsw/shared/src/cfe_psp_configdata.c @@ -25,10 +25,10 @@ * Author: joseph.p.hickey@nasa.gov */ -#include -#include -#include -#include +#include "cfe_psp.h" +#include "cfe_psp_config.h" +#include "psp_version.h" +#include "cfe_psp_configdata.h" /** * Instantiation of the PSP/HW configuration data diff --git a/fsw/shared/src/cfe_psp_exceptionstorage.c b/fsw/shared/src/cfe_psp_exceptionstorage.c index 0724c2be..5a5e814e 100644 --- a/fsw/shared/src/cfe_psp_exceptionstorage.c +++ b/fsw/shared/src/cfe_psp_exceptionstorage.c @@ -51,7 +51,7 @@ #include "cfe_psp_exceptionstorage_api.h" #include "cfe_psp_memory.h" -#include +#include "target_config.h" /* ** Constants diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c index 5e2c0830..efc2d59c 100644 --- a/fsw/shared/src/cfe_psp_module.c +++ b/fsw/shared/src/cfe_psp_module.c @@ -27,7 +27,7 @@ #include #include -#include +#include "osapi.h" #include "cfe_psp_configdata.h" #include "cfe_psp_module.h" diff --git a/fsw/shared/src/cfe_psp_version.c b/fsw/shared/src/cfe_psp_version.c index ff3b28af..39c11b39 100644 --- a/fsw/shared/src/cfe_psp_version.c +++ b/fsw/shared/src/cfe_psp_version.c @@ -24,8 +24,8 @@ * Defines API that obtains the values of the various version identifiers */ -#include -#include +#include "cfe_psp.h" +#include "cfe_psp_configdata.h" /*---------------------------------------------------------------- * diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h b/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h index de49c624..54b0d0db 100644 --- a/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h +++ b/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h @@ -20,7 +20,7 @@ #ifndef INCLUDE_UT_ADAPTOR_BOOTREC_H_ #define INCLUDE_UT_ADAPTOR_BOOTREC_H_ -#include +#include "common_types.h" void UT_Setup_ReservedMem_BootRec(void); uint32 UT_Get_ReservedMem_BootType(void); diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c b/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c index 8319a749..ef5f99a1 100644 --- a/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c +++ b/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c @@ -18,8 +18,8 @@ */ #include "ut-adaptor-bootrec.h" -#include -#include +#include "cfe_psp_config.h" +#include "cfe_psp_memory.h" static CFE_PSP_ReservedMemoryBootRecord_t UT_BOOTREC; diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c index befaa4be..80495276 100644 --- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c +++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c @@ -20,12 +20,12 @@ #include "coveragetest-psp-mcp750-vxworks.h" #include "ut-adaptor-bootrec.h" -#include +#include "cfe_psp.h" -#include -#include -#include -#include +#include "PCS_sysLib.h" +#include "PCS_mcpx750.h" +#include "PCS_stdlib.h" +#include "PCS_cfe_configdata.h" extern void UT_OS_Application_Startup(void); extern void UT_OS_Application_Run(void); diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c index 7b2a6b25..7ddd4583 100644 --- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c +++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c @@ -20,11 +20,11 @@ #include "coveragetest-psp-mcp750-vxworks.h" #include "ut-adaptor-bootrec.h" -#include +#include "cfe_psp.h" -#include -#include -#include +#include "PCS_stdlib.h" +#include "PCS_rebootLib.h" +#include "PCS_cacheLib.h" #include "PCS_cfe_configdata.h" void Test_CFE_PSP_Restart(void) diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h index 9ef50cb6..ef7dc7ae 100644 --- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h +++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h @@ -20,11 +20,11 @@ #ifndef INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_ #define INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_ -#include -#include -#include +#include "utassert.h" +#include "uttest.h" +#include "utstubs.h" -#include +#include "coveragetest-psp-shared.h" #define ADD_TEST(test) UtTest_Add((Test_##test), Psp_Test_Setup, Psp_Test_Teardown, #test) diff --git a/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h b/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h index e63534b5..139a9bc2 100644 --- a/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h +++ b/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h @@ -20,8 +20,8 @@ #ifndef INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_ #define INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_ -#include -#include +#include "common_types.h" +#include "cfe_psp_exceptionstorage_api.h" uint32 UT_Get_Exception_MaxEntries(void); size_t UT_Get_Exception_Size(void); diff --git a/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c b/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c index 72d80bce..6b92d5cc 100644 --- a/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c +++ b/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c @@ -18,8 +18,8 @@ */ #include "ut-adaptor-exceptions.h" -#include -#include +#include "cfe_psp_config.h" +#include "cfe_psp_memory.h" #define CFE_PSP_MAX_EXCEPTION_ENTRIES 4 #define CFE_PSP_MAX_EXCEPTION_BACKTRACE_SIZE 16 diff --git a/unit-test-coverage/shared/inc/coveragetest-psp-shared.h b/unit-test-coverage/shared/inc/coveragetest-psp-shared.h index dd568fe8..e56851f6 100644 --- a/unit-test-coverage/shared/inc/coveragetest-psp-shared.h +++ b/unit-test-coverage/shared/inc/coveragetest-psp-shared.h @@ -20,9 +20,9 @@ #ifndef INCLUDE_PSP_SHARED_COVERAGETEST_H_ #define INCLUDE_PSP_SHARED_COVERAGETEST_H_ -#include -#include -#include +#include "utassert.h" +#include "uttest.h" +#include "utstubs.h" void Test_CFE_PSP_Exception_GetBuffer(void); void Test_CFE_PSP_Exception_GetNextContextBuffer(void); diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c index f9431fc7..15b05fab 100644 --- a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c +++ b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c @@ -21,13 +21,13 @@ #include "utstubs.h" #include "ut-adaptor-exceptions.h" -#include -#include +#include "cfe_psp.h" +#include "cfe_psp_exceptionstorage_api.h" #ifdef jphfix -#include -#include -#include +#include "PCS_stdlib.h" +#include "PCS_rebootLib.h" +#include "PCS_cacheLib.h" #include "PCS_cfe_configdata.h" #endif diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h index 809a51bb..0c7bfdb7 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_ESFPPC_H_ #define _PSP_STUB_ESFPPC_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in esfPpc.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h index d227d312..7ac39e79 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_VXPPCLIB_H_ #define _PSP_STUB_VXPPCLIB_H_ -#include +#include "PCS_basetypes.h" /* * When building the coverage test on an actual VxWorks target, diff --git a/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h b/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h index 35268ceb..9ef1779f 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h @@ -12,8 +12,8 @@ #ifndef _PSP_STUB_BLKIO_H_ #define _PSP_STUB_BLKIO_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* The module and blk_dev types are used in several headers */ typedef struct PCS_BLK_DEV diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h b/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h index 3e0f385e..6ddfa76b 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_CACHELIB_H_ #define _PSP_STUB_CACHELIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in cacheLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h b/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h index 63bae598..b78573f5 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h @@ -1,7 +1,7 @@ #ifndef _PSP_STUB_CFE_CONFIGDATA_H_ #define _PSP_STUB_CFE_CONFIGDATA_H_ -#include +#include "PCS_basetypes.h" #define PCS_CONFIG_MISSIONVERSION "UT-mission" #define PCS_CONFIG_CFEVERSION "UT-CFE" diff --git a/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h b/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h index 5e0accf0..4bb5a321 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_DOSFSLIB_H_ #define _PSP_STUB_DOSFSLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in dosFsLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h b/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h index 8e83fbe5..5918c8a9 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h @@ -2,10 +2,10 @@ #ifndef _PSP_STUB_DRV_HDISK_ATADRV_H_ #define _PSP_STUB_DRV_HDISK_ATADRV_H_ -#include -#include -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" +#include "PCS_blkIo.h" +#include "PCS_xbdBlkDev.h" /* ----------------------------------------- */ /* constants normally defined in drv/hdisk/ataDrv.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h b/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h index 10204a64..2d5e8ac8 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_ERRNOLIB_H_ #define _PSP_STUB_ERRNOLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in errnoLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_excLib.h b/unit-test-coverage/ut-stubs/inc/PCS_excLib.h index 4daad260..14ed9c65 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_excLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_excLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_EXCLIB_H_ #define _PSP_STUB_EXCLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_taskLib.h" /* ----------------------------------------- */ /* constants normally defined in excLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h b/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h index 56d2646e..54ffc02a 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_FPPLIB_H_ #define _PSP_STUB_FPPLIB_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in fppLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h b/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h index fdcaae75..50e9f2f8 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_MCPX750_H_ #define _PSP_STUB_MCPX750_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in mcpx750.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h b/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h index 130f89aa..7872acca 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_MODULELIB_H_ #define _PSP_STUB_MODULELIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in moduleLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h b/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h index 2386af76..5db51e75 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h @@ -2,9 +2,9 @@ #ifndef _PSP_STUB_RAMDRV_H_ #define _PSP_STUB_RAMDRV_H_ -#include -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" +#include "PCS_blkIo.h" /* ----------------------------------------- */ /* constants normally defined in ramDrv.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h b/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h index 27dd8118..91b644c9 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_REBOOTLIB_H_ #define _PSP_STUB_REBOOTLIB_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in rebootLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h b/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h index 5736f854..eb547226 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_STDARG_H_ #define _PSP_STUB_STDARG_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in stdarg.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdio.h b/unit-test-coverage/ut-stubs/inc/PCS_stdio.h index fabfc4db..d2c6db0a 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_stdio.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_stdio.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_STDIO_H_ #define _PSP_STUB_STDIO_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_stdarg.h" /* ----------------------------------------- */ /* constants normally defined in stdio.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h b/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h index cdb09590..03ae7935 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_STDLIB_H_ #define _PSP_STUB_STDLIB_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in stdlib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_string.h b/unit-test-coverage/ut-stubs/inc/PCS_string.h index 8d6137f7..045519dd 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_string.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_string.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_STRING_H_ #define _PSP_STUB_STRING_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in string.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h b/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h index 034fd6dc..35390da2 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_SYSLIB_H_ #define _PSP_STUB_SYSLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in sysLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h b/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h index f5633e59..68395021 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_SYS_TYPES_H_ #define _PSP_STUB_SYS_TYPES_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in sys/types.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h b/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h index db69815d..81c778e6 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_TASKLIB_H_ #define _PSP_STUB_TASKLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in taskLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_unistd.h b/unit-test-coverage/ut-stubs/inc/PCS_unistd.h index d9307be3..93ed9101 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_unistd.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_unistd.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_UNISTD_H_ #define _PSP_STUB_UNISTD_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_sys_types.h" /* ----------------------------------------- */ /* constants normally defined in unistd.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h b/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h index d8dbeb9a..bd966013 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_USRLIB_H_ #define _PSP_STUB_USRLIB_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in usrLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h b/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h index 710efe2e..e797053a 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h @@ -2,7 +2,7 @@ #ifndef _PSP_STUB_VXLIB_H_ #define _PSP_STUB_VXLIB_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in vxLib.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h index fc4da4e5..6f6e06e8 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h @@ -20,7 +20,7 @@ #ifndef INCLUDE_OCS_VXWORKS_H_ #define INCLUDE_OCS_VXWORKS_H_ -#include +#include "PCS_basetypes.h" /* ----------------------------------------- */ /* constants normally defined in vxWorks.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h b/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h index 93c7a14b..2d9b6cca 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h @@ -2,9 +2,9 @@ #ifndef _PSP_STUB_XBDBLKDEV_H_ #define _PSP_STUB_XBDBLKDEV_H_ -#include -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" +#include "PCS_blkIo.h" /* ----------------------------------------- */ /* constants normally defined in xbdBlkDev.h */ diff --git a/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h b/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h index 1d62e325..a432a8af 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h @@ -2,8 +2,8 @@ #ifndef _PSP_STUB_XBDRAMDISK_H_ #define _PSP_STUB_XBDRAMDISK_H_ -#include -#include +#include "PCS_basetypes.h" +#include "PCS_vxWorks.h" /* ----------------------------------------- */ /* constants normally defined in xbdRamDisk.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h index bf7b4a5c..4ffcc65f 100644 --- a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h +++ b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_ESFPPC_H_ #define _PSP_OVERRIDE_ESFPPC_H_ -#include +#include "PCS_arch_ppc_esfPpc.h" /* ----------------------------------------- */ /* mappings for declarations in fenv.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h index 0c7bbe88..e10e3adf 100644 --- a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_VXPPCLIB_H_ #define _PSP_OVERRIDE_VXPPCLIB_H_ -#include +#include "PCS_arch_ppc_vxPpcLib.h" /* * When building the coverage test on an actual VxWorks target, diff --git a/unit-test-coverage/ut-stubs/override_inc/blkIo.h b/unit-test-coverage/ut-stubs/override_inc/blkIo.h index 79b7cbec..6b15ce02 100644 --- a/unit-test-coverage/ut-stubs/override_inc/blkIo.h +++ b/unit-test-coverage/ut-stubs/override_inc/blkIo.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_BLKIO_H_ #define _PSP_OVERRIDE_BLKIO_H_ -#include +#include "PCS_blkIo.h" #include /* ---------------------------------------*/ diff --git a/unit-test-coverage/ut-stubs/override_inc/cacheLib.h b/unit-test-coverage/ut-stubs/override_inc/cacheLib.h index 519da6f0..fd22e447 100644 --- a/unit-test-coverage/ut-stubs/override_inc/cacheLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/cacheLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_CACHELIB_H_ #define _PSP_OVERRIDE_CACHELIB_H_ -#include +#include "PCS_cacheLib.h" /* ----------------------------------------- */ /* mappings for declarations in cacheLib.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h b/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h index 6a200587..a477443e 100644 --- a/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_DOSFSLIB_H_ #define _PSP_OVERRIDE_DOSFSLIB_H_ -#include +#include "PCS_dosFsLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h b/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h index 10ad3101..bdf21555 100644 --- a/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h +++ b/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_DRV_HDISK_ATADRV_H_ #define _PSP_OVERRIDE_DRV_HDISK_ATADRV_H_ -#include +#include "PCS_drv_hdisk_ataDrv.h" #include #include diff --git a/unit-test-coverage/ut-stubs/override_inc/errnoLib.h b/unit-test-coverage/ut-stubs/override_inc/errnoLib.h index b567f49e..06ec500b 100644 --- a/unit-test-coverage/ut-stubs/override_inc/errnoLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/errnoLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_ERRNOLIB_H_ #define _PSP_OVERRIDE_ERRNOLIB_H_ -#include +#include "PCS_errnoLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/excLib.h b/unit-test-coverage/ut-stubs/override_inc/excLib.h index ef9e16c5..e259f5e6 100644 --- a/unit-test-coverage/ut-stubs/override_inc/excLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/excLib.h @@ -13,7 +13,7 @@ #define _PSP_OVERRIDE_EXCLIB_H_ #include -#include +#include "PCS_excLib.h" /* ----------------------------------------- */ /* mappings for declarations in excLib.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/fppLib.h b/unit-test-coverage/ut-stubs/override_inc/fppLib.h index 63e27f0a..9aa92bfd 100644 --- a/unit-test-coverage/ut-stubs/override_inc/fppLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/fppLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_FPPLIB_H_ #define _PSP_OVERRIDE_FPPLIB_H_ -#include +#include "PCS_fppLib.h" /* ----------------------------------------- */ /* mappings for declarations in fppLib.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/mcpx750.h b/unit-test-coverage/ut-stubs/override_inc/mcpx750.h index f3906346..0bc3eca4 100644 --- a/unit-test-coverage/ut-stubs/override_inc/mcpx750.h +++ b/unit-test-coverage/ut-stubs/override_inc/mcpx750.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_MCPX750_H_ #define _PSP_OVERRIDE_MCPX750_H_ -#include +#include "PCS_mcpx750.h" /* ----------------------------------------- */ /* mappings for declarations in mcpx750.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/moduleLib.h b/unit-test-coverage/ut-stubs/override_inc/moduleLib.h index cf89eeab..ac4b1944 100644 --- a/unit-test-coverage/ut-stubs/override_inc/moduleLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/moduleLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_MODULELIB_H_ #define _PSP_OVERRIDE_MODULELIB_H_ -#include +#include "PCS_moduleLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/ramDrv.h b/unit-test-coverage/ut-stubs/override_inc/ramDrv.h index d2f3c85f..417c4edb 100644 --- a/unit-test-coverage/ut-stubs/override_inc/ramDrv.h +++ b/unit-test-coverage/ut-stubs/override_inc/ramDrv.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_RAMDRV_H_ #define _PSP_OVERRIDE_RAMDRV_H_ -#include +#include "PCS_ramDrv.h" #include #include diff --git a/unit-test-coverage/ut-stubs/override_inc/rebootLib.h b/unit-test-coverage/ut-stubs/override_inc/rebootLib.h index edeea362..a94756c1 100644 --- a/unit-test-coverage/ut-stubs/override_inc/rebootLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/rebootLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_REBOOTLIB_H_ #define _PSP_OVERRIDE_REBOOTLIB_H_ -#include +#include "PCS_rebootLib.h" /* ----------------------------------------- */ /* mappings for declarations in rebootLib.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/stdarg.h b/unit-test-coverage/ut-stubs/override_inc/stdarg.h index d35eb937..24d38d28 100644 --- a/unit-test-coverage/ut-stubs/override_inc/stdarg.h +++ b/unit-test-coverage/ut-stubs/override_inc/stdarg.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_STDARG_H_ #define _PSP_OVERRIDE_STDARG_H_ -#include +#include "PCS_stdarg.h" /* ----------------------------------------- */ /* mappings for declarations in stdarg.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/stdio.h b/unit-test-coverage/ut-stubs/override_inc/stdio.h index 38802fa8..cf8fc7a3 100644 --- a/unit-test-coverage/ut-stubs/override_inc/stdio.h +++ b/unit-test-coverage/ut-stubs/override_inc/stdio.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_STDIO_H_ #define _PSP_OVERRIDE_STDIO_H_ -#include +#include "PCS_stdio.h" /* ----------------------------------------- */ /* mappings for declarations in stdio.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/stdlib.h b/unit-test-coverage/ut-stubs/override_inc/stdlib.h index dd2ed941..b4b1940a 100644 --- a/unit-test-coverage/ut-stubs/override_inc/stdlib.h +++ b/unit-test-coverage/ut-stubs/override_inc/stdlib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_STDLIB_H_ #define _PSP_OVERRIDE_STDLIB_H_ -#include +#include "PCS_stdlib.h" /* ----------------------------------------- */ /* mappings for declarations in stdlib.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/string.h b/unit-test-coverage/ut-stubs/override_inc/string.h index 2273e834..633eee02 100644 --- a/unit-test-coverage/ut-stubs/override_inc/string.h +++ b/unit-test-coverage/ut-stubs/override_inc/string.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_STRING_H_ #define _PSP_OVERRIDE_STRING_H_ -#include +#include "PCS_string.h" /* ----------------------------------------- */ /* mappings for declarations in string.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/sys/types.h b/unit-test-coverage/ut-stubs/override_inc/sys/types.h index 9ff54bd0..f0d52329 100644 --- a/unit-test-coverage/ut-stubs/override_inc/sys/types.h +++ b/unit-test-coverage/ut-stubs/override_inc/sys/types.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_SYS_TYPES_H_ #define _PSP_OVERRIDE_SYS_TYPES_H_ -#include +#include "PCS_sys_types.h" /* ----------------------------------------- */ /* mappings for declarations in sys/types.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/sysLib.h b/unit-test-coverage/ut-stubs/override_inc/sysLib.h index 2ab3c81f..35425528 100644 --- a/unit-test-coverage/ut-stubs/override_inc/sysLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/sysLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_SYSLIB_H_ #define _PSP_OVERRIDE_SYSLIB_H_ -#include +#include "PCS_sysLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/taskLib.h b/unit-test-coverage/ut-stubs/override_inc/taskLib.h index 6ebcf6f6..f982a687 100644 --- a/unit-test-coverage/ut-stubs/override_inc/taskLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/taskLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_TASKLIB_H_ #define _PSP_OVERRIDE_TASKLIB_H_ -#include +#include "PCS_taskLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/unistd.h b/unit-test-coverage/ut-stubs/override_inc/unistd.h index 7a55b29a..4fb81368 100644 --- a/unit-test-coverage/ut-stubs/override_inc/unistd.h +++ b/unit-test-coverage/ut-stubs/override_inc/unistd.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_UNISTD_H_ #define _PSP_OVERRIDE_UNISTD_H_ -#include +#include "PCS_unistd.h" /* ----------------------------------------- */ /* mappings for declarations in unistd.h */ diff --git a/unit-test-coverage/ut-stubs/override_inc/usrLib.h b/unit-test-coverage/ut-stubs/override_inc/usrLib.h index 7b17e097..a8d368c0 100644 --- a/unit-test-coverage/ut-stubs/override_inc/usrLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/usrLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_USRLIB_H_ #define _PSP_OVERRIDE_USRLIB_H_ -#include +#include "PCS_usrLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/vxLib.h b/unit-test-coverage/ut-stubs/override_inc/vxLib.h index 0847715e..43ac89d7 100644 --- a/unit-test-coverage/ut-stubs/override_inc/vxLib.h +++ b/unit-test-coverage/ut-stubs/override_inc/vxLib.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_VXLIB_H_ #define _PSP_OVERRIDE_VXLIB_H_ -#include +#include "PCS_vxLib.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/override_inc/vxWorks.h b/unit-test-coverage/ut-stubs/override_inc/vxWorks.h index fdc69209..8aac88aa 100644 --- a/unit-test-coverage/ut-stubs/override_inc/vxWorks.h +++ b/unit-test-coverage/ut-stubs/override_inc/vxWorks.h @@ -20,7 +20,7 @@ #ifndef INCLUDE_VXWORKS_H_ #define INCLUDE_VXWORKS_H_ -#include +#include "PCS_vxWorks.h" #define IMPORT diff --git a/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h b/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h index de1f91b5..4dcbefbe 100644 --- a/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h +++ b/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_XBDBLKDEV_H_ #define _PSP_OVERRIDE_XBDBLKDEV_H_ -#include +#include "PCS_xbdBlkDev.h" #include #include diff --git a/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h b/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h index b729b35e..0313cbfa 100644 --- a/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h +++ b/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h @@ -12,7 +12,7 @@ #ifndef _PSP_OVERRIDE_XBDRAMDISK_H_ #define _PSP_OVERRIDE_XBDRAMDISK_H_ -#include +#include "PCS_xbdRamDisk.h" #include /* ----------------------------------------- */ diff --git a/unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c b/unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c index 7deb1f8b..98308f45 100644 --- a/unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c +++ b/unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c @@ -14,10 +14,10 @@ #include #include "utstubs.h" -#include -#include +#include "common_types.h" +#include "target_config.h" -#include +#include "PCS_cfe_configdata.h" Target_CfeConfigData GLOBAL_CFE_CONFIGDATA = { diff --git a/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c b/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c index b7b2b84e..fec84d3c 100644 --- a/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c +++ b/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c @@ -14,7 +14,7 @@ #include #include "utstubs.h" -#include +#include "PCS_stdio.h" struct PCS_FILE { diff --git a/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c b/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c index e96ff024..453012a5 100644 --- a/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c @@ -15,7 +15,7 @@ #include "utstubs.h" #include "utassert.h" -#include +#include "PCS_stdlib.h" /* * The malloc emulator relies on two magic numbers; diff --git a/unit-test-coverage/ut-stubs/src/libc-string-stubs.c b/unit-test-coverage/ut-stubs/src/libc-string-stubs.c index 8dcd255a..668d94ab 100644 --- a/unit-test-coverage/ut-stubs/src/libc-string-stubs.c +++ b/unit-test-coverage/ut-stubs/src/libc-string-stubs.c @@ -14,7 +14,7 @@ #include #include "utstubs.h" -#include +#include "PCS_string.h" void *PCS_memset(void *s, int c, size_t n) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c index c9b2b52b..94396b7e 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_drv_hdisk_ataDrv.h" PCS_device_t PCS_ataXbdDevCreate(int ctrl, int drive, unsigned int nBlks, unsigned int offset, const char *name) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-cacheLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-cacheLib-stubs.c index 7dceaabf..27cc46a6 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-cacheLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-cacheLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_cacheLib.h" PCS_STATUS PCS_cacheTextUpdate(void *adrs, size_t bytes) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-excLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-excLib-stubs.c index 93cbca07..d1d25082 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-excLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-excLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_excLib.h" void PCS_excHookAdd(void (*Hook)(PCS_TASK_ID, int, void *)) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-fppLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-fppLib-stubs.c index 7f07e697..6fb70c70 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-fppLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-fppLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_fppLib.h" void PCS_fppSave(PCS_FP_CONTEXT *fpc) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-mcpx750-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-mcpx750-stubs.c index 6c1d67d5..29ee7136 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-mcpx750-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-mcpx750-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_mcpx750.h" static uint32_t PCS_SYS_REG_BLRR_VALUE; diff --git a/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c index 13137639..29d8bf0c 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_moduleLib.h" PCS_MODULE_ID PCS_moduleFindByName(const char *moduleName) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-rebootLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-rebootLib-stubs.c index ee1b141e..590a9f3e 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-rebootLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-rebootLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_rebootLib.h" void PCS_reboot(int boottype) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c index a2dad2a7..663aa994 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c @@ -13,7 +13,7 @@ #include #include "utstubs.h" -#include +#include "PCS_sysLib.h" int PCS_sysClkRateGet(void) { diff --git a/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c index 5093710c..146cb53e 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c @@ -13,8 +13,8 @@ #include #include "utstubs.h" -#include -#include +#include "PCS_taskLib.h" +#include "PCS_errnoLib.h" static PCS_WIND_TCB PCS_LOCAL_TASK = {0}; diff --git a/unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c b/unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c index 28902071..85ea5396 100644 --- a/unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c @@ -13,8 +13,8 @@ #include #include "utstubs.h" -#include -#include +#include "PCS_vxLib.h" +#include "PCS_arch_ppc_vxPpcLib.h" void PCS_vxTimeBaseGet(uint32_t *u, uint32_t *l) { diff --git a/ut-stubs/ut_psp_stubs.c b/ut-stubs/ut_psp_stubs.c index 72e8b7b1..b4369008 100644 --- a/ut-stubs/ut_psp_stubs.c +++ b/ut-stubs/ut_psp_stubs.c @@ -37,7 +37,7 @@ #include "utstubs.h" #include -#include +#include "target_config.h" Target_PspConfigData GLOBAL_PSP_CONFIGDATA = {0}; Target_CfeConfigData GLOBAL_CFE_CONFIGDATA = {0};