From 0790e118d8e6642cc4b8362e7d79cac2602ecdce Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 20 Oct 2020 11:47:13 -0400 Subject: [PATCH] Update #943, Make CFE and OSAL task ID equivalent For backward compatibility - remove logic that actually made thes different numerical values. This should be put back in at some point. --- fsw/cfe-core/src/es/cfe_es_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsw/cfe-core/src/es/cfe_es_resource.c b/fsw/cfe-core/src/es/cfe_es_resource.c index 82ae36a77..e51867277 100644 --- a/fsw/cfe-core/src/es/cfe_es_resource.c +++ b/fsw/cfe-core/src/es/cfe_es_resource.c @@ -73,7 +73,7 @@ int32 CFE_ES_ResourceID_ToIndex_Internal(uint32 Serial, uint32 TableSize, uint32 osal_id_t CFE_ES_ResourceID_ToOSAL(CFE_ES_ResourceID_t id) { unsigned long val = CFE_ES_ResourceID_ToInteger(id); - return OS_ObjectIdFromInteger(val ^ CFE_ES_RESOURCEID_MARK); + return OS_ObjectIdFromInteger(val); } /*********************************************************************/ @@ -85,7 +85,7 @@ osal_id_t CFE_ES_ResourceID_ToOSAL(CFE_ES_ResourceID_t id) CFE_ES_ResourceID_t CFE_ES_ResourceID_FromOSAL(osal_id_t id) { unsigned long val = OS_ObjectIdToInteger(id); - return CFE_ES_ResourceID_FromInteger(val ^ CFE_ES_RESOURCEID_MARK); + return CFE_ES_ResourceID_FromInteger(val); } /*********************************************************************/