Skip to content

Commit

Permalink
Merge pull request #247 from skliper/fix210-standard_format
Browse files Browse the repository at this point in the history 
Fix #210, Apply standard formatting
  • Loading branch information
@astrogeco
astrogeco authored Feb 12, 2021
2 parents ee82721 + d27eaa1 commit 3c0d871
Show file tree
Hide file tree
Showing 124 changed files with 3,312 additions and 3,790 deletions.
212 changes: 107 additions & 105 deletions fsw/inc/cfe_psp.h
View file

Large diffs are not rendered by default.

33 changes: 15 additions & 18 deletions fsw/inc/cfe_psp_configdata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@
*/
typedef const struct
{
uint8 MajorVersion;
uint8 MinorVersion;
uint8 Revision;
uint8 MissionRev;
char Version[16];
uint8 MajorVersion;
uint8 MinorVersion;
uint8 Revision;
uint8 MissionRev;
char Version[16];
} CFE_PSP_VersionInfo_t;



/**
* PSP/Hardware configuration parameters
* This structure should be instantiated by the PSP according
Expand All @@ -56,18 +54,18 @@ typedef const struct
*/
typedef const struct
{
uint32 PSP_WatchdogMin; /**< PSP Minimum watchdog in milliseconds */
uint32 PSP_WatchdogMax; /**< PSP Maximum watchdog in milliseconds */
uint32 PSP_MemTableSize; /**< Size of PSP memory table */
uint32 PSP_ExceptionLogSize; /**< Size of PSP exception log */
CFE_PSP_MemTable_t *PSP_MemoryTable; /**< Pointer to PSP memory table (forward reference) */
uint32 PSP_WatchdogMin; /**< PSP Minimum watchdog in milliseconds */
uint32 PSP_WatchdogMax; /**< PSP Maximum watchdog in milliseconds */
uint32 PSP_MemTableSize; /**< Size of PSP memory table */
uint32 PSP_ExceptionLogSize; /**< Size of PSP exception log */
CFE_PSP_MemTable_t *PSP_MemoryTable; /**< Pointer to PSP memory table (forward reference) */

/**
* Number of EEPROM banks on this platform
*/
uint32 HW_NumEepromBanks;
/**
* Number of EEPROM banks on this platform
*/
uint32 HW_NumEepromBanks;

CFE_PSP_VersionInfo_t PSP_VersionInfo;
CFE_PSP_VersionInfo_t PSP_VersionInfo;

} Target_PspConfigData;

Expand All @@ -83,5 +81,4 @@ extern Target_PspConfigData GLOBAL_PSP_CONFIGDATA;
*/
extern CFE_PSP_MemTable_t CFE_PSP_MemoryTable[];


#endif /* CFE_PSP_CONFIG_H_ */
28 changes: 12 additions & 16 deletions fsw/mcp750-vxworks/inc/cfe_psp_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#ifndef _cfe_psp_config_
#define _cfe_psp_config_


#include "common_types.h"

#include <stdio.h>
Expand All @@ -50,7 +49,7 @@
*
* It must always be a power of two.
*/
#define CFE_PSP_MAX_EXCEPTION_ENTRIES 4
#define CFE_PSP_MAX_EXCEPTION_ENTRIES 4

/*
** Typedef for the layout of the vxWorks boot record structure
Expand All @@ -60,14 +59,13 @@
*/
typedef struct
{
uint32 bsp_reset_type;
uint32 spare1;
uint32 spare2;
uint32 spare3;
uint32 bsp_reset_type;
uint32 spare1;
uint32 spare2;
uint32 spare3;

} CFE_PSP_ReservedMemoryBootRecord_t;


/**
* \brief The data type used by the underlying OS to represent a thread ID.
*/
Expand All @@ -78,19 +76,19 @@ typedef TASK_ID CFE_PSP_Exception_SysTaskId_t;
*/
typedef struct
{
UINT32 timebase_upper; /* Upper 32 bits of timebase as sampled by hook */
UINT32 timebase_lower; /* Lower 32 bits of timebase as sampled by hook */
int vector; /* vector number */
ESFPPC esf; /* Exception stack frame */
FP_CONTEXT fp; /* floating point registers */
UINT32 timebase_upper; /* Upper 32 bits of timebase as sampled by hook */
UINT32 timebase_lower; /* Lower 32 bits of timebase as sampled by hook */
int vector; /* vector number */
ESFPPC esf; /* Exception stack frame */
FP_CONTEXT fp; /* floating point registers */

} CFE_PSP_Exception_ContextDataEntry_t;

/*
** Watchdog minimum and maximum values ( in milliseconds )
*/
#define CFE_PSP_WATCHDOG_MIN (0)
#define CFE_PSP_WATCHDOG_MAX (0xFFFFFFFF)
#define CFE_PSP_WATCHDOG_MAX (0xFFFFFFFF)

/*
** Number of EEPROM banks on this platform
Expand All @@ -105,8 +103,6 @@ typedef struct
* Chosen as the cache line size of the MPC750 processor (32 bytes)
* such that the blocks will be cached more efficiently.
*/
#define CFE_PSP_MEMALIGN_MASK ((cpuaddr)0x1F)

#define CFE_PSP_MEMALIGN_MASK ((cpuaddr)0x1F)

#endif

35 changes: 19 additions & 16 deletions fsw/mcp750-vxworks/inc/psp_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
*/

/*! @file mcp750-vxworks/inc/psp_version.h
* @brief Purpose:
* @details Provide version identifiers for the cFE Platform Support Packages (PSP).
* @brief Purpose:
* @details Provide version identifiers for the cFE Platform Support Packages (PSP).
* See @ref cfsversions for version and build number and description
*/
#ifndef _psp_version_
#define _psp_version_

/*
* Development Build Macro Definitions
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 58
#define CFE_PSP_IMPL_BUILD_NUMBER 58
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"

/*
Expand All @@ -38,26 +38,29 @@
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CFE_PSP_IMPL_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
#define CFE_PSP_IMPL_MISSION_REV 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased development version. */
#define CFE_PSP_IMPL_MISSION_REV \
99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased \
development version. */

/*
* Tools to construct version string
*/
#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
*/
#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
#define CFE_PSP_IMPL_STR(x) \
CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */

/*! @brief Development Build Version Number.
/*! @brief Development Build Version Number.
* @details Baseline git tag + Number of commits since baseline. @n
* See @ref cfsversions for format differences between development and release versions.
*/
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)

/*! @brief Development Build Version String.
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
* See @ref cfsversions for format differences between development and release versions.
*/
#define CFE_PSP_IMPL_VERSION_STRING \
" PSP Development Build " CFE_PSP_IMPL_VERSION /* Codename for current development */ \
", Last Official Release: psp v1.4.0" /* For full support please use this version */
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
* official version. @n See @ref cfsversions for format differences between development and release versions.
*/
#define CFE_PSP_IMPL_VERSION_STRING \
" PSP Development Build " CFE_PSP_IMPL_VERSION /* Codename for current development */ \
", Last Official Release: psp v1.4.0" /* For full support please use this version */

#endif /* _psp_version_ */
#endif /* _psp_version_ */
Loading

0 comments on commit 3c0d871

Please sign in to comment.