X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_gen.c;h=6b594bbe131346ab2f59f87c6e4d600e294a9283;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=1870b44aa1a8fc5499805238d09ac405f9799332;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c index 1870b44aa..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 @@ -276,7 +275,7 @@ PUBLIC S16 SInit() sprintf(prntBufLoc,"\n SInit(): ssdInitGen failed to initialize\ implementation specific general information \n"); SDisplay(1,prntBufLoc); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SSI_STATIC_MEM_LEAK_DETECTION @@ -667,7 +666,7 @@ PUBLIC S16 SInit() ssdStart(); - RETVALUE(ROK); + return ROK; /* clean up code */ @@ -724,7 +723,7 @@ cleanup0: ssdDeinitGen(); - RETVALUE(RFAILED); + return RFAILED; } @@ -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); @@ -774,7 +771,7 @@ PUBLIC S16 SDeInit() #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS014, ERRZERO, "Could not destroy the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -786,7 +783,7 @@ PUBLIC S16 SDeInit() #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS015, ERRZERO, "Could not destroy the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -803,30 +800,29 @@ PUBLIC S16 SDeInit() SDestroyLock(&(osCp.logger.bufLock)); #endif /* SS_LOGGER_SUPPORT */ ssdDeinitLog(); - RETVALUE(ROK); + return ROK; } /* 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); if(osCp.logger.started == FALSE) { (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } /* * Append the buffer to the global buffer @@ -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; } @@ -846,7 +842,7 @@ Txt *buf; /* buffer */ osCp.logger.curBufSiz += bufSz; } (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } #endif /* SS_LOGGER_SUPPORT */ /* @@ -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); @@ -888,7 +883,7 @@ Txt *buf; /* buffer */ SWrtLogBuf(buf); #endif /* SS_LOGGER_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* end of SPrint */ @@ -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, @@ -938,7 +929,7 @@ Reason reason; /* reason */ ret = ssdError(seq, reason); - RETVALUE(ret); + return (ret); } @@ -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,17 +1016,16 @@ Txt *errDesc; /* description of error */ * */ #ifdef ANSI -PUBLIC ProcId SFndProcId +ProcId SFndProcId ( void ) #else -PUBLIC ProcId SFndProcId() +ProcId SFndProcId() #endif { - TRC1(SFndProcId); - RETVALUE(osCp.procId); + 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++) @@ -1115,7 +1100,7 @@ ProcId proc; if (osCp.procLst.procId[i] == proc) return i; - RETVALUE(SS_INV_PROCID_IDX); + return (SS_INV_PROCID_IDX); } /* SGetProcIdIdx */ @@ -1145,7 +1130,6 @@ ProcId proc; U16 i; U16 idx; - TRC1(SInsProcId); idx = SS_HASH_IDX(proc); @@ -1154,7 +1138,7 @@ ProcId proc; { osCp.procLst.procId[i] = proc; osCp.procLst.free--; - RETVALUE(ROK); + return ROK; } /* search for free entry upto idx */ @@ -1163,10 +1147,10 @@ ProcId proc; { osCp.procLst.procId[i] = proc; osCp.procLst.free--; - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* SInsProcId */ @@ -1196,7 +1180,6 @@ ProcId proc; U16 i; U16 idx; - TRC1(SRemProcId); idx = SS_HASH_IDX(proc); @@ -1205,7 +1188,7 @@ ProcId proc; { osCp.procLst.procId[i] = SS_INV_PROCID; osCp.procLst.free++; - RETVALUE(ROK); + return ROK; } /* search upto idx */ @@ -1214,10 +1197,10 @@ ProcId proc; { osCp.procLst.procId[i] = SS_INV_PROCID; osCp.procLst.free++; - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* SRemProcId */ @@ -1245,14 +1228,13 @@ PRIVATE S16 SLockOsCp(Void) { S16 ret; - TRC1(SLockOsCp); ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { SSLOGERROR(ERRCLS_DEBUG, ESS016, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); @@ -1269,14 +1251,14 @@ PRIVATE S16 SLockOsCp(Void) #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS018, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SLockOsCp */ @@ -1303,7 +1285,6 @@ Void PRIVATE S16 SULockOsCp(Void) #endif { - TRC1(SULockOsCp); /* unlock the table */ SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem); @@ -1313,11 +1294,11 @@ PRIVATE S16 SULockOsCp(Void) #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS019, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* SULockOsCp */ @@ -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 */ @@ -1359,7 +1339,7 @@ ProcId *pIdLst; { SSLOGERROR(ERRCLS_INT_PAR, ESS020, ERRZERO, "number of proc Ids exceeds\ limit"); - RETVALUE(RFAILED); + return RFAILED; } /* find if the entry exist in the table */ @@ -1368,14 +1348,14 @@ ProcId *pIdLst; if (pIdLst[i] == SS_INV_PROCID) { SSLOGERROR(ERRCLS_INT_PAR, ESS021, ERRZERO, "Invalid proc Ids"); - RETVALUE(RFAILED); + return RFAILED; } } #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; #if (ERRCLASS & ERRCLS_INT_PAR) for (i = 0; i < numPIds; i++) @@ -1383,7 +1363,7 @@ ProcId *pIdLst; { SSLOGERROR(ERRCLS_INT_PAR, ESS022, ERRZERO, "Duplicate proc id"); (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } if (numPIds > osCp.procLst.free) @@ -1391,7 +1371,7 @@ ProcId *pIdLst; SSLOGERROR(ERRCLS_INT_PAR, ESS023, ERRZERO, "Total number of proc id \ exceeds"); (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1407,15 +1387,15 @@ exceeds"); "Could not insert the proc id"); #endif (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } } /* unlock the table */ if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ret); + return (ret); } /* SAddProcIdLst */ @@ -1433,34 +1413,33 @@ 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 */ if (numPIds > SS_MAX_PROCS) - RETVALUE(RFAILED); + return RFAILED; #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; if (numPIds > (SS_MAX_PROCS - osCp.procLst.free)) { (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } /* find if the entry exist in the table */ @@ -1469,7 +1448,7 @@ ProcId *pIdLst; if (SGetProcIdIdx(pIdLst[i]) == SS_INV_PROCID_IDX) { (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1478,9 +1457,9 @@ ProcId *pIdLst; SRemProcId(pIdLst[i]); if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SRemProcIdLst */ @@ -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,18 +1491,17 @@ ProcId *pIdLst; U16 i; U16 count = 0; - TRC1(SGetProcIdLst); #if (ERRCLASS & ERRCLS_INT_PAR) if ((numPIds == NULLP) || (pIdLst == NULLP)) { SSLOGERROR(ERRCLS_INT_PAR, ESS025, ERRZERO, "Invalid numPIds/pIdLst"); - RETVALUE(RFAILED); + return RFAILED; } #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; for (i = 0; i < SS_MAX_PROCS; i++) { @@ -1534,12 +1512,12 @@ ProcId *pIdLst; *numPIds = count; if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; if (count == 0) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SGetProcIdLst */ @@ -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,13 +1554,12 @@ 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)) { SSLOGERROR(ERRCLS_INT_PAR, ESS026, ERRZERO, "Invalid proc/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1598,22 +1575,22 @@ Void **xxCb; #if (ERRCLASS & ERRCLS_INT_PAR) SSLOGERROR(ERRCLS_INT_PAR, ESS027, ERRZERO, "Could not get proc table idx"); #endif - RETVALUE(RFAILED); + return RFAILED; } idx = osCp.tTskIds[procIdIdx][ent][inst]; if (idx == SS_TSKNC) { - RETVALUE(RFAILED); + return RFAILED; } /* update the CB */ *xxCb = osCp.tTskTbl[idx].xxCb; /*ss032.103 added a check for NULLP */ if (*xxCb == NULLP) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SGetXxCb */ #endif /* SS_MULTIPLE_PROCS */ @@ -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,10 +1783,9 @@ PUBLIC S16 SFillEntIds(Void) }; /*ss013.301 :Adding TRC MACRO*/ - TRC2(SFillEntIds) memcpy((U8*)osCp.entId, (U8*)entInfo, sizeof(entInfo)); - RETVALUE(ROK); + return ROK; } /* SFillEntIds */ @@ -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, '/'))) @@ -1877,7 +1852,7 @@ U8 *fileName; if (letter[1] == 'g' && letter[2] == 'u') { *entId = ENTGT; - RETVALUE(ROK); + return ROK; } default: break; @@ -1897,7 +1872,7 @@ U8 *fileName; if(letter[count] < 'a' || letter[count] > 'z') { *entId = ENTNC; - RETVALUE(ROK); + return ROK; } else { @@ -1915,7 +1890,7 @@ U8 *fileName; /* First two letter of file name are alphabets the get the * entity id from the static data base which is loaded in sFillEntIds() */ *entId = osCp.entId[firstIdx][secondIdx]; - RETVALUE(ROK); + return ROK; } /* SGetEntInd */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -1935,28 +1910,27 @@ 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) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SLockNew(): Failed to aquire the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -1973,27 +1947,26 @@ 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) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SInitLockNew(): Initialization of lock Failed\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -2010,27 +1983,26 @@ 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) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SUnlockNew(): Failed to release the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -2047,27 +2019,26 @@ 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) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SDestroyLockNew(): Failed to destroy the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCK_SUPPORT */ @@ -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; @@ -2251,9 +2222,9 @@ PUBLIC S16 SReInitTmr() { /*ss012.301 : Fix log related issue to suite MT and NS implementations*/ SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SReInitTmr(): Failed to Restart the Tmr\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -2269,7 +2240,7 @@ PUBLIC S16 SReInitTmr() * File: ss_gen.c * */ -PUBLIC S8* SGetConfigPath(Void) +S8* SGetConfigPath(Void) { return osCp.configFilePath; }