Skip to content

Commit

Permalink
Fix #265, Use quotes for local includes
Browse files Browse the repository at this point in the history
  • Loading branch information
skliper committed Mar 16, 2021
1 parent 0f39a13 commit a8c9b36
Show file tree
Hide file tree
Showing 94 changed files with 143 additions and 143 deletions.
4 changes: 2 additions & 2 deletions fsw/inc/cfe_psp_configdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#define CFE_PSP_CONFIG_H_

/* osapi.h is required for the definition of OS_VolumeInto_t */
#include <osapi.h>
#include "osapi.h"
/* cfe_psp.h is required for the definition of CFE_PSP_MemTable_t */
#include <cfe_psp.h>
#include "cfe_psp.h"

/*
** PSP software version record
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_exception.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include "cfe_psp_exceptionstorage_api.h"
#include "cfe_psp_memory.h"

#include <target_config.h>
#include "target_config.h"

/*
**
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#include "cfe_psp.h"
#include "cfe_psp_memory.h"

#include <target_config.h>
#include "target_config.h"

/*
** External Declarations
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <target_config.h>
#include "target_config.h"

#define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)
#define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile)
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "cfe_psp.h"
#include "cfe_psp_memory.h"

#include <target_config.h>
#include "target_config.h"

#define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId)
#define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName)
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
#define CFE_PSP_RESET_KEY_FILE ".resetkeyfile"
#define CFE_PSP_RESERVED_KEY_FILE ".reservedkeyfile"

#include <target_config.h>
#include "target_config.h"

/*
* Define the PSP-supported capacities to be the maximum allowed,
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/src/cfe_psp_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
* the dynamically generated configuration object. This allows a single build
* of the PSP to be completely CFE-independent.
*/
#include <target_config.h>
#include "target_config.h"
#include "cfe_psp_module.h"

#define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
/*
** Macro Definitions
*/
#include <target_config.h>
#include "target_config.h"

/*
* Define the PSP-supported capacities to be the maximum allowed,
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/src/cfe_psp_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <target_config.h>
#include "target_config.h"

#define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)
#define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile)
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/src/cfe_psp_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* the dynamically generated configuration object. This allows a single build
* of the PSP to be completely CFE-independent.
*/
#include <target_config.h>
#include "target_config.h"

#define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId)
#define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName)
Expand Down
2 changes: 1 addition & 1 deletion fsw/shared/inc/cfe_psp_exceptionstorage_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#ifndef CFE_PSP_EXCEPTIONSTORAGE_API_H_
#define CFE_PSP_EXCEPTIONSTORAGE_API_H_

#include <cfe_psp.h>
#include "cfe_psp.h"

/*
* Abstract types for exception storage.
Expand Down
4 changes: 2 additions & 2 deletions fsw/shared/inc/cfe_psp_exceptionstorage_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#ifndef CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_
#define CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_

#include <cfe_psp.h>
#include <cfe_psp_config.h>
#include "cfe_psp.h"
#include "cfe_psp_config.h"

/*
* The "MetaData" stores ephemeral exception information
Expand Down
4 changes: 2 additions & 2 deletions fsw/shared/inc/cfe_psp_module.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#ifndef CFE_PSP_MODULE_H_
#define CFE_PSP_MODULE_H_

#include <cfe_psp.h>
#include <target_config.h>
#include "cfe_psp.h"
#include "target_config.h"

typedef enum
{
Expand Down
8 changes: 4 additions & 4 deletions fsw/shared/src/cfe_psp_configdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
* Author: [email protected]
*/

#include <cfe_psp.h>
#include <cfe_psp_config.h>
#include <psp_version.h>
#include <cfe_psp_configdata.h>
#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
Expand Down
2 changes: 1 addition & 1 deletion fsw/shared/src/cfe_psp_exceptionstorage.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "cfe_psp_exceptionstorage_api.h"
#include "cfe_psp_memory.h"

#include <target_config.h>
#include "target_config.h"

/*
** Constants
Expand Down
2 changes: 1 addition & 1 deletion fsw/shared/src/cfe_psp_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <stdio.h>
#include <string.h>
#include <osapi.h>
#include "osapi.h"

#include "cfe_psp_configdata.h"
#include "cfe_psp_module.h"
Expand Down
4 changes: 2 additions & 2 deletions fsw/shared/src/cfe_psp_version.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* Defines API that obtains the values of the various version identifiers
*/

#include <cfe_psp.h>
#include <cfe_psp_configdata.h>
#include "cfe_psp.h"
#include "cfe_psp_configdata.h"

/*----------------------------------------------------------------
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef INCLUDE_UT_ADAPTOR_BOOTREC_H_
#define INCLUDE_UT_ADAPTOR_BOOTREC_H_

#include <common_types.h>
#include "common_types.h"

void UT_Setup_ReservedMem_BootRec(void);
uint32 UT_Get_ReservedMem_BootType(void);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/

#include "ut-adaptor-bootrec.h"
#include <cfe_psp_config.h>
#include <cfe_psp_memory.h>
#include "cfe_psp_config.h"
#include "cfe_psp_memory.h"

static CFE_PSP_ReservedMemoryBootRecord_t UT_BOOTREC;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#include "coveragetest-psp-mcp750-vxworks.h"
#include "ut-adaptor-bootrec.h"

#include <cfe_psp.h>
#include "cfe_psp.h"

#include <PCS_sysLib.h>
#include <PCS_mcpx750.h>
#include <PCS_stdlib.h>
#include <PCS_cfe_configdata.h>
#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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include "coveragetest-psp-mcp750-vxworks.h"
#include "ut-adaptor-bootrec.h"

#include <cfe_psp.h>
#include "cfe_psp.h"

#include <PCS_stdlib.h>
#include <PCS_rebootLib.h>
#include <PCS_cacheLib.h>
#include "PCS_stdlib.h"
#include "PCS_rebootLib.h"
#include "PCS_cacheLib.h"
#include "PCS_cfe_configdata.h"

void Test_CFE_PSP_Restart(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#ifndef INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_
#define INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_

#include <utassert.h>
#include <uttest.h>
#include <utstubs.h>
#include "utassert.h"
#include "uttest.h"
#include "utstubs.h"

#include <coveragetest-psp-shared.h>
#include "coveragetest-psp-shared.h"

#define ADD_TEST(test) UtTest_Add((Test_##test), Psp_Test_Setup, Psp_Test_Teardown, #test)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_
#define INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_

#include <common_types.h>
#include <cfe_psp_exceptionstorage_api.h>
#include "common_types.h"
#include "cfe_psp_exceptionstorage_api.h"

uint32 UT_Get_Exception_MaxEntries(void);
size_t UT_Get_Exception_Size(void);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/

#include "ut-adaptor-exceptions.h"
#include <cfe_psp_config.h>
#include <cfe_psp_memory.h>
#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
Expand Down
6 changes: 3 additions & 3 deletions unit-test-coverage/shared/inc/coveragetest-psp-shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef INCLUDE_PSP_SHARED_COVERAGETEST_H_
#define INCLUDE_PSP_SHARED_COVERAGETEST_H_

#include <utassert.h>
#include <uttest.h>
#include <utstubs.h>
#include "utassert.h"
#include "uttest.h"
#include "utstubs.h"

void Test_CFE_PSP_Exception_GetBuffer(void);
void Test_CFE_PSP_Exception_GetNextContextBuffer(void);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
#include "utstubs.h"
#include "ut-adaptor-exceptions.h"

#include <cfe_psp.h>
#include <cfe_psp_exceptionstorage_api.h>
#include "cfe_psp.h"
#include "cfe_psp_exceptionstorage_api.h"

#ifdef jphfix
#include <PCS_stdlib.h>
#include <PCS_rebootLib.h>
#include <PCS_cacheLib.h>
#include "PCS_stdlib.h"
#include "PCS_rebootLib.h"
#include "PCS_cacheLib.h"
#include "PCS_cfe_configdata.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef _PSP_STUB_ESFPPC_H_
#define _PSP_STUB_ESFPPC_H_

#include <PCS_basetypes.h>
#include "PCS_basetypes.h"

/* ----------------------------------------- */
/* constants normally defined in esfPpc.h */
Expand Down
2 changes: 1 addition & 1 deletion unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef _PSP_STUB_VXPPCLIB_H_
#define _PSP_STUB_VXPPCLIB_H_

#include <PCS_basetypes.h>
#include "PCS_basetypes.h"

/*
* When building the coverage test on an actual VxWorks target,
Expand Down
4 changes: 2 additions & 2 deletions unit-test-coverage/ut-stubs/inc/PCS_blkIo.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef _PSP_STUB_BLKIO_H_
#define _PSP_STUB_BLKIO_H_

#include <PCS_basetypes.h>
#include <PCS_vxWorks.h>
#include "PCS_basetypes.h"
#include "PCS_vxWorks.h"

/* The module and blk_dev types are used in several headers */
typedef struct PCS_BLK_DEV
Expand Down
4 changes: 2 additions & 2 deletions unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#ifndef _PSP_STUB_CACHELIB_H_
#define _PSP_STUB_CACHELIB_H_

#include <PCS_basetypes.h>
#include <PCS_vxWorks.h>
#include "PCS_basetypes.h"
#include "PCS_vxWorks.h"

/* ----------------------------------------- */
/* constants normally defined in cacheLib.h */
Expand Down
2 changes: 1 addition & 1 deletion unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _PSP_STUB_CFE_CONFIGDATA_H_
#define _PSP_STUB_CFE_CONFIGDATA_H_

#include <PCS_basetypes.h>
#include "PCS_basetypes.h"

#define PCS_CONFIG_MISSIONVERSION "UT-mission"
#define PCS_CONFIG_CFEVERSION "UT-CFE"
Expand Down
4 changes: 2 additions & 2 deletions unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#ifndef _PSP_STUB_DOSFSLIB_H_
#define _PSP_STUB_DOSFSLIB_H_

#include <PCS_basetypes.h>
#include <PCS_vxWorks.h>
#include "PCS_basetypes.h"
#include "PCS_vxWorks.h"

/* ----------------------------------------- */
/* constants normally defined in dosFsLib.h */
Expand Down
8 changes: 4 additions & 4 deletions unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#ifndef _PSP_STUB_DRV_HDISK_ATADRV_H_
#define _PSP_STUB_DRV_HDISK_ATADRV_H_

#include <PCS_basetypes.h>
#include <PCS_vxWorks.h>
#include <PCS_blkIo.h>
#include <PCS_xbdBlkDev.h>
#include "PCS_basetypes.h"
#include "PCS_vxWorks.h"
#include "PCS_blkIo.h"
#include "PCS_xbdBlkDev.h"

/* ----------------------------------------- */
/* constants normally defined in drv/hdisk/ataDrv.h */
Expand Down
4 changes: 2 additions & 2 deletions unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#ifndef _PSP_STUB_ERRNOLIB_H_
#define _PSP_STUB_ERRNOLIB_H_

#include <PCS_basetypes.h>
#include <PCS_vxWorks.h>
#include "PCS_basetypes.h"
#include "PCS_vxWorks.h"

/* ----------------------------------------- */
/* constants normally defined in errnoLib.h */
Expand Down
4 changes: 2 additions & 2 deletions unit-test-coverage/ut-stubs/inc/PCS_excLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#ifndef _PSP_STUB_EXCLIB_H_
#define _PSP_STUB_EXCLIB_H_

#include <PCS_basetypes.h>
#include <PCS_taskLib.h>
#include "PCS_basetypes.h"
#include "PCS_taskLib.h"

/* ----------------------------------------- */
/* constants normally defined in excLib.h */
Expand Down
2 changes: 1 addition & 1 deletion unit-test-coverage/ut-stubs/inc/PCS_fppLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef _PSP_STUB_FPPLIB_H_
#define _PSP_STUB_FPPLIB_H_

#include <PCS_basetypes.h>
#include "PCS_basetypes.h"

/* ----------------------------------------- */
/* constants normally defined in fppLib.h */
Expand Down
Loading

0 comments on commit a8c9b36

Please sign in to comment.