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+dev67 #423

Merged
merged 5 commits into from
Jan 10, 2024
Merged

PSP Integration candidate: Caelum-rc4+dev67 #423

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
7e9108a
Fix #379, Align mismatched function prototype/implem. parameter names
thnkslprpt Feb 24, 2023
cb38cdc
Merge pull request #380 from thnkslprpt:fix-379-mismatched-function-p…
dzbaker Jan 5, 2024
2b93573
Updating documentation and version numbers for v1.6.0-rc4+dev115
dzbaker Jan 5, 2024
10bce08
Fix #424, re-add rtems_fxp_attach() to cfe_psp_start.c.
dzbaker Jan 8, 2024
14a1678
Merge pull request #425 from dzbaker/fix-424
dzbaker Jan 8, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: v1.6.0-rc4+dev117
- Align mismatched function prototype/implem. parameter names
- See <https://github.com/nasa/PSP/pull/380>

## Development Build: v1.6.0-rc4+dev102
- malloc stub memalign calculation
- See <https://github.com/nasa/PSP/pull/419>
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 102
#define CFE_PSP_IMPL_BUILD_NUMBER 115
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
4 changes: 2 additions & 2 deletions fsw/mcp750-vxworks/src/cfe_psp_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ extern CFE_PSP_MemoryBlock_t MCP750_ReservedMemBlock;
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
void CFE_PSP_Restart(uint32 reset_type)
void CFE_PSP_Restart(uint32 resetType)
{
if (reset_type == CFE_PSP_RST_TYPE_POWERON)
if (resetType == CFE_PSP_RST_TYPE_POWERON)
{
CFE_PSP_ReservedMemoryMap.BootPtr->bsp_reset_type = CFE_PSP_RST_TYPE_POWERON;
CFE_PSP_FlushCaches(1, MCP750_ReservedMemBlock.BlockPtr, MCP750_ReservedMemBlock.BlockSize);
Expand Down
6 changes: 3 additions & 3 deletions fsw/pc-linux/src/cfe_psp_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
void CFE_PSP_Restart(uint32 reset_type)
void CFE_PSP_Restart(uint32 resetType)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
{
if (reset_type == CFE_PSP_RST_TYPE_POWERON)
if (resetType == CFE_PSP_RST_TYPE_POWERON)
{
OS_printf("CFE_PSP: Exiting cFE with POWERON Reset status.\n");

Expand All @@ -75,7 +75,7 @@
/*
* Record the reset type for the next boot.
*/
CFE_PSP_ReservedMemoryMap.BootPtr->NextResetType = reset_type;
CFE_PSP_ReservedMemoryMap.BootPtr->NextResetType = resetType;
CFE_PSP_ReservedMemoryMap.BootPtr->ValidityFlag = CFE_PSP_BOOTRECORD_VALID;

/*
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 102
#define CFE_PSP_IMPL_BUILD_NUMBER 115
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -36,6 +36,8 @@
#include <rtems/rtems_dhcp_failsafe.h>
#include <bsp.h>

extern int rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching);

/*
** cFE includes
*/
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/src/cfe_psp_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ extern CFE_PSP_MemoryBlock_t PcRtems_ReservedMemBlock;
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
void CFE_PSP_Restart(uint32 reset_type)
void CFE_PSP_Restart(uint32 resetType)
{
CFE_PSP_FlushCaches(1, PcRtems_ReservedMemBlock.BlockPtr, PcRtems_ReservedMemBlock.BlockSize);
OS_printf("%s is not implemented on this platform ( yet ! )\n", __func__);
Expand Down
8 changes: 4 additions & 4 deletions fsw/shared/src/cfe_psp_memutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
int32 CFE_PSP_MemCpy(void *dst, const void *src, uint32 size)
int32 CFE_PSP_MemCpy(void *dest, const void *src, uint32 n)
{
memcpy(dst, src, size);
memcpy(dest, src, n);
return CFE_PSP_SUCCESS;
}

Expand All @@ -63,8 +63,8 @@ int32 CFE_PSP_MemCpy(void *dst, const void *src, uint32 size)
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
int32 CFE_PSP_MemSet(void *dst, uint8 value, uint32 size)
int32 CFE_PSP_MemSet(void *dest, uint8 value, uint32 n)
{
memset(dst, (int)value, (size_t)size);
memset(dest, (int)value, (size_t)n);
return CFE_PSP_SUCCESS;
}
2 changes: 1 addition & 1 deletion unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void Test_CFE_PSP_Restart(void)
{
/*
* Test Case For:
* void CFE_PSP_Restart(uint32 reset_type)
* void CFE_PSP_Restart(uint32 resetType)
*/

UT_Setup_ReservedMem_BootRec();
Expand Down
12 changes: 6 additions & 6 deletions ut-stubs/ut_psp_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,10 @@ int32 CFE_PSP_GetVolatileDiskMem(cpuaddr *PtrToVolDisk, uint32 *SizeOfVolDisk)
** This function does not return a value.
**
******************************************************************************/
void CFE_PSP_Restart(uint32 reset_type)
void CFE_PSP_Restart(uint32 resetType)
{
UT_DEFAULT_IMPL(CFE_PSP_Restart);
UT_Stub_CopyFromLocal(UT_KEY(CFE_PSP_Restart), (uint8 *)&reset_type, sizeof(reset_type));
UT_Stub_CopyFromLocal(UT_KEY(CFE_PSP_Restart), (uint8 *)&resetType, sizeof(resetType));
}

/*****************************************************************************/
Expand Down Expand Up @@ -668,7 +668,7 @@ int32 CFE_PSP_MemValidateRange(cpuaddr Address, size_t Size, uint32 MemoryType)
** Returns OS_SUCCESS.
**
******************************************************************************/
int32 CFE_PSP_MemCpy(void *dst, const void *src, uint32 size)
int32 CFE_PSP_MemCpy(void *dest, const void *src, uint32 n)
{
int32 status;

Expand All @@ -677,7 +677,7 @@ int32 CFE_PSP_MemCpy(void *dst, const void *src, uint32 size)
if (status >= 0)
{
/* this is not actually a stub; it actually has to _do_ the intended function */
memcpy(dst, src, size);
memcpy(dest, src, n);
}

return status;
Expand All @@ -698,7 +698,7 @@ int32 CFE_PSP_MemCpy(void *dst, const void *src, uint32 size)
** Returns OS_SUCCESS.
**
******************************************************************************/
int32 CFE_PSP_MemSet(void *dst, uint8 value, uint32 size)
int32 CFE_PSP_MemSet(void *dest, uint8 value, uint32 n)
{
int32 status;

Expand All @@ -707,7 +707,7 @@ int32 CFE_PSP_MemSet(void *dst, uint8 value, uint32 size)
if (status >= 0)
{
/* this is not actually a stub; it actually has to _do_ the intended function */
memset(dst, (int)value, (size_t)size);
memset(dest, (int)value, (size_t)n);
}

return status;
Expand Down
Loading