X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_gen.c;h=6b594bbe131346ab2f59f87c6e4d600e294a9283;hb=3fb14013a5209cb17f3e2a5a3faf496b5e9cdd95;hp=e7f308d022ff40beede3ea500063c59accb38d60;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c
index e7f308d02..6b594bbe1 100644
--- a/src/mt/ss_gen.c
+++ b/src/mt/ss_gen.c
@@ -110,9 +110,9 @@
 
 /*ss014.301: SSI-4GMX related changes*/
 #ifdef SS_4GMX_LCORE
-PUBLIC VOLATILE SsOs     osCp;           /* common OS control point */
+VOLATILE SsOs     osCp;           /* common OS control point */
 #else
-PUBLIC SsOs     osCp;           /* common OS control point */
+SsOs     osCp;           /* common OS control point */
 #endif
 
  
@@ -132,17 +132,17 @@ PRIVATE S16 SULockOsCp ARGS((Void));
 #ifdef SSI_STATIC_MEM_LEAK_DETECTION
 PRIVATE void InitializeForStaticMemLeak ARGS((void));
 PRIVATE void InitializeStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo));
-PUBLIC U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
-PUBLIC void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo* memAllocInfo,U32 size, char*
+U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo));
+void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo* memAllocInfo,U32 size, char*
       file, U32 line));
-PUBLIC void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file,
+void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file,
       U32 line, U32 size, void* ptr, U32 idx));
 PRIVATE void PrintStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo, FILE
       *opFile));
 #endif
 /* ss001.301: additions */
 
-PUBLIC void DumpSSIDemandQDebugInformation()
+void DumpSSIDemandQDebugInformation()
 {
    U32 i,j;
    RTLIN_DUMP_DEBUG("Demand Q Information\n");
@@ -165,7 +165,7 @@ PUBLIC void DumpSSIDemandQDebugInformation()
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
 pthread_mutex_t dumpingLock = PTHREAD_MUTEX_INITIALIZER;
 
-PUBLIC Void mtSigSegvHndlr()
+Void mtSigSegvHndlr()
 {
    int i;
 
@@ -183,7 +183,7 @@ PUBLIC Void mtSigSegvHndlr()
    sleep(5);
 }
 
-PUBLIC Void mtSigUsr2Hndlr()
+Void mtSigUsr2Hndlr()
 {
    printf("Backtrace for thread Id (%lu) cause:SIGUSR2(%d)\n",(unsigned long) pthread_self(),SIGUSR2);   
 
@@ -217,12 +217,12 @@ PUBLIC Void mtSigUsr2Hndlr()
 *
 */
 #ifdef ANSI
-PUBLIC S16 SInit
+S16 SInit
 (
 void
 )
 #else
-PUBLIC S16 SInit()
+S16 SInit()
 #endif
 {
    S16 ret;
@@ -239,7 +239,6 @@ PUBLIC S16 SInit()
    SsDrvrTskEntry *drvrTsk;
 #endif
 /* ss002.301 : Modications */
-   TRC1(SInit);
 
    osCp.configFilePath = "/mnt/tmp/configFile";
 
@@ -263,7 +262,7 @@ PUBLIC S16 SInit()
 #endif /* SS_MULTIPLE_PROCS */
 
 #ifdef SS_THR_REG_MAP
-   cmMemset(osCp.threadMemoryRegionMap, SS_INVALID_THREAD_REG_MAP, 
+   memset(osCp.threadMemoryRegionMap, SS_INVALID_THREAD_REG_MAP, 
             (sizeof(Region) * SS_MAX_THREAD_REGION_MAP));
    ssRegMainThread();
 #endif
@@ -745,19 +744,17 @@ cleanup0:
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeInit
+S16 SDeInit
 (
 void
 )
 #else
-PUBLIC S16 SDeInit()
+S16 SDeInit()
 #endif
 {
   /* ss007.301 */
   U16    regCnt;
 
-   TRC1(SDeInit);
-
 
    ssdDeinitTmr();
    SDestroyLock(&osCp.tmrTblLock);
@@ -809,17 +806,16 @@ PUBLIC S16 SDeInit()
 /* ss001.301: additions */
 #ifdef SS_LOGGER_SUPPORT 
 #ifdef ANSI
-PUBLIC S16 SWrtLogBuf
+S16 SWrtLogBuf
 (
 Txt *buf                        /* buffer */
 )
 #else
-PUBLIC S16 SWrtLogBuf(buf)
+S16 SWrtLogBuf(buf)
 Txt *buf;                       /* buffer */
 #endif
 {
    S16 bufSz;
-   TRC1(SWrtLogBuf);
    /* buffer synchronisation*/
    bufSz = cmStrlen((U8 *)buf);
    SLock(&osCp.logger.bufLock);
@@ -836,7 +832,7 @@ Txt *buf;                       /* buffer */
    {
       SFlushBufToLog(osCp.logger.buffer);
       osCp.logger.curBufSiz = 0;
-      cmMemset((U8 *)osCp.logger.buffer, '\0', osCp.logger.maxBufSiz);
+      memset(osCp.logger.buffer, '\0', osCp.logger.maxBufSiz);
       sprintf(osCp.logger.buffer, "%s", buf);
       osCp.logger.curBufSiz += bufSz;
    }
@@ -871,16 +867,15 @@ Txt *buf;                       /* buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SPrint
+S16 SPrint
 (
 Txt *buf                        /* buffer */
 )
 #else
-PUBLIC S16 SPrint(buf)
+S16 SPrint(buf)
 Txt *buf;                       /* buffer */
 #endif
 {
-   TRC1(SPrint);
 
 /* ss001.301: additions */
    SDisplay(0, buf);
@@ -909,13 +904,13 @@ Txt *buf;                       /* buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SError
+S16 SError
 (
 Seq seq,                    /* sequence */
 Reason reason               /* reason */
 )
 #else
-PUBLIC S16 SError(seq, reason)
+S16 SError(seq, reason)
 Seq seq;                    /* sequence */
 Reason reason;              /* reason */
 #endif
@@ -924,10 +919,6 @@ Reason reason;              /* reason */
    DateTime dt;
    Txt errBuf[256];
 
-
-   TRC1(SError);
-
-
    SGetDateTime(&dt);
    sprintf(errBuf, "\n\ndate: %02d/%02d/%04d time: %02d:%02d:%02d\n",
           (int)dt.month,(int)dt.day,(int)dt.year + 1900,
@@ -956,7 +947,7 @@ Reason reason;              /* reason */
 *
 */
 #ifdef ANSI
-PUBLIC Void SLogError
+Void SLogError
 (
 Ent ent,                    /* Calling layer's entity id */
 Inst inst,                  /* Calling layer's instance id */
@@ -969,7 +960,7 @@ ErrVal errVal,              /* error value */
 Txt *errDesc                /* description of error */
 )
 #else
-PUBLIC Void SLogError(ent, inst, procId, file, line,
+Void SLogError(ent, inst, procId, file, line,
                         errCls, errCode, errVal, errDesc)
 Ent ent;                    /* Calling layer's entity id */
 Inst inst;                  /* Calling layer's instance id */
@@ -986,8 +977,6 @@ Txt *errDesc;               /* description of error */
    Txt errBuf[512];
 
 
-   TRC1(SLogError);
-
 /*ss014.301: SSI-4GMX related changes*/
 #ifndef SS_4GMX_LCORE
    SGetDateTime(&dt);
@@ -1027,15 +1016,14 @@ Txt *errDesc;               /* description of error */
 *
 */
 #ifdef ANSI
-PUBLIC ProcId SFndProcId
+ProcId SFndProcId
 (
 void
 )
 #else
-PUBLIC ProcId SFndProcId()
+ProcId SFndProcId()
 #endif
 {
-   TRC1(SFndProcId);
 
    return (osCp.procId);
 } /* end of SFndProcId */
@@ -1055,16 +1043,15 @@ PUBLIC ProcId SFndProcId()
 *
 */
 #ifdef ANSI
-PUBLIC Void SSetProcId
+Void SSetProcId
 (
 ProcId procId
 )
 #else
-PUBLIC Void SSetProcId(procId)
+Void SSetProcId(procId)
 ProcId procId;
 #endif
 {
-   TRC1(SSetProcId);
 
    osCp.procId = procId;
 
@@ -1090,20 +1077,18 @@ ProcId procId;
 *
 */
 #ifdef ANSI
-PUBLIC U16 SGetProcIdIdx
+U16 SGetProcIdIdx
 (
 ProcId proc
 )
 #else
-PUBLIC U16 SGetProcIdIdx(proc)
+U16 SGetProcIdIdx(proc)
 ProcId proc; 
 #endif
 {
    U16 i;
    U16 idx;
 
-   TRC1(SGetProcIdIdx);
-
    idx = SS_HASH_IDX(proc);
 
    for (i = idx; i < SS_MAX_PROCS; i++)
@@ -1145,7 +1130,6 @@ ProcId proc;
    U16 i;
    U16 idx;
 
-   TRC1(SInsProcId);
 
    idx = SS_HASH_IDX(proc);
 
@@ -1196,7 +1180,6 @@ ProcId proc;
    U16 i;
    U16 idx;
 
-   TRC1(SRemProcId);
 
    idx = SS_HASH_IDX(proc);
 
@@ -1245,7 +1228,6 @@ PRIVATE S16 SLockOsCp(Void)
 {
    S16 ret;
 
-   TRC1(SLockOsCp);
 
    ret = SLock(&osCp.sTskTblLock);
    if (ret != ROK)
@@ -1303,7 +1285,6 @@ Void
 PRIVATE S16 SULockOsCp(Void)
 #endif
 {
-   TRC1(SULockOsCp);
 
    /* unlock the table */
    SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem);
@@ -1337,13 +1318,13 @@ PRIVATE S16 SULockOsCp(Void)
 *
 */
 #ifdef ANSI
-PUBLIC S16 SAddProcIdLst
+S16 SAddProcIdLst
 (
 U16 numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SAddProcIdLst(numPIds, pIdLst)
+S16 SAddProcIdLst(numPIds, pIdLst)
 U16 numPIds;
 ProcId *pIdLst;
 #endif
@@ -1351,7 +1332,6 @@ ProcId *pIdLst;
    U16 i;
    S16 ret;
 
-   TRC1(SAddProcIdLst);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* range check */
@@ -1433,20 +1413,19 @@ exceeds");
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRemProcIdLst
+S16 SRemProcIdLst
 (
 U16 numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SRemProcIdLst(numPIds, pIdLst)
+S16 SRemProcIdLst(numPIds, pIdLst)
 U16 numPIds;
 ProcId *pIdLst;
 #endif
 {
    U16 i;
 
-   TRC1(SRemProcIdLst);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* range check */
@@ -1498,13 +1477,13 @@ ProcId *pIdLst;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetProcIdLst
+S16 SGetProcIdLst
 (
 U16 *numPIds,
 ProcId *pIdLst
 )
 #else
-PUBLIC S16 SGetProcIdLst(numPIds, pIdLst)
+S16 SGetProcIdLst(numPIds, pIdLst)
 U16 *numPIds;
 ProcId *pIdLst;
 #endif
@@ -1512,7 +1491,6 @@ ProcId *pIdLst;
    U16 i;
    U16 count = 0;
 
-   TRC1(SGetProcIdLst);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if ((numPIds == NULLP) || (pIdLst == NULLP))
@@ -1558,7 +1536,7 @@ ProcId *pIdLst;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetXxCb
+S16 SGetXxCb
 (
 ProcId proc,
 Ent ent,
@@ -1566,7 +1544,7 @@ Inst inst,
 Void **xxCb
 )
 #else
-PUBLIC S16 SGetXxCb(proc, ent, inst, xxCb)
+S16 SGetXxCb(proc, ent, inst, xxCb)
 ProcId proc;
 Ent ent;
 Inst inst;
@@ -1576,7 +1554,6 @@ Void **xxCb;
    U16 procIdIdx;
    SsIdx idx;
 
-   TRC1(SGetXxCb);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
@@ -1636,12 +1613,12 @@ Void **xxCb;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SFillEntIds
+S16 SFillEntIds
 (
 Void
 )
 #else
-PUBLIC S16 SFillEntIds(Void)
+S16 SFillEntIds(Void)
 #endif
 {
 
@@ -1712,7 +1689,7 @@ PUBLIC S16 SFillEntIds(Void)
                               W      X      Y      Z */
                            {ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC,
                   /* K */   ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC, ENTNC,
-                            ENTKW, ENTNC, ENTNC, ENTNC},
+                            ENTRLC, ENTNC, ENTNC, ENTNC},
                            /* A      B      C      D      E      F      G      H      I      J      K  *
                               L      M      N      O      P      Q      R      S      T      U      V  *
                               W      X      Y      Z */
@@ -1806,7 +1783,6 @@ PUBLIC S16 SFillEntIds(Void)
                         };
 
    /*ss013.301 :Adding  TRC MACRO*/
-   TRC2(SFillEntIds)
             memcpy((U8*)osCp.entId, (U8*)entInfo, sizeof(entInfo));
 
    return ROK;
@@ -1829,13 +1805,13 @@ PUBLIC S16 SFillEntIds(Void)
 *
 */
 #ifdef ANSI
-PUBLIC S16 SGetEntInd 
+S16 SGetEntInd 
 (
 Ent      *entId,
 U8       *fileName
 )
 #else
-PUBLIC S16 SGetEntInd(entId, fileName)
+S16 SGetEntInd(entId, fileName)
 Ent      *entId;
 U8       *fileName;
 #endif
@@ -1850,7 +1826,6 @@ U8       *fileName;
 	U8   firstIdx = 0;
 	U8   secondIdx = 0;
 
-   TRC1(SGetEntInd);
 
    /* ss002.301 Additions */
 	if ((strippedName = strrchr((const char *)fileName, '/')))
@@ -1935,21 +1910,20 @@ U8       *fileName;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SLockNew 
+S16 SLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 
 )
 #else
-PUBLIC S16 SLockNew(lockId, lockType)
+S16 SLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
 {
    S16    retVal = ROK;
 
-  TRC1(SLockNew);
 
   if((retVal = ssdLockNew(lockId, lockType)) != ROK) 
   {
@@ -1973,20 +1947,19 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SInitLockNew 
+S16 SInitLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SInitLockNew(lockId, lockType)
+S16 SInitLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
 {
    S16    retVal = ROK;
 
-  TRC1(SInitLockNew);
 
   if((retVal = ssdInitLockNew(lockId, lockType)) != ROK) 
   {
@@ -2010,20 +1983,19 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SUnlockNew 
+S16 SUnlockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SUnlockNew(lockId, lockType)
+S16 SUnlockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
 {
    S16    retVal = ROK;
 
-  TRC1(SUnlockNew);
 
   if((retVal = ssdUnlockNew(lockId, lockType)) != ROK) 
   {
@@ -2047,20 +2019,19 @@ U8         lockType;
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDestroyLockNew 
+S16 SDestroyLockNew 
 (
 SLockInfo *lockId,
 U8         lockType
 )
 #else
-PUBLIC S16 SDestroyLockNew(lockId, lockType)
+S16 SDestroyLockNew(lockId, lockType)
 SLockInfo *lockId;
 U8         lockType;
 #endif
 {
    S16    retVal = ROK;
 
-  TRC1(SDestroyLockNew);
 
   if((retVal = ssdDestroyLockNew(lockId, lockType)) != ROK) 
   {
@@ -2206,7 +2177,7 @@ void InitializeForStaticMemLeak()
    }
 }
 
-PUBLIC void DumpStaticMemLeakFiles()
+void DumpStaticMemLeakFiles()
 {
    int i;
 
@@ -2233,12 +2204,12 @@ PUBLIC void DumpStaticMemLeakFiles()
  *
  */
 #ifdef ANSI
-PUBLIC S16 SReInitTmr
+S16 SReInitTmr
 (
 void
 )
 #else
-PUBLIC S16 SReInitTmr()
+S16 SReInitTmr()
 #endif
 {
    U8 ret = ROK;
@@ -2269,7 +2240,7 @@ PUBLIC S16 SReInitTmr()
  *       File: ss_gen.c
  *
  */
-PUBLIC S8* SGetConfigPath(Void)
+S8* SGetConfigPath(Void)
 {
    return osCp.configFilePath;
 }