Merge pull request #1443 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev33
+- updating OSAL to use new versioning system
+- patch build for old RTEMS
+- See <https://github.com/nasa/osal/pull/1437> and <https://github.com/nasa/osal/pull/1442>
+
 ## Development Build: v6.0.0-rc4+dev251
 - RTEMS semaphore return bugs and functional test update
 - See <https://github.com/nasa/osal/pull/1438>

src/os/inc/osapi-version.h

@@ -34,15 +34,22 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   251
-#define OS_BUILD_BASELINE "v6.0.0-rc4"
+#define OS_BUILD_NUMBER     33
+#define OS_BUILD_BASELINE   "equuleus-rc1"
+#define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
+#define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
  */
 #define OS_MAJOR_VERSION 5  /*!< @brief Major version number */
 #define OS_MINOR_VERSION 0  /*!< @brief Minor version number */
-#define OS_REVISION      99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
+#define OS_REVISION      0  /*!< @brief Revision version number. Value of 99 indicates a development version.*/
+
+/**
+ * @brief Last official release.
+ */
+#define OS_LAST_OFFICIAL "v5.0.0"
 
 /*!
  * @brief Mission revision.
@@ -64,20 +71,6 @@
  */
 #define OS_VERSION OS_BUILD_BASELINE "+dev" OS_STR(OS_BUILD_NUMBER)
 
-/*! @brief Version code name
- * All modular components which are tested/validated together should share the same code name
- */
-#define OS_VERSION_CODENAME "Draco"
-
-/*! @brief Development Build Version String.
- * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
- * official version.
- */
-#define OS_VERSION_STRING                                                                          \
-    " OSAL Development Build\n"                                                                    \
-    " " OS_VERSION " (Codename: " OS_VERSION_CODENAME ")\n" /* Codename for current development */ \
-    " Latest Official Version: osal v5.0.0"                 /* For full support please use official release version */
-
 /*! @brief Combines the revision components into a single value
  * @details Applications can check against this number @n
  * e.g. "#if OSAL_API_VERSION >= 40100" would check if some feature added in
@@ -152,4 +145,12 @@ void OS_GetVersionNumber(uint8 VersionNumbers[4]);
  */
 uint32 OS_GetBuildNumber(void);
 
+/**
+ * @brief Max Version String length.
+ * 
+ * Maximum length that an OSAL version string can be.
+ * 
+ */
+#define OS_CFG_MAX_VERSION_STR_LEN 256
+
 #endif /* OSAPI_VERSION_H */

src/os/rtems/inc/os-rtems.h

@@ -60,6 +60,9 @@
 #define OSAL_UNRESOLVED_SYMBOL  rtems_rtl_unresolved_name
 #define OSAL_UNRESOLVED_ITERATE rtems_rtl_unresolved_interate
 
+/* RTEMS 4.x does not implement thread names, so this becomes a no-op */
+#define pthread_setname_np(...)
+
 #else
 
 #define OSAL_HEAP_INFO_BLOCK    Heap_Information_block

src/os/shared/src/osapi-version.c

@@ -48,7 +48,7 @@ const char *OS_GetVersionString(void)
  *-----------------------------------------------------------------*/
 const char *OS_GetVersionCodeName(void)
 {
-    return OS_VERSION_CODENAME;
+    return OS_BUILD_CODENAME;
 }
 
 /*----------------------------------------------------------------