Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1415, Update misnamed member variable in OS_BSP_GlobalData_t #1416

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/bsp/shared/inc/bsp-impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
4 changes: 2 additions & 2 deletions src/bsp/shared/src/bsp_default_resourcecfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/rtems/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/os/vxworks/inc/os-impl-dirs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ut_assert/src/utstubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down