From 0d433cfb7c742609031affbd90460b084d604ebe Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 10 Jan 2024 14:39:30 -0500 Subject: [PATCH 1/3] Fix #1441, patch build for old RTEMS Ignore the call to pthread_setname_np() on RTEMS 4.x. This becomes a no-op, and OSAL is able to build again. --- src/os/rtems/inc/os-rtems.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/os/rtems/inc/os-rtems.h b/src/os/rtems/inc/os-rtems.h index e18ed3b15..b768cc695 100644 --- a/src/os/rtems/inc/os-rtems.h +++ b/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 From 089bf8d861c743873303e3f6ef1bebb3b0cdb13d Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 26 Dec 2023 09:22:56 -0500 Subject: [PATCH 2/3] Fix #1420, updating OSAL to use new versioning system. --- src/os/inc/osapi-version.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 84ac26ce8..49be84f92 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,15 +34,22 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 247 -#define OS_BUILD_BASELINE "v6.0.0-rc4" +#define OS_BUILD_NUMBER 247 +#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 */ From 0434dd4a132dbaedc449c96f2d5ecebeb74c4591 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 17 Jan 2024 14:05:41 -0500 Subject: [PATCH 3/3] Updating documentation and version numbers for v6.0.0-rc4+dev33 --- CHANGELOG.md | 5 +++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6af30c6f3..5b50b7342 100644 --- a/CHANGELOG.md +++ b/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 and + ## Development Build: v6.0.0-rc4+dev251 - RTEMS semaphore return bugs and functional test update - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index dcb546f31..f61b0ad3f 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,7 +34,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 251 +#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 */