Skip to content

Commit

Permalink
Merge pull request nasa#377 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
PSP Integration candidate: Caelum-rc4+dev34
  • Loading branch information
dzbaker authored Jan 5, 2023
2 parents a260e9c + 24464ae commit 6fceb13
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Development Build: v1.6.0-rc4+dev67
- Squash constParameter warning in linux cfe_psp_memory.c
- Remove obsolete _USING_RTEMS_INCLUDES_
- See <https://github.com/nasa/PSP/pull/374> and <https://github.com/nasa/PSP/pull/372>

## Development Build: v1.6.0-rc4+dev61
- Stop empty function catching CI workflow format checks
- Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines.
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 61
#define CFE_PSP_IMPL_BUILD_NUMBER 67
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 61
#define CFE_PSP_IMPL_BUILD_NUMBER 67
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
8 changes: 5 additions & 3 deletions fsw/pc-linux/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -757,14 +757,16 @@ void CFE_PSP_DeleteProcessorReservedMemory(void)
*/
int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *SizeOfKernelSegment)
{
/*
** Prevent warnings by referencing parameters
*/
/* Check pointers */
if (PtrToKernelSegment == NULL || SizeOfKernelSegment == NULL)
{
return CFE_PSP_ERROR;
}

/* Set to known values */
*PtrToKernelSegment = (cpuaddr)0x0;
*SizeOfKernelSegment = 0;

return CFE_PSP_ERROR_NOT_IMPLEMENTED;
}

Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 61
#define CFE_PSP_IMPL_BUILD_NUMBER 67
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
1 change: 0 additions & 1 deletion fsw/pc-rtems/src/cfe_psp_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
**
**
******************************************************************************/
#define _USING_RTEMS_INCLUDES_

/*
** Include Files
Expand Down

0 comments on commit 6fceb13

Please sign in to comment.