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

PSP Integration candidate: Equuleus-rc1+dev21 #442

Merged
merged 3 commits into from
Dec 10, 2024
Merged

PSP Integration candidate: Equuleus-rc1+dev21 #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
799d25a
Fix nasa#440, rename parameter in CFE_PSP_MemSet and CFE_PSP_MemCpy h…
CDKnightNASA Nov 20, 2024
2916bae
Merge pull request #441 from CDKnightNASA:fix440-memset_handler_param
dzbaker Dec 10, 2024
e0fd658
Updating documentation and version numbers for equuleus-rc1+dev55
dzbaker Dec 10, 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: equuleus-rc1+dev55
- rename parameter in CFE_PSP_MemSet handler to align with stub and actual code
- See <https://github.com/nasa/PSP/pull/441>

## Development Build: equuleus-rc1+dev49
- buffer error in the VxWorks sysmon module
- add coverage tests for PSP modules
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 49
#define CFE_PSP_IMPL_BUILD_NUMBER 55
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
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 49
#define CFE_PSP_IMPL_BUILD_NUMBER 55
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
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 49
#define CFE_PSP_IMPL_BUILD_NUMBER 55
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
8 changes: 4 additions & 4 deletions ut-stubs/src/cfe_psp_memaccess_api_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ void UT_DefaultHandler_CFE_PSP_MemCpy(void *UserObj, UT_EntryKey_t FuncKey, cons
/* CFE_PSP_MemCpy(void *dest, const void *src, uint32 size) */
void * dest = UT_Hook_GetArgValueByName(Context, "dest", void *);
const void *src = UT_Hook_GetArgValueByName(Context, "src", const void *);
uint32 size = UT_Hook_GetArgValueByName(Context, "size", uint32);
uint32 n = UT_Hook_GetArgValueByName(Context, "n", uint32);
int32 Status;

UT_Stub_GetInt32StatusCode(Context, &Status);
if (Status >= 0)
{
memcpy(dest, src, size);
memcpy(dest, src, n);
}
}

Expand All @@ -65,13 +65,13 @@ void UT_DefaultHandler_CFE_PSP_MemSet(void *UserObj, UT_EntryKey_t FuncKey, cons
/* int32 CFE_PSP_MemSet(void *dest, uint8 value, uint32 size) */
void * dest = UT_Hook_GetArgValueByName(Context, "dest", void *);
uint8 value = UT_Hook_GetArgValueByName(Context, "value", uint8);
uint32 size = UT_Hook_GetArgValueByName(Context, "size", uint32);
uint32 n = UT_Hook_GetArgValueByName(Context, "n", uint32);
int32 Status;

UT_Stub_GetInt32StatusCode(Context, &Status);
if (Status >= 0)
{
memset(dest, value, size);
memset(dest, value, n);
}
}

Expand Down
Loading