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.

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

Integration Candidate: 2020-08-26 #190

Merged
merged 6 commits into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ This is a collection of APIs abstracting platform specific functionality to be l

## Version History

### Development Build: 1.5.0-rc1+dev6

- Adds CFE_PSP_GetProcessorName
- Removes classic make artifacts
- See <https://github.com/nasa/PSP/pull/190>

### Development Build: 1.4.0+dev76

- Provide a new framework and perform PSP coverage tests. New coverage test executable is built and several files within PSP are targeted.
Expand Down
4 changes: 4 additions & 0 deletions fsw/inc/cfe_psp.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ extern uint32 CFE_PSP_GetSpacecraftId ( void );
** CFE_PSP_GetSpacecraftId retuns the Spacecraft ID (if any )
*/

extern const char * CFE_PSP_GetProcessorName(void);
/*
** CFE_PSP_GetProcessorName returns the processor name
*/

extern uint32 CFE_PSP_Get_Timer_Tick(void);
/*
Expand Down
107 changes: 0 additions & 107 deletions fsw/mcp750-vxworks/make/compiler-opts.mak

This file was deleted.

39 changes: 0 additions & 39 deletions fsw/mcp750-vxworks/make/link-rules.mak

This file was deleted.

21 changes: 21 additions & 0 deletions fsw/mcp750-vxworks/src/cfe_psp_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include <target_config.h>

#define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId)
#define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName)
#define CFE_PSP_SPACECRAFT_ID (GLOBAL_CONFIGDATA.Default_SpacecraftId)

/*
Expand Down Expand Up @@ -192,3 +193,23 @@ uint32 CFE_PSP_GetSpacecraftId (void)
return CFE_PSP_SPACECRAFT_ID;
}

/*
** Name: CFE_PSP_GetProcessorName
**
** Purpose:
** return the processor name.
**
** Parameters:
**
** Global Inputs: None
**
** Global Outputs: None
**
**
** Return Values: Processor name
*/
const char *CFE_PSP_GetProcessorName (void)
{
return CFE_PSP_CPU_NAME;
}

50 changes: 0 additions & 50 deletions fsw/mcp750-vxworks/src/psp.mak

This file was deleted.

95 changes: 0 additions & 95 deletions fsw/pc-linux/make/compiler-opts.mak

This file was deleted.

42 changes: 0 additions & 42 deletions fsw/pc-linux/make/link-rules.mak

This file was deleted.

Loading