From f340f684fd3e3dfa84d522e1d9c05a448a246b6d Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Fri, 22 Sep 2023 13:43:21 +1000 Subject: [PATCH 1/2] Fix #1415, Update misnamed member variable in `OS_BSP_GlobalData_t` --- .github/pull_request_template.md | 2 +- src/bsp/shared/inc/bsp-impl.h | 2 +- src/bsp/shared/src/bsp_default_resourcecfg.c | 4 ++-- src/os/rtems/CMakeLists.txt | 2 +- src/os/vxworks/inc/os-impl-dirs.h | 2 +- ut_assert/src/utstubs.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 95b73d13d..6d5a727d2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,7 +10,7 @@ A clear and concise description of what the contribution is. **Testing performed** Steps taken to test the contribution: 1. Build steps '...' -1. Execution steps '...' +2. Execution steps '...' **Expected behavior changes** A clear and concise description of how this contribution will change behavior and level of impact. diff --git a/src/bsp/shared/inc/bsp-impl.h b/src/bsp/shared/inc/bsp-impl.h index df249316b..666df4612 100644 --- a/src/bsp/shared/inc/bsp-impl.h +++ b/src/bsp/shared/inc/bsp-impl.h @@ -102,7 +102,7 @@ typedef struct * for each resource type. Flags are all platform-defined, and not every platform uses this * feature. */ - uint32 ResoureConfig[OS_OBJECT_TYPE_USER]; + uint32 ResourceConfig[OS_OBJECT_TYPE_USER]; } OS_BSP_GlobalData_t; /* diff --git a/src/bsp/shared/src/bsp_default_resourcecfg.c b/src/bsp/shared/src/bsp_default_resourcecfg.c index d68eeeccd..1cd86632a 100644 --- a/src/bsp/shared/src/bsp_default_resourcecfg.c +++ b/src/bsp/shared/src/bsp_default_resourcecfg.c @@ -37,7 +37,7 @@ void OS_BSP_SetResourceTypeConfig(uint32 ResourceType, uint32 ConfigOptionValue) { if (ResourceType < OS_OBJECT_TYPE_USER) { - OS_BSP_Global.ResoureConfig[ResourceType] = ConfigOptionValue; + OS_BSP_Global.ResourceConfig[ResourceType] = ConfigOptionValue; } } @@ -52,7 +52,7 @@ uint32 OS_BSP_GetResourceTypeConfig(uint32 ResourceType) if (ResourceType < OS_OBJECT_TYPE_USER) { - ConfigOptionValue = OS_BSP_Global.ResoureConfig[ResourceType]; + ConfigOptionValue = OS_BSP_Global.ResourceConfig[ResourceType]; } else { diff --git a/src/os/rtems/CMakeLists.txt b/src/os/rtems/CMakeLists.txt index ad624cf2a..2358ae844 100644 --- a/src/os/rtems/CMakeLists.txt +++ b/src/os/rtems/CMakeLists.txt @@ -63,7 +63,7 @@ if (OSAL_CONFIG_INCLUDE_NETWORK) ../portable/os-impl-bsd-select.c ) - # In RTEMS 6+ the networking subsystem is not included with the defualt libs, + # In RTEMS 6+ the networking subsystem is not included with the default libs, # it needs to be explicitly added to the final link. Note the "VERSION_GREATER_EQUAL" # operation was not added until CMake 3.7, so this uses not "VERSION_LESS" instead. if(NOT CMAKE_SYSTEM_VERSION VERSION_LESS 6.0) diff --git a/src/os/vxworks/inc/os-impl-dirs.h b/src/os/vxworks/inc/os-impl-dirs.h index 2e84542af..3717574ee 100644 --- a/src/os/vxworks/inc/os-impl-dirs.h +++ b/src/os/vxworks/inc/os-impl-dirs.h @@ -34,7 +34,7 @@ /* * In VxWorks 6.x the system mkdir() function only has a path argument - * In VxWorks 7 it is now POSIX compilant and adds a mode argument + * In VxWorks 7 it is now POSIX-compliant and adds a mode argument * * This macro simply discards the second argument, allowing code to use * mkdir() in a consistent, POSIX compliant fashion. diff --git a/ut_assert/src/utstubs.c b/ut_assert/src/utstubs.c index 78a7cf2bc..8aa8f5df9 100644 --- a/ut_assert/src/utstubs.c +++ b/ut_assert/src/utstubs.c @@ -1068,7 +1068,7 @@ int32 UT_DefaultStubImplWithArgs(const char *FunctionName, UT_EntryKey_t FuncKey RvcPtr = UT_Stub_FindRetvalConfig(FuncKey); - /* For legacy compatibility, determine the int32 status code (this may or may not be relevent) */ + /* For legacy compatibility, determine the int32 status code (this may or may not be relevant) */ if (RvcPtr != NULL && UT_Stub_IsValueCompatible(&RvcPtr->Data.Rvc, "int32", UT_ValueGenre_INTEGER)) { LocalContext.Int32StatusIsSet = From 2415e2082cc2c9da5bb79949816571996cc162ff Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 5 Nov 2024 09:46:20 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev89 --- CHANGELOG.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5520f9c7..d7081e43d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev89 +- Update misnamed member variable in OS_BSP_GlobalData_t +- See + ## Development Build: equuleus-rc1+dev85 - Fix workflow bug and enforce updating of coverage minimums - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 470088568..b4d306a67 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 85 +#define OS_BUILD_NUMBER 89 #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 */