Skip to content

Commit

Permalink
Merge pull request #820 from skliper/fix819-redundancy_cleanup
Browse files Browse the repository at this point in the history
Fix #819, Remove redundant logic
  • Loading branch information
astrogeco authored Feb 24, 2021
2 parents 58823bb + 84d443b commit 3a29906
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/os/vxworks/src/os-impl-network.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf)
else
{
*IdBuf = (int32)host_id;
status = OS_SUCCESS;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/os/vxworks/src/os-impl-timebase.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,12 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
if (!sigismember(&inuse, signo))
{
/* signal is available, stop search */
local->assigned_signal = signo;
break;
}
}

if (signo < SIGRTMIN || signo > SIGRTMAX)
if (local->assigned_signal == 0)
{
/* no available signal for timer */
OS_DEBUG("No free RT signals to use for simulated time base\n");
Expand All @@ -421,7 +422,6 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
* Therefore, we choose the signal now, but defer calling
* timer_create to the internal helper task.
*/
local->assigned_signal = signo;
sigaddset(&local->timer_sigset, signo);

/*
Expand Down

0 comments on commit 3a29906

Please sign in to comment.