X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=1001da39b09d28d4356a161e97c6ff98a5cad1d1;hb=ed6746a6081339633c3baa314251fcc11b98ce10;hp=d909e4b504d2e5ec0d30a253fda6bb1f437b86f1;hpb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index d909e4b50..1001da39b 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -204,14 +204,7 @@ Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); void dump_external(void); -#ifdef ANSI -static Void mtDelSigals -( -Void -) -#else -static Void mtDelSignals() -#endif +static Void mtDelSigals(Void) { struct sigaction sa; @@ -510,7 +503,19 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { SS_POOL_DYNAMIC, MT_POOL_4_DSIZE }, { SS_POOL_STATIC, 0 } } + }, + { + SS_DFLT_REGION + 6, SS_MAX_POOLS_PER_REG - 1, + { + { SS_POOL_DYNAMIC, MT_POOL_0_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_1_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_2_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_3_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_4_DSIZE }, + { SS_POOL_STATIC, 0 } + } } + #endif /* SS_LOCKLESS_MEMORY */ }; /* mt003.301 Modifications - File Based task registration made @@ -593,11 +598,23 @@ MtDynMemCfg mtDynMemoCfg = {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } + }, + { + SS_DFLT_REGION + 6, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + { + /* block size, no. of blocks, Upper threshold, lower threshold */ + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} + } } #if ((defined (SPLIT_RLC_DL_TASK)) && (!defined (L2_L3_SPLIT))) , { - SS_DFLT_REGION + 4, /* region id */ + SS_DFLT_REGION + 7, /* region id */ MT_MAX_BKTS, /* number of buckets */ { /* block size, no. of blocks, Upper threshold, lower threshold */ @@ -736,6 +753,18 @@ MtMemCfg mtMemoCfg = {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ } }, + { + SS_DFLT_REGION + 5, /* 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 */ + {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ + } + }, { SS_DFLT_REGION + 5, /* region id */ MT_MAX_BKTS, /* number of buckets */ @@ -874,17 +903,11 @@ static int SOpenWlsIntf() * File: mt_ss.c * */ -#ifdef ANSI int main ( int argc, /* argument count */ char **argv /* argument vector */ ) -#else -int main(argc, argv) -int argc; /* argument count */ -char **argv; /* argument vector */ -#endif { #ifdef XEON_MULTIPLE_CELL_CHANGES @@ -934,17 +957,11 @@ char **argv; /* argument vector */ * File: mt_ss.c * */ -#ifdef ANSI int ssMain ( int argc, /* argument count */ char **argv /* argument vector */ ) -#else -int ssMain(argc, argv) -int argc; /* argument count */ -char **argv; /* argument vector */ -#endif { @@ -976,14 +993,7 @@ char **argv; /* argument vector */ * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitGen -( -void -) -#else -S16 ssdInitGen() -#endif +S16 ssdInitGen(void) { struct sigaction act; sigset_t set; @@ -1135,14 +1145,7 @@ S16 ssdInitGen() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitGen -( -void -) -#else -Void ssdDeinitGen() -#endif +Void ssdDeinitGen(void) { @@ -1168,19 +1171,12 @@ Void ssdDeinitGen() * File: cm_mem.c * */ -#ifdef ANSI S16 ssPutDynMemBlkSet ( uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is needs to be added to global region */ ) -#else -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 { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1226,19 +1222,12 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be * File: cm_mem.c * */ -#ifdef ANSI S16 ssGetDynMemBlkSet ( uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is updated with new set values */ ) -#else -S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -uint8_t bktIdx; /* Index to bucket list */ -CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated - with new set values */ -#endif { CmMmGlobRegCb *globReg; @@ -1288,21 +1277,13 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated * File: cm_mem.c * */ -#ifdef ANSI S16 ssPutDynMemBlkSet ( -uint8_t 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 */ -uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) -#else -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 */ -uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1375,7 +1356,6 @@ uint32_t doNotBlockForLock; /* Boolean whether to block for * File: cm_mem.c * */ -#ifdef ANSI S16 ssGetDynMemBlkSet ( uint8_t bktIdx, /* Index to bucket list */ @@ -1383,13 +1363,6 @@ CmMmBlkSetElement *dynMemSetElem, /* Memory set element which is updat with new set values */ uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) -#else -S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -uint8_t bktIdx; /* Index to bucket list */ -CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated - with new set values */ -uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1448,14 +1421,7 @@ uint32_t doNotBlockForLock; /* Boolean whether to block for uint32_t gDynMemAlrm[4]; static uint32_t memoryCheckCounter; -#ifdef ANSI -uint32_t isMemThreshReached( -Region reg -) -#else -uint32_t isMemThreshReached(reg) -Region reg; -#endif +uint32_t isMemThreshReached(Region reg) { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1519,15 +1485,7 @@ Region reg; * File: mt_ss.c * */ -#ifdef ANSI -Void * ssGetIccHdl -( -Region region -) -#else -Void * ssGetIccHdl() -Region region; -#endif +Void * ssGetIccHdl(Region region) { CmMmDynRegCb *dynRegCb; @@ -1766,14 +1724,7 @@ S16 SAllocateStaticMem() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitMem -( -void -) -#else -S16 ssdInitMem() -#endif +S16 ssdInitMem(void) { /* mt018.201 - added local variable */ uint8_t i; @@ -2083,14 +2034,7 @@ S16 ssdInitMem() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitMem -( -void -) -#else -Void ssdDeinitMem() -#endif +Void ssdDeinitMem(void) { /* mt018.201 - added local variables */ uint8_t i; @@ -2126,14 +2070,7 @@ Void ssdDeinitMem() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitTsk -( -void -) -#else -S16 ssdInitTsk() -#endif +S16 ssdInitTsk(void) { /* mt001.301 : Additions */ /*mt013.301 :Added SS_AFFINITY_SUPPORT */ @@ -2169,14 +2106,7 @@ S16 ssdInitTsk() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitTsk -( -void -) -#else -Void ssdDeinitTsk() -#endif +Void ssdDeinitTsk(void) { return; @@ -2198,14 +2128,7 @@ Void ssdDeinitTsk() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitDrvr -( -void -) -#else -S16 ssdInitDrvr() -#endif +S16 ssdInitDrvr(void) { S16 i; #ifndef L2_L3_SPLIT @@ -2276,14 +2199,7 @@ S16 ssdInitDrvr() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitDrvr -( -void -) -#else -Void ssdDeinitDrvr() -#endif +Void ssdDeinitDrvr(void) { /* mt008.301: Terminate the Driver Task on exit */ while(pthread_cancel(osCp.dep.isTskHdlrTID)); @@ -2315,14 +2231,7 @@ Void ssdDeinitDrvr() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitTmr -( -void -) -#else -S16 ssdInitTmr() -#endif +S16 ssdInitTmr(void) { pthread_attr_t attr; struct sched_param param_sched; @@ -2412,14 +2321,7 @@ S16 ssdInitTmr() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitTmr -( -void -) -#else -Void ssdDeinitTmr() -#endif +Void ssdDeinitTmr(void) { #ifdef SS_MULTICORE_SUPPORT SsSTskEntry *sTsk; @@ -2477,14 +2379,7 @@ Void ssdDeinitTmr() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitLog -( -void -) -#else -S16 ssdInitLog() -#endif +S16 ssdInitLog(void) { /* mt027.201 - Modification to fix warnings with no STDIN and STDOUT */ #ifdef CONAVL @@ -2583,14 +2478,7 @@ S16 ssdInitLog() * */ /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */ -#ifdef ANSI -Void ssdDeinitLog -( -void -) -#else -Void ssdDeinitLog() -#endif +Void ssdDeinitLog(void) { /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */ #ifdef CONAVL @@ -2606,15 +2494,7 @@ Void ssdDeinitLog() #ifdef SS_WATCHDOG -#ifdef ANSI -S16 ssdInitWatchDog -( -uint16_t port -) -#else -S16 ssdInitWatchDog(port) -uint16_t port; -#endif +S16 ssdInitWatchDog(uint16_t port) { uint8_t idx; Txt prntBuf[PRNTSZE]; @@ -2729,15 +2609,7 @@ uint16_t port; return ROK; } -#ifdef ANSI -S16 ssdInitWatchDgPst -( -Pst *pst -) -#else -S16 ssdInitWatchDgPst(pst) -Pst *pst; -#endif +S16 ssdInitWatchDgPst(Pst *pst) { pst->selector = SS_LOOSE_COUPLING; @@ -2757,7 +2629,6 @@ Pst *pst; } #ifdef SS_MULTIPLE_PROCS -#ifdef ANSI S16 ssdWatchDgActvTmr ( ProcId proc, @@ -2765,17 +2636,7 @@ Ent ent, Inst inst ) #else -S16 ssdWatchDgActvTmr(proc, ent, inst) -#endif -#else -#ifdef ANSI -S16 ssdWatchDgActvTmr -( -Void -) -#else -S16 ssdWatchDgActvTmr() -#endif +S16 ssdWatchDgActvTmr(Void) #endif /* SS_MULTIPLE_PROCS */ { @@ -2784,17 +2645,11 @@ S16 ssdWatchDgActvTmr() return ROK; } -#ifdef ANSI Void ssdWatchDgTmrEvt ( PTR cb, /* control block */ S16 event /* timer number */ ) -#else -Void ssdWatchDgTmrEvt(cb, event) -PTR cb; /* control block */ -S16 event; /* timer number */ -#endif { /* mt003.301 Fixed warings */ #ifdef DEBUGP @@ -2844,19 +2699,12 @@ S16 event; /* timer number */ } -#ifdef ANSI Void ssdStartWatchDgTmr ( -void *cb, -S16 event, -uint16_t wait +void *cb, +S16 event, +uint16_t wait ) -#else -Void ssdStartWatchDgTmr(cb, event, wait) -void *cb; -S16 event; -uint16_t wait; -#endif { CmTmrArg arg; int i; @@ -2899,17 +2747,11 @@ uint16_t wait; return; } -#ifdef ANSI Void ssdStopWatchDgTmr ( -void *cb, -S16 event +void *cb, +S16 event ) -#else -Void ssdStopWatchDgTmr(cb, event) -void *cb; -S16 event; -#endif { CmTmrArg arg; #ifdef DEBUGP @@ -2949,17 +2791,11 @@ S16 event; return; } -#ifdef ANSI S16 ssdSndHrtBtMsg ( -Bool restart, -uint32_t type +Bool restart, +uint32_t type ) -#else -S16 ssdSndHrtBtMsg(restart, type) -Bool restart; -uint32_t type; -#endif { S16 ret = ROK; #ifdef DEBUGP @@ -3043,14 +2879,7 @@ uint32_t type; * File: mt_ss.c * */ -#ifdef ANSI -static Void mtGetOpts -( -void -) -#else -static Void mtGetOpts() -#endif +static Void mtGetOpts(void) { S32 argc; S8 **argv; @@ -3427,19 +3256,12 @@ static Void mtGetOpts() * File: mt_ss.c * */ -#ifdef ANSI S16 SGetOpt ( int argc, /* argument count */ char **argv, /* argument value */ char *opts /* options */ ) -#else -S16 SGetOpt(argc, argv, opts) -int argc; /* argument count */ -char **argv; /* argument value */ -char *opts; /* options */ -#endif { /* mt020.201 - Removed for no command line */ #ifndef NOCMDLINE @@ -3541,14 +3363,7 @@ char *opts; /* options */ * File: mt_ss.c * */ -#ifdef ANSI -Void ssdStart -( -void -) -#else -Void ssdStart() -#endif +Void ssdStart(void) { S16 i; @@ -3585,15 +3400,10 @@ Void ssdStart() * File: mt_ss.c * */ -#ifdef ANSI S16 ssdAttachTTsk ( SsTTskEntry *tTsk /* pointer to TAPA task entry */ ) -#else -S16 ssdAttachTTsk(tTsk) -SsTTskEntry *tTsk; /* pointer to TAPA task entry */ -#endif { Buffer *mBuf; SsMsgInfo *mInfo; @@ -3669,15 +3479,10 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdDetachTTsk ( SsTTskEntry *tTsk /* pointer to TAPA task entry */ ) -#else -S16 ssdDetachTTsk(tTsk) -SsTTskEntry *tTsk; /* pointer to TAPA task entry */ -#endif { return ROK; @@ -3698,15 +3503,10 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdCreateSTsk ( SsSTskEntry *sTsk /* pointer to system task entry */ ) -#else -S16 ssdCreateSTsk(sTsk) -SsSTskEntry *sTsk; /* pointer to system task entry */ -#endif { S16 ret; pthread_attr_t attr; @@ -3832,7 +3632,6 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ } -#ifdef ANSI int SCreatePThread ( pthread_t* tid, @@ -3840,13 +3639,6 @@ pthread_attr_t* attr, void *(*start_routine) (void *), void* arg ) -#else -int SCreatePThread(tid, attr, start_routine, arg) -pthread_t* tid; -pthread_attr_t* attr; -void *(*start_routine) (void *); -void* arg; -#endif { int retVal = 0; #ifdef SS_THR_REG_MAP @@ -3906,17 +3698,11 @@ void* arg; * */ -#ifdef ANSI static S16 ssdSetPthreadAttr ( S32 tskPrior, pthread_attr_t *attr ) -#else -static S16 ssdSetPthreadAttr(sTsk, attr) -S32 tskPrior, -pthread_attr_t *attr -#endif { struct sched_param param; @@ -3984,17 +3770,11 @@ pthread_attr_t *attr * File: ss_task.c * */ -#ifdef ANSI S16 ssdGetAffinity ( SSTskId *tskId, /* filled in with system task ID */ uint32_t *coreId /* the core/processor id to which the affinity is set */ ) -#else -S16 ssdGetAffinity(tskId, coreId) -SSTskId *tskId; /* filled in with system task ID */ -uint32_t *coreId; /* the core/processor id to which the affinity is set */ -#endif { uint32_t tskInd; @@ -4100,17 +3880,11 @@ uint32_t *coreId; /* the core/processor id to which the affin * File: ss_task.c * */ -#ifdef ANSI S16 ssdSetAffinity ( SSTskId *tskId, /* filled in with system task ID */ uint32_t coreId /* the core/processor id to which the affinity has to be set */ ) -#else -S16 ssdSetAffinity(tskId, coreId) -SSTskId *tskId; /* filled in with system task ID */ -uint32_t coreId; /* the core/processor id to which the affinity has to be set */ -#endif { uint32_t tskInd = 0; @@ -4212,15 +3986,10 @@ uint32_t coreId; /* the core/processor id to which the affin * File: mt_ss.c * */ -#ifdef ANSI S16 ssdDestroySTsk ( SsSTskEntry *sTsk /* pointer to system task entry */ ) -#else -S16 ssdDestroySTsk(sTsk) -SsSTskEntry *sTsk; /* pointer to system task entry */ -#endif { Buffer *mBuf; SsMsgInfo *mInfo; @@ -4273,14 +4042,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SThreadYield -( -void -) -#else -S16 SThreadYield() -#endif +S16 SThreadYield(void) { @@ -4324,15 +4086,10 @@ S16 SThreadYield() * File: mt_ss.c * */ -#ifdef ANSI S16 ssdRegTmr ( SsTmrEntry *tmr /* pointer to timer entry */ ) -#else -S16 ssdRegTmr(tmr) -SsTmrEntry *tmr; /* pointer to timer entry */ -#endif { CmTmrArg arg; @@ -4373,15 +4130,10 @@ SsTmrEntry *tmr; /* pointer to timer entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdDeregTmr ( SsTmrEntry *tmr /* pointer to timer entry */ ) -#else -S16 ssdDeregTmr(tmr) -SsTmrEntry *tmr; /* pointer to timer entry */ -#endif { CmTmrArg arg; @@ -4418,17 +4170,11 @@ SsTmrEntry *tmr; /* pointer to timer entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdError ( Seq seq, /* sequence number */ Reason reason /* reset reason */ ) -#else -S16 ssdError(seq, reason) -Seq seq; /* sequence number */ -Reason reason; /* reset reason */ -#endif { S16 i; pthread_t tId; @@ -4480,7 +4226,6 @@ Reason reason; /* reset reason */ * File: mt_ss.c * */ -#ifdef ANSI Void ssdLogError ( Ent ent, /* Calling layer's entity id */ @@ -4493,19 +4238,6 @@ ErrCode errCode, /* layer unique error code */ ErrVal errVal, /* error value */ Txt *errDesc /* description of error */ ) -#else -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 */ -ProcId procId; /* Calling layer's processor id */ -Txt *file; /* file name where error occured */ -S32 line; /* line in file where error occured */ -ErrCls errCls; /* error class */ -ErrCode errCode; /* layer unique error code */ -ErrVal errVal; /* error value */ -Txt *errDesc; /* description of error */ -#endif { #ifndef DEBUGNOEXIT S16 i; @@ -4613,15 +4345,10 @@ Txt *errDesc; /* description of error */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdRegDrvrTsk ( SsDrvrTskEntry *drvrTsk /* driver task entry */ ) -#else -S16 ssdRegDrvrTsk(drvrTsk) -SsDrvrTskEntry *drvrTsk; /* driver task entry */ -#endif { @@ -4642,15 +4369,10 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 ssdDeregDrvrTsk ( SsDrvrTskEntry *drvrTsk /* driver task entry */ ) -#else -S16 ssdDeregDrvrTsk(drvrTsk) -SsDrvrTskEntry *drvrTsk; /* driver task entry */ -#endif { @@ -4665,31 +4387,18 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ * mt003.301 Additions - SDeRegTTsk fix */ #ifdef SS_MULTIPLE_PROCS -#ifdef ANSI S16 ssdProcTTskTerm ( ProcId procIdx, SsTTskEntry *tTsk, SsIdx idx ) -#else -S16 ssdProcTTskTerm(procIdx, tTsk, idx) -ProcId procIdx; -SsTTskEntry *tTsk; -SsIdx idx; -#endif #else /*SS_MULTIPLE_PROCS*/ -#ifdef ANSI S16 ssdProcTTskTerm ( SsTTskEntry *tTsk, SsIdx idx ) -#else -S16 ssdProcTTskTerm(tTsk, idx) -SsTTskEntry *tTsk; -SsIdx idx; -#endif #endif /*SS_MULTIPLE_PROCS*/ { #ifdef SS_MULTIPLE_PROCS @@ -4820,15 +4529,10 @@ SsIdx idx; Void ysMtTskHdlr(Void); Void ysMtPollPhyMsg(uint8_t region); Void ysMtRcvPhyMsg(Void); -#ifdef ANSI Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) -#else -Void *mtTskHdlrT2kL2(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { S16 ret; @@ -4856,15 +4560,10 @@ Ptr tskPtr; /* pointer to task entry */ #else Void ysMtTskHdlr(Void); Void YsPhyRecvMsg(); -#ifdef ANSI Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) -#else -Void *mtTskHdlrT2kL2(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { S16 ret; SsSTskEntry *sTsk; @@ -4916,15 +4615,7 @@ Ptr tskPtr; /* pointer to task entry */ #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #endif -#ifdef ANSI -void *pthreadCreateHdlr -( -void * arg -) -#else -void *pthreadCreateHdlr(pthreadCreateArg) -void *arg; -#endif +void *pthreadCreateHdlr(void * arg) { S16 ret; SPThreadCreateArg* pthreadCreateArg = (SPThreadCreateArg*)arg; @@ -4955,15 +4646,10 @@ void *arg; * File: mt_ss.c * */ -#ifdef ANSI Void *mtTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) -#else -Void *mtTskHdlr(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { S16 ret; SsSTskEntry *sTsk; @@ -5021,15 +4707,10 @@ Ptr tskPtr; /* pointer to task entry */ * File: mt_ss.c * */ -#ifdef ANSI S16 mtTskHdlMsg ( SsSTskEntry *sTsk ) -#else -S16 mtTskHdlMsg(sTsk) -SsSTskEntry *sTsk -#endif { S16 i; S16 ret; @@ -5427,13 +5108,7 @@ Bool g_usettitmr; /* * Fun: mtTmrHdlrPublic */ -#ifdef ANSI -Void mtTmrHdlrPublic -( -) -#else Void mtTmrHdlrPublic() -#endif { if (SLock(&osCp.tmrTblLock) != ROK) { @@ -5464,16 +5139,10 @@ Void mtTmrHdlrPublic() * */ /*mt041.201 Modified SSI tick handling in mtTmrHdlr() */ -#ifdef ANSI static Void *mtTmrHdlr ( void *parm /* unused */ ) -#else - /* mt009.21: addition */ -static Void *mtTmrHdlr(parm) -void *parm; /* unused */ -#endif { /*mt004.301-addede new region*/ /* mt010.301 Removed SS_FAP portion and @@ -5627,17 +5296,11 @@ void *parm; /* unused */ * File: mt_ss.c * */ -#ifdef ANSI Void mtTimeout ( PTR tCb, /* control block */ S16 evnt /* event */ ) -#else -Void mtTimeout(tCb, evnt) -PTR tCb; /* control block */ -S16 evnt; /* event */ -#endif { Buffer *mBuf; SsMsgInfo *mInfo; @@ -5863,16 +5526,10 @@ S16 evnt; /* event */ * File: mt_ss.c * */ -#ifdef ANSI static Void *mtConHdlr ( Ptr parm /* unused */ ) -#else - /* mt009.21: addition */ -static Void *mtConHdlr(parm) -Ptr parm; /* unused */ -#endif { int fd; Data data; @@ -5931,17 +5588,11 @@ Ptr parm; /* unused */ * File: mt_ss.c * */ -#ifdef ANSI /* mt009.21: addition */ static Void *mtIsTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) -#else - /* mt009.21: addition */ -static Void *mtIsTskHdlr(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { #if (ERRCLASS & ERRCLS_DEBUG) int ret; @@ -6036,15 +5687,7 @@ Ptr tskPtr; /* pointer to task entry */ * File: mt_ss.c * */ -#ifdef ANSI -Void mtIntSigHndlr -( -int arg -) -#else -Void mtIntSigHndlr(arg) -int arg; -#endif +Void mtIntSigHndlr(int arg) { osCp.dep.sigEvnt=TRUE; @@ -6072,14 +5715,7 @@ int arg; * File: mt_ss.c * */ -#ifdef ANSI -Void mtExitClnup -( -void -) -#else -Void mtExitClnup() -#endif +Void mtExitClnup(void) { Ticks ticks; S8 buf[128]; @@ -6134,17 +5770,11 @@ Ticks SGetTtiCount(Void) * File: mt_ss.c * */ -#ifdef ANSI S16 SDisplay ( S16 chan, /* channel */ Txt *buf /* buffer */ ) -#else -S16 SDisplay(chan, buf) -S16 chan; /* channel */ -Txt *buf; /* buffer */ -#endif { /* mt020.201 - Fixed typo */ @@ -6204,14 +5834,7 @@ Txt *buf; /* buffer */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SFini -( -void -) -#else -S16 SFini() -#endif +S16 SFini(void) { /* mt030.201 added under compilet time flag SS_LINUX and SLES9_PLUS @@ -6248,15 +5871,10 @@ S16 SFini() * File: mt_ss.c * */ -#ifdef ANSI S16 SSetDateTime ( REG1 DateTime *dt /* date and time */ ) -#else -S16 SSetDateTime(dt) -REG1 DateTime *dt; /* date and time */ -#endif { UNUSED(dt); @@ -6282,15 +5900,10 @@ REG1 DateTime *dt; /* date and time */ * File: mt_ss.c * */ -#ifdef ANSI S16 SGetDateTime ( REG1 DateTime *dt /* date and time */ ) -#else -S16 SGetDateTime(dt) -REG1 DateTime *dt; /* date and time */ -#endif { /*-- mt035.201 : SSI enhancements for micro second in datetime struct --*/ /* time_t tt; --*/ @@ -6361,15 +5974,10 @@ REG1 DateTime *dt; /* date and time */ * File: mt_ss.c */ /* mt003.301 Modifications */ -#ifdef ANSI S16 SGetEpcTime ( EpcTime *et /* date and time */ ) -#else -S16 SGetEpcTime(et) -EpcTime *et; /* date and time */ -#endif { /* mt003.301 Modifications */ static uint64_t now; @@ -6427,15 +6035,10 @@ static uint64_t now; * File: mt_ss.c * */ -#ifdef ANSI S16 SGetSysTime ( Ticks *sysTime /* system time */ ) -#else -S16 SGetSysTime(sysTime) -Ticks *sysTime; /* system time */ -#endif { @@ -6474,19 +6077,12 @@ Ticks *sysTime; /* system time */ * File: mt_ss.c * */ -#ifdef ANSI S16 SGetRefTime ( uint32_t refTime, /* reference time */ uint32_t *sec, uint32_t *usec ) -#else -S16 SGetRefTime(refTime, sec, usec) -uint32_t refTime; /* reference time */ -uint32_t *sec; -uint32_t *usec; -#endif { #ifndef SS_LINUX @@ -6543,15 +6139,10 @@ uint32_t *usec; * File: mt_ss.c * */ -#ifdef ANSI S16 SRandom ( Random *value /* random number */ ) -#else -S16 SRandom(value) -Random *value; /* random number */ -#endif { @@ -6585,14 +6176,7 @@ Random *value; /* random number */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SExitTsk -( -void -) -#else -S16 SExitTsk() -#endif +S16 SExitTsk(void) { @@ -6613,14 +6197,7 @@ S16 SExitTsk() * File: mt_ss.c * */ -#ifdef ANSI -S16 SExitInt -( -void -) -#else -S16 SExitInt() -#endif +S16 SExitInt(void) { @@ -6645,14 +6222,7 @@ S16 SExitInt() * File: mt_ss.c * */ -#ifdef ANSI -S16 SHoldInt -( -void -) -#else -S16 SHoldInt() -#endif +S16 SHoldInt(void) { @@ -6673,14 +6243,7 @@ S16 SHoldInt() * File: mt_ss.c * */ -#ifdef ANSI -S16 SRelInt -( -void -) -#else -S16 SRelInt() -#endif +S16 SRelInt(void) { @@ -6702,14 +6265,7 @@ S16 SRelInt() * File: mt_ss.c * */ -#ifdef ANSI -inline S16 SEnbInt -( -void -) -#else -inline S16 SEnbInt() -#endif +inline S16 SEnbInt(void) { @@ -6731,14 +6287,7 @@ inline S16 SEnbInt() * File: mt_ss.c * */ -#ifdef ANSI -inline S16 SDisInt -( -void -) -#else -inline S16 SDisInt() -#endif +inline S16 SDisInt(void) { @@ -6760,17 +6309,11 @@ inline S16 SDisInt() * File: mt_ss.c * */ -#ifdef ANSI S16 SGetVect ( VectNmb vectNmb, /* vector number */ PIF *vectFnct /* vector function */ ) -#else -S16 SGetVect(vectNmb, vectFnct) -VectNmb vectNmb; /* vector number */ -PIF *vectFnct; /* vector function */ -#endif { @@ -6796,17 +6339,11 @@ PIF *vectFnct; /* vector function */ * File: mt_ss.c * */ -#ifdef ANSI S16 SPutVect ( VectNmb vectNmb, /* vector number */ PIF vectFnct /* vector function */ ) -#else -S16 SPutVect(vectNmb, vectFnct) -VectNmb vectNmb; /* vector number */ -PIF vectFnct; /* vector function */ -#endif { @@ -6835,17 +6372,11 @@ PIF vectFnct; /* vector function */ * File: mt_ss.c * */ -#ifdef ANSI S16 SGetEntInst ( Ent *ent, /* entity */ Inst *inst /* instance */ ) -#else -S16 SGetEntInst(ent, inst) -Ent *ent; /* entity */ -Inst *inst; /* instance */ -#endif { S16 i; S16 ret; @@ -6909,17 +6440,11 @@ Inst *inst; /* instance */ * File: mt_ss.c * */ -#ifdef ANSI S16 SSetEntInst ( Ent ent, /* entity */ Inst inst /* instance */ ) -#else -S16 SSetEntInst(ent, inst) -Ent ent; /* entity */ -Inst inst; /* instance */ -#endif { S16 i; S16 ret; @@ -6987,17 +6512,11 @@ Inst inst; /* instance */ * File: mt_ss.c * */ -#ifdef ANSI inline S16 SSetIntPend ( uint16_t id, /* driver task identifier */ Bool flag /* flag */ ) -#else -inline S16 SSetIntPend(id, flag) -uint16_t id; /* driver task identifier */ -Bool flag; /* flag */ -#endif { MtIsFlag isFlag; @@ -7042,14 +6561,7 @@ Bool flag; /* flag */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SGlobMemInfoShow -( -Void -) -#else -S16 SGlobMemInfoShow() -#endif +S16 SGlobMemInfoShow(Void) { uint16_t idx; Txt prntBuf[100]; @@ -7143,17 +6655,11 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) * File: mt_ss.c * */ -#ifdef ANSI S16 SRegInfoShow ( Region region, uint32_t *availmem ) -#else -S16 SRegInfoShow(region, availmem) -Region region; -uint32_t *availmem; -#endif { uint16_t idx; Txt prntBuf[100]; @@ -7252,17 +6758,11 @@ 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 static Void SInitMemThreshold ( Region region, uint8_t maxBkt ) -#else -static Void SInitMemThreshold(region, maxBkt) -Region region; -uint8_t maxBkt; -#endif { uint8_t idx = 0; for (idx = 0; (idx < maxBkt && idx < mtCMMRegCb[region]->numBkts); idx++) @@ -7274,17 +6774,11 @@ uint8_t maxBkt; } } -#ifdef ANSI S16 SRegReachedMemThreshold ( Region region, uint8_t maxBkt ) -#else -S16 SRegReachedMemThreshold(region, maxBkt) -Region region; -uint8_t maxBkt; -#endif { uint8_t idx = 0; uint8_t memStatus = 3; @@ -7331,17 +6825,11 @@ uint8_t maxBkt; * File: mt_ss.c * */ -#ifdef ANSI S16 SGetRegInfo ( Region region, SsMemDbgInfo *dbgInfo ) -#else -S16 SGetRegInfo(region, dbgInfo) -Region region; -SsMemDbgInfo *dbgInfo; -#endif { uint32_t idx; @@ -7388,17 +6876,11 @@ SsMemDbgInfo *dbgInfo; return ROK; } -#ifdef ANSI S16 SGetRegPoolInfo ( uint8_t *numRegion, uint8_t *numPool ) -#else -S16 SGetRegPoolInfo(numRegion, numPool) -uint8_t *numRegion; -uint8_t *numPool; -#endif { /* Send number of Region available */ *numRegion = mtMemoCfg.numRegions; @@ -7431,17 +6913,11 @@ uint8_t *numPool; * File: mt_ss.c * */ -#ifdef ANSI S16 SPrintRegMemStatusInfo ( Region region, uint8_t typeFlag ) -#else -S16 SPrintRegMemStatusInfo(region, typeFlag) -Region region; -uint8_t typeFlag; -#endif { Txt prntBuf[150]; uint32_t idx; @@ -7545,15 +7021,7 @@ uint8_t typeFlag; * File: mt_ss.c * */ -#ifdef ANSI -static S16 SPrintRegMemStats -( -Region region -) -#else -static S16 SPrintRegMemStats(region) -Region region; -#endif +static S16 SPrintRegMemStats(Region region) { CmMmHashListCp *hashListCp; Txt prntBuf[150]; @@ -7651,19 +7119,12 @@ Region region; * File: mt_ss.c * */ -#ifdef ANSI Void SRegMemErrHdlr ( Region region, Data *ptr, S16 errCode ) -#else -Void SRegMemErrHdlr(region, ptr, errCode) -Region region; -Data *ptr; -S16 errCode; -#endif { Txt prntBuf[150]; @@ -7698,15 +7159,10 @@ S16 errCode; * File: mt_ss.c * */ -#ifdef ANSI S16 SPrintRegMemProfile ( Region region ) -#else -S16 SPrintRegMemProfile(region) -Region region; -#endif { CmMmHeapCb *heapCb; CmMmRegCb *regCb; @@ -7932,15 +7388,10 @@ Region region; * File: mt_ss.c * --*/ -#ifdef ANSI S16 SGetTimeStamp ( S8 *ts ) -#else -S16 SGetTimeStamp(ts) -S8 *ts; -#endif { #ifndef SS_LINUX @@ -8002,14 +7453,7 @@ S8 *ts; * File: mt_ss.c * --*/ -#ifdef ANSI -uint32_t SGetSystemTsk -( -Void -) -#else -uint32_t SGetSystemTsk() -#endif +uint32_t SGetSystemTsk(Void) { return (pthread_self()); @@ -8031,11 +7475,7 @@ uint32_t SGetSystemTsk() * File: mt_ss.c * --*/ -#ifdef ANSI static SsSTskEntry* ssdAddTmrSTsk(Void) -#else -static SsSTskEntry* ssdAddTmrSTsk() -#endif { SsSTskEntry *sTsk; S16 ret; @@ -8161,17 +7601,7 @@ static SsSTskEntry* ssdAddTmrSTsk() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitLockNew -( -SLockInfo *lockId, -uint8_t lockType -) -#else -S16 ssdInitLockNew(lockId, lockType) -SLockInfo *lockId; -uint8_t lockType; -#endif +S16 ssdInitLockNew(SLockInfo *lockId,uint8_t lockType) { #ifdef SS_REC_LOCK_SUPPORT @@ -8251,17 +7681,7 @@ uint8_t lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdLockNew -( -SLockInfo *lockId, -uint8_t lockType -) -#else -S16 ssdLockNew(lockId, lockType) -SLockInfo *lockId; -uint8_t lockType; -#endif +S16 ssdLockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; @@ -8349,17 +7769,7 @@ uint8_t lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdUnlockNew -( -SLockInfo *lockId, -uint8_t lockType -) -#else -S16 ssdUnlockNew(lockId, lockType) -SLockInfo *lockId; -uint8_t lockType; -#endif +S16 ssdUnlockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; @@ -8415,17 +7825,7 @@ uint8_t lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdDestroyLockNew -( -SLockInfo *lockId, -uint8_t lockType -) -#else -S16 ssdDestroyLockNew(lockId, lockType) -SLockInfo *lockId; -uint8_t lockType; -#endif +S16 ssdDestroyLockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; S16 retVal = ROK; @@ -8488,14 +7888,7 @@ uint8_t lockType; * File: * **/ -#ifdef ANSI -S16 ssInitRcvWork -( - void - ) -#else -S16 ssInitRcvWork() -#endif +S16 ssInitRcvWork(void) { pthread_attr_t attr; pthread_t thread; @@ -8540,15 +7933,7 @@ S16 ssInitRcvWork() * **/ -#ifdef ANSI -static void *workRcvTsk -( - Ptr ptr - ) -#else -static void *workRcvTsk (ptr) - Ptr ptr; -#endif +static void *workRcvTsk(Ptr ptr) { cvmx_wqe_t *workPtr; @@ -8828,17 +8213,11 @@ pthread_t threadId /* Thread Id of system task */ * File: pt_ss.c * */ -#ifdef ANSI S16 SStartTask ( volatile uint32_t *startTime, uint32_t taskId ) -#else -S16 SStartTask(startTime, taskId) -volatile uint32_t *startTime; -uint32_t taskId; -#endif { #ifdef MSPD_MLOG_NEW *startTime = GetTIMETICK(); @@ -8861,17 +8240,11 @@ uint32_t taskId; * File: pt_ss.c * */ -#ifdef ANSI S16 SStopTask ( volatile uint32_t startTime, uint32_t taskId ) -#else -S16 SStopTask(startTime, taskId) -volatile uint32_t startTime; -uint32_t taskId; -#endif { /*uint32_t stopTime;*/ switch(taskId) @@ -8910,33 +8283,21 @@ uint32_t taskId; return ROK; } #else -#ifdef ANSI S16 SStartTask ( -volatile uint32_t * startTime, -uint32_t taskId +volatile uint32_t * startTime, +uint32_t taskId ) -#else -S16 SStartTask(startTime, taskId) -volatile uint32_t * startTime; -uint32_t taskId; -#endif { *startTime = 0; return ROK; } -#ifdef ANSI S16 SStopTask ( -volatile uint32_t startTime, -uint32_t taskId +volatile uint32_t startTime, +uint32_t taskId ) -#else -S16 SStopTask(startTime, taskId) -volatile uint32_t startTime; -uint32_t taskId; -#endif { return ROK; } @@ -8951,17 +8312,11 @@ uint32_t taskId; * * @return Void - function is always success */ -#ifdef ANSI Void UpdateSocCpuInfo ( CmCpuStatsInfo *cpuInfo, uint8_t idx ) -#else -Void UpdateSocCpuInfo(*cpuInfo, idx) -CmCpuStatsInfo *cpuInfo; -uint8_t idx; -#endif { FILE *mipsFd; S8 mipsStr[MIPS_STRING_LEN]; @@ -9042,14 +8397,9 @@ uint8_t idx; * File: mt_ss.c * --*/ -#ifdef ANSI static SsSTskEntry* ssdReAddTmrSTsk( uint8_t idx ) -#else -static SsSTskEntry* ssdReAddTmrSTsk(idx) -uint8_t idx; -#endif { SsSTskEntry *sTsk; S16 ret; @@ -9160,14 +8510,7 @@ uint8_t idx; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdReInitTmr -( -void -) -#else -S16 ssdReInitTmr() -#endif +S16 ssdReInitTmr(void) { pthread_attr_t attr; struct sched_param param_sched;