replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...

[o-du/l2.git] / src / mt / ss_task.c

diff --git a/src/mt/ss_task.c b/src/mt/ss_task.c
index 73f9037..8c016cd 100644 (file)
--- a/src/mt/ss_task.c
+++ b/src/mt/ss_task.c
@@ -134,7 +134,7 @@
 EXTERN S32 clusterMode;
 #endif 
 
-PUBLIC pthread_t tmpRegTidMap[20];
+pthread_t tmpRegTidMap[20];
 
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
 EXTERN unsigned int tlPost(void *handle);
@@ -166,14 +166,14 @@ EXTERN int          WLS_WakeUp(void* h);
 */
   
 #ifdef ANSI
-PUBLIC S16 SRegInit
+S16 SRegInit
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
 PAIFS16 initFnct            /* initialization function */
 )
 #else
-PUBLIC S16 SRegInit(ent, inst, initFnct)
+S16 SRegInit(ent, inst, initFnct)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 PAIFS16 initFnct;           /* initialization function */
@@ -183,7 +183,6 @@ PAIFS16 initFnct;           /* initialization function */
    S16         ret;     /* return value */
    SsTTskEntry *tTsk;
 
-   TRC1(SRegInit);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -191,14 +190,14 @@ PAIFS16 initFnct;           /* initialization function */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS350, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check initialization function */
    if (initFnct == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS351, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -217,7 +216,7 @@ PAIFS16 initFnct;           /* initialization function */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS352, ERRZERO,
                      "Could not lock system task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret);
@@ -229,7 +228,7 @@ PAIFS16 initFnct;           /* initialization function */
                  "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -246,11 +245,11 @@ PAIFS16 initFnct;           /* initialization function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS355, ERRZERO,
                       "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
    /* check if entity and instance already registered */
@@ -266,11 +265,11 @@ PAIFS16 initFnct;           /* initialization function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS357, ERRZERO,
                          "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -312,11 +311,11 @@ PAIFS16 initFnct;           /* initialization function */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS358, ERRZERO,
                       "Could not give the Semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SRegInit */
 
 
@@ -345,7 +344,7 @@ PAIFS16 initFnct;           /* initialization function */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegActvTsk
+S16 SRegActvTsk
 (
 Ent ent,                       /* entity */
 Inst inst,                     /* instance */
@@ -354,7 +353,7 @@ Prior prior,                   /* task priority */
 ActvTsk actvTsk                /* activate task function */
 )
 #else
-PUBLIC S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk)
+S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk)
 Ent ent;                       /* entity */
 Inst inst;                     /* instance */
 Ttype ttype;                   /* task type */
@@ -368,7 +367,6 @@ ActvTsk actvTsk;               /* activate task function */
    /* ss021.103 - Addition for pointer */
    SsTTskEntry *tTsk;
 
-   TRC1(SRegActvTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -376,14 +374,14 @@ ActvTsk actvTsk;               /* activate task function */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS359, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check activation function */
    if (actvTsk == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS360, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check task type */
@@ -391,14 +389,14 @@ ActvTsk actvTsk;               /* activate task function */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS361, ERRZERO, "Invalid task type");
       /* ss021.103 - Addition of return fail for invalid task type */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check task priority */
    if (prior > PRIOR3)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS362, ERRZERO, "Invalid task priority");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -408,7 +406,7 @@ ActvTsk actvTsk;               /* activate task function */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS363, ERRZERO,
                      "Could not lock system task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* lock TAPA task table */
@@ -420,13 +418,13 @@ ActvTsk actvTsk;               /* activate task function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS364, ERRZERO,
                          "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
  
       SSLOGERROR(ERRCLS_DEBUG, ESS365, ERRZERO,
                      "Could not lock TAPA task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* ss021.103 - Modification for SRegInit not called yet */
    /* check if entity and instance already registered */
@@ -445,11 +443,11 @@ ActvTsk actvTsk;               /* activate task function */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS366, ERRZERO,
                          "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
          }
          SSLOGERROR(ERRCLS_INT_PAR, ESS367, ERRZERO, "Too many tasks");
-         RETVALUE(ROUTRES);
+         return (ROUTRES);
       }
 #endif
 
@@ -491,13 +489,13 @@ ActvTsk actvTsk;               /* activate task function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS368, ERRZERO,
                     "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS369, ERRZERO, 
                  "ActvTask already registered");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -513,7 +511,7 @@ ActvTsk actvTsk;               /* activate task function */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS370, ERRZERO,
                       "Could not give the Semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
@@ -535,7 +533,7 @@ ActvTsk actvTsk;               /* activate task function */
 #endif
 
       SDeregTTsk(ent, inst);
-      RETVALUE(ret);
+      return (ret);
    }
 
 
@@ -555,7 +553,7 @@ ActvTsk actvTsk;               /* activate task function */
    }
 
 
-   RETVALUE(ret);
+   return (ret);
 
 } /* SRegActvTsk */
  
@@ -575,13 +573,13 @@ ActvTsk actvTsk;               /* activate task function */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeregInitTskTmr
+S16 SDeregInitTskTmr
 (
 Ent ent,                       /* entity */
 Inst inst                      /* instance */
 )
 #else
-PUBLIC S16 SDeregInitTskTmr(ent, inst)
+S16 SDeregInitTskTmr(ent, inst)
 Ent ent;                       /* entity */
 Inst inst;                     /* instance */
 #endif
@@ -594,7 +592,6 @@ Inst inst;                     /* instance */
    Bool        destroySTsk;
 
 
-   TRC1(SDeregInitTskTmr);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -602,7 +599,7 @@ Inst inst;                     /* instance */
    if (ent >= SS_MAX_ENT  ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS373, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -613,7 +610,7 @@ Inst inst;                     /* instance */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS374, ERRZERO,
                      "Could not lock system task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* lock the TAPA task table */
@@ -626,7 +623,7 @@ Inst inst;                     /* instance */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -643,11 +640,11 @@ Inst inst;                     /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS377, ERRZERO,
                          "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -675,7 +672,7 @@ Inst inst;                     /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS378, ERRZERO,
                       "Could not give the Semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
@@ -683,7 +680,7 @@ Inst inst;                     /* instance */
    /* deregister the TAPA task */
    if (SDeregTTsk(ent, inst) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -704,7 +701,7 @@ Inst inst;                     /* instance */
                         "Could not lock system task table");
 #endif
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       idx = (SsIdx) sTskId;
@@ -720,11 +717,11 @@ Inst inst;                     /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS380, ERRZERO,
                          "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
          }
 
-         RETVALUE(ROK);
+         return ROK;
       }
 
       /* check if the system task is dying already */
@@ -737,10 +734,10 @@ Inst inst;                     /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS381, ERRZERO,
                          "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
          }
-         RETVALUE(ROK);
+         return ROK;
       }
 
 
@@ -762,7 +759,7 @@ Inst inst;                     /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS382, ERRZERO,
                       "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
@@ -781,13 +778,13 @@ Inst inst;                     /* instance */
                         "Could not destroy system task");
 #endif
 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
    }
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SDeregInitTskTmr */
 
 #endif /* SS_MULTIPLE_PROCS */
@@ -813,7 +810,7 @@ Inst inst;                     /* instance */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SRegTTsk
+S16 SRegTTsk
 (
 Ent ent,                        /* entity */
 Inst inst,                      /* instance */
@@ -823,7 +820,7 @@ PAIFS16 initTsk,                /* initialization function */
 ActvTsk actvTsk                 /* activation function */
 )
 #else
-PUBLIC S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk)
+S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk)
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
 Ttype type;                     /* task type */
@@ -835,7 +832,7 @@ ActvTsk actvTsk;                /* activation function */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SRegTTsk
+S16 SRegTTsk
 (
 ProcId proc,                    /* processor */
 Ent ent,                        /* entity */
@@ -846,7 +843,7 @@ PAIFS16 initTsk,                /* initialization function */
 ActvTsk actvTsk                 /* activation function */
 )
 #else
-PUBLIC S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk)
+S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk)
 ProcId proc;                    /* processor */
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
@@ -866,7 +863,6 @@ ActvTsk actvTsk;                /* activation function */
    U16 procIdIdx;
 #endif
 
-   TRC1(SRegTTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -877,13 +873,13 @@ ActvTsk actvTsk;                /* activation function */
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS384, ERRZERO, "Invalid proc/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS385, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -891,7 +887,7 @@ ActvTsk actvTsk;                /* activation function */
    if (actvTsk == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS386, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check task type */
@@ -899,14 +895,14 @@ ActvTsk actvTsk;                /* activation function */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS387, ERRZERO, "Invalid task type");
       /* ss021.103 - Addition of return fail for invalid task type */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check task priority */
    if (prior > PRIOR3)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS388, ERRZERO, "Invalid task priority");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -923,7 +919,7 @@ ActvTsk actvTsk;                /* activation function */
                      "Could not find proc table index");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -943,7 +939,7 @@ ActvTsk actvTsk;                /* activation function */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS390, ERRZERO,
                      "Could not lock system task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret);
@@ -961,11 +957,11 @@ ActvTsk actvTsk;                /* activation function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS392, ERRZERO,
                       "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -982,11 +978,11 @@ ActvTsk actvTsk;                /* activation function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS394, ERRZERO,
                       "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
    /* check if entity and instance already registered */
@@ -1007,11 +1003,11 @@ ActvTsk actvTsk;                /* activation function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS396, ERRZERO,
                       "Could not give the Semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -1111,10 +1107,10 @@ ActvTsk actvTsk;                /* activation function */
       SSLOGERROR(ERRCLS_DEBUG, ESS397, ERRZERO,
                       "Could not give the Semaphore");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SRegTTsk */
  /* ss002.301 Additions */
 /*
@@ -1134,14 +1130,14 @@ ActvTsk actvTsk;                /* activation function */
 **/
 #ifndef SS_MULTIPLE_PROCS
 #ifdef ANSI
-PUBLIC S16 SRegCbTsk
+S16 SRegCbTsk
 (
 Ent ent,                        /* entity */
 Inst inst,                      /* instance */
 ActvTsk cbTsk                   /* Callback Function */
 )
 #else
-PUBLIC S16 SRegCbTsk(ent, inst, cbTsk)
+S16 SRegCbTsk(ent, inst, cbTsk)
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
 ActvTsk cbTsk;
@@ -1150,7 +1146,7 @@ ActvTsk cbTsk;
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SRegCbTsk 
+S16 SRegCbTsk 
 (
 ProcId proc,                    /* processor */
 Ent ent,                        /* entity */
@@ -1158,7 +1154,7 @@ Inst inst,                       /* instance */
 ActvTsk cbTsk 
 )
 #else
-PUBLIC S16 SRegCbTsk(proc, ent, inst, cbTsk)
+S16 SRegCbTsk(proc, ent, inst, cbTsk)
 ProcId proc;                    /* processor */
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
@@ -1173,19 +1169,18 @@ ActvTsk cbTsk;
    U16 procIdIdx;
 #endif /* SS_MULTIPLE_PROCS */
 
-   TRC1(SRegCbTsk);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRegCbTsk() : Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (cbTsk == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, " SRegCbTsk() : Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -1201,7 +1196,7 @@ ActvTsk cbTsk;
                      " SRegCbTsk() : Could not find proc table index");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -1213,7 +1208,7 @@ ActvTsk cbTsk;
       SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO,
                      "SRegCbTsk() : Could not lock TAPA task table");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef SS_MULTIPLE_PROCS
@@ -1227,7 +1222,7 @@ ActvTsk cbTsk;
    {
       SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem);
       SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRegCbTsk() : Unknown task");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    tTsk = &osCp.tTskTbl[idx];
@@ -1235,7 +1230,7 @@ ActvTsk cbTsk;
 
    /* unlock the table */
    SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -1259,13 +1254,13 @@ ActvTsk cbTsk;
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SDeregTTsk
+S16 SDeregTTsk
 (
 Ent ent,                        /* entity */
 Inst inst                       /* instance */
 )
 #else
-PUBLIC S16 SDeregTTsk(ent, inst)
+S16 SDeregTTsk(ent, inst)
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
 #endif
@@ -1273,14 +1268,14 @@ Inst inst;                      /* instance */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SDeregTTsk
+S16 SDeregTTsk
 (
 ProcId proc,                    /* processor */
 Ent ent,                        /* entity */
 Inst inst                       /* instance */
 )
 #else
-PUBLIC S16 SDeregTTsk(proc, ent, inst)
+S16 SDeregTTsk(proc, ent, inst)
 ProcId proc;                    /* processor */
 Ent ent;                        /* entity */
 Inst inst;                      /* instance */
@@ -1300,7 +1295,6 @@ Inst inst;                      /* instance */
    Buffer *mBuf;
    SsMsgInfo *mInfo;
 
-   TRC1(SDeregTTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1310,13 +1304,13 @@ Inst inst;                      /* instance */
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS398, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS399, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -1333,7 +1327,7 @@ Inst inst;                      /* instance */
       SSLOGERROR(ERRCLS_DEBUG, ESS400, ERRZERO,
                              "Could not find proc id index");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -1347,7 +1341,7 @@ Inst inst;                      /* instance */
       SSLOGERROR(ERRCLS_DEBUG, ESS401, ERRZERO,
                              "Could not lock timer table");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    for (idx = 0;  idx < SS_MAX_TMRS;  idx++)
@@ -1400,7 +1394,7 @@ Inst inst;                      /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
              SSLOGERROR(ERRCLS_DEBUG, ESS402, ERRZERO,
                       "Could not give the Semaphore");
-             RETVALUE(RFAILED);
+             return RFAILED;
 #endif
           }
 
@@ -1408,7 +1402,7 @@ Inst inst;                      /* instance */
             SSLOGERROR(ERRCLS_DEBUG, ESS403, ERRZERO,
                         "Could not deregister task's timer(s)");
 #endif
-            RETVALUE(RFAILED);
+            return RFAILED;
 
          }
       }
@@ -1421,7 +1415,7 @@ Inst inst;                      /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
              SSLOGERROR(ERRCLS_DEBUG, ESS404, ERRZERO,
                       "Could not give the Semaphore");
-             RETVALUE(RFAILED);
+             return RFAILED;
 #endif
           }
  /* ss002.301 Additions */
@@ -1439,7 +1433,7 @@ Inst inst;                      /* instance */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -1459,7 +1453,7 @@ Inst inst;                      /* instance */
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS412, ERRZERO, "Unknown task");
  /* ss002.301 Additions */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    tTsk = &osCp.tTskTbl[idx];
@@ -1492,7 +1486,7 @@ Inst inst;                      /* instance */
        SSLOGERROR(ERRCLS_DEBUG, ESS415, ERRZERO, "Could not get a message");
 #endif
 
-       RETVALUE(RFAILED);
+       return RFAILED;
        }
 
        /* Update message*/
@@ -1528,12 +1522,12 @@ Inst inst;                      /* instance */
 #if (ERRCLASS & ERRCLS_DEBUG)
        SSLOGERROR(ERRCLS_INT_PAR, ESS416, ERRZERO, "Could not write to demand queue");
 #endif
-       RETVALUE(RFAILED);
+       return RFAILED;
        }
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SDeregTTsk */
 
 \f
@@ -1555,13 +1549,13 @@ Inst inst;                      /* instance */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SCreateSTsk
+S16 SCreateSTsk
 (
 SSTskPrior tskPrior,            /* task priority */
 SSTskId *tskId                  /* filled in with system task ID */
 )
 #else
-PUBLIC S16 SCreateSTsk(tskPrior, tskId)
+S16 SCreateSTsk(tskPrior, tskId)
 SSTskPrior tskPrior;            /* task priority */
 SSTskId *tskId;                 /* filled in with system task ID */
 #endif
@@ -1570,7 +1564,6 @@ SSTskId *tskId;                 /* filled in with system task ID */
    SsSTskEntry *sTsk;
 
 
-   TRC1(SCreateSTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1578,7 +1571,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
    if (tskId == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS417, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check system task priority */
@@ -1586,7 +1579,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS418, ERRZERO,
                      "Invalid system task priority");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -1601,7 +1594,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
                      "Could not lock system task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -1647,10 +1640,10 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS420, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
-      RETVALUE(ROK);
+      return ROK;
    }
 #endif /* SS_SINGLE_THREADED */
 
@@ -1665,7 +1658,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS421, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
@@ -1673,7 +1666,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
       SSLOGERROR(ERRCLS_ADD_RES, ESS422, ERRZERO, "Too many system tasks");
 #endif
 
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
 
@@ -1695,7 +1688,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS423, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
@@ -1704,7 +1697,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
                   "Could not initialize demand queue");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* initialize the system task entry lock */
@@ -1718,7 +1711,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS425, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
@@ -1727,7 +1720,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
                   "Could not initialize system task entry lock");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -1750,7 +1743,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS427, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
@@ -1759,7 +1752,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
                   "Could not create system task");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* success, update the table */
@@ -1781,11 +1774,11 @@ SSTskId *tskId;                 /* filled in with system task ID */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS429, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* SCreateSTsk */
 
@@ -1811,7 +1804,7 @@ SSTskId *tskId;                 /* filled in with system task ID */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegLogCfg
+S16 SRegLogCfg
 (
 U8 mode,
 S8 *path,
@@ -1820,7 +1813,7 @@ S8 *IPA,
 U16 port
 )
 #else
-PUBLIC S16 SRegLogCfg(mode, path, size, IPA, port)
+S16 SRegLogCfg(mode, path, size, IPA, port)
 U8 mode;
 S8 *path;
 U32 size;
@@ -1838,7 +1831,6 @@ U16 port
    struct sockaddr_in localAddr={0};
    struct sockaddr_in remoteAddr ={0};
 
-   TRC1(SRegLogCfg);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
 #endif
@@ -1846,7 +1838,7 @@ U16 port
    /* Initialize the lock, return on failure */
    if( SInitLock(&(osCp.logger.bufLock),SS_LOCK_MUTEX) != ROK)
        {
-      RETVALUE(RFAILED);
+      return RFAILED;
    } /* if */
 
    SLock(&osCp.logger.bufLock);
@@ -1857,7 +1849,7 @@ U16 port
    if( osCp.logger.started == TRUE)
    {
       (Void)SUnlock(&(osCp.logger.bufLock));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
        /* set the mode of the logging */
@@ -1882,7 +1874,7 @@ U16 port
       {
          SDisplay(0,"Error Opening Log File \n");
          (Void)SUnlock(&(osCp.logger.bufLock));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       strcpy(osCp.logger.filePath,path);
        }
@@ -1895,7 +1887,7 @@ U16 port
                        {
                           SDisplay(0, "Error at WSAStartup!\n");
             (Void)SUnlock(&(osCp.logger.bufLock));
-                               RETVALUE(RFAILED);
+                               return RFAILED;
                        }
 #endif
       osCp.logger.socketdes = socket(AF_INET, SOCK_DGRAM, 0);
@@ -1906,7 +1898,7 @@ U16 port
                        WSACleanup();
 #endif
          (Void)SUnlock(&(osCp.logger.bufLock));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
                /* bind to local address */
                localAddr.sin_family = AF_INET;
@@ -1922,7 +1914,7 @@ U16 port
                        close(osCp.logger.socketdes);
 #endif
          (Void)SUnlock(&(osCp.logger.bufLock));
-         RETVALUE(RFAILED);
+         return RFAILED;
                }
                /* remote address */
                remoteAddr.sin_family = AF_INET;
@@ -1937,14 +1929,14 @@ U16 port
                        close(osCp.logger.socketdes);
 #endif
          (Void)SUnlock(&(osCp.logger.bufLock));
-         RETVALUE(RFAILED);
+         return RFAILED;
                }
                remoteAddr.sin_addr.s_addr = inet_addr(IPA);
                osCp.logger.remoteAddr = remoteAddr;
 
        }
 
-   cmMemset((U8*)osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer));
+   memset(osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer));
    
    osCp.logger.maxBufSiz = SS_MAX_LOGBUF_SIZE;
    osCp.logger.curBufSiz = 0;
@@ -1958,7 +1950,7 @@ U16 port
 
    (Void)SUnlock(&(osCp.logger.bufLock));
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SRegLogCfg */
 
 /*
@@ -1975,12 +1967,12 @@ U16 port
 *
 --*/
 #ifdef ANSI
-PUBLIC S16 SFlushBufToLog 
+S16 SFlushBufToLog 
 (
 S8 *logBuf
 )
 #else
-PUBLIC S16 SFlushBufToLog(logBuf)
+S16 SFlushBufToLog(logBuf)
 S8 *logBuf
 #endif
 {
@@ -1994,7 +1986,6 @@ S8 *logBuf
 #endif
    FILE* oldFileP;
    /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC1(SFlushBufToLog)
 
    buffer = logBuf;
 
@@ -2007,12 +1998,12 @@ S8 *logBuf
        {
       writeNum = sendto(osCp.logger.socketdes, buffer, cmStrlen((U8 *)buffer), 0, (struct sockaddr*)&osCp.logger.remoteAddr, sizeof(osCp.logger.remoteAddr));
       /*ss013.301 : Returned after sending to socket*/
-      RETVALUE(ROK);
+      return ROK;
        }
    osCp.logger.curNumFlush++;
    if(osCp.logger.curNumFlush == osCp.logger.maxNumFlush)
    {
-      cmMemset((U8 *)newFileName,'\0',sizeof(newFileName));
+      memset(newFileName,'\0',sizeof(newFileName));
       /*Store the current File*/
       oldFileP = osCp.logger.filep;
       /*Open a new file and use it as a new log file*/
@@ -2030,7 +2021,7 @@ S8 *logBuf
    /*SPutSBuf(DFLT_REGION,DFLT_POOL,
             (Data *)buffer, (Size)(osCp.logger.maxBufSiz * sizeof(S8)));*/
  
-   RETVALUE(ROK);
+   return ROK;
 } /* SFlushBufToLog */
 
 /*
@@ -2047,22 +2038,21 @@ S8 *logBuf
 *
 --*/
 #ifdef ANSI
-PUBLIC S16 SCleanUp
+S16 SCleanUp
 (
 Void
 )
 #else
-PUBLIC S16 SCleanUp()
+S16 SCleanUp()
 #endif
 {
 
-   TRC1(SCleanUp);
    /*Flush the remaining data in the log file*/
    SLock(&osCp.logger.bufLock);
    if(osCp.logger.started == FALSE)
    {
       (Void)SUnlock(&(osCp.logger.bufLock));
-      RETVALUE(ROK);
+      return ROK;
    }
    if(osCp.logger.curBufSiz)
    {
@@ -2089,7 +2079,7 @@ PUBLIC S16 SCleanUp()
    signal(SIGINT, App_SigExitCallBack);
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of SCleanUp */
 
@@ -2109,20 +2099,19 @@ PUBLIC S16 SCleanUp()
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeregLogCfg
+S16 SDeregLogCfg
 (
 )
 #else
-PUBLIC S16 SDeregLogCfg()
+S16 SDeregLogCfg()
 #endif
 {
 
 
-   TRC1(SDeregLogCfg);
  
    SCleanUp();   
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* SDeregLogCfg */
 
@@ -2140,12 +2129,12 @@ PUBLIC S16 SDeregLogCfg()
 *
 */
 #ifdef ANSI
-PUBLIC Void SStartLogger
+Void SStartLogger
 (
 void
 )
 #else
-PUBLIC Void SStartLogger()
+Void SStartLogger()
 #endif
 {
        if (osCp.logger.configured == TRUE)
@@ -2169,12 +2158,12 @@ PUBLIC Void SStartLogger()
 *
 */
 #ifdef ANSI
-PUBLIC Void SStopLogger
+Void SStopLogger
 (
 void
 )
 #else
-PUBLIC Void SStopLogger()
+Void SStopLogger()
 #endif
 {
    osCp.logger.started = FALSE;
@@ -2202,26 +2191,25 @@ PUBLIC Void SStopLogger()
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegCpuInfo 
+S16 SRegCpuInfo 
 (
 SCpuInfo *cpuInfo    /* Information about the cores/threads per core */
 )
 #else
-PUBLIC S16 SRegCpuInfo (cpuInfo)
+S16 SRegCpuInfo (cpuInfo)
 SCpuInfo *cpuInfo;  /* Information about the cores/threads per core */
 #endif
 {
    U32 coreCount = 0;
 
    /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC1(SRegCpuInfo)
    /* check the number of cores */
    if ( cpuInfo->numCores > SS_MAX_CORES || 
         cpuInfo->threadsPerCore > SS_MAX_THREADS_PER_CORE || 
         cpuInfo->numCores < 1 || cpuInfo->threadsPerCore < 1 )
    {
        SSLOGERROR(ERRCLS_INT_PAR, ESS430, ERRZERO, "Invalid number of cores\n");
-       RETVALUE(RFAILED);
+       return RFAILED;
    }
 
    /* lock mCInfo */
@@ -2243,7 +2231,7 @@ SCpuInfo *cpuInfo;  /* Information about the cores/threads per core */
    /* unlock mCInfo */
    SUnlock(&osCp.mCILock);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* SRegCpuInfo */
 
@@ -2266,13 +2254,13 @@ SCpuInfo *cpuInfo;  /* Information about the cores/threads per core */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetAffinity
+S16 SGetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
 U32 *coreId                      /* the core/processor id to which the affinity is set */
 )
 #else
-PUBLIC S16 SGetAffinity(tskId, coreId)
+S16 SGetAffinity(tskId, coreId)
 SSTskId *tskId;                 /* filled in with system task ID */
 U32 *coreId;                    /* the core/processor id to which the affinity is set */
 #endif
@@ -2280,17 +2268,16 @@ U32 *coreId;                    /* the core/processor id to which the affinity i
    S16 ret;
 
     /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-    TRC1(SGetAffinity)
     /* implementation specific */
     ret = ssdGetAffinity(tskId, coreId);
 
     if (ret != ROK)
     {
        SSLOGERROR(ERRCLS_INT_PAR, ESS431, ERRZERO, "Failed to get affinity\n");
-       RETVALUE(RFAILED);
+       return RFAILED;
     } /* end if */
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetAffinity */
 
 
@@ -2311,7 +2298,7 @@ U32 *coreId;                    /* the core/processor id to which the affinity i
 *
 */
 #ifdef ANSI
-PUBLIC S16 SSetAffinity
+S16 SSetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
 SsAffinityMode mode,             /* the mode according to which the affinty is set */
@@ -2319,7 +2306,7 @@ U32 coreId,                      /* the core/processor id to which the affinity
 SSTskId *tskAssociatedTskId      /* filled in with system task ID of the associated layer */
 )
 #else
-PUBLIC S16 SSetAffinity(tskId, mode, coreId, tskAssociatedTskId)
+S16 SSetAffinity(tskId, mode, coreId, tskAssociatedTskId)
 SSTskId *tskId;                 /* filled in with system task ID */
 SsAffinityMode mode;            /* the mode according to which the affinty is set */
 U32 coreId;                     /* the core/processor id to which the affinity has to be set */
@@ -2329,13 +2316,12 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
    S16 ret;
   
    /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC1(SSetAffinity)
    /* validate the mode */
    if (mode < SS_AFFINITY_MODE_DEFAULT || 
        mode > SS_AFFINITY_MODE_EXCL)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS432, ERRZERO, "Invalid mode for setting core affinity\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    } /* end if */
 
    /* check the value of core id */
@@ -2343,7 +2329,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
        (coreId > osCp.mCInfo.cpuInfo.numCores || coreId < 0))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS433, ERRZERO, "Invalid core id\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    } /* end if */
 
    /* set affinity according to the mode supplied */
@@ -2374,7 +2360,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                              {
                                  SSLOGERROR(ERRCLS_INT_PAR, ESS434, ERRZERO, \
                                             "Failed to set core affinity\n");
-                                 RETVALUE(RFAILED);
+                                 return RFAILED;
                              } /* end if */
   
                              /* lock mCInfo */
@@ -2414,7 +2400,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
               {
                   SSLOGERROR(ERRCLS_INT_PAR, ESS436, ERRZERO,\
                              "Can not set core affinity, core is exclusively used for other task\n");
-                  RETVALUE(RFAILED);
+                  return RFAILED;
               } /* end if */
               /* call the implementation specific affinity function with the core id supplied by caller */
               ret = ssdSetAffinity(tskId, coreId);
@@ -2422,7 +2408,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
               if (ret != ROK)
               {
                   SSLOGERROR(ERRCLS_INT_PAR, ESS437, ERRZERO, "Failed to set core affinity\n");
-                  RETVALUE(RFAILED);
+                  return RFAILED;
               } /* end if */
 
               /* lock mCInfo */
@@ -2467,7 +2453,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                               if (ret != ROK)
                               {
                                   SSLOGERROR(ERRCLS_INT_PAR, ESS439, ERRZERO, "Failed to set core affinity\n");
-                                  RETVALUE(RFAILED);
+                                  return RFAILED;
                               } /* end if */
     
                               /* lock mCInfo */
@@ -2498,7 +2484,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                          {
                              SSLOGERROR(ERRCLS_INT_PAR, ESS441, ERRZERO, 
                                         "Can not set core affinity, core is exclusively used for other task\n");
-                             RETVALUE(RFAILED);
+                             return RFAILED;
                          } /* end else */
                          tskNotFound = FALSE;
                            break;
@@ -2510,7 +2496,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                if (coreIndex == SS_MAX_CORES)
                 {
                     SSLOGERROR(ERRCLS_INT_PAR, ESS442, ERRZERO, "Invalid core id\n");
-                    RETVALUE(RFAILED);
+                    return RFAILED;
                 } /* if */
              break;
           } /* end case SS_AFFINITY_MODE_ASSOC */
@@ -2527,7 +2513,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                  if (ret != ROK)
                  {
                     SSLOGERROR(ERRCLS_INT_PAR, ESS443, ERRZERO, "Failed to set core affinity\n");
-                    RETVALUE(RFAILED);
+                    return RFAILED;
                  } /* end if */
 
                  /* lock mCInfo */
@@ -2571,7 +2557,7 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                                 if (ret != ROK)
                                  {
                                     SSLOGERROR(ERRCLS_INT_PAR, ESS444, ERRZERO, "Failed to set core affinity\n");
-                                    RETVALUE(RFAILED);
+                                    return RFAILED;
                                  } /* end if */
      
                                  /* lock mCInfo */
@@ -2604,25 +2590,25 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
                   {
                      SSLOGERROR(ERRCLS_INT_PAR, ESS445, ERRZERO, 
                                 "Failed to set core affinity, no threads on cores available\n");
-                     RETVALUE(RFAILED);
+                     return RFAILED;
                   } /* end if no thrs on cores available */
 
               } /* else if */
               else
               {
                  SSLOGERROR(ERRCLS_INT_PAR, ESS446, ERRZERO, "Can not set exclusive affinity for the core\n");
-                 RETVALUE(RFAILED);
+                 return RFAILED;
               } /* end else */
             break;
          } /* end case SS_AFFINITY_MODE_EXCL */
          default:
          {
             SSLOGERROR(ERRCLS_INT_PAR, ESS447, ERRZERO, "Invalid mode for setting core affinity\n");
-            RETVALUE(RFAILED);
+            return RFAILED;
          } /* end default case */
     } /* end of switch */
 
-    RETVALUE(ROK);
+    return ROK;
                
 
 } /* SSetAffinity */
@@ -2649,12 +2635,12 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDestroySTsk
+S16 SDestroySTsk
 (
 SSTskId tskId                   /* system task to be destroyed */
 )
 #else
-PUBLIC S16 SDestroySTsk(tskId)
+S16 SDestroySTsk(tskId)
 SSTskId tskId;                  /* system task to be destroyed */
 #endif
 {
@@ -2670,7 +2656,6 @@ SSTskId tskId;                  /* system task to be destroyed */
 #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT*/
 
 
-   TRC1(SDestroySTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2678,7 +2663,7 @@ SSTskId tskId;                  /* system task to be destroyed */
    if (tskId >= SS_MAX_STSKS)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS448, (ErrVal) tskId, "Invalid task ID");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -2693,7 +2678,7 @@ SSTskId tskId;                  /* system task to be destroyed */
                      "Could not lock system task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -2715,13 +2700,13 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS450, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS451, (ErrVal) idx,
                         "Invalid system task ID");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else if (sTsk->termPend != FALSE)
    {
@@ -2732,13 +2717,13 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS452, ERRZERO,
                        "Could not give the Semaphore");
-           RETVALUE(RFAILED);
+           return RFAILED;
 #endif
       }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS453, (ErrVal) idx,
                         "Invalid system task ID");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -2756,7 +2741,7 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
              SSLOGERROR(ERRCLS_DEBUG, ESS454, ERRZERO,
                        "Could not give the Semaphore");
-             RETVALUE(RFAILED);
+             return RFAILED;
 #endif
          }
 
@@ -2765,7 +2750,7 @@ SSTskId tskId;                  /* system task to be destroyed */
                         "Could not lock system task entry");
 #endif
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -2782,7 +2767,7 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
              SSLOGERROR(ERRCLS_DEBUG, ESS456, ERRZERO,
                        "Could not give the Semaphore");
-             RETVALUE(RFAILED);
+             return RFAILED;
 #endif
          }
       }
@@ -2793,7 +2778,7 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
              SSLOGERROR(ERRCLS_DEBUG, ESS457, ERRZERO,
                        "Could not give the Semaphore");
-             RETVALUE(RFAILED);
+             return RFAILED;
 #endif
          }
 
@@ -2802,7 +2787,7 @@ SSTskId tskId;                  /* system task to be destroyed */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -2840,7 +2825,7 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS459, ERRZERO,
                        "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
    }
@@ -2852,7 +2837,7 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS460, ERRZERO,
                      "Could not give the Semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
     }
 
@@ -2875,7 +2860,7 @@ SSTskId tskId;                  /* system task to be destroyed */
                   "Could not destroy system task");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    /* multi-core support */
@@ -2932,12 +2917,12 @@ SSTskId tskId;                  /* system task to be destroyed */
 #if (ERRCLASS & ERRCLS_DEBUG)
        SSLOGERROR(ERRCLS_DEBUG, ESS462, ERRZERO,
                          "Could not unlock the Semaphore");
-       RETVALUE(RFAILED);
+       return RFAILED;
 #endif
    }
 #endif
    
-   RETVALUE(ROK);
+   return ROK;
 } /* SDestroySTsk */
 
 
@@ -2963,14 +2948,14 @@ SSTskId tskId;                  /* system task to be destroyed */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SAttachTTsk
+S16 SAttachTTsk
 (
 Ent ent,                        /* entity ID of the task */
 Inst inst,                      /* instance ID of the task */
 SSTskId sTskId                  /* system task to use */
 )
 #else
-PUBLIC S16 SAttachTTsk(ent, inst, sTskId)
+S16 SAttachTTsk(ent, inst, sTskId)
 Ent ent;                        /* entity ID of the task */
 Inst inst;                      /* instance ID of the task */
 SSTskId sTskId;                 /* system task to use */
@@ -2979,7 +2964,7 @@ SSTskId sTskId;                 /* system task to use */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SAttachTTsk
+S16 SAttachTTsk
 (
 ProcId proc,                    /* processor ID of the task */
 Ent ent,                        /* entity ID of the task */
@@ -2987,7 +2972,7 @@ Inst inst,                      /* instance ID of the task */
 SSTskId sTskId                  /* system task to use */
 )
 #else
-PUBLIC S16 SAttachTTsk(proc, ent, inst, sTskId)
+S16 SAttachTTsk(proc, ent, inst, sTskId)
 ProcId proc;                    /* processor ID of the task */
 Ent ent;                        /* entity ID of the task */
 Inst inst;                      /* instance ID of the task */
@@ -3013,7 +2998,6 @@ SSTskId sTskId;                 /* system task to use */
 #endif
 
 
-   TRC1(SAttachTTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -3024,14 +3008,14 @@ SSTskId sTskId;                 /* system task to use */
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS463, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    /* check entity and instance range */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS464, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -3040,7 +3024,7 @@ SSTskId sTskId;                 /* system task to use */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS465, (ErrVal) sTskId,
                   "Invalid system task ID");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3055,7 +3039,7 @@ SSTskId sTskId;                 /* system task to use */
       SSLOGERROR(ERRCLS_DEBUG, ESS466, ERRZERO,
                              "Could not find proc id index");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -3069,7 +3053,7 @@ SSTskId sTskId;                 /* system task to use */
                      "Could not lock system task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3087,13 +3071,13 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS468, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS469, (ErrVal) sTskId,
                      "Unknown system task ID");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3111,7 +3095,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS470, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
 
@@ -3120,7 +3104,7 @@ SSTskId sTskId;                 /* system task to use */
                         "Could not lock system task entry");
 #endif
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -3137,7 +3121,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS472, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
       }
@@ -3148,11 +3132,11 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS473, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3169,7 +3153,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS474, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
       }
@@ -3181,7 +3165,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS475, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
@@ -3190,7 +3174,7 @@ SSTskId sTskId;                 /* system task to use */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3216,7 +3200,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS477, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
       }
@@ -3227,12 +3211,12 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS478, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS479, ERRZERO, "Unknown task");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3250,7 +3234,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS480, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
       }
@@ -3261,11 +3245,11 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS481, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3282,7 +3266,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS482, ERRZERO,
                      "Could not give the Semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
         }
       }
@@ -3293,11 +3277,11 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS483, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
 
@@ -3337,7 +3321,7 @@ SSTskId sTskId;                 /* system task to use */
                      "Could not find proc table index");
 #endif
 
-              RETVALUE(RFAILED);
+              return RFAILED;
         }
        (Void)(tTsk->initTsk)(tTsk->proc, tTsk->ent, tTsk->inst, sTsk->region, PWR_UP, &xxCb);
        /* 
@@ -3372,7 +3356,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS484, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
    }
@@ -3383,7 +3367,7 @@ SSTskId sTskId;                 /* system task to use */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS485, ERRZERO,
                      "Could not give the Semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
    }
 
@@ -3399,11 +3383,11 @@ SSTskId sTskId;                 /* system task to use */
 #else /* SS_MULTIPLE_PROCS */
       SDetachTTsk(ent, inst);
 #endif /* SS_MULTIPLE_PROCS */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SAttachTTsk */
 
 \f
@@ -3427,13 +3411,13 @@ SSTskId sTskId;                 /* system task to use */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SDetachTTsk
+S16 SDetachTTsk
 (
 Ent ent,                        /* entity ID of the task */
 Inst inst                       /* instance ID of the task */
 )
 #else
-PUBLIC S16 SDetachTTsk(ent, inst)
+S16 SDetachTTsk(ent, inst)
 Ent ent;                        /* entity ID of the task */
 Inst inst;                      /* instance ID of the task */
 #endif
@@ -3441,14 +3425,14 @@ Inst inst;                      /* instance ID of the task */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SDetachTTsk
+S16 SDetachTTsk
 (
 ProcId proc,                    /* processor ID of the task */
 Ent ent,                        /* entity ID of the task */
 Inst inst                       /* instance ID of the task */
 )
 #else
-PUBLIC S16 SDetachTTsk(proc, ent, inst)
+S16 SDetachTTsk(proc, ent, inst)
 ProcId proc;                    /* processor ID of the task */
 Ent ent;                        /* entity ID of the task */
 Inst inst;                      /* instance ID of the task */
@@ -3467,7 +3451,6 @@ Inst inst;                      /* instance ID of the task */
    U16 procIdIdx;
 #endif /* SS_MULTIPLE_PROCS */
 
-   TRC1(SDetachTTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -3478,14 +3461,14 @@ Inst inst;                      /* instance ID of the task */
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS486, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    /* check entity and instance ranges */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS487, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 #endif
@@ -3501,7 +3484,7 @@ Inst inst;                      /* instance ID of the task */
       SSLOGERROR(ERRCLS_DEBUG, ESS488, ERRZERO,
                              "Could not find proc id index");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -3519,7 +3502,7 @@ Inst inst;                      /* instance ID of the task */
                      "Could not lock system task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3534,7 +3517,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS490, ERRZERO,
                      "Could not give the Semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
     }
 
@@ -3543,7 +3526,7 @@ Inst inst;                      /* instance ID of the task */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3567,12 +3550,12 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS492, ERRZERO,
                      "Could not give the Semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
      }
 
       SSLOGERROR(ERRCLS_INT_PAR, ESS493, ERRZERO, "Unknown task");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3596,10 +3579,10 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS494, ERRZERO,
                      "Could not give the Semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
      }
-      RETVALUE(ROK);
+      return ROK;
    }
 
 
@@ -3629,7 +3612,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS495, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
        }
 
@@ -3638,7 +3621,7 @@ Inst inst;                      /* instance ID of the task */
                         "Could not lock system task entry");
 #endif
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -3654,7 +3637,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS497, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
       if ( SUnlock(&osCp.sTskTblLock) != ROK)
@@ -3662,7 +3645,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS498, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
@@ -3671,7 +3654,7 @@ Inst inst;                      /* instance ID of the task */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -3713,7 +3696,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS500, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
    }
@@ -3726,7 +3709,7 @@ Inst inst;                      /* instance ID of the task */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS501, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
@@ -3736,11 +3719,11 @@ Inst inst;                      /* instance ID of the task */
     */
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SDetachTTsk */
 
 \f
@@ -3762,13 +3745,13 @@ Inst inst;                      /* instance ID of the task */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SPstTsk
+S16 SPstTsk
 (
 Pst *pst,                       /* post information */
 Buffer *mBuf                    /* message to post */
 )
 #else
-PUBLIC S16 SPstTsk(pst, mBuf)
+S16 SPstTsk(pst, mBuf)
 Pst *pst;                       /* post information */
 Buffer *mBuf;                   /* message to post */
 #endif
@@ -3811,7 +3794,6 @@ Buffer *mBuf;                   /* message to post */
    U32 t = MacGetTick();
 #endif
  
-   TRC1(SPstTsk);
 
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -3819,7 +3801,7 @@ Buffer *mBuf;                   /* message to post */
    if (mBuf == NULLP)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS502, ERRZERO, "Invalid message buffer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check the pst structure */
@@ -3827,7 +3809,7 @@ Buffer *mBuf;                   /* message to post */
    {
       SPutMsg(mBuf);
       SSLOGERROR(ERRCLS_INT_PAR, ESS503, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* ss021.103 - Addition to check for valid route */
    /* ss023.103 - Modification to fix bug in route validation */
@@ -3836,7 +3818,7 @@ Buffer *mBuf;                   /* message to post */
    {
       SPutMsg(mBuf);
       SSLOGERROR(ERRCLS_INT_PAR, ESS504, ERRZERO, "No route defined");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3852,7 +3834,7 @@ Buffer *mBuf;                   /* message to post */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3874,7 +3856,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS506, ERRZERO,
                      "Could not release the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
       }
 #endif
@@ -3884,7 +3866,7 @@ Buffer *mBuf;                   /* message to post */
       SSLOGERROR(ERRCLS_INT_PAR, ESS507, ERRZERO,
                   "Invalid source/destination entity/instance");
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -3917,7 +3899,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS508, ERRZERO,
                      "Could not release the semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
           }
 #endif
@@ -3928,7 +3910,7 @@ Buffer *mBuf;                   /* message to post */
                      "Could not lock router task entry");
 #endif
 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* call the router activation function */
@@ -3942,7 +3924,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
           SSLOGERROR(ERRCLS_DEBUG, ESS510, ERRZERO,
                      "Could not give the Semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
       }
 
@@ -3955,11 +3937,11 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
             SSLOGERROR(ERRCLS_DEBUG, ESS511, ERRZERO,
                      "Could not release the semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
           }
 #endif
-         RETVALUE((r == RFAILED) ? RFAILED : ROK);
+         return ((r == RFAILED) ? RFAILED : ROK);
       }
    }
 #endif  /* SS_RTR_SUPPORT */
@@ -3986,7 +3968,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS512, ERRZERO,
                      "Could not release the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
       }
 #endif
@@ -3997,7 +3979,7 @@ Buffer *mBuf;                   /* message to post */
       SSLOGERROR(ERRCLS_DEBUG, ESS513, ERRZERO, "Unknown task");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #else /* SS_MULTIPLE_PROCS */
@@ -4022,7 +4004,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS514, ERRZERO,
                      "Could not release the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
       }
 #endif
@@ -4032,7 +4014,7 @@ Buffer *mBuf;                   /* message to post */
       SSLOGERROR(ERRCLS_DEBUG, ESS515, ERRZERO, "Unknown task");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #endif /* SS_MULTIPLE_PROCS */
@@ -4086,7 +4068,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
                   SSLOGERROR(ERRCLS_DEBUG, ESS516, ERRZERO,
                      "Could not release the semaphore");
-                  RETVALUE(RFAILED);
+                  return RFAILED;
 #endif
                }
 #endif
@@ -4097,7 +4079,7 @@ Buffer *mBuf;                   /* message to post */
                            "Could not lock driver task entry");
 #endif
 
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 #ifdef L2_L3_SPLIT
 }
@@ -4120,7 +4102,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
               SSLOGERROR(ERRCLS_DEBUG, ESS519, ERRZERO,
                      "Could not give the Semaphore");
-              RETVALUE(RFAILED);
+              return RFAILED;
 #endif
             }
 #ifdef L2_L3_SPLIT
@@ -4134,11 +4116,11 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
                SSLOGERROR(ERRCLS_DEBUG, ESS520, ERRZERO,
                      "Could not release the semaphore");
-               RETVALUE(RFAILED);
+               return RFAILED;
 #endif
             }
 #endif
-            RETVALUE(ROK);
+            return ROK;
          }
       }
 
@@ -4149,7 +4131,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS521, ERRZERO,
                      "Could not release the semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
       }
 #endif
@@ -4160,7 +4142,7 @@ Buffer *mBuf;                   /* message to post */
                   "Could not find a driver task to handle this proc ID");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif  /* SS_DRVR_SUPPORT */
  /* ss002.301 Modifications */
@@ -4169,7 +4151,7 @@ Buffer *mBuf;                   /* message to post */
     */
    tTsk = &osCp.tTskTbl[dstIdx];
 
-       cmMemcpy((U8*)&tempPst, (U8*)pst, sizeof(Pst));
+   memcpy(&tempPst, pst, sizeof(Pst));
    if(tTsk->cbTsk != NULLP)
    {
       retValue = tTsk->cbTsk(&tempPst,mBuf);
@@ -4181,7 +4163,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
                SSLOGERROR(ERRCLS_DEBUG, ESS512, ERRZERO,
                      "Could not release the semaphore");
-               RETVALUE(RFAILED);
+               return RFAILED;
 #endif
        }
 #endif
@@ -4189,7 +4171,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
        SSLOGERROR(ERRCLS_DEBUG, ESS513, ERRZERO, "call back function failed\n");
 #endif
-                       RETVALUE(ROK);
+                       return ROK;
                }
 #ifdef SS_MULTIPLE_PROCS
                dstIdx = osCp.tTskIds[dstProcIdIdx][tempPst.dstEnt][tempPst.dstInst];
@@ -4213,7 +4195,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS527, ERRZERO,
            "Could not release the semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
@@ -4222,7 +4204,7 @@ Buffer *mBuf;                   /* message to post */
       if( ret != ROK )
       {
          /* No need to free the buffer, its already done in called fun */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* Allocate for the mBuf */
@@ -4231,7 +4213,7 @@ Buffer *mBuf;                   /* message to post */
       if( workPtr == NULLP )
       {
          SPutFpaMsg(wqBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* Convert the pointers to physical address */
@@ -4239,7 +4221,7 @@ Buffer *mBuf;                   /* message to post */
       if( ret != ROK )
       {
          SPutFpaMsg(wqBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* Assign the values for work ptr */
@@ -4253,7 +4235,7 @@ Buffer *mBuf;                   /* message to post */
       cvmx_pow_work_submit(workPtr, workPtr->tag, workPtr->tag_type, \
             workPtr->qos, workPtr->grp);
 
-      RETVALUE(ROK);
+      return ROK;
    }
 #endif /* SS_SEUM_CAVIUM */
 
@@ -4273,7 +4255,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS523, ERRZERO,
                      "Could not release the semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
       }
 #endif
@@ -4284,7 +4266,7 @@ Buffer *mBuf;                   /* message to post */
                  "Destination TAPA task is not attached");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef SS_LOCKLESS_MEMORY
@@ -4308,8 +4290,8 @@ Buffer *mBuf;                   /* message to post */
             if ((srctTsk->sTsk == tTsk->sTsk)
 #if defined(SPLIT_RLC_DL_TASK) && !defined(RLC_MAC_DAT_REQ_RBUF)
                 ||
-                ((pst->dstEnt == ENTRG) && 
-                 (pst->srcEnt == ENTKW) && 
+                ((pst->dstEnt == ENTMAC) && 
+                 (pst->srcEnt == ENTRLC) && 
                  (pst->event == EVTRGUDDATREQ))
 #endif
                )
@@ -4354,7 +4336,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
            SSLOGERROR(ERRCLS_DEBUG, ESS525, ERRZERO,
                      "Could not release the semaphore");
-            RETVALUE(RFAILED);
+            return RFAILED;
 #endif
       }
 #endif
@@ -4365,7 +4347,7 @@ Buffer *mBuf;                   /* message to post */
                      "Could not write to demand queue");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -4377,7 +4359,7 @@ Buffer *mBuf;                   /* message to post */
 #if (ERRCLASS & ERRCLS_DEBUG)
         SSLOGERROR(ERRCLS_DEBUG, ESS527, ERRZERO,
                   "Could not release the semaphore");
-        RETVALUE(RFAILED);
+        return RFAILED;
 #endif
    }
 #endif
@@ -4388,7 +4370,7 @@ Buffer *mBuf;                   /* message to post */
     */
    ssdPstTsk(tempPst, mBuf, tTsk);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SPstTsk */
 
 /* ss001.301: additions */
@@ -4411,26 +4393,25 @@ Buffer *mBuf;                   /* message to post */
 /* ss029.103: modification: procId added */
 
 #ifdef ANSI
-PUBLIC S16 SGetTapaTskEntIds
+S16 SGetTapaTskEntIds
 (
 Ent *ent                        /* entity */
 )
 #else
-PUBLIC S16 SGetTapaTskEntIds(ent)
+S16 SGetTapaTskEntIds(ent)
 Ent *ent;                        /* entity */
 #endif
 {
 
    U32 tskCnt = 0;
 
-   TRC1(SGetTapaTskEntIds);
    /* Get the tapa task entity Ids from the osCp structure */
    for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
    {
       ent[tskCnt] = osCp.tTskTbl[tskCnt].ent;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetTapaTskEntIds */
 
 /*
@@ -4452,12 +4433,12 @@ Ent *ent;                        /* entity */
 /* ss029.103: modification: procId added */
 
 #ifdef ANSI
-PUBLIC S16 SRegForHstGrm
+S16 SRegForHstGrm
 (
 Ent ent                        /* entity */
 )
 #else
-PUBLIC S16 SRegForHstGrm(ent)
+S16 SRegForHstGrm(ent)
 Ent ent;                        /* entity */
 #endif
 {
@@ -4465,7 +4446,6 @@ Ent ent;                        /* entity */
    U32 tskCnt = 0;
    S16 r = 0;
 
-   TRC1(SRegForHstGrm);
 
    SS_ACQUIRE_SEMA(&osCp.tTskTblSem, r);
    if (r != ROK)
@@ -4475,7 +4455,7 @@ Ent ent;                        /* entity */
                      "Could not lock TAPA task table");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
@@ -4492,11 +4472,11 @@ Ent ent;                        /* entity */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS639, ERRZERO,
                    "Could not release the semaphore");
-          RETVALUE(RFAILED);
+          return RFAILED;
 #endif
     }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetTapaTskEntIds */
 
 /*
@@ -4515,13 +4495,13 @@ Ent ent;                        /* entity */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetHstGrmInfo
+S16 SGetHstGrmInfo
 (
 Ent   *entId,
 Bool  *hstReg                        /* entity */
 )
 #else
-PUBLIC S16 SGetHstGrmInfo(entId, hstReg)
+S16 SGetHstGrmInfo(entId, hstReg)
 Ent   *entId;
 Bool  *hstReg;                        /* entity */
 #endif
@@ -4531,7 +4511,6 @@ Bool  *hstReg;                        /* entity */
    Bool found = FALSE;
    *hstReg = 0;
 
-   TRC1(SGetHstGrmInfo);
    for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
    {
       if( *entId == osCp.tTskTbl[tskCnt].ent)
@@ -4548,19 +4527,19 @@ Bool  *hstReg;                        /* entity */
       *hstReg = TRUE;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* SGetTapaTskEntIds */
 
 #endif /* SS_HISTOGRAM_SUPPORT */
 
 #ifdef SS_WATCHDOG
 #ifdef ANSI
-PUBLIC S16 SInitWatchdog
+S16 SInitWatchdog
 (
 U16 port
 )
 #else
-PUBLIC S16 SInitWatchdog(port)
+S16 SInitWatchdog(port)
 U16 port;
 #endif
 {
@@ -4568,7 +4547,7 @@ U16 port;
 }
 
 #ifdef ANSI
-PUBLIC S16 SRegCfgWd
+S16 SRegCfgWd
 (
 U32 numNodes,
 U8  *addr[],
@@ -4578,7 +4557,7 @@ WdUserCallback callback,
 void *data
 )
 #else
-PUBLIC S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data)
+S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data)
 U32 numNodes;
 U8  *addr[];
 U16 port[];
@@ -4591,7 +4570,6 @@ void *data;
    int i = 0;
 
    /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC1(SRegCfgWd)
 
    osCp.wdCp.globWd.timeout = timeout;
    osCp.wdCp.globWd.callback = callback;
@@ -4621,16 +4599,16 @@ void *data;
 #endif
    SPrint(prntBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 SDeregCfgWd
+S16 SDeregCfgWd
 (
 void
 )
 #else
-PUBLIC S16 SDeregCfgWd(void)
+S16 SDeregCfgWd(void)
 void;
 #endif
 {
@@ -4638,7 +4616,6 @@ void;
    int i = 0;
 
    /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC1(SDeregCfgWd)
 
    osCp.wdCp.globWd.timeout = 0;
    osCp.wdCp.globWd.callback = 0;
@@ -4660,52 +4637,50 @@ void;
    /* Implicit watchdog stop during dereg */
    SStopHrtBt();
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 SStartHrtBt
+S16 SStartHrtBt
 (
 U8 timeInterval /* time interval */
 )
 #else
-PUBLIC S16 SStartHrtBt(timeInterval)
+S16 SStartHrtBt(timeInterval)
 U8 timeInterval;
 #endif
 {
-   TRC1(SStartHrtBt);
 
    ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval);
    ssdSndHrtBtMsg(TRUE, SS_WD_HB_REQ);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 SStopHrtBt
+S16 SStopHrtBt
 (
 void
 )
 #else
-PUBLIC S16 SStopHrtBt()
+S16 SStopHrtBt()
 void
 #endif
 {
-   TRC1(SStopHrtBt);
 
    osCp.wdCp.globWd.watchdogStop = 1;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 watchDgActvTsk
+S16 watchDgActvTsk
 (
 Pst *pst,                   /* post */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 watchDgActvTsk(pst, mBuf)
+S16 watchDgActvTsk(pst, mBuf)
 Pst *pst;                   /* post */
 Buffer *mBuf;               /* message buffer */
 #endif
@@ -4716,24 +4691,23 @@ Buffer *mBuf;               /* message buffer */
    Txt prntBuf[PRNTSZE];
 #endif /* DEBUGP */
 
-   TRC3(watchDgActvTsk)
 #ifdef DEBUGP
    SGetDateTime(&dt);
    sprintf(prntBuf,"watchDgActvTsk: Time: %02d:%02d:%02d\n",dt.hour,dt.min, dt.sec
 );
    SPrint(prntBuf);
 #endif /* DEBUGP */
-       RETVALUE(ROK);
+       return ROK;
 }
 
 #ifdef ANSI
-PUBLIC S16 watchDgRcvrActvTsk
+S16 watchDgRcvrActvTsk
 (
 Pst *pst,                   /* post */
 Buffer *mBuf                /* message buffer */
 )
 #else
-PUBLIC S16 watchDgRcvrActvTsk(pst, mBuf)
+S16 watchDgRcvrActvTsk(pst, mBuf)
 Pst *pst;                   /* post */
 Buffer *mBuf;               /* message buffer */
 #endif
@@ -4753,7 +4727,6 @@ Buffer *mBuf;               /* message buffer */
    int           socklen = sizeof(struct sockaddr);
 #endif
 
-   TRC3(watchDgActvTsk)
 
 #ifdef DEBUGP
    SGetDateTime(&dt);
@@ -4808,7 +4781,7 @@ Buffer *mBuf;               /* message buffer */
 #endif /* DEBUGP */
       }
    }
-       RETVALUE(ROK);
+       return ROK;
 }
 
 #endif /* SS_WATCHDOG */
@@ -4835,7 +4808,7 @@ Buffer *mBuf;               /* message buffer */
 */
 #ifdef SS_MULTIPLE_PROCS
 #ifdef ANSI
-PUBLIC S16 SGetThrdProf
+S16 SGetThrdProf
 (
 SSTskId *sTskId,
 ProcId procId,
@@ -4846,7 +4819,7 @@ U32 *curEvtTime,
 U64 *totTime
 )
 #else
-PUBLIC S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime)
+S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime)
 SSTskId *sTskId;
 ProcId procId;
 Ent ent;                      /* entity */
@@ -4857,7 +4830,7 @@ U64 *totTime;
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 SGetThrdProf
+S16 SGetThrdProf
 (
 SSTskId *sTskId,
 Ent ent,                       /* entity */
@@ -4867,7 +4840,7 @@ U32 *curEvtTime,
 U64 *totTime
 )
 #else
-PUBLIC S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime)
+S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime)
 SSTskId *sTskId;
 Ent ent;                      /* entity */
 Inst inst;
@@ -4885,7 +4858,6 @@ U64 *totTime;
 #endif
 
 
-   TRC1(SGetThrdProf);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* check entity and instance range */
@@ -4894,14 +4866,14 @@ U64 *totTime;
    if ((procId == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS463, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    /* check entity and instance range */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS464, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 #endif
@@ -4910,7 +4882,7 @@ U64 *totTime;
    ret = SLock(&osCp.sTskTblLock);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -4919,7 +4891,7 @@ U64 *totTime;
 
     if (procIdIdx == SS_INV_PROCID_IDX)
     {
-      RETVALUE(RFAILED);
+      return RFAILED;
     }
 
     idx = osCp.tTskIds[procIdIdx][ent][inst];
@@ -4931,7 +4903,7 @@ U64 *totTime;
     if(tTsk == NULLP )
     {
              SUnlock(&osCp.sTskTblLock);
-             RETVALUE(RFAILED);
+             return RFAILED;
     }
     *curEvent      = osCp.tTskTbl[idx].curEvent;
     *curEvtTime    = osCp.tTskTbl[idx].curEvtTime;
@@ -4939,7 +4911,7 @@ U64 *totTime;
     *sTskId        = osCp.tTskTbl[idx].sTsk->tskId;
 
    SUnlock(&osCp.sTskTblLock);
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* SS_THREAD_PROFILE */
 
@@ -4958,12 +4930,12 @@ U64 *totTime;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegTskInfo
+S16 SRegTskInfo
 (
 U8 *cfgFile
 )
 #else
-PUBLIC S16 SRegTskInfo(cfgFile)
+S16 SRegTskInfo(cfgFile)
 U8 *cfgFile;
 #endif
 {