Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PSP Integration candidate: Caelum-rc4+dev34 #377

Merged
merged 5 commits into from
Jan 5, 2023
Merged

PSP Integration candidate: Caelum-rc4+dev34 #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0b9fc1
Fix #371, Remove obsolete _USING_RTEMS_INCLUDES_
skliper Jan 3, 2023
f5bdede
Fix #373, Squash constParameter warning in linux cfe_psp_memory.c
skliper Jan 3, 2023
aaa404c
Merge pull request #374 from skliper/fix373-constparameter_warning
dzbaker Jan 5, 2023
3f56e01
Merge pull request #372 from skliper/fix371-rtems_includes
dzbaker Jan 5, 2023
24464ae
Bump to v1.6.0-rc4+dev67
dzbaker Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
**
**
******************************************************************************/
#define _USING_RTEMS_INCLUDES_

/*
** Include Files
Expand Down