X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=725a850c4fb1f39f726245ec9d4aa05ee514a4dd;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=f1845b368d7d0f44541c63fab485db8f0c7b7e96;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index f1845b368..725a850c4 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -36,9 +36,6 @@ #define _POSIX_C_SOURCE 199309L #endif /* mt003.301 moved env files to use the __USE_UNIX98 flag in sys includes */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ #include #include @@ -62,11 +59,7 @@ /* header include files (.h) */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ - -#include "cm5.h" /* common timers */ - +#include "common_def.h" #include "mt_ss.h" /* MTSS specific */ #include "mt_err.h" /* MTSS error defines */ @@ -78,7 +71,6 @@ /* mt003.301 Additions - Task deregistration */ #include "ss_err.h" /* error */ #include "cm_mem.h" /* common memory manager */ -#include "cm_lte.h" /* common lte param */ /* mt001.301 : Additions */ #ifdef SS_THREAD_PROFILE #include "ss_err.h" @@ -161,11 +153,15 @@ #include "sys/syscall.h" #endif -#ifdef RGL_SPECIFIC_CHANGES +#if defined(RGL_SPECIFIC_CHANGES) || defined(INTEL_WLS) #include #include #endif +#ifdef INTEL_WLS +EXTERN void LwrMacRecvPhyMsg(); +#endif + #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) EXTERN S16 rgBatchProc (Void); #endif @@ -227,7 +223,7 @@ PRIVATE Void mtDelSignals() sa.sa_handler = SIG_DFL; sigaction(SIGILL, &sa, NULL); - RETVOID; + return; } static void signal_segv(int signum, siginfo_t * info, void *ptr) { @@ -322,14 +318,14 @@ typedef struct _SPThreadCreateArg void *(*start_routine) (void *); /* function from which pthread starts */ }SPThreadCreateArg; -PUBLIC void *pthreadCreateHdlr(void* arg); +void *pthreadCreateHdlr(void* arg); #ifdef SS_LOCKLESS_MEMORY -PUBLIC Buffer *mtTskBuffer1; -PUBLIC Buffer *mtTskBuffer2; +Buffer *mtTskBuffer1; +Buffer *mtTskBuffer2; EXTERN pthread_t tmpRegTidMap[20]; -EXTERN U8 stopBtInfo; +EXTERN uint8_t stopBtInfo; EXTERN S16 SGlobMemInfoShow(void); #endif /* SS_LOCKLESS_MEMORY */ @@ -345,9 +341,9 @@ EXTERN unsigned int tlPost(void *handle); /* forward references */ /* mt003.301 Modifications - Moved to ss_gen.x */ #ifdef TENB_T2K3K_SPECIFIC_CHANGES -PUBLIC Void *mtTskHdlrT2kL2 ARGS((Void*)); -PUBLIC void mtSigSegvHndlr ARGS((void)); -PUBLIC void mtSigUsr2Hndlr ARGS((void)); +Void *mtTskHdlrT2kL2 ARGS((Void*)); + void mtSigSegvHndlr ARGS((void)); + void mtSigUsr2Hndlr ARGS((void)); #endif PRIVATE S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); @@ -389,7 +385,7 @@ PRIVATE S16 SPrintRegMemStats ARGS((Region region)); #ifdef SS_MULTICORE_SUPPORT PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void); -PRIVATE SsSTskEntry* ssdReAddTmrSTsk ARGS((U8 idx)); +PRIVATE SsSTskEntry* ssdReAddTmrSTsk ARGS((uint8_t idx)); #ifndef SS_LOCKLESS_MEMORY #ifndef RGL_SPECIFIC_CHANGES PRIVATE S16 ssdInitMemInfo ARGS((void)); @@ -403,9 +399,9 @@ PRIVATE Void *workRcvTsk ARGS((void *)); #endif /* SS_SEUM_CAVIUM */ #ifdef SS_THR_REG_MAP -PUBLIC S32 ssCheckAndAddMemoryRegionMap ARGS((pthread_t threadId, +S32 ssCheckAndAddMemoryRegionMap ARGS((pthread_t threadId, Region region)); -PUBLIC S32 ssCheckAndDelMemoryRegionMap ARGS((pthread_t threadId)); +S32 ssCheckAndDelMemoryRegionMap ARGS((pthread_t threadId)); #endif /* SS_THR_REG_MAP */ /* type declarations */ @@ -413,8 +409,8 @@ PUBLIC S32 ssCheckAndDelMemoryRegionMap ARGS((pthread_t threadId)); #ifdef SS_DRVR_SUPPORT typedef struct mtIsFlag { - U16 id; - U8 action; + uint16_t id; + uint8_t action; } MtIsFlag; #endif @@ -423,13 +419,13 @@ typedef struct mtIsFlag /* public variable declarations */ -PUBLIC Cntr cfgNumRegs = SS_MAX_REGS; +Cntr cfgNumRegs = SS_MAX_REGS; /* Set memory configuration as false. * Set to true if memory configuration through file is successfull. */ -PUBLIC Bool memConfigured = FALSE; +Bool memConfigured = FALSE; /* mt022.201 - Modification for shared memory relay region and memcal tool */ -PUBLIC SsRegCfg cfgRegInfo[SS_MAX_REGS] = +SsRegCfg cfgRegInfo[SS_MAX_REGS] = { { SS_DFLT_REGION, SS_MAX_POOLS_PER_REG - 1, @@ -504,7 +500,7 @@ PUBLIC SsRegCfg cfgRegInfo[SS_MAX_REGS] = */ #ifdef SS_LOCKLESS_MEMORY -PUBLIC MtDynMemCfg mtDynMemoCfg = +MtDynMemCfg mtDynMemoCfg = { SS_MAX_REGS, /* number of regions */ { @@ -581,7 +577,7 @@ PUBLIC MtDynMemCfg mtDynMemoCfg = }; -PUBLIC MtGlobMemCfg mtGlobMemoCfg = +MtGlobMemCfg mtGlobMemoCfg = { MT_MAX_BKTS, /* number of buckets */ { @@ -603,7 +599,7 @@ PUBLIC MtGlobMemCfg mtGlobMemoCfg = /* mt022.201 - Modification for memory calculator tool */ /* mt018.201 - added memory configuration matrix */ -PUBLIC MtMemCfg mtMemoCfg = +MtMemCfg mtMemoCfg = { #ifdef RY_ENBS5SHM SS_MAX_REGS - 1, /* number of regions */ @@ -687,7 +683,19 @@ PUBLIC MtMemCfg mtMemoCfg = {MT_BKT_2_DSIZE, MT_BKT_2_STATIC_NUMBLKS}, /* block size, no. of blocks */ {MT_BKT_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS} /* block size, no. of blocks */ } + }, + { + SS_DFLT_REGION + 4, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + MT_HEAP_SIZE, /* heap size */ + { + {MT_BKT_0_DSIZE, MT_BKT_0_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_1_DSIZE, MT_BKT_1_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_2_DSIZE, MT_BKT_2_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS} /* block size, no. of blocks */ + } } + #endif /* SS_LOCKLESS_MEMORY */ STATIC_MEM_CFG } @@ -697,18 +705,18 @@ PUBLIC MtMemCfg mtMemoCfg = * bucket info, as different regions may request for different no. * of blocks */ -PUBLIC MtBktCfg mtBktInfo[MT_MAX_BKTS]; -PUBLIC S16 msArgc; /* argc */ -PUBLIC Txt **msArgv; /* argv */ -PUBLIC S16 msOptInd; /* SGetOpt vars */ -PUBLIC S8 *msOptArg; /* SGetOpt vars */ +MtBktCfg mtBktInfo[MT_MAX_BKTS]; +S16 msArgc; /* argc */ +Txt **msArgv; /* argv */ +S16 msOptInd; /* SGetOpt vars */ +S8 *msOptArg; /* SGetOpt vars */ #ifdef INTEL_WLS typedef struct _MtRegMemSz { - U32 reqdSz; - U8 *startAddr; + uint32_t reqdSz; + uint8_t *startAddr; }MtRegMemSz; PRIVATE MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; @@ -741,7 +749,7 @@ unsigned int mtGetNtlHdl() void * mtGetWlsHdl() { - RETVALUE(osCp.wls.intf); + return (osCp.wls.intf); } #ifdef XEON_MULTIPLE_CELL_CHANGES @@ -761,7 +769,7 @@ PRIVATE int SOpenWlsIntf() hdl = WLS_Open(WLS_DEVICE_NAME, 1); #endif #else - hdl = WLS_Open(WLS_DEVICE_NAME, 0); + hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, (512 *1024 * 1024)); #endif osCp.wls.intf = hdl; @@ -769,10 +777,10 @@ PRIVATE int SOpenWlsIntf() if(!osCp.wls.intf) { printf("Could not open WLS Interface \n"); - RETVALUE(0); + return (0); } - RETVALUE(1); + return (1); } #endif @@ -796,31 +804,30 @@ PRIVATE int SOpenWlsIntf() * */ #ifdef ANSI -PUBLIC int main +int main ( int argc, /* argument count */ char **argv /* argument vector */ ) #else -PUBLIC int main(argc, argv) +int main(argc, argv) int argc; /* argument count */ char **argv; /* argument vector */ #endif { - TRC0(main); #ifdef XEON_MULTIPLE_CELL_CHANGES /* Read the WLS parameters from the file and copy into global control block */ if(smWrReadWlsConfigParams() != ROK) { fprintf(stderr, "Failed to read WLS params from file wr_cfg.txt"); - RETVALUE(RFAILED); + return RFAILED; } /* end of if statement */ #endif #ifdef INTEL_WLS if(!SOpenWlsIntf()) - RETVALUE(0); + return (0); #endif /* INTEL_WLS */ msArgc = argc; @@ -831,11 +838,11 @@ char **argv; /* argument vector */ printf("\n SInit failed, SSI could not start \n"); /* pthread_exit(NULLP);*/ /* Commented to Come out of Main thread*/ - RETVALUE(0); + return (0); } /*mt010.301 cleanup part exposed to user*/ SFini(); - RETVALUE(0); + return (0); } #else @@ -857,18 +864,17 @@ char **argv; /* argument vector */ * */ #ifdef ANSI -PUBLIC int ssMain +int ssMain ( int argc, /* argument count */ char **argv /* argument vector */ ) #else -PUBLIC int ssMain(argc, argv) +int ssMain(argc, argv) int argc; /* argument count */ char **argv; /* argument vector */ #endif { - TRC0(ssMain); msArgc = argc; @@ -877,7 +883,7 @@ char **argv; /* argument vector */ SInit(); - RETVALUE(0); + return (0); } #endif @@ -900,12 +906,12 @@ char **argv; /* argument vector */ * */ #ifdef ANSI -PUBLIC S16 ssdInitGen +S16 ssdInitGen ( void ) #else -PUBLIC S16 ssdInitGen() +S16 ssdInitGen() #endif { struct sigaction act; @@ -914,7 +920,6 @@ PUBLIC S16 ssdInitGen() struct sigaction sa; #endif - TRC0(ssdInitGen); /*mt014.301 : 4GMX release related changes*/ #ifdef SS_4GMX_UCORE @@ -936,7 +941,7 @@ PUBLIC S16 ssdInitGen() if(fileBasedMemCfg == TRUE && memConfigured == FALSE) { printf("\n File Based Memory configuration failed \n"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -952,7 +957,7 @@ PUBLIC S16 ssdInitGen() /* initialize the started semaphore */ if (sem_init(&osCp.dep.ssStarted, 0, 0) != 0) { - RETVALUE(RFAILED); + return RFAILED; } /* mt028.201 added compile time flag to allow not to mask signals */ @@ -996,27 +1001,27 @@ PUBLIC S16 ssdInitGen() if(sigaction(SIGILL, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGILL\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGSEGV, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGSEGV\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGABRT, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGABRT\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGTERM, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGTERM\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGHUP, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGHUP\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif #else @@ -1035,14 +1040,14 @@ PUBLIC S16 ssdInitGen() act.sa_flags = 0; if (sigaction(SIGINT, &act, NULLP) != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* mt040.201 initialise random seed */ osCp.dep.randSeed = time(NULLP); - RETVALUE(ROK); + return ROK; } @@ -1060,21 +1065,20 @@ PUBLIC S16 ssdInitGen() * */ #ifdef ANSI -PUBLIC Void ssdDeinitGen +Void ssdDeinitGen ( void ) #else -PUBLIC Void ssdDeinitGen() +Void ssdDeinitGen() #endif { - TRC0(ssdDeinitGen); sem_destroy(&osCp.dep.ssStarted); - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY #ifdef USE_MALLOC @@ -1094,15 +1098,15 @@ PUBLIC Void ssdDeinitGen() * */ #ifdef ANSI -PUBLIC S16 ssPutDynMemBlkSet +S16 ssPutDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is needs to be added to global region */ ) #else -PUBLIC S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be added to global region */ #endif @@ -1110,14 +1114,14 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1133,7 +1137,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be dynMemSetElem->nextBktPtr = NULLP; dynMemSetElem->numFreeBlks = 0; - RETVALUE(ROK); + return ROK; } /* @@ -1152,15 +1156,15 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be * */ #ifdef ANSI -PUBLIC S16 ssGetDynMemBlkSet +S16 ssGetDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is updated with new set values */ ) #else -PUBLIC S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated with new set values */ #endif @@ -1170,14 +1174,14 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated CmMmGlobalBktCb *bktCb; Data **basePtr; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1193,7 +1197,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated dynMemSetElem->numFreeBlks = bktCb->bucketSetSize; - RETVALUE(ROK); + return ROK; } /* ssGetDynMemBlkSet */ @@ -1214,19 +1218,19 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated * */ #ifdef ANSI -PUBLIC S16 ssPutDynMemBlkSet +S16 ssPutDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem, /* Memory set element which is needs to be added to global region */ -U32 doNotBlockForLock /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) #else -PUBLIC S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be added to global region */ -U32 doNotBlockForLock; /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ #endif { CmMmGlobRegCb *globReg; @@ -1235,14 +1239,13 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock CmMmBlkSetElement *globMemNode; S16 lockRet = 0; - TRC1(ssPutDynMemBlkSet); globReg = osCp.globRegCb; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1264,7 +1267,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock if(lstNode == NULLP) { SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } cmLListDelFrm(&(bktCb->listFreeBktSet), lstNode); @@ -1282,7 +1285,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock SUnlock(&(bktCb->bucketLock)); } - RETVALUE(ROK); + return ROK; } /* @@ -1302,19 +1305,19 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock * */ #ifdef ANSI -PUBLIC S16 ssGetDynMemBlkSet +S16 ssGetDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem, /* Memory set element which is updated with new set values */ -U32 doNotBlockForLock /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) #else -PUBLIC S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated with new set values */ -U32 doNotBlockForLock; /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ #endif { CmMmGlobRegCb *globReg; @@ -1323,14 +1326,13 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock CmMmBlkSetElement *globMemNode; S16 lockRet = 0; - TRC1(ssGetDynMemBlkSet); globReg = osCp.globRegCb; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1351,7 +1353,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock if(lstNode == NULLP) { SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } /* Delete the node from the valid linked list and copy the values of the @@ -1367,35 +1369,33 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock SUnlock(&(bktCb->bucketLock)); } - RETVALUE(ROK); + return ROK; } /* ssGetDynMemBlkSet */ #define NUM_CALLS_TO_CHECK_MEM_DYN_AGAIN 100 -U32 gDynMemAlrm[4]; -PRIVATE U32 memoryCheckCounter; +uint32_t gDynMemAlrm[4]; +PRIVATE uint32_t memoryCheckCounter; #ifdef ANSI -PUBLIC U32 isMemThreshReached( +uint32_t isMemThreshReached( Region reg ) #else -PUBLIC U32 isMemThreshReached(reg) +uint32_t isMemThreshReached(reg) Region reg; #endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; - U8 blkCnt; - U8 bktIdx= reg; - TRC3(isMemThreshReached) + uint8_t bktIdx= reg; globReg = osCp.globRegCb; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1411,7 +1411,7 @@ Region reg; // printf ("recoverd bktCb->listValidBktSet.count %d bktIdx %d\n",bktCb->listValidBktSet.count ,bktIdx); } SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -1426,7 +1426,7 @@ Region reg; SUnlock(&(bktCb->bucketLock)); } } - RETVALUE(ROK); + return ROK; } #endif /* USE_MALLOC */ @@ -1449,12 +1449,12 @@ Region reg; * */ #ifdef ANSI -PUBLIC Void * ssGetIccHdl +Void * ssGetIccHdl ( Region region ) #else -PUBLIC Void * ssGetIccHdl() +Void * ssGetIccHdl() Region region; #endif { @@ -1463,12 +1463,12 @@ Region region; /* Klock work fix ccpu00148484 */ if(!(region < SS_MAX_REGS)) { - RETVALUE(NULLP); + return (NULLP); } dynRegCb = (CmMmDynRegCb *)osCp.dynRegionTbl[region].regCb; - RETVALUE(dynRegCb->iccHdl); + return (dynRegCb->iccHdl); } #endif /* SS_USE_ICC_MEMORY */ @@ -1478,44 +1478,44 @@ extern RegionMemLeakInfo regMemLeakInfo; #ifdef INTEL_WLS -PUBLIC S16 SPartitionWlsMemory() +S16 SPartitionWlsMemory() { - U32 i; + uint32_t i; #ifndef ALIGN_64BIT - U64 reqdSz; - U64 pageSize[1], hugePageSize; + uint64_t reqdSz; + uint64_t pageSize[1], hugePageSize; #else long int reqdSz; long int pageSize[1], hugePageSize; #endif - U32 numHugePg; + uint32_t numHugePg; #define DIV_ROUND_OFFSET(X,Y) ( X/Y + ((X%Y)?1:0) ) - U8 *regMemStrtAddr = (U8 *)osCp.wls.allocAddr; + uint8_t *regMemStrtAddr = (uint8_t *)osCp.wls.allocAddr; gethugepagesizes(pageSize,1); hugePageSize = pageSize[0]; for (i = 0; i < 1; i++) { mtRegMemSz[i].startAddr = regMemStrtAddr; - CM_LOG_DEBUG(CM_LOG_ID_MT, "Global Region-->Bkt[%d] Addr:%p\n", i, mtRegMemSz[i].startAddr); + //CM_LOG_DEBUG(CM_LOG_ID_MT, "Global Region-->Bkt[%d] Addr:%p\n", i, mtRegMemSz[i].startAddr); numHugePg = DIV_ROUND_OFFSET(mtRegMemSz[i].reqdSz, hugePageSize); reqdSz = numHugePg * hugePageSize; regMemStrtAddr += reqdSz; #ifdef T2K_MEM_LEAK_DBG /* Since wls is region 0 */ - regMemLeakInfo.regStartAddr[i] = (U64)mtRegMemSz[i].startAddr; + regMemLeakInfo.regStartAddr[i] = (uint64_t)mtRegMemSz[i].startAddr; regMemLeakInfo.numActvRegions++; #endif /* T2K_MEM_LEAK_DBG */ } //Store last region addr for validation mtRegMemSz[i].startAddr = regMemStrtAddr; - RETVALUE(ROK); + return ROK; } #ifdef SS_MEM_WL_DEBUG -PUBLIC Void SChkAddrValid(int type, int region, PTR ptr) +Void SChkAddrValid(int type, int region, PTR ptr) { char *tryPtr = NULL; if(type == 0) //Global @@ -1539,12 +1539,12 @@ PUBLIC Void SChkAddrValid(int type, int region, PTR ptr) } #endif /* SS_MEM_WL_DEBUG */ -PUBLIC S16 SPartitionStaticMemory(U8 *startAddr) +S16 SPartitionStaticMemory(uint8_t *startAddr) { int i; - U32 reqdSz; + uint32_t reqdSz; - U8 *regMemStrtAddr = (U8 *)startAddr; + uint8_t *regMemStrtAddr = (uint8_t *)startAddr; //for (i = 0; i < mtMemoCfg.numRegions; i++) @@ -1555,18 +1555,18 @@ PUBLIC S16 SPartitionStaticMemory(U8 *startAddr) regMemStrtAddr += reqdSz; #ifdef T2K_MEM_LEAK_DBG { /* Since region 1 onwards are used for non wls */ - regMemLeakInfo.regStartAddr[i] = (U64)mtRegMemSz[i].startAddr; + regMemLeakInfo.regStartAddr[i] = (uint64_t)mtRegMemSz[i].startAddr; regMemLeakInfo.numActvRegions++; } #endif /* T2K_MEM_LEAK_DBG */ } - RETVALUE(ROK); + return ROK; } -PUBLIC S16 SAllocateWlsMem() +S16 SAllocateWlsMem() { - U32 reqdMemSz; - U32 i, j; + uint32_t reqdMemSz; + uint32_t i, j; MtRegCfg *region; reqdMemSz = 0; @@ -1594,15 +1594,15 @@ PUBLIC S16 SAllocateWlsMem() printf("\n ************* \n WLS memory: %lx, %d\n ****** \n", (PTR)osCp.wls.allocAddr, reqdMemSz); #endif SPartitionWlsMemory(); - RETVALUE(ROK); + return ROK; } -PUBLIC S16 SAllocateStaticMem() +S16 SAllocateStaticMem() { - U32 reqdMemSz; + uint32_t reqdMemSz; int i, j; MtRegCfg *region; - U8 *startAddr; + uint8_t *startAddr; reqdMemSz = 0; //memset(&mtRegMemSz[0], sizeof(mtRegMemSz), 0); @@ -1629,7 +1629,7 @@ PUBLIC S16 SAllocateStaticMem() printf("\n ************* \n Static memory: %lx, %d\n ****** \n", (PTR)startAddr, reqdMemSz); #endif SPartitionStaticMemory(startAddr); - RETVALUE(ROK); + return ROK; } #endif /* INTEL_WLS */ @@ -1651,18 +1651,18 @@ PUBLIC S16 SAllocateStaticMem() * */ #ifdef ANSI -PUBLIC S16 ssdInitMem +S16 ssdInitMem ( void ) #else -PUBLIC S16 ssdInitMem() +S16 ssdInitMem() #endif { /* mt018.201 - added local variable */ - U8 i; - U16 j; - U8 k; + uint8_t i; + uint16_t j; + uint8_t k; MtRegCfg *region; Txt errMsg[256] = {'\0'}; #ifdef SS_LOCKLESS_MEMORY @@ -1674,7 +1674,6 @@ PUBLIC S16 ssdInitMem() #endif #endif /* SS_LOCKLESS_MEMORY */ - TRC0(ssdInitMem); /* Use the default SSI memory manager if the ICC memory manager is not * avilable. If ICC memory manager is avilable, it will be used for @@ -1688,7 +1687,7 @@ PUBLIC S16 ssdInitMem() dynRegCb = (CmMmDynRegCb *)calloc(1, sizeof(CmMmDynRegCb)); if(dynRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } for(k = 0; k < mtDynMemoCfg.region[i].numBkts; k++) { @@ -1707,7 +1706,7 @@ PUBLIC S16 ssdInitMem() if(osCp.globRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } globReg = (CmMmGlobRegCb *)osCp.globRegCb; @@ -1722,7 +1721,7 @@ PUBLIC S16 ssdInitMem() #endif if(globReg->bktTbl[i].startAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } globReg->bktTbl[i].poolId = i; globReg->bktTbl[i].size = mtGlobMemoCfg.bkt[i].blkSize; @@ -1740,7 +1739,7 @@ PUBLIC S16 ssdInitMem() dynRegCb = (CmMmDynRegCb *)calloc(1, sizeof(CmMmDynRegCb)); if(dynRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } for(k = 0; k < mtDynMemoCfg.region[i].numBkts; k++) { @@ -1752,7 +1751,7 @@ PUBLIC S16 ssdInitMem() #ifdef XEON_SPECIFIC_CHANGES free(dynRegCb); #endif - RETVALUE(RFAILED); + return RFAILED; } dynRegCb->bktTbl[k].size = mtGlobMemoCfg.bkt[k].blkSize; dynRegCb->bktTbl[k].blkSetRelThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetRelThreshold; @@ -1771,7 +1770,7 @@ PUBLIC S16 ssdInitMem() #endif /* SS_LOCKLESS_MEMORY */ #ifdef T2K_MEM_LEAK_DBG - U8 reg; + uint8_t reg; /* Initailize mem leak tool memorys for debguing */ regMemLeakInfo.numActvRegions=0; for(reg=0; reg vAddr); free(mtCMMRegCb[i]); free(mtCMMRegCfg[i]); - RETVALUE(RFAILED); + return RFAILED; } @@ -1931,7 +1930,7 @@ PUBLIC S16 ssdInitMem() free(mtCMMRegCfg[i]->vAddr); free(mtCMMRegCb[i]); free(mtCMMRegCfg[i]); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1941,7 +1940,7 @@ PUBLIC S16 ssdInitMem() #endif /* SS_MEM_LEAK_STS */ - RETVALUE(ROK); + return ROK; } @@ -1959,18 +1958,17 @@ PUBLIC S16 ssdInitMem() * */ #ifdef ANSI -PUBLIC Void ssdDeinitMem +Void ssdDeinitMem ( void ) #else -PUBLIC Void ssdDeinitMem() +Void ssdDeinitMem() #endif { /* mt018.201 - added local variables */ - U8 i; + uint8_t i; - TRC0(ssdDeinitMem); /* mt008.301 Additions */ #ifdef SS_MEM_LEAK_STS cmDeinitMemLeakMdl(); @@ -1984,7 +1982,7 @@ PUBLIC Void ssdDeinitMem() free(mtCMMRegCfg[i]); } - RETVOID; + return; } @@ -2003,21 +2001,20 @@ PUBLIC Void ssdDeinitMem() * */ #ifdef ANSI -PUBLIC S16 ssdInitTsk +S16 ssdInitTsk ( void ) #else -PUBLIC S16 ssdInitTsk() +S16 ssdInitTsk() #endif { /* mt001.301 : Additions */ /*mt013.301 :Added SS_AFFINITY_SUPPORT */ #if defined(SS_MULTICORE_SUPPORT) ||defined(SS_AFFINITY_SUPPORT) - U32 tskInd = 0; + uint32_t tskInd = 0; #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ - TRC0(ssdInitTsk); /*mt013.301 :Added SS_AFFINITY_SUPPORT */ @@ -2028,7 +2025,7 @@ PUBLIC S16 ssdInitTsk() osCp.sTskTbl[tskInd].dep.lwpId = 0; } #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ - RETVALUE(ROK); + return ROK; } @@ -2047,17 +2044,16 @@ PUBLIC S16 ssdInitTsk() * */ #ifdef ANSI -PUBLIC Void ssdDeinitTsk +Void ssdDeinitTsk ( void ) #else -PUBLIC Void ssdDeinitTsk() +Void ssdDeinitTsk() #endif { - TRC0(ssdDeinitTsk); - RETVOID; + return; } @@ -2077,12 +2073,12 @@ PUBLIC Void ssdDeinitTsk() * */ #ifdef ANSI -PUBLIC S16 ssdInitDrvr +S16 ssdInitDrvr ( void ) #else -PUBLIC S16 ssdInitDrvr() +S16 ssdInitDrvr() #endif { S16 i; @@ -2090,7 +2086,6 @@ PUBLIC S16 ssdInitDrvr() pthread_attr_t attr; #endif - TRC0(ssdInitDrvr); /* initialize the dependent portion of the driver task entries */ @@ -2105,7 +2100,7 @@ PUBLIC S16 ssdInitDrvr() */ if (pipe(osCp.dep.isFildes) != 0) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef L2_L3_SPLIT @@ -2120,7 +2115,7 @@ PUBLIC S16 ssdInitDrvr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2137,7 +2132,7 @@ PUBLIC S16 ssdInitDrvr() pthread_attr_destroy(&attr); #endif - RETVALUE(ROK); + return ROK; } @@ -2156,15 +2151,14 @@ PUBLIC S16 ssdInitDrvr() * */ #ifdef ANSI -PUBLIC Void ssdDeinitDrvr +Void ssdDeinitDrvr ( void ) #else -PUBLIC Void ssdDeinitDrvr() +Void ssdDeinitDrvr() #endif { - TRC0(ssdDeinitDrvr); /* mt008.301: Terminate the Driver Task on exit */ while(pthread_cancel(osCp.dep.isTskHdlrTID)); @@ -2176,7 +2170,7 @@ PUBLIC Void ssdDeinitDrvr() } #endif - RETVOID; + return; } #endif /* SS_DRVR_SUPPORT */ @@ -2196,12 +2190,12 @@ PUBLIC Void ssdDeinitDrvr() * */ #ifdef ANSI -PUBLIC S16 ssdInitTmr +S16 ssdInitTmr ( void ) #else -PUBLIC S16 ssdInitTmr() +S16 ssdInitTmr() #endif { pthread_attr_t attr; @@ -2212,10 +2206,9 @@ PUBLIC S16 ssdInitTmr() SsSTskEntry *sTsk; #endif /* SS_MULTICORE_SUPPORT */ #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif /* SS_THR_REG_MAP */ - TRC0(ssdInitTmr); osCp.dep.tmrTqCp.tmrLen = SS_MAX_TMRS; @@ -2230,7 +2223,7 @@ PUBLIC S16 ssdInitTmr() sTsk = ssdAddTmrSTsk(); if(!sTsk) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTICORE_SUPPORT */ /* create the timer handler thread */ @@ -2259,7 +2252,7 @@ PUBLIC S16 ssdInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP @@ -2275,7 +2268,7 @@ PUBLIC S16 ssdInitTmr() pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; } @@ -2294,12 +2287,12 @@ PUBLIC S16 ssdInitTmr() * */ #ifdef ANSI -PUBLIC Void ssdDeinitTmr +Void ssdDeinitTmr ( void ) #else -PUBLIC Void ssdDeinitTmr() +Void ssdDeinitTmr() #endif { #ifdef SS_MULTICORE_SUPPORT @@ -2307,7 +2300,6 @@ PUBLIC Void ssdDeinitTmr() S16 ret; #endif /* SS_MULTICORE_SUPPORT */ - TRC0(ssdDeinitTmr); #ifdef SS_MULTICORE_SUPPORT ret = SLock(&osCp.sTskTblLock); @@ -2318,7 +2310,7 @@ PUBLIC Void ssdDeinitTmr() MTLOGERROR(ERRCLS_DEBUG, EMT008, (ErrVal) ret, "Could not lock system task table"); #endif - RETVOID; + return; } sTsk = &osCp.sTskTbl[0]; /* first entry is timer entry always */ /* clean up the system task entry */ @@ -2341,7 +2333,7 @@ PUBLIC Void ssdDeinitTmr() #endif /* SS_MULTICORE_SUPPORT */ /* mt008.301: Terminate the timer thread on exit */ while(pthread_cancel(osCp.dep.tmrHdlrTID)); - RETVOID; + return; } @@ -2360,12 +2352,12 @@ PUBLIC Void ssdDeinitTmr() * */ #ifdef ANSI -PUBLIC S16 ssdInitLog +S16 ssdInitLog ( void ) #else -PUBLIC S16 ssdInitLog() +S16 ssdInitLog() #endif { /* mt027.201 - Modification to fix warnings with no STDIN and STDOUT */ @@ -2381,7 +2373,6 @@ PUBLIC S16 ssdInitLog() #endif /* CONAVL */ /* mt008.301: ssdInitFinal changed to ssdInitLog */ - TRC0(ssdInitLog); #ifdef CONAVL @@ -2397,7 +2388,7 @@ PUBLIC S16 ssdInitLog() if ((tcgetattr(fd, &tio)) != 0) { printf("Error: disable canonical input processing\n"); - RETVALUE(RFAILED); + return RFAILED; } tio.c_lflag &= ~ICANON; @@ -2406,7 +2397,7 @@ PUBLIC S16 ssdInitLog() if ((tcsetattr(fd, TCSANOW, &tio)) != 0) { printf("Error: while tcsetattr() processing\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* CONSTDIO */ @@ -2419,7 +2410,7 @@ PUBLIC S16 ssdInitLog() if (fcntl(fd, F_SETFL, flags) == -1) { printf("Error: while fcntl processing\n"); - RETVALUE(RFAILED); + return RFAILED; } @@ -2437,7 +2428,7 @@ PUBLIC S16 ssdInitLog() pthread_attr_destroy(&attr); printf("Error: Logging Thread creation failed \n"); - RETVALUE(RFAILED); + return RFAILED; } /* mt020.201 - Addition for destroying thread attribute object attr */ @@ -2447,7 +2438,7 @@ PUBLIC S16 ssdInitLog() #endif /* CONAVL */ - RETVALUE(ROK); + return ROK; } @@ -2467,16 +2458,15 @@ PUBLIC S16 ssdInitLog() */ /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */ #ifdef ANSI -PUBLIC Void ssdDeinitLog +Void ssdDeinitLog ( void ) #else -PUBLIC Void ssdDeinitLog() +Void ssdDeinitLog() #endif { /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */ - TRC0(ssdDeinitLog); #ifdef CONAVL #ifndef CONRD /* mt008.301: Terminate the console reader on exit */ @@ -2484,23 +2474,23 @@ PUBLIC Void ssdDeinitLog() #endif /* CONRD */ #endif /* CONVAL */ - RETVOID; + return; } /* mt001.301 : Additions */ #ifdef SS_WATCHDOG #ifdef ANSI -PUBLIC S16 ssdInitWatchDog +S16 ssdInitWatchDog ( -U16 port +uint16_t port ) #else -PUBLIC S16 ssdInitWatchDog(port) -U16 port; +S16 ssdInitWatchDog(port) +uint16_t port; #endif { - U8 idx; + uint8_t idx; Txt prntBuf[PRNTSZE]; Pst pst; Buffer *mBuf; @@ -2513,11 +2503,10 @@ U16 port; ProcId procId = SS_WD_WDPROC; if (SAddProcIdLst(1, &procId) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ - TRC0(ssdInitWatchDog); SInitLock(&osCp.wdCp.wdLock, SS_LOCK_MUTEX); @@ -2556,7 +2545,7 @@ U16 port; ssdInitWatchDgPst(&(osCp.wdCp.watchDgPst)); /* Initialize the watch dog timer resolution default is 1 sec */ - cmInitTimers(osCp.wdCp.watchDgTmr, (U8)1); + cmInitTimers(osCp.wdCp.watchDgTmr, (uint8_t)1); osCp.wdCp.watchDgTqCp.nxtEnt = 0; osCp.wdCp.watchDgTqCp.tmrLen = 1; for(idx = 0; idx < 1; idx++) @@ -2598,7 +2587,7 @@ U16 port; if (SGetMsg(SS_DFLT_REGION, SS_DFLT_POOL, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef SS_MULTIPLE_PROCS pst.srcProcId = SFndProcId(); @@ -2611,20 +2600,19 @@ U16 port; ssdInitWatchDgPst(&pst); SPstTsk(&pst, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC S16 ssdInitWatchDgPst +S16 ssdInitWatchDgPst ( Pst *pst ) #else -PUBLIC S16 ssdInitWatchDgPst(pst) +S16 ssdInitWatchDgPst(pst) Pst *pst; #endif { - TRC1(ssInitWatchDgPst); pst->selector = SS_LOOSE_COUPLING; @@ -2639,46 +2627,45 @@ Pst *pst; pst->srcEnt = ENTDW; /* source entity */ pst->srcInst = 0; - RETVALUE(ROK); + return ROK; } #ifdef SS_MULTIPLE_PROCS #ifdef ANSI -PUBLIC S16 ssdWatchDgActvTmr +S16 ssdWatchDgActvTmr ( ProcId proc, Ent ent, Inst inst ) #else -PUBLIC S16 ssdWatchDgActvTmr(proc, ent, inst) +S16 ssdWatchDgActvTmr(proc, ent, inst) #endif #else #ifdef ANSI -PUBLIC S16 ssdWatchDgActvTmr +S16 ssdWatchDgActvTmr ( Void ) #else -PUBLIC S16 ssdWatchDgActvTmr() +S16 ssdWatchDgActvTmr() #endif #endif /* SS_MULTIPLE_PROCS */ { - TRC3(ssWatchDgActvTmr); cmPrcTmr(&osCp.wdCp.watchDgTqCp, osCp.wdCp.watchDgTs, (PFV)ssdWatchDgTmrEvt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC Void ssdWatchDgTmrEvt +Void ssdWatchDgTmrEvt ( PTR cb, /* control block */ S16 event /* timer number */ ) #else -PUBLIC Void ssdWatchDgTmrEvt(cb, event) +Void ssdWatchDgTmrEvt(cb, event) PTR cb; /* control block */ S16 event; /* timer number */ #endif @@ -2691,7 +2678,6 @@ S16 event; /* timer number */ Bool restartTmr; int i; - TRC2(ssWatchDgTmrEvt); switch(event) { @@ -2733,17 +2719,17 @@ S16 event; /* timer number */ } #ifdef ANSI -PUBLIC Void ssdStartWatchDgTmr +Void ssdStartWatchDgTmr ( void *cb, S16 event, -U16 wait +uint16_t wait ) #else -PUBLIC Void ssdStartWatchDgTmr(cb, event, wait) +Void ssdStartWatchDgTmr(cb, event, wait) void *cb; S16 event; -U16 wait; +uint16_t wait; #endif { CmTmrArg arg; @@ -2754,7 +2740,6 @@ U16 wait; #endif - TRC2(ssStartWatchDgTmr) /* mt003.301 Modifications */ #ifdef DEBUGP SGetDateTime(&dt); @@ -2785,17 +2770,17 @@ U16 wait; arg.max = 1; cmPlcCbTq(&arg); - RETVOID; + return; } #ifdef ANSI -PUBLIC Void ssdStopWatchDgTmr +Void ssdStopWatchDgTmr ( void *cb, S16 event ) #else -PUBLIC Void ssdStopWatchDgTmr(cb, event) +Void ssdStopWatchDgTmr(cb, event) void *cb; S16 event; #endif @@ -2807,7 +2792,6 @@ S16 event; int i; #endif - TRC2(ssStopWatchDgTmr) /* mt003.301 Modifications */ #ifdef DEBUGP SGetDateTime(&dt); @@ -2836,19 +2820,19 @@ S16 event; arg.max = 1; cmRmvCbTq(&arg); - RETVOID; + return; } #ifdef ANSI -PUBLIC S16 ssdSndHrtBtMsg +S16 ssdSndHrtBtMsg ( Bool restart, -U32 type +uint32_t type ) #else -PUBLIC S16 ssdSndHrtBtMsg(restart, type) +S16 ssdSndHrtBtMsg(restart, type) Bool restart; -U32 type; +uint32_t type; #endif { S16 ret = ROK; @@ -2861,7 +2845,6 @@ U32 type; int n; int err; - TRC2(ssdSndHrtBtReq) #ifdef DEBUGP SGetDateTime(&dt); @@ -2912,7 +2895,7 @@ U32 type; } SUnlock(&osCp.wdCp.wdLock); - RETVALUE(ret); + return (ret); } #endif /* SS_WATCHDOG */ @@ -2950,7 +2933,7 @@ PRIVATE Void mtGetOpts() #ifndef NOFILESYS FILE *memOpt; /* memory options file pointer */ Txt pBuf[128]; - U8 i; + uint8_t i; /* mt007.301 : Fix related to file based mem config on 64 bit machine */ PTR numReg; PTR numBkts; @@ -2975,7 +2958,6 @@ PRIVATE Void mtGetOpts() Cntr idx=0; #endif - TRC0(mtGetOpts); msOptInd = 1; @@ -3278,7 +3260,7 @@ PRIVATE Void mtGetOpts() msOptInd = 1; - RETVOID; + return; } #endif @@ -3320,14 +3302,14 @@ PRIVATE Void mtGetOpts() * */ #ifdef ANSI -PUBLIC S16 SGetOpt +S16 SGetOpt ( int argc, /* argument count */ char **argv, /* argument value */ char *opts /* options */ ) #else -PUBLIC S16 SGetOpt(argc, argv, opts) +S16 SGetOpt(argc, argv, opts) int argc; /* argument count */ char **argv; /* argument value */ char *opts; /* options */ @@ -3340,7 +3322,6 @@ char *opts; /* options */ S8 *cp; #endif - TRC1(SGetOpt); /* mt020.201 - Addition for no command line */ #ifdef NOCMDLINE @@ -3348,7 +3329,7 @@ char *opts; /* options */ UNUSED(argv); UNUSED(opts); - RETVALUE(EOF); + return (EOF); #else sp = 1; @@ -3357,19 +3338,19 @@ char *opts; /* options */ /*mt013.301 : Changes as per coding standards*/ if (msOptInd >= (S16) argc || argv[msOptInd][0] == '\0') { - RETVALUE(EOF); + return (EOF); } else { if (!strcmp(argv[msOptInd], "--")) { msOptInd++; - RETVALUE(EOF); + return (EOF); } else if (argv[msOptInd][0] != '-') { msOptInd++; - RETVALUE('?'); + return ('?'); } } } @@ -3383,7 +3364,7 @@ char *opts; /* options */ sp = 1; } - RETVALUE('?'); + return ('?'); } if (*++cp == ':') @@ -3394,7 +3375,7 @@ char *opts; /* options */ if (++msOptInd >= (S16) argc) { sp = 1; - RETVALUE('?'); + return ('?'); } else msOptArg = argv[msOptInd++]; @@ -3413,7 +3394,7 @@ char *opts; /* options */ } - RETVALUE(c); + return (c); #endif /* NOCMDLINE */ } @@ -3435,18 +3416,17 @@ char *opts; /* options */ * */ #ifdef ANSI -PUBLIC Void ssdStart +Void ssdStart ( void ) #else -PUBLIC Void ssdStart() +Void ssdStart() #endif { S16 i; - TRC0(ssdStart); /* mt025.201 - Modification for adding lock to timer handler */ @@ -3456,7 +3436,7 @@ PUBLIC Void ssdStart() } - RETVOID; + return; } @@ -3480,12 +3460,12 @@ PUBLIC Void ssdStart() * */ #ifdef ANSI -PUBLIC S16 ssdAttachTTsk +S16 ssdAttachTTsk ( SsTTskEntry *tTsk /* pointer to TAPA task entry */ ) #else -PUBLIC S16 ssdAttachTTsk(tTsk) +S16 ssdAttachTTsk(tTsk) SsTTskEntry *tTsk; /* pointer to TAPA task entry */ #endif { @@ -3493,10 +3473,6 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ SsMsgInfo *mInfo; S16 ret; - - TRC0(ssdAttachTTsk); - - if (tTsk->tskType == SS_TSK_PERMANENT) { /* Send a permanent tick message to this task, to start @@ -3508,7 +3484,7 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT001, ret, "SGetMsg() failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } mInfo = (SsMsgInfo *)mBuf->b_rptr; @@ -3545,12 +3521,12 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ MTLOGERROR(ERRCLS_DEBUG, EMT002, ret, "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -3568,19 +3544,17 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ * */ #ifdef ANSI -PUBLIC S16 ssdDetachTTsk +S16 ssdDetachTTsk ( SsTTskEntry *tTsk /* pointer to TAPA task entry */ ) #else -PUBLIC S16 ssdDetachTTsk(tTsk) +S16 ssdDetachTTsk(tTsk) SsTTskEntry *tTsk; /* pointer to TAPA task entry */ #endif { - TRC0(ssdDetachTTsk); - - RETVALUE(ROK); + return ROK; } @@ -3599,23 +3573,23 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ * */ #ifdef ANSI -PUBLIC S16 ssdCreateSTsk +S16 ssdCreateSTsk ( SsSTskEntry *sTsk /* pointer to system task entry */ ) #else -PUBLIC S16 ssdCreateSTsk(sTsk) +S16 ssdCreateSTsk(sTsk) SsSTskEntry *sTsk; /* pointer to system task entry */ #endif { + S16 ret; pthread_attr_t attr; /* struct sched_param param_sched;*/ #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif - TRC0(ssdCreateSTsk); #ifdef SS_SINGLE_THREADED @@ -3634,7 +3608,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ #endif /* SS_MULTICORE_SUPPORT */ #endif /* SS_WATCHDOG */ { - RETVALUE(ROK); + return ROK; } #endif @@ -3665,16 +3639,17 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ while(threadCreated == FALSE) { #endif - if ((pthread_create(&sTsk->dep.tId, &attr, mtTskHdlrT2kL2, (Ptr)sTsk)) != 0) + ret = pthread_create(&sTsk->dep.tId, &attr, mtTskHdlr, (Ptr)sTsk); + if (ret != 0) { - + DU_LOG("\nDU APP : Failed to create thread. Cause[%d]",ret); pthread_attr_destroy(&attr); #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT004, ERRZERO, "Could not create thread"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(sTsk->dep.tId, @@ -3695,7 +3670,8 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ while(threadCreated == FALSE) { #endif - if ((pthread_create(&sTsk->dep.tId, &attr, mtTskHdlr, (Ptr)sTsk)) != 0) + ret = pthread_create(&sTsk->dep.tId, &attr, mtTskHdlr, (Ptr)sTsk); + if (ret != 0) { /* mt020.201 - Addition for destroying thread attribute object attr */ @@ -3705,7 +3681,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ MTLOGERROR(ERRCLS_DEBUG, EMT004, ERRZERO, "Could not create thread"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(sTsk->dep.tId, @@ -3718,7 +3694,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ /*mt013.301 :Added SS_AFFINITY_SUPPORT */ #if defined(SS_MULTICORE_SUPPORT) ||defined(SS_AFFINITY_SUPPORT) { - static U32 stLwpId = 3; + static uint32_t stLwpId = 3; sTsk->dep.lwpId = ++stLwpId; } #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ @@ -3726,12 +3702,12 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC int SCreatePThread +int SCreatePThread ( pthread_t* tid, pthread_attr_t* attr, @@ -3739,7 +3715,7 @@ void *(*start_routine) (void *), void* arg ) #else -PUBLIC int SCreatePThread(tid, attr, start_routine, arg) +int SCreatePThread(tid, attr, start_routine, arg) pthread_t* tid; pthread_attr_t* attr; void *(*start_routine) (void *); @@ -3748,19 +3724,18 @@ void* arg; { int retVal = 0; #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif SPThreadCreateArg* threadArg = (SPThreadCreateArg*)malloc(sizeof(SPThreadCreateArg)); /* Klock work fix ccpu00148484 */ if(threadArg == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } threadArg->argument = arg; threadArg->start_routine = start_routine; - TRC0(SCreatePThread); printf("Creating thread here %s %d\n", __FILE__, __LINE__); { @@ -3778,7 +3753,7 @@ void* arg; if (((retVal = pthread_create(tid, attr, pthreadCreateHdlr, threadArg))) != 0) { - RETVALUE(retVal); + return (retVal); } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(*tid, SS_MAX_REGS - 1); @@ -3786,7 +3761,7 @@ void* arg; #endif } - RETVALUE(retVal); + return (retVal); } @@ -3819,7 +3794,6 @@ pthread_attr_t *attr { struct sched_param param; - TRC0 (ssdSetPthreadAttr) SMemSet(¶m, 0, sizeof(param)); @@ -3860,7 +3834,7 @@ pthread_attr_t *attr #endif pthread_attr_setschedparam(attr, ¶m); - RETVALUE (ROK); + return (ROK); } /* ssdSetPthreadAttr */ @@ -3885,32 +3859,31 @@ pthread_attr_t *attr * */ #ifdef ANSI -PUBLIC S16 ssdGetAffinity +S16 ssdGetAffinity ( SSTskId *tskId, /* filled in with system task ID */ -U32 *coreId /* the core/processor id to which the affinity is set */ +uint32_t *coreId /* the core/processor id to which the affinity is set */ ) #else -PUBLIC S16 ssdGetAffinity(tskId, coreId) +S16 ssdGetAffinity(tskId, coreId) SSTskId *tskId; /* filled in with system task ID */ -U32 *coreId; /* the core/processor id to which the affinity is set */ +uint32_t *coreId; /* the core/processor id to which the affinity is set */ #endif { - U32 tskInd; + uint32_t tskInd; #ifdef SS_LINUX pthread_t tId =0; cpu_set_t cpuSet; - U32 cpuInd = 0; + uint32_t cpuInd = 0; /*mt013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ #else #ifdef SUNOS - U32 lwpId = *tskId; + uint32_t lwpId = *tskId; #endif /*SUNOS*/ #endif /*SS_LINUX*/ - TRC0(ssdGetAffinity); #ifdef SS_LINUX for (tskInd = 0; tskInd < SS_MAX_STSKS; tskInd++) { @@ -3925,7 +3898,7 @@ U32 *coreId; /* the core/processor id to which the affinity i if (tskInd == SS_MAX_STSKS) { MTLOGERROR(ERRCLS_DEBUG, EMT036, ERRZERO, "Invalid system task Id\n"); - RETVALUE(RFAILED); + return RFAILED; } @@ -3938,7 +3911,7 @@ U32 *coreId; /* the core/processor id to which the affinity i #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT037, ERRZERO, "Could not get thread affinity\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end if pthread_setaffinity fails */ for (cpuInd = 0; cpuInd b_rptr; @@ -4154,11 +4125,11 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* mt023.201 - Added SThreadYield function to yield CPU @@ -4177,16 +4148,15 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ * */ #ifdef ANSI -PUBLIC S16 SThreadYield +S16 SThreadYield ( void ) #else -PUBLIC S16 SThreadYield() +S16 SThreadYield() #endif { - TRC0(SThreadYield); /* mt024.201 - seperated Linux and other UNIX implementations */ @@ -4198,11 +4168,11 @@ PUBLIC S16 SThreadYield() tw.tv_sec=0; tw.tv_usec=0; - RETVALUE(select(0,0,0,0,&tw) == 0 ? ROK : RFAILED); + return (select(0,0,0,0,&tw) == 0 ? ROK : RFAILED); } #else /* other UNICes */ - RETVALUE(sleep(0) == 0 ? ROK : RFAILED); + return (sleep(0) == 0 ? ROK : RFAILED); #endif /* SS_LINUX */ @@ -4229,19 +4199,18 @@ PUBLIC S16 SThreadYield() * */ #ifdef ANSI -PUBLIC S16 ssdRegTmr +S16 ssdRegTmr ( SsTmrEntry *tmr /* pointer to timer entry */ ) #else -PUBLIC S16 ssdRegTmr(tmr) +S16 ssdRegTmr(tmr) SsTmrEntry *tmr; /* pointer to timer entry */ #endif { CmTmrArg arg; - TRC0(ssdRegTmr); /* initialize common timers */ @@ -4261,7 +4230,7 @@ SsTmrEntry *tmr; /* pointer to timer entry */ cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -4279,19 +4248,18 @@ SsTmrEntry *tmr; /* pointer to timer entry */ * */ #ifdef ANSI -PUBLIC S16 ssdDeregTmr +S16 ssdDeregTmr ( SsTmrEntry *tmr /* pointer to timer entry */ ) #else -PUBLIC S16 ssdDeregTmr(tmr) +S16 ssdDeregTmr(tmr) SsTmrEntry *tmr; /* pointer to timer entry */ #endif { CmTmrArg arg; - TRC0(ssdDeregTmr); /* stop the timer */ @@ -4307,7 +4275,7 @@ SsTmrEntry *tmr; /* pointer to timer entry */ cmRmvCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -4325,13 +4293,13 @@ SsTmrEntry *tmr; /* pointer to timer entry */ * */ #ifdef ANSI -PUBLIC S16 ssdError +S16 ssdError ( Seq seq, /* sequence number */ Reason reason /* reset reason */ ) #else -PUBLIC S16 ssdError(seq, reason) +S16 ssdError(seq, reason) Seq seq; /* sequence number */ Reason reason; /* reset reason */ #endif @@ -4341,7 +4309,6 @@ Reason reason; /* reset reason */ Txt errBuf[256]; - TRC0(ssdError); /* get calling task ID */ @@ -4350,7 +4317,7 @@ Reason reason; /* reset reason */ /* set up the message to display */ sprintf(errBuf, "\n\nFATAL ERROR - taskid = %x, errno = %d," - "reason = %d\n\n", (U8)tId, seq, reason); + "reason = %d\n\n", (uint8_t)tId, seq, reason); SPrint(errBuf); @@ -4370,7 +4337,7 @@ Reason reason; /* reset reason */ /* won't reach here */ - RETVALUE(ROK); + return ROK; } @@ -4388,7 +4355,7 @@ Reason reason; /* reset reason */ * */ #ifdef ANSI -PUBLIC Void ssdLogError +Void ssdLogError ( Ent ent, /* Calling layer's entity id */ Inst inst, /* Calling layer's instance id */ @@ -4401,7 +4368,7 @@ ErrVal errVal, /* error value */ Txt *errDesc /* description of error */ ) #else -PUBLIC Void ssdLogError(ent, inst, procId, file, line, +Void ssdLogError(ent, inst, procId, file, line, errCls, errCode, errVal, errDesc) Ent ent; /* Calling layer's entity id */ Inst inst; /* Calling layer's instance id */ @@ -4422,7 +4389,6 @@ Txt *errDesc; /* description of error */ Txt errBuf[512]; - TRC0(ssdLogError); /* get calling task ID */ @@ -4502,7 +4468,7 @@ Txt *errDesc; /* description of error */ #endif - RETVOID; + return; } #ifdef ENB_RELAY @@ -4522,19 +4488,18 @@ Txt *errDesc; /* description of error */ * */ #ifdef ANSI -PUBLIC S16 ssdRegDrvrTsk +S16 ssdRegDrvrTsk ( SsDrvrTskEntry *drvrTsk /* driver task entry */ ) #else -PUBLIC S16 ssdRegDrvrTsk(drvrTsk) +S16 ssdRegDrvrTsk(drvrTsk) SsDrvrTskEntry *drvrTsk; /* driver task entry */ #endif { - TRC0(ssdRegDrvrTsk); - RETVALUE(ROK); + return ROK; } /* mt001.30 : Additions */ /* @@ -4552,19 +4517,18 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ * */ #ifdef ANSI -PUBLIC S16 ssdDeregDrvrTsk +S16 ssdDeregDrvrTsk ( SsDrvrTskEntry *drvrTsk /* driver task entry */ ) #else -PUBLIC S16 ssdDeregDrvrTsk(drvrTsk) +S16 ssdDeregDrvrTsk(drvrTsk) SsDrvrTskEntry *drvrTsk; /* driver task entry */ #endif { - TRC0(ssdDeregDrvrTsk); - RETVALUE(ROK); + return ROK; } #endif @@ -4576,27 +4540,27 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ */ #ifdef SS_MULTIPLE_PROCS #ifdef ANSI -PUBLIC S16 ssdProcTTskTerm +S16 ssdProcTTskTerm ( ProcId procIdx, SsTTskEntry *tTsk, SsIdx idx ) #else -PUBLIC S16 ssdProcTTskTerm(procIdx, tTsk, idx) +S16 ssdProcTTskTerm(procIdx, tTsk, idx) ProcId procIdx; SsTTskEntry *tTsk; SsIdx idx; #endif #else /*SS_MULTIPLE_PROCS*/ #ifdef ANSI -PUBLIC S16 ssdProcTTskTerm +S16 ssdProcTTskTerm ( SsTTskEntry *tTsk, SsIdx idx ) #else -PUBLIC S16 ssdProcTTskTerm(tTsk, idx) +S16 ssdProcTTskTerm(tTsk, idx) SsTTskEntry *tTsk; SsIdx idx; #endif @@ -4611,7 +4575,6 @@ SsIdx idx; S16 n; S16 ret; - TRC0(ssdProcTTskTerm); ent = tTsk->ent; @@ -4624,7 +4587,7 @@ SsIdx idx; if (ret != ROK) { MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); if (ret != ROK) @@ -4636,11 +4599,11 @@ SsIdx idx; { #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not Unlock system task table"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MULTIPLE_PROCS @@ -4720,24 +4683,24 @@ SsIdx idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not Unlock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } //#ifndef SPLIT_RLC_DL_TASK #ifdef TENB_T2K3K_SPECIFIC_CHANGES #if defined (L2_L3_SPLIT) && defined(SPLIT_RLC_DL_TASK) EXTERN Void ysMtTskHdlr(Void); -EXTERN Void ysMtPollPhyMsg(U8 region); +EXTERN Void ysMtPollPhyMsg(uint8_t region); EXTERN Void ysMtRcvPhyMsg(Void); #ifdef ANSI -PUBLIC Void *mtTskHdlrT2kL2 +Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) #else -PUBLIC Void *mtTskHdlrT2kL2(tskPtr) +Void *mtTskHdlrT2kL2(tskPtr) Ptr tskPtr; /* pointer to task entry */ #endif { @@ -4762,18 +4725,18 @@ Ptr tskPtr; /* pointer to task entry */ * (processes L1 msgs) */ } - RETVALUE(NULLP); + return (NULLP); } #else EXTERN Void ysMtTskHdlr(Void); EXTERN Void YsPhyRecvMsg(); #ifdef ANSI -PUBLIC Void *mtTskHdlrT2kL2 +Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) #else -PUBLIC Void *mtTskHdlrT2kL2(tskPtr) +Void *mtTskHdlrT2kL2(tskPtr) Ptr tskPtr; /* pointer to task entry */ #endif { @@ -4822,18 +4785,18 @@ Ptr tskPtr; /* pointer to task entry */ #endif } - RETVALUE(NULLP); + return (NULLP); } #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #endif #ifdef ANSI -PUBLIC void *pthreadCreateHdlr +void *pthreadCreateHdlr ( void * arg ) #else -PUBLIC void *pthreadCreateHdlr(pthreadCreateArg) +void *pthreadCreateHdlr(pthreadCreateArg) void *arg; #endif { @@ -4844,7 +4807,7 @@ void *arg; continue; pthreadCreateArg->start_routine(pthreadCreateArg->argument); - RETVALUE(ROK); + return ROK; } /* @@ -4867,12 +4830,12 @@ void *arg; * */ #ifdef ANSI -PUBLIC Void *mtTskHdlr +Void *mtTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) #else -PUBLIC Void *mtTskHdlr(tskPtr) +Void *mtTskHdlr(tskPtr) Ptr tskPtr; /* pointer to task entry */ #endif { @@ -4893,6 +4856,11 @@ Ptr tskPtr; /* pointer to task entry */ #endif while (1) { +#ifndef ODU_TEST_STUB +#ifdef INTEL_WLS + LwrMacRecvPhyMsg(); +#endif +#endif /* Wait for a message from the demand queue */ #ifdef SS_CDMNDQ_SUPPORT ret = ssCDmndQWait(&sTsk->dQ); @@ -4909,7 +4877,7 @@ Ptr tskPtr; /* pointer to task entry */ } } - RETVALUE(NULLP); + return (NULLP); } @@ -4933,12 +4901,12 @@ Ptr tskPtr; /* pointer to task entry */ * */ #ifdef ANSI -PUBLIC S16 mtTskHdlMsg +S16 mtTskHdlMsg ( SsSTskEntry *sTsk ) #else -PUBLIC S16 mtTskHdlMsg(sTsk) +S16 mtTskHdlMsg(sTsk) SsSTskEntry *sTsk #endif { @@ -4961,7 +4929,7 @@ SsSTskEntry *sTsk PFS16 tmrActvFn = NULLP; #else PAIFTMRS16 tmrActvFn; - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ /* mt003.301 Modifications */ #ifdef SS_THREAD_PROFILE @@ -4973,7 +4941,7 @@ SsSTskEntry *sTsk if (ret != ROK) { /* nothing to receive */ - RETVALUE(ROK); + return ROK; } /* if we can't lock this system task entry, return the message */ @@ -4986,7 +4954,7 @@ SsSTskEntry *sTsk "Could not lock system task entry"); #endif SPutMsg(mBuf); - RETVALUE(ROK); + return ROK; } /* mt034.201 */ @@ -5038,7 +5006,7 @@ SsSTskEntry *sTsk "Could not lock system task table"); #endif /* what to do here? */ - RETVALUE(ROK); + return ROK; } /* clean up the system task entry */ @@ -5067,7 +5035,7 @@ SsSTskEntry *sTsk /* unlock the system task table */ SUnlock(&osCp.sTskTblLock); - RETVALUE(RFAILED); + return RFAILED; /* this is a data message or a permanent task keep-alive message */ @@ -5110,7 +5078,7 @@ SsSTskEntry *sTsk /* copy the Pst structure into a local duplicate */ for (i = 0; i < (S16) sizeof(Pst); i++) - *(((U8 *)(&nPst)) + i) = *(((U8 *)&mInfo->pst) + i); + *(((uint8_t *)(&nPst)) + i) = *(((uint8_t *)&mInfo->pst) + i); /* Give the message to the task activation function. If * its a normal data message, we pass it, if this is a @@ -5122,7 +5090,7 @@ SsSTskEntry *sTsk { #ifndef RGL_SPECIFIC_CHANGES #ifdef SS_TSKLOG_ENABLE - U32 t = MacGetTick(); + uint32_t t = MacGetTick(); #endif #endif /* mt003.301 Modifications */ @@ -5138,8 +5106,8 @@ SsSTskEntry *sTsk #endif #if SS_THREAD_PROFILE SGetEpcTime(&et2); - tTsk->curEvtTime = (U32)(et2 - et1); - tTsk->totTime += (U64)tTsk->curEvtTime; + tTsk->curEvtTime = (uint32_t)(et2 - et1); + tTsk->totTime += (uint64_t)tTsk->curEvtTime; #endif /* SS_THREAD_PROFILE */ } else @@ -5331,7 +5299,7 @@ SsSTskEntry *sTsk SThreadYield(); #endif - RETVALUE(ROK); + return ROK; } Bool g_usettitmr; @@ -5339,11 +5307,11 @@ Bool g_usettitmr; * Fun: mtTmrHdlrPublic */ #ifdef ANSI -PUBLIC Void mtTmrHdlrPublic +Void mtTmrHdlrPublic ( ) #else -PUBLIC Void mtTmrHdlrPublic() +Void mtTmrHdlrPublic() #endif { if (SLock(&osCp.tmrTblLock) != ROK) @@ -5391,14 +5359,14 @@ void *parm; /* unused */ * enabled oroginal code in function mtTmrHdlr */ struct timespec ts; - U32 time_int; - U32 i, cnt, oldTicks, newTicks; + uint32_t time_int; + uint32_t i, cnt, oldTicks, newTicks; struct timeval tv1,tv2; /* mt038.201 added return */ S16 ret; /* mt039.201 changes for nanosleep */ struct timespec tsN; - PRIVATE U32 err_in_usec; + PRIVATE uint32_t err_in_usec; /*mt013.301 : doesn't need TRC macro ,as this will never return*/ @@ -5519,7 +5487,7 @@ void *parm; /* unused */ } /* mt009.21: addition */ - RETVALUE( (Void *) NULLP); + return ( (Void *) NULLP); /* will not reach here */ } @@ -5539,13 +5507,13 @@ void *parm; /* unused */ * */ #ifdef ANSI -PUBLIC Void mtTimeout +Void mtTimeout ( PTR tCb, /* control block */ S16 evnt /* event */ ) #else -PUBLIC Void mtTimeout(tCb, evnt) +Void mtTimeout(tCb, evnt) PTR tCb; /* control block */ S16 evnt; /* event */ #endif @@ -5561,15 +5529,14 @@ S16 evnt; /* event */ #endif /* mt028.201: modification: multiple procs support related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ #ifdef RGL_SPECIFIC_CHANGES #ifdef MSPD_MLOG_NEW - U32 t = GetTIMETICK(); + uint32_t t = GetTIMETICK(); #endif #endif - TRC0(mtTimeout); /* get the timer entry */ @@ -5579,7 +5546,7 @@ S16 evnt; /* event */ /* if the timer was deleted, this will be NULL, so drop it */ if (tEnt == NULL) { - RETVOID; + return; } /* mt008.301 Deletion: tmrTbl Lock is moved to mtTmrHdlr */ @@ -5590,7 +5557,7 @@ S16 evnt; /* event */ */ if (tEnt->used == FALSE) { - RETVOID; + return; } @@ -5612,7 +5579,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT017, ERRZERO, "Could not get message"); #endif - RETVOID; + return; } mInfo = (SsMsgInfo *)mBuf->b_rptr; @@ -5653,7 +5620,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT018, ret, "Could not lock TAPA task table"); #endif - RETVOID; + return; } #endif @@ -5672,7 +5639,7 @@ S16 evnt; /* event */ SS_RELEASE_SEMA(&osCp.tTskTblSem); #endif SPutMsg(mBuf); - RETVOID; + return; } @@ -5684,7 +5651,7 @@ S16 evnt; /* event */ SS_RELEASE_SEMA(&osCp.tTskTblSem); #endif SPutMsg(mBuf); - RETVOID; + return; } /* Klock work fix ccpu00148484 */ /* write the timer message to the queue of the destination task */ @@ -5701,7 +5668,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY mInfo->pst.region = tTsk->sTsk->region; @@ -5720,7 +5687,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } /* Fix for ccpu00130657 */ #ifdef TENB_T2K3K_SPECIFIC_CHANGES @@ -5756,7 +5723,7 @@ S16 evnt; /* event */ MLogTask(131313, RESOURCE_LARM, t, GetTIMETICK()); #endif #endif - RETVOID; + return; } @@ -5800,7 +5767,7 @@ Ptr parm; /* unused */ if (osCp.dep.conInFp == NULLP) { /* die */ - RETVALUE(NULLP); + return (NULLP); } fd = fileno(osCp.dep.conInFp); @@ -5860,10 +5827,6 @@ Ptr tskPtr; /* pointer to task entry */ #endif MtIsFlag isFlag; - - TRC0(mtIsTskHdlr); - - for (; ;) { if (read(osCp.dep.isFildes[0], &isFlag, sizeof(isFlag)) != sizeof(isFlag)) @@ -5930,7 +5893,7 @@ Ptr tskPtr; /* pointer to task entry */ } } /* mt009.21: addition */ - RETVALUE( (Void *) NULLP); + return ( (Void *) NULLP); /* not reached */ } @@ -5953,18 +5916,16 @@ Ptr tskPtr; /* pointer to task entry */ * */ #ifdef ANSI -PUBLIC Void mtIntSigHndlr +Void mtIntSigHndlr ( int arg ) #else -PUBLIC Void mtIntSigHndlr(arg) +Void mtIntSigHndlr(arg) int arg; #endif { - TRC0(mtIntSigHndlr); - osCp.dep.sigEvnt=TRUE; #ifdef MSPD @@ -5973,7 +5934,7 @@ int arg; #endif #endif - RETVOID; + return; } /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ @@ -5991,20 +5952,18 @@ int arg; * */ #ifdef ANSI -PUBLIC Void mtExitClnup +Void mtExitClnup ( void ) #else -PUBLIC Void mtExitClnup() +Void mtExitClnup() #endif { Ticks ticks; S8 buf[128]; - TRC0(mtExitClnup); - SGetSysTime(&ticks); #ifdef ALIGN_64BIT sprintf(buf, "\n\nmtss(posix) ends\nticks: %u\n", ticks); @@ -6055,32 +6014,31 @@ Ticks SGetTtiCount(Void) * */ #ifdef ANSI -PUBLIC S16 SDisplay +S16 SDisplay ( S16 chan, /* channel */ Txt *buf /* buffer */ ) #else -PUBLIC S16 SDisplay(chan, buf) +S16 SDisplay(chan, buf) S16 chan; /* channel */ Txt *buf; /* buffer */ #endif { - TRC1(SDisplay); /* mt020.201 - Fixed typo */ #if (ERRCLASS & ERRCLS_INT_PAR) if (buf == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT022, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef XEON_SPECIFIC_CHANGES #ifdef TENB_T2K3K_SPECIFIC_CHANGES ssMemlog(buf, strlen(buf)); - RETVALUE(ROK); + return ROK; #endif #endif @@ -6108,7 +6066,7 @@ Txt *buf; /* buffer */ #endif #endif - RETVALUE(ROK); + return ROK; } /*mt010.301 */ @@ -6126,15 +6084,14 @@ Txt *buf; /* buffer */ * */ #ifdef ANSI -PUBLIC S16 SFini +S16 SFini ( void ) #else -PUBLIC S16 SFini() +S16 SFini() #endif { - TRC1(SFini); /* mt030.201 added under compilet time flag SS_LINUX and SLES9_PLUS a loop to overcome the child processes being killed upon exiting the @@ -6153,7 +6110,7 @@ PUBLIC S16 SFini() #endif pthread_exit(NULLP); - RETVALUE(0); + return (0); } /* @@ -6171,22 +6128,20 @@ PUBLIC S16 SFini() * */ #ifdef ANSI -PUBLIC S16 SSetDateTime +S16 SSetDateTime ( REG1 DateTime *dt /* date and time */ ) #else -PUBLIC S16 SSetDateTime(dt) +S16 SSetDateTime(dt) REG1 DateTime *dt; /* date and time */ #endif { - TRC1(SSetDateTime); - UNUSED(dt); - RETVALUE(ROK); + return ROK; } @@ -6207,12 +6162,12 @@ REG1 DateTime *dt; /* date and time */ * */ #ifdef ANSI -PUBLIC S16 SGetDateTime +S16 SGetDateTime ( REG1 DateTime *dt /* date and time */ ) #else -PUBLIC S16 SGetDateTime(dt) +S16 SGetDateTime(dt) REG1 DateTime *dt; /* date and time */ #endif { @@ -6227,14 +6182,12 @@ REG1 DateTime *dt; /* date and time */ struct tm tme; - TRC1(SGetDateTime); - #if (ERRCLASS & ERRCLS_INT_PAR) if (dt == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT023, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6251,12 +6204,12 @@ REG1 DateTime *dt; /* date and time */ #endif localtime_r(&ptime.tv_sec, &tme); - dt->month = (U8) tme.tm_mon + 1; - dt->day = (U8) tme.tm_mday; - dt->year = (U8) tme.tm_year; - dt->hour = (U8) tme.tm_hour; - dt->min = (U8) tme.tm_min; - dt->sec = (U8) tme.tm_sec; + dt->month = (uint8_t) tme.tm_mon + 1; + dt->day = (uint8_t) tme.tm_mday; + dt->year = (uint8_t) tme.tm_year; + dt->hour = (uint8_t) tme.tm_hour; + dt->min = (uint8_t) tme.tm_min; + dt->sec = (uint8_t) tme.tm_sec; dt->tenths = 0; #ifdef SS_DATETIME_USEC @@ -6267,7 +6220,7 @@ REG1 DateTime *dt; /* date and time */ #endif #endif /*-- SS_DATETIME_USEC --*/ - RETVALUE(ROK); + return ROK; } /* @@ -6288,32 +6241,31 @@ REG1 DateTime *dt; /* date and time */ */ /* mt003.301 Modifications */ #ifdef ANSI -PUBLIC S16 SGetEpcTime +S16 SGetEpcTime ( EpcTime *et /* date and time */ ) #else -PUBLIC S16 SGetEpcTime(et) +S16 SGetEpcTime(et) EpcTime *et; /* date and time */ #endif { /* mt003.301 Modifications */ -PRIVATE U64 now; - U64 to_sec = 1000000; - U64 to_nsec = 1000; +PRIVATE uint64_t now; + uint64_t to_sec = 1000000; + uint64_t to_nsec = 1000; #ifndef SS_LINUX struct timespec ptime; #else struct timeval ptime; #endif - TRC1(SEpcTime); #if (ERRCLASS & ERRCLS_INT_PAR) if (et == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6336,7 +6288,7 @@ PRIVATE U64 now; *et = now; - RETVALUE(ROK); + return ROK; } @@ -6355,23 +6307,22 @@ PRIVATE U64 now; * */ #ifdef ANSI -PUBLIC S16 SGetSysTime +S16 SGetSysTime ( Ticks *sysTime /* system time */ ) #else -PUBLIC S16 SGetSysTime(sysTime) +S16 SGetSysTime(sysTime) Ticks *sysTime; /* system time */ #endif { - TRC1(SGetSysTime); #if (ERRCLASS & ERRCLS_INT_PAR) if (sysTime == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT024, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6379,7 +6330,7 @@ Ticks *sysTime; /* system time */ *sysTime = osCp.dep.sysTicks; - RETVALUE(ROK); + return ROK; } /* mt021.201 - Addition of SGetRefTime function */ @@ -6403,17 +6354,17 @@ Ticks *sysTime; /* system time */ * */ #ifdef ANSI -PUBLIC S16 SGetRefTime +S16 SGetRefTime ( -U32 refTime, /* reference time */ -U32 *sec, -U32 *usec +uint32_t refTime, /* reference time */ +uint32_t *sec, +uint32_t *usec ) #else -PUBLIC S16 SGetRefTime(refTime, sec, usec) -U32 refTime; /* reference time */ -U32 *sec; -U32 *usec; +S16 SGetRefTime(refTime, sec, usec) +uint32_t refTime; /* reference time */ +uint32_t *sec; +uint32_t *usec; #endif { @@ -6423,7 +6374,6 @@ U32 *usec; struct timeval ptime; #endif - TRC1(SGetSysTime); #ifndef SS_LINUX clock_gettime(CLOCK_REALTIME, &ptime); @@ -6435,13 +6385,13 @@ U32 *usec; if (sec == NULLP || usec == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT025, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* mt022.201 - Modification to fix compile warning */ - if (refTime > (U32)(ptime.tv_sec)) + if (refTime > (uint32_t)(ptime.tv_sec)) { MTLOGERROR(ERRCLS_INT_PAR, EMT026, ERRZERO, "Reference time exceeds present time"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6452,7 +6402,7 @@ U32 *usec; *usec = ptime.tv_usec; #endif - RETVALUE(ROK); + return ROK; } @@ -6473,16 +6423,15 @@ U32 *usec; * */ #ifdef ANSI -PUBLIC S16 SRandom +S16 SRandom ( Random *value /* random number */ ) #else -PUBLIC S16 SRandom(value) +S16 SRandom(value) Random *value; /* random number */ #endif { - TRC1(SRandom); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6490,7 +6439,7 @@ Random *value; /* random number */ { /* mt011.21: addition */ MTLOGERROR(ERRCLS_INT_PAR, EMT028, (ErrVal)0 , "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6498,7 +6447,7 @@ Random *value; /* random number */ *value = (Random) rand_r(&osCp.dep.randSeed); - RETVALUE(ROK); + return ROK; } @@ -6516,18 +6465,17 @@ Random *value; /* random number */ * */ #ifdef ANSI -PUBLIC S16 SExitTsk +S16 SExitTsk ( void ) #else -PUBLIC S16 SExitTsk() +S16 SExitTsk() #endif { - TRC1(SExitTsk); - RETVALUE(ROK); + return ROK; } @@ -6545,18 +6493,17 @@ PUBLIC S16 SExitTsk() * */ #ifdef ANSI -PUBLIC S16 SExitInt +S16 SExitInt ( void ) #else -PUBLIC S16 SExitInt() +S16 SExitInt() #endif { - TRC1(SExitInt); - RETVALUE(ROK); + return ROK; } @@ -6578,18 +6525,17 @@ PUBLIC S16 SExitInt() * */ #ifdef ANSI -PUBLIC S16 SHoldInt +S16 SHoldInt ( void ) #else -PUBLIC S16 SHoldInt() +S16 SHoldInt() #endif { - TRC1(SHoldInt); - RETVALUE(ROK); + return ROK; } @@ -6607,18 +6553,17 @@ PUBLIC S16 SHoldInt() * */ #ifdef ANSI -PUBLIC S16 SRelInt +S16 SRelInt ( void ) #else -PUBLIC S16 SRelInt() +S16 SRelInt() #endif { - TRC1(SRelInt); - RETVALUE(ROK); + return ROK; } @@ -6637,18 +6582,17 @@ PUBLIC S16 SRelInt() * */ #ifdef ANSI -PUBLIC INLINE S16 SEnbInt +INLINE S16 SEnbInt ( void ) #else -PUBLIC INLINE S16 SEnbInt() +INLINE S16 SEnbInt() #endif { - TRC1(SEnbInt); - RETVALUE(ROK); + return ROK; } @@ -6667,18 +6611,17 @@ PUBLIC INLINE S16 SEnbInt() * */ #ifdef ANSI -PUBLIC INLINE S16 SDisInt +INLINE S16 SDisInt ( void ) #else -PUBLIC INLINE S16 SDisInt() +INLINE S16 SDisInt() #endif { - TRC1(SDisInt); - RETVALUE(ROK); + return ROK; } @@ -6697,25 +6640,24 @@ PUBLIC INLINE S16 SDisInt() * */ #ifdef ANSI -PUBLIC S16 SGetVect +S16 SGetVect ( VectNmb vectNmb, /* vector number */ PIF *vectFnct /* vector function */ ) #else -PUBLIC S16 SGetVect(vectNmb, vectFnct) +S16 SGetVect(vectNmb, vectFnct) VectNmb vectNmb; /* vector number */ PIF *vectFnct; /* vector function */ #endif { - TRC1(SGetVect); UNUSED(vectNmb); UNUSED(vectFnct); - RETVALUE(ROK); + return ROK; } @@ -6734,25 +6676,24 @@ PIF *vectFnct; /* vector function */ * */ #ifdef ANSI -PUBLIC S16 SPutVect +S16 SPutVect ( VectNmb vectNmb, /* vector number */ PIF vectFnct /* vector function */ ) #else -PUBLIC S16 SPutVect(vectNmb, vectFnct) +S16 SPutVect(vectNmb, vectFnct) VectNmb vectNmb; /* vector number */ PIF vectFnct; /* vector function */ #endif { - TRC1(SPutVect); UNUSED(vectNmb); UNUSED(vectFnct); - RETVALUE(ROK); + return ROK; } /* mt028.201: modification: multiple procs support related changes */ @@ -6774,13 +6715,13 @@ PIF vectFnct; /* vector function */ * */ #ifdef ANSI -PUBLIC S16 SGetEntInst +S16 SGetEntInst ( Ent *ent, /* entity */ Inst *inst /* instance */ ) #else -PUBLIC S16 SGetEntInst(ent, inst) +S16 SGetEntInst(ent, inst) Ent *ent; /* entity */ Inst *inst; /* instance */ #endif @@ -6791,7 +6732,6 @@ Inst *inst; /* instance */ SsSTskEntry *sTsk; - TRC1(SGetEntInst); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6799,7 +6739,7 @@ Inst *inst; /* instance */ if (ent == NULLP || inst == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT029, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6813,7 +6753,7 @@ Inst *inst; /* instance */ ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i = 0; i < SS_MAX_STSKS; i++) { @@ -6831,7 +6771,7 @@ Inst *inst; /* instance */ SUnlock(&osCp.sTskTblLock); - RETVALUE(ret == ROK ? ROK : RFAILED); + return (ret == ROK ? ROK : RFAILED); } @@ -6849,13 +6789,13 @@ Inst *inst; /* instance */ * */ #ifdef ANSI -PUBLIC S16 SSetEntInst +S16 SSetEntInst ( Ent ent, /* entity */ Inst inst /* instance */ ) #else -PUBLIC S16 SSetEntInst(ent, inst) +S16 SSetEntInst(ent, inst) Ent ent; /* entity */ Inst inst; /* instance */ #endif @@ -6866,7 +6806,6 @@ Inst inst; /* instance */ SsSTskEntry *sTsk; - TRC1(SSetEntInst); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6874,7 +6813,7 @@ Inst inst; /* instance */ if (ent >= ENTNC || inst >= INSTNC) { MTLOGERROR(ERRCLS_INT_PAR, EMT030, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6888,7 +6827,7 @@ Inst inst; /* instance */ ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i = 0; i < SS_MAX_STSKS; i++) { @@ -6906,7 +6845,7 @@ Inst inst; /* instance */ SUnlock(&osCp.sTskTblLock); - RETVALUE(ret == ROK ? ROK : RFAILED); + return (ret == ROK ? ROK : RFAILED); } #endif /* SS_MULTIPLE_PROCS */ @@ -6928,28 +6867,27 @@ Inst inst; /* instance */ * */ #ifdef ANSI -PUBLIC INLINE S16 SSetIntPend +INLINE S16 SSetIntPend ( -U16 id, /* driver task identifier */ +uint16_t id, /* driver task identifier */ Bool flag /* flag */ ) #else -PUBLIC INLINE S16 SSetIntPend(id, flag) -U16 id; /* driver task identifier */ +INLINE S16 SSetIntPend(id, flag) +uint16_t id; /* driver task identifier */ Bool flag; /* flag */ #endif { MtIsFlag isFlag; - TRC1(SSetIntPend); #if (ERRCLASS & ERRCLS_INT_PAR) if (id >= SS_MAX_DRVRTSKS || osCp.drvrTskTbl[id].used == FALSE) { MTLOGERROR(ERRCLS_INT_PAR, EMT031, id, "Invalid instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6959,11 +6897,11 @@ Bool flag; /* flag */ if (write(osCp.dep.isFildes[1], &isFlag, sizeof(isFlag)) != sizeof(isFlag)) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_DRVR_SUPPORT */ @@ -6984,19 +6922,18 @@ Bool flag; /* flag */ * */ #ifdef ANSI -PUBLIC S16 SGlobMemInfoShow +S16 SGlobMemInfoShow ( Void ) #else -PUBLIC S16 SGlobMemInfoShow() +S16 SGlobMemInfoShow() #endif { - U16 idx; + uint16_t idx; Txt prntBuf[100]; CmMmGlobRegCb *globReg; - TRC1(SGlobMemInfoShow); globReg = osCp.globRegCb; @@ -7031,7 +6968,7 @@ PUBLIC S16 SGlobMemInfoShow() sprintf(prntBuf, "--------------------------------------------------------------\n"); SDisplay(0, prntBuf); - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCKLESS_MEMORY */ @@ -7046,9 +6983,9 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) pool, mtCMMRegCb[reg]->bktTbl[pool].numAlloc, mtCMMRegCb[reg]->bktTbl[pool].numBlks); - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } */ @@ -7086,27 +7023,26 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) * */ #ifdef ANSI -PUBLIC S16 SRegInfoShow +S16 SRegInfoShow ( Region region, -U32 *availmem +uint32_t *availmem ) #else -PUBLIC S16 SRegInfoShow(region, availmem) +S16 SRegInfoShow(region, availmem) Region region; -U32 *availmem; +uint32_t *availmem; #endif { - U16 idx; + uint16_t idx; Txt prntBuf[100]; - TRC1(SRegInfoShow); #if (ERRCLASS & ERRCLS_INT_PAR) if (region > (SS_MAX_REGS-1) ) { MTLOGERROR(ERRCLS_INT_PAR, EMT032, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7186,28 +7122,28 @@ U32 *availmem; SDisplay(0, prntBuf); #endif - RETVALUE(ROK); + return ROK; } #ifdef XEON_SPECIFIC_CHANGES #define SSI_MAX_BKT_THRESHOLD 6 #define SSI_MAX_REG_THRESHOLD 2 -U32 SMemMaxThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; -U32 SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; -U32 SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemMaxThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; #ifdef ANSI PRIVATE Void SInitMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) #else PRIVATE Void SInitMemThreshold(region, maxBkt) Region region; -U8 maxBkt; +uint8_t maxBkt; #endif { - U8 idx = 0; + uint8_t idx = 0; for (idx = 0; (idx < maxBkt && idx < mtCMMRegCb[region]->numBkts); idx++) { SMemMaxThreshold[region][idx] = (mtCMMRegCb[region]->bktTbl[idx].numBlks*95)/100; @@ -7218,20 +7154,20 @@ U8 maxBkt; } #ifdef ANSI -PUBLIC S16 SRegReachedMemThreshold +S16 SRegReachedMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) #else -PUBLIC S16 SRegReachedMemThreshold(region, maxBkt) +S16 SRegReachedMemThreshold(region, maxBkt) Region region; -U8 maxBkt; +uint8_t maxBkt; #endif { - U8 idx = 0; - U8 memStatus = 3; - PRIVATE U8 initFlag = 1; + uint8_t idx = 0; + uint8_t memStatus = 3; + PRIVATE uint8_t initFlag = 1; if(initFlag) { initFlag = 0; @@ -7254,7 +7190,7 @@ U8 maxBkt; memStatus = 2; } } - RETVALUE(memStatus); + return (memStatus); } #endif /* mt033.201 - addition of API to return the memory statistical data */ @@ -7275,26 +7211,25 @@ U8 maxBkt; * */ #ifdef ANSI -PUBLIC S16 SGetRegInfo +S16 SGetRegInfo ( Region region, SsMemDbgInfo *dbgInfo ) #else -PUBLIC S16 SGetRegInfo(region, dbgInfo) +S16 SGetRegInfo(region, dbgInfo) Region region; SsMemDbgInfo *dbgInfo; #endif { - U32 idx; + uint32_t idx; - TRC1(SGetRegInfo); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT033, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7329,19 +7264,19 @@ SsMemDbgInfo *dbgInfo; dbgInfo->numFragBlk = mtCMMRegCb[region]->heapCb.numFragBlk; #endif - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC S16 SGetRegPoolInfo +S16 SGetRegPoolInfo ( -U8 *numRegion, -U8 *numPool +uint8_t *numRegion, +uint8_t *numPool ) #else -PUBLIC S16 SGetRegPoolInfo(numRegion, numPool) -U8 *numRegion; -U8 *numPool; +S16 SGetRegPoolInfo(numRegion, numPool) +uint8_t *numRegion; +uint8_t *numPool; #endif { /* Send number of Region available */ @@ -7349,7 +7284,7 @@ U8 *numPool; /* Send number of Pools available */ *numPool = cfgRegInfo[0].numPools; - RETVALUE(ROK); + return ROK; } /* mt033.201 - addition of APIs to print the memory statistical data @@ -7376,29 +7311,28 @@ U8 *numPool; * */ #ifdef ANSI -PUBLIC S16 SPrintRegMemStatusInfo +S16 SPrintRegMemStatusInfo ( Region region, -U8 typeFlag +uint8_t typeFlag ) #else -PUBLIC S16 SPrintRegMemStatusInfo(region, typeFlag) +S16 SPrintRegMemStatusInfo(region, typeFlag) Region region; -U8 typeFlag; +uint8_t typeFlag; #endif { Txt prntBuf[150]; - U32 idx; - U32 statMemSize; - U32 dynMemSize; + uint32_t idx; + uint32_t statMemSize; + uint32_t dynMemSize; - TRC1(SPrintRegMemStatusInfo); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT034, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7463,7 +7397,7 @@ U8 typeFlag; else if (typeFlag == SS_MEM_BLK_SIZE_PROFILE) { /* Bucket Memory allocation Statistics */ - RETVALUE(SPrintRegMemStats(region)); + return (SPrintRegMemStats(region)); } else { @@ -7472,7 +7406,7 @@ U8 typeFlag; SDisplay(0, prntBuf); } - RETVALUE(ROK); + return ROK; } /* @@ -7502,10 +7436,9 @@ Region region; { CmMmHashListCp *hashListCp; Txt prntBuf[150]; - U32 idx; - U32 cntEnt; + uint32_t idx; + uint32_t cntEnt; - TRC1(SPrintRegMemStats); hashListCp = &mtCMMRegCb[region]->hashListCp; @@ -7579,7 +7512,7 @@ Region region; sprintf(prntBuf, "\n"); SDisplay(0, prntBuf); - RETVALUE(ROK); + return ROK; } /* @@ -7598,14 +7531,14 @@ Region region; * */ #ifdef ANSI -PUBLIC Void SRegMemErrHdlr +Void SRegMemErrHdlr ( Region region, Data *ptr, S16 errCode ) #else -PUBLIC Void SRegMemErrHdlr(region, ptr, errCode) +Void SRegMemErrHdlr(region, ptr, errCode) Region region; Data *ptr; S16 errCode; @@ -7613,7 +7546,6 @@ S16 errCode; { Txt prntBuf[150]; - TRC1(SRegMemErrHdlr); if (errCode == RDBLFREE) { @@ -7626,7 +7558,7 @@ S16 errCode; SDisplay(0, prntBuf); } - RETVOID; + return; } /* @@ -7646,12 +7578,12 @@ S16 errCode; * */ #ifdef ANSI -PUBLIC S16 SPrintRegMemProfile +S16 SPrintRegMemProfile ( Region region ) #else -PUBLIC S16 SPrintRegMemProfile(region) +S16 SPrintRegMemProfile(region) Region region; #endif { @@ -7662,17 +7594,16 @@ Region region; Size offsetToNxtBlk; Size hdrSize; Txt prntBuf[250]; - U32 idx; - U32 blkCnt; + uint32_t idx; + uint32_t blkCnt; - TRC1(SPrintRegMemProfile); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT035, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7810,7 +7741,7 @@ Region region; * we cannot rely on this size. So it is better to stop here unless there * exists any other mechanism(?) to know the offset to next block. */ - RETVALUE(ROK); + return ROK; } /*mt009.301 Fixed 64BIT compilation warnings*/ @@ -7861,7 +7792,7 @@ Region region; } - RETVALUE(ROK); + return ROK; } #endif /* SSI_DEBUG_LEVEL1 */ @@ -7881,12 +7812,12 @@ Region region; * --*/ #ifdef ANSI -PUBLIC S16 SGetTimeStamp +S16 SGetTimeStamp ( S8 *ts ) #else -PUBLIC S16 SGetTimeStamp(ts) +S16 SGetTimeStamp(ts) S8 *ts; #endif { @@ -7901,7 +7832,6 @@ S8 *ts; S8 time_string[40]; S32 microseconds; - TRC1(SGetTimeStamp); #ifndef SS_LINUX clock_gettime(CLOCK_REALTIME, &ptime); @@ -7934,7 +7864,7 @@ S8 *ts; sprintf(ts, "%s.%03ld", time_string, microseconds); #endif - RETVALUE(ROK); + return ROK; } /*-- mt037.201 : Added new API for SGetSystemTsk --*/ @@ -7952,17 +7882,16 @@ S8 *ts; * --*/ #ifdef ANSI -PUBLIC U32 SGetSystemTsk +uint32_t SGetSystemTsk ( Void ) #else -PUBLIC U32 SGetSystemTsk() +uint32_t SGetSystemTsk() #endif { - TRC1(SGetSystemTskS); - RETVALUE(pthread_self()); + return (pthread_self()); } /* end of SGetSystemTsk */ @@ -7990,7 +7919,6 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() SsSTskEntry *sTsk; S16 ret; - TRC1(ssdAddTmrSTsk); sTsk = NULLP; /* lock the system task table */ ret = SLock(&osCp.sTskTblLock); @@ -8002,7 +7930,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not lock system task table"); #endif - RETVALUE(sTsk); + return (sTsk); } /* check count of system tasks */ @@ -8014,7 +7942,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT040, ERRZERO, "Could not give the Semaphore"); - RETVALUE(sTsk); + return (sTsk); #endif } @@ -8022,7 +7950,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() MTLOGERROR(ERRCLS_ADD_RES, EMT041, ERRZERO, "Too many system tasks"); #endif - RETVALUE(sTsk); + return (sTsk); } @@ -8041,7 +7969,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT042, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -8050,7 +7978,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not initialize demand queue"); #endif - RETVALUE(NULLP); + return (NULLP); } /* initialize the system task entry lock */ @@ -8063,7 +7991,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT044, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -8072,7 +8000,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not initialize system task entry lock"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -8090,11 +8018,11 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } - RETVALUE(sTsk); + return (sTsk); } #endif /* SS_MULTICORE_SUPPORT */ /* mt003.301 Readwrite lock and recursive mutex additions */ @@ -8113,15 +8041,15 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() * */ #ifdef ANSI -PUBLIC S16 ssdInitLockNew +S16 ssdInitLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else -PUBLIC S16 ssdInitLockNew(lockId, lockType) +S16 ssdInitLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { @@ -8131,7 +8059,6 @@ U8 lockType; Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdInitLockNew); switch(lockType) { @@ -8142,7 +8069,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdInitLockNew(): Initialization of read write lock failed,Error# retVal %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8156,7 +8083,7 @@ U8 lockType; { sprintf(prntBuf,"\n ssdInitLockNew(): mutexattr init failed,Error# %d \n",retVal); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_LINUX retVal = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -8168,7 +8095,7 @@ U8 lockType; sprintf(prntBuf,"\n ssdInitLockNew(): mutexattr settype failed,Error# %d \n",retVal); pthread_mutexattr_destroy(&attr); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } retVal = pthread_mutex_init((pthread_mutex_t *)&(lockId->l.recurLock), &attr); if(retVal != 0) @@ -8176,7 +8103,7 @@ U8 lockType; sprintf(prntBuf,"\n ssdInitLockNew(): mutex init failed,Error# %d \n",retVal); pthread_mutexattr_destroy(&attr); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8185,10 +8112,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdInitLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* * @@ -8204,22 +8131,21 @@ U8 lockType; * */ #ifdef ANSI -PUBLIC S16 ssdLockNew +S16 ssdLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else -PUBLIC S16 ssdLockNew(lockId, lockType) +S16 ssdLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdLockNew); switch(lockType) { @@ -8230,7 +8156,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8240,7 +8166,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the write lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8250,7 +8176,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8260,7 +8186,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8272,7 +8198,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the recursive mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8281,11 +8207,11 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -8303,22 +8229,21 @@ U8 lockType; * */ #ifdef ANSI -PUBLIC S16 ssdUnlockNew +S16 ssdUnlockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else -PUBLIC S16 ssdUnlockNew(lockId, lockType) +S16 ssdUnlockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdUnlockNew); switch(lockType) { @@ -8329,7 +8254,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnLockNew(): Failed to unlock the lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8341,7 +8266,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnLockNew(): Failed to aquire the recursive mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8350,10 +8275,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnlockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -8370,21 +8295,20 @@ U8 lockType; * */ #ifdef ANSI -PUBLIC S16 ssdDestroyLockNew +S16 ssdDestroyLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else -PUBLIC S16 ssdDestroyLockNew(lockId, lockType) +S16 ssdDestroyLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdDestroyLockNew); switch(lockType) { @@ -8395,7 +8319,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Failed to destroy the lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8407,7 +8331,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Failed to destroy the mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8416,10 +8340,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCK_SUPPORT */ @@ -8444,18 +8368,17 @@ U8 lockType; * **/ #ifdef ANSI -PUBLIC S16 ssInitRcvWork +S16 ssInitRcvWork ( void ) #else -PUBLIC S16 ssInitRcvWork() +S16 ssInitRcvWork() #endif { pthread_attr_t attr; pthread_t thread; - TRC1(ssInitRcvWork); /* set the required attributes */ pthread_attr_init(&attr); @@ -8468,12 +8391,12 @@ PUBLIC S16 ssInitRcvWork() { pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; }/* ssInitRcvWork */ @@ -8514,7 +8437,6 @@ PRIVATE void *workRcvTsk (ptr) struct timespec ts; Pst pst; - TRC1(workRcvTsk); for (;;) @@ -8592,7 +8514,7 @@ PRIVATE void *workRcvTsk (ptr) #endif /* SS_SEUM_CAVIUM */ #ifdef TENB_RTLIN_CHANGES -PUBLIC S16 SInitLock(SLockId *l, U8 t) +S16 SInitLock(SLockId *l, uint8_t t) { S16 r = 0; pthread_mutexattr_t prior; @@ -8621,7 +8543,7 @@ PUBLIC S16 SInitLock(SLockId *l, U8 t) * */ -PUBLIC Void ssRegMainThread(Void) +Void ssRegMainThread(Void) { if(SS_INVALID_THREAD_REG_MAP != SS_GET_THREAD_MEM_REGION()) @@ -8665,17 +8587,16 @@ PUBLIC Void ssRegMainThread(Void) * File: mt_ss.c * */ -PUBLIC S32 ssCheckAndAddMemoryRegionMap +S32 ssCheckAndAddMemoryRegionMap ( pthread_t threadId, /* Thread Id of system task */ Region region /* Region associated with thread */ ) { - PRIVATE U32 createdThreads; + PRIVATE uint32_t createdThreads; PRIVATE pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; - U32 indx; + uint32_t indx; - TRC1(ssCheckAndAddMemoryRegionMap); /* Here 0xFF is considered as invalid region and if the mapping table * contains 0xFF, that mapping entry is free @@ -8691,7 +8612,7 @@ Region region /* Region associated with thread */ exit(1); } createdThreadIds[createdThreads++] = threadId; - RETVALUE(FALSE); + return (FALSE); } /* If we found free mapping table entry, place the region and send pthread_cancel * for all the thread Ids which are created before this @@ -8711,7 +8632,7 @@ Region region /* Region associated with thread */ } createdThreads = 0; - RETVALUE(TRUE); + return (TRUE); } /* ssCheckAndAddMemoryRegionMap */ @@ -8739,13 +8660,12 @@ Region region /* Region associated with thread */ * File: mt_ss.c * */ -PUBLIC S32 ssCheckAndDelMemoryRegionMap +S32 ssCheckAndDelMemoryRegionMap ( pthread_t threadId /* Thread Id of system task */ ) { - TRC1(ssCheckAndDelMemoryRegionMap); /* Raghu To-Do Check with team, is it necessary to acquire lock * as del and add may go parallel */ @@ -8756,18 +8676,18 @@ pthread_t threadId /* Thread Id of system task */ osCp.threadMemoryRegionMap[((threadId >> SS_MEM_THREAD_ID_SHIFT) % SS_MAX_THREAD_REGION_MAP)]) { #ifndef ALIGN_64BIT - printf("Invalid Thread ID (%ld)\n", (U32)threadId); + printf("Invalid Thread ID (%ld)\n", (uint32_t)threadId); #else - printf("Invalid Thread ID (%d)\n", (U32)threadId); + printf("Invalid Thread ID (%d)\n", (uint32_t)threadId); #endif - RETVALUE(RFAILED); + return RFAILED; } /* If we found free mapping table entry, place the region and send pthread_cancel * for all the thread Ids which are created before this */ osCp.threadMemoryRegionMap[((threadId >> SS_MEM_THREAD_ID_SHIFT) % SS_MAX_THREAD_REGION_MAP)] = SS_INVALID_THREAD_REG_MAP; - RETVALUE(ROK); + return ROK; } /* ssCheckAndAddMemoryRegionMap */ @@ -8788,21 +8708,21 @@ pthread_t threadId /* Thread Id of system task */ * */ #ifdef ANSI -PUBLIC S16 SStartTask +S16 SStartTask ( -VOLATILE U32 *startTime, -U32 taskId +VOLATILE uint32_t *startTime, +uint32_t taskId ) #else -PUBLIC S16 SStartTask(startTime, taskId) -VOLATILE U32 *startTime; -U32 taskId; +S16 SStartTask(startTime, taskId) +VOLATILE uint32_t *startTime; +uint32_t taskId; #endif { #ifdef MSPD_MLOG_NEW *startTime = GetTIMETICK(); #endif - RETVALUE(ROK); + return ROK; } /* @@ -8821,18 +8741,18 @@ U32 taskId; * */ #ifdef ANSI -PUBLIC S16 SStopTask +S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +VOLATILE uint32_t startTime, +uint32_t taskId ) #else -PUBLIC S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; +S16 SStopTask(startTime, taskId) +VOLATILE uint32_t startTime; +uint32_t taskId; #endif { - /*U32 stopTime;*/ + /*uint32_t stopTime;*/ switch(taskId) { case PID_MAC_HARQ_IND: @@ -8866,38 +8786,38 @@ U32 taskId; #endif break; } - RETVALUE(ROK); + return ROK; } #else #ifdef ANSI -PUBLIC S16 SStartTask +S16 SStartTask ( -VOLATILE U32 * startTime, -U32 taskId +VOLATILE uint32_t *startTime, +uint32_t taskId ) #else -PUBLIC S16 SStartTask(startTime, taskId) -VOLATILE U32 * startTime; -U32 taskId; +S16 SStartTask(startTime, taskId) +VOLATILE uint32_t *startTime; +uint32_t taskId; #endif { *startTime = 0; - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC S16 SStopTask +S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +VOLATILE uint32_t startTime, +uint32_t taskId ) #else -PUBLIC S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; +S16 SStopTask(startTime, taskId) +VOLATILE uint32_t startTime; +uint32_t taskId; #endif { - RETVALUE(ROK); + return ROK; } #endif /*#ifdef SS_TSKLOG_ENABLE */ @@ -8911,31 +8831,31 @@ U32 taskId; * @return Void - function is always success */ #ifdef ANSI -PUBLIC Void UpdateSocCpuInfo +Void UpdateSocCpuInfo ( CmCpuStatsInfo *cpuInfo, -U8 idx +uint8_t idx ) #else -PUBLIC Void UpdateSocCpuInfo(*cpuInfo, idx) +Void UpdateSocCpuInfo(*cpuInfo, idx) CmCpuStatsInfo *cpuInfo; -U8 idx; +uint8_t idx; #endif { FILE *mipsFd; - S8 mipsStr[MIPS_STRING_LEN]; + S8 mipsStr[MIPS_STRING_LEN]; S8 *strPart; - U32 l2FreeCpu; - U32 l2CpuUsed; - U32 l3FreeCpu; - U32 l3CpuUsed; + uint32_t l2FreeCpu; + uint32_t l2CpuUsed; + uint32_t l3FreeCpu; + uint32_t l3CpuUsed; /* Open the file which holds the MIPS available value */ mipsFd = fopen(MIPS_FILE, "r"); if(mipsFd == NULLP) { - RETVOID; + return; } /* Get the free mips available value from the file */ @@ -8943,7 +8863,7 @@ U8 idx; { printf("fgets to get the free mips available failed\n"); fclose(mipsFd); - RETVOID; + return; } strtok(mipsStr, " "); @@ -8957,7 +8877,7 @@ U8 idx; l2FreeCpu = atoi(strPart); l2CpuUsed = 100 - l2FreeCpu; cpuInfo->cpuUtil[0].totCpuUtil += l2CpuUsed; - cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l2CpuUsed);; + cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l2CpuUsed); cpuInfo->cpuUtil[0].numSamples++; } } @@ -8969,7 +8889,7 @@ U8 idx; l3FreeCpu = atoi(strPart); l3CpuUsed = 100 - l3FreeCpu; cpuInfo->cpuUtil[0].totCpuUtil += l3CpuUsed; - cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l3CpuUsed);; + cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l3CpuUsed); cpuInfo->cpuUtil[0].numSamples++; } } @@ -8983,7 +8903,7 @@ U8 idx; } fclose(mipsFd); - RETVOID; + return; } #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #ifdef SS_MULTICORE_SUPPORT @@ -9003,17 +8923,16 @@ U8 idx; --*/ #ifdef ANSI PRIVATE SsSTskEntry* ssdReAddTmrSTsk( -U8 idx +uint8_t idx ) #else PRIVATE SsSTskEntry* ssdReAddTmrSTsk(idx) -U8 idx; +uint8_t idx; #endif { SsSTskEntry *sTsk; S16 ret; - TRC1(ssdReAddTmrSTsk); sTsk = NULLP; /* lock the system task table */ ret = SLock(&osCp.sTskTblLock); @@ -9025,7 +8944,7 @@ U8 idx; "Could not lock system task table"); #endif - RETVALUE(sTsk); + return (sTsk); } /* initialize the system task entry with the information we have */ @@ -9050,7 +8969,7 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT042, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -9059,7 +8978,7 @@ U8 idx; "Could not initialize demand queue"); #endif - RETVALUE(NULLP); + return (NULLP); } /* initialize the system task entry lock */ @@ -9072,7 +8991,7 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT044, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -9081,7 +9000,7 @@ U8 idx; "Could not initialize system task entry lock"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -9097,11 +9016,11 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } - RETVALUE(sTsk); + return (sTsk); } #endif /* SS_MULTICORE_SUPPORT */ @@ -9121,27 +9040,26 @@ U8 idx; * */ #ifdef ANSI -PUBLIC S16 ssdReInitTmr +S16 ssdReInitTmr ( void ) #else -PUBLIC S16 ssdReInitTmr() +S16 ssdReInitTmr() #endif { pthread_attr_t attr; struct sched_param param_sched; #ifndef XEON_SPECIFIC_CHANGES - U8 ret = ROK; + uint8_t ret = ROK; #endif #ifdef SS_MULTICORE_SUPPORT SsSTskEntry *sTsk; #endif /* SS_MULTICORE_SUPPORT */ #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif /* SS_THR_REG_MAP */ - TRC0(ssdReInitTmr); #ifndef XEON_SPECIFIC_CHANGES ret = ssCheckAndDelMemoryRegionMap(osCp.dep.tmrHdlrTID); @@ -9151,7 +9069,7 @@ PUBLIC S16 ssdReInitTmr() MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9162,7 +9080,7 @@ PUBLIC S16 ssdReInitTmr() sTsk = ssdReAddTmrSTsk(0); if(!sTsk) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTICORE_SUPPORT */ /* create the timer handler thread */ @@ -9192,7 +9110,7 @@ PUBLIC S16 ssdReInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP @@ -9207,7 +9125,7 @@ PUBLIC S16 ssdReInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); sem_post(&osCp.dep.ssStarted); - RETVALUE(ROK); + return ROK; } /**********************************************************************