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+dev10 #346

Merged
merged 3 commits into from
May 31, 2022
Merged

psp Integration candidate: Caelum-rc4+dev10 #346

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
05af21e
Fix #342, Resolve uninit var static analysis warning
skliper May 16, 2022
832e16d
Merge pull request #344 from skliper/fix342-uninit_var
astrogeco May 31, 2022
7ca0ee5
IC:Caelum-rc4+dev10, psp v1.6.0-rc4+dev38
astrogeco May 31, 2022
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
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ This is a collection of APIs abstracting platform specific functionality to be l

## Version History

### Development Build: v1.6.0-rc4+dev38

### Development Build: v1.6.0-rc4+34
- Resolve uninit var static analysis warning
- See <https://github.com/nasa/PSP/pull/346> and <https://github.com/nasa/cFS/pull/492>

### Development Build: v1.6.0-rc4+dev34

- Update codeql workflow for reusable updates
- Add cpu affinity example
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 34
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#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 34
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
2 changes: 2 additions & 0 deletions fsw/pc-linux/src/cfe_psp_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ int32 CFE_PSP_OS_EventHandler(OS_Event_t event, osal_id_t object_id, void *data)
char taskname[OS_MAX_API_NAME];
cpu_set_t cpuset;

memset(taskname, 0, sizeof(taskname));

switch (event)
{
case OS_EVENT_RESOURCE_ALLOCATED:
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 34
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
8 changes: 8 additions & 0 deletions unit-test-coverage/modules/timebase_vxworks/src/coveragetest-timebase_vxworks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ void Test_Nominal(void)
OS_time_t OsTime;
PSP_VxWorks_TimeBaseVal_t VxTime;

memset(&OsTime, 0, sizeof(OsTime));

/* Nominal test with a simple 1:1 ratio */
UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodNumerator = 1;
UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodDenominator = 1;
Expand All @@ -103,6 +105,8 @@ void Test_Non_Reducible(void)
PSP_VxWorks_TimeBaseVal_t VxTime;
int64 TestTime;

memset(&OsTime, 0, sizeof(OsTime));

/* Use an oddball ratio of of some primes, will not be reducible */
/* Ratio is 43*3 / 53*2 => 129/106 */
/* This translates to about ~1.217ns per tick */
Expand Down Expand Up @@ -136,6 +140,8 @@ void Test_Reducible_1(void)
PSP_VxWorks_TimeBaseVal_t VxTime;
int64 TestTime;

memset(&OsTime, 0, sizeof(OsTime));

/* Test with a ratio that is also 1:1, but can be reduced */
UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodNumerator = 1000;
UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodDenominator = 1000;
Expand Down Expand Up @@ -164,6 +170,8 @@ void Test_Reducible_2(void)
PSP_VxWorks_TimeBaseVal_t VxTime;
int64 TestTime;

memset(&OsTime, 0, sizeof(OsTime));

/* Test with a ratio that can be reduced */
/* Final reduced ratio should be 12:5 with 100ns OS ticks */
UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodNumerator = 84000;
Expand Down