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 5255445..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)
@@ -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)
@@ -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)
@@ -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)
@@ -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,7 +1169,6 @@ ActvTsk cbTsk;
    U16 procIdIdx;
 #endif /* SS_MULTIPLE_PROCS */
 
-   TRC1(SRegCbTsk);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
@@ -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)
@@ -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)
@@ -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
@@ -1944,7 +1936,7 @@ U16 port
 
        }
 
-   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;
@@ -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;
 
@@ -2012,7 +2003,7 @@ S8 *logBuf
    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*/
@@ -2047,16 +2038,15 @@ 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)
@@ -2109,16 +2099,15 @@ PUBLIC S16 SCleanUp()
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeregLogCfg
+S16 SDeregLogCfg
 (
 )
 #else
-PUBLIC S16 SDeregLogCfg()
+S16 SDeregLogCfg()
 #endif
 {
 
 
-   TRC1(SDeregLogCfg);
  
    SCleanUp();   
 
@@ -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,19 +2191,18 @@ 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 || 
@@ -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,7 +2268,6 @@ 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);
 
@@ -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,7 +2316,6 @@ 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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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);
@@ -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
                )
@@ -4411,19 +4393,18 @@ 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++)
    {
@@ -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)
@@ -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)
@@ -4555,12 +4534,12 @@ Bool  *hstReg;                        /* entity */
 
 #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;
@@ -4625,12 +4603,12 @@ void *data;
 }
 
 #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;
@@ -4664,16 +4641,15 @@ void;
 }
 
 #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);
@@ -4682,16 +4658,15 @@ U8 timeInterval;
 }
 
 #ifdef ANSI
-PUBLIC S16 SStopHrtBt
+S16 SStopHrtBt
 (
 void
 )
 #else
-PUBLIC S16 SStopHrtBt()
+S16 SStopHrtBt()
 void
 #endif
 {
-   TRC1(SStopHrtBt);
 
    osCp.wdCp.globWd.watchdogStop = 1;
 
@@ -4699,13 +4674,13 @@ void
 }
 
 #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,7 +4691,6 @@ 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
@@ -4727,13 +4701,13 @@ Buffer *mBuf;               /* message buffer */
 }
 
 #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);
@@ -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 */
@@ -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
 {