Skip to content

Commit e3d28d8

Browse files
astrogecoastrogeco
authored
Merge pull request #330 from nasa/integration-candidate
psp Integration candidate: Caelum-rc4+dev7
2 parents 609e076 + 8f229c8 commit e3d28d8

File tree

131 files changed

+2227
-1246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2227
-1246
lines changed

‎README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ This is a collection of APIs abstracting platform specific functionality to be l
99

1010
## Version History
1111

12+
### Development Build: v1.6.0-rc4+dev21
13+
14+
- Standardize version.h
15+
- Update Copyright Header
16+
- See <https://github.com/nasa/PSP/pull/330> and <https://github.com/nasa/cFS/445>
17+
18+
1219
### Development Build: v1.6.0-rc4+dev14
1320

1421
- Remove explicit filename doxygen comments

‎fsw/inc/cfe_psp.h

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/*
2220
** Author: A. Cudmore

‎fsw/mcp750-vxworks/inc/cfe_psp_config.h

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
#ifndef CFE_PSP_CONFIG_H
2220
#define CFE_PSP_CONFIG_H

‎fsw/mcp750-vxworks/inc/psp_version.h

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/*! @file
2220
* @brief Purpose:
@@ -29,21 +27,22 @@
2927
/*
3028
* Development Build Macro Definitions
3129
*/
32-
#define CFE_PSP_IMPL_BUILD_NUMBER 14
33-
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
30+
#define CFE_PSP_IMPL_BUILD_NUMBER 21
31+
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
3432

3533
/*
36-
* Version Macro Definitions
34+
* Version Macros, see \ref cfsversions for definitions.
3735
*/
38-
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
39-
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
40-
#define CFE_PSP_IMPL_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
36+
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief Major version number */
37+
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief Minor version number */
38+
#define CFE_PSP_IMPL_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
4139

4240
/*!
4341
* @brief Mission revision.
4442
*
45-
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
46-
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
43+
* Reserved for mission use to denote patches/customizations as needed.
44+
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
45+
* cFS open-source development use (pending resolution of nasa/cFS#440)
4746
*/
4847
#define CFE_PSP_IMPL_MISSION_REV 0xFF
4948

‎fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/*
2220
** cFE Support routines

‎fsw/mcp750-vxworks/src/cfe_psp_exception.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/******************************************************************************
2220
**

‎fsw/mcp750-vxworks/src/cfe_psp_memory.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/******************************************************************************
2220
** File: cfe_psp_memory.c

‎fsw/mcp750-vxworks/src/cfe_psp_ssr.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/******************************************************************************
2220
** File: cfe_psp_ssr.c

‎fsw/mcp750-vxworks/src/cfe_psp_start.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/******************************************************************************
2220
** File: cfe_psp_start.c

0 commit comments

Comments
 (0)