Skip to content

Commit b6dd1d6

Browse files
author
Gerardo E. Cruz-Ortiz
committed
HOTFIX IC-20200624, Remove commented code
1 parent f194bc2 commit b6dd1d6

File tree

3 files changed

+78
-118
lines changed

3 files changed

+78
-118
lines changed

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

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,63 +18,46 @@
1818
** limitations under the License.
1919
*/
2020

21-
/*
22-
* File: psp_version.h
23-
*
24-
* Purpose:
25-
* Provide version identifiers for the cFE Platform Support Packages (PSP).
26-
* See cfe documentation for version and build number descriptions
27-
*
21+
/*! @file mcp750-vxworks/inc/psp_version.h
22+
* @brief Purpose:
23+
* @details Provide version identifiers for the cFE Platform Support Packages (PSP).
24+
* See @ref cfsversions for version and build number and description
2825
*/
29-
3026
#ifndef _psp_version_
3127
#define _psp_version_
3228

33-
/* Development Build Macro Definitions */
29+
/*
30+
* Development Build Macro Definitions
31+
*/
3432
#define CFE_PSP_IMPL_BUILD_NUMBER 68
3533
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"
3634

3735
/*
38-
* Macro Definitions
39-
* ONLY APPLY for OFFICIAL releases
36+
* Version Macro Definitions
4037
*/
41-
#define CFE_PSP_IMPL_MAJOR_VERSION 1
42-
#define CFE_PSP_IMPL_MINOR_VERSION 4
43-
#define CFE_PSP_IMPL_REVISION 0
44-
#define CFE_PSP_IMPL_MISSION_REV 0
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. */
41+
#define CFE_PSP_IMPL_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
4542

46-
#define CFE_PSP_IMPL_STR_HELPER(x) #x
47-
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)
48-
49-
/* Baseling git tag + Number of commits since baseline */
43+
/*
44+
* Tools to construct version string
45+
*/
46+
#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
47+
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
48+
49+
/*! @brief Development Build Version Number.
50+
* @details Baseline git tag + Number of commits since baseline. @n
51+
* See @ref cfsversions for format differences between development and release versions.
52+
*/
5053
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
5154

55+
/*! @brief Development Build Version String.
56+
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
57+
* See @ref cfsversions for format differences between development and release versions.
58+
*/
5259
#define CFE_PSP_IMPL_VERSION_STRING \
5360
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
5461
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */
5562

56-
/* Use the following templates for Official Releases ONLY */
57-
58-
/* Official Release format for CFE_PSP_IMPLVERSION */
59-
/*
60-
#define CFE_PSP_IMPL_VERSION "v" \
61-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
62-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
63-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
64-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
65-
*/
66-
67-
/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
68-
/*
69-
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
70-
*/
71-
72-
73-
/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
74-
/*
75-
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPLVERSION
76-
*/
77-
78-
/* END TEMPLATES */
79-
8063
#endif /* _psp_version_ */

‎fsw/pc-linux/inc/psp_version.h‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,57 +18,46 @@
1818
** limitations under the License.
1919
*/
2020

21-
/*
22-
* File: psp_version.h
23-
*
24-
* Purpose:
25-
* Provide version identifiers for the cFE Platform Support Packages (PSP).
26-
* See cfe documentation for version and build number descriptions
27-
*
21+
/*! @file pc-linux/inc/psp_version.h
22+
* @brief Purpose:
23+
* @details Provide version identifiers for the cFE Platform Support Packages (PSP).
24+
* See @ref cfsversions for version and build number and description
2825
*/
29-
3026
#ifndef _psp_version_
3127
#define _psp_version_
3228

33-
/* Development Build Macro Definitions */
29+
/*
30+
* Development Build Macro Definitions
31+
*/
3432
#define CFE_PSP_IMPL_BUILD_NUMBER 68
3533
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"
3634

3735
/*
38-
* Macro Definitions
39-
* ONLY APPLY for OFFICIAL releases
36+
* Version Macro Definitions
4037
*/
41-
#define CFE_PSP_IMPL_MAJOR_VERSION 1
42-
#define CFE_PSP_IMPL_MINOR_VERSION 4
43-
#define CFE_PSP_IMPL_REVISION 0
44-
#define CFE_PSP_IMPL_MISSION_REV 0
45-
46-
#define CFE_PSP_IMPL_STR_HELPER(x) #x
47-
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)
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. */
41+
#define CFE_PSP_IMPL_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
4842

49-
/* Baseling git tag + Number of commits since baseline */
43+
/*
44+
* Tools to construct version string
45+
*/
46+
#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
47+
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
48+
49+
/*! @brief Development Build Version Number.
50+
* @details Baseline git tag + Number of commits since baseline. @n
51+
* See @ref cfsversions for format differences between development and release versions.
52+
*/
5053
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
5154

55+
/*! @brief Development Build Version String.
56+
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
57+
* See @ref cfsversions for format differences between development and release versions.
58+
*/
5259
#define CFE_PSP_IMPL_VERSION_STRING \
5360
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
5461
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */
5562

56-
/* Use the following templates for Official Releases ONLY */
57-
58-
/* Official Release format for CFE_PSP_IMPLVERSION */
59-
/*
60-
#define CFE_PSP_IMPL_VERSION "v" \
61-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
62-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
63-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
64-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
65-
*/
66-
67-
/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
68-
/*
69-
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
70-
*/
71-
72-
/* END TEMPLATES */
73-
7463
#endif /* _psp_version_ */

‎fsw/pc-rtems/inc/psp_version.h‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,46 @@
1818
** limitations under the License.
1919
*/
2020

21-
/*
22-
* File: psp_version.h
23-
*
24-
* Purpose:
25-
* Provide version identifiers for the cFE Platform Support Packages (PSP).
26-
* See cfe documentation for version and build number descriptions
27-
*
21+
/*! @file pc-rtems/inc/psp_version.h
22+
* @brief Purpose:
23+
* @details Provide version identifiers for the cFE Platform Support Packages (PSP).
24+
* See @ref cfsversions for version and build number and description
2825
*/
29-
3026
#ifndef _psp_version_
3127
#define _psp_version_
3228

33-
/* Development Build Macro Definitions */
29+
/*
30+
* Development Build Macro Definitions
31+
*/
3432
#define CFE_PSP_IMPL_BUILD_NUMBER 68
3533
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"
3634

3735
/*
38-
* Macro Definitions
39-
* ONLY APPLY for OFFICIAL releases
36+
* Version Macro Definitions
4037
*/
41-
#define CFE_PSP_IMPL_MAJOR_VERSION 1
42-
#define CFE_PSP_IMPL_MINOR_VERSION 4
43-
#define CFE_PSP_IMPL_REVISION 0
44-
#define CFE_PSP_IMPL_MISSION_REV 0
45-
46-
#define CFE_PSP_IMPL_STR_HELPER(x) #x
47-
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)
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. */
41+
#define CFE_PSP_IMPL_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
4842

49-
/* Baseling git tag + Number of commits since baseline */
43+
/*
44+
* Tools to construct version string
45+
*/
46+
#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
47+
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
48+
49+
/*! @brief Development Build Version Number.
50+
* @details Baseline git tag + Number of commits since baseline. @n
51+
* See @ref cfsversions for format differences between development and release versions.
52+
*/
5053
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
5154

55+
/*! @brief Development Build Version String.
56+
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
57+
* See @ref cfsversions for format differences between development and release versions.
58+
*/
5259
#define CFE_PSP_IMPL_VERSION_STRING \
5360
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
5461
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */
5562

56-
/* Use the following templates for Official Releases ONLY */
57-
58-
/* Official Release format for CFE_PSP_IMPLVERSION */
59-
/*
60-
#define CFE_PSP_IMPL_VERSION "v" \
61-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
62-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
63-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
64-
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
65-
*/
66-
67-
/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
68-
/*
69-
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
70-
*/
71-
72-
73-
/* END TEMPLATES */
74-
7563
#endif /* _psp_version_ */

0 commit comments

Comments
 (0)