From 84d443bd25a628f9d5c53e73864063b8e431e79f Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 17 Feb 2021 12:25:09 -0500 Subject: [PATCH] Fix #819, Remove redundant logic --- src/os/vxworks/src/os-impl-network.c | 1 - src/os/vxworks/src/os-impl-timebase.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/os/vxworks/src/os-impl-network.c b/src/os/vxworks/src/os-impl-network.c index 6180c1439..adfc911b0 100644 --- a/src/os/vxworks/src/os-impl-network.c +++ b/src/os/vxworks/src/os-impl-network.c @@ -85,7 +85,6 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) else { *IdBuf = (int32)host_id; - status = OS_SUCCESS; } } diff --git a/src/os/vxworks/src/os-impl-timebase.c b/src/os/vxworks/src/os-impl-timebase.c index 235413179..b390f15f2 100644 --- a/src/os/vxworks/src/os-impl-timebase.c +++ b/src/os/vxworks/src/os-impl-timebase.c @@ -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"); @@ -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); /*