X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_task.c;h=4c71a4ef12fa18bca7922cb77cab96ea6f0c1ae3;hb=ba2574ac618b40905509604da8d3a2b1b9e39664;hp=8c016cdf9728a33f6da82943111313c79447cd0d;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/mt/ss_task.c b/src/mt/ss_task.c index 8c016cdf9..4c71a4ef1 100644 --- a/src/mt/ss_task.c +++ b/src/mt/ss_task.c @@ -131,15 +131,15 @@ #include "signal.h" #include "mt_plat_t33.h" #include "mt_4gmx.x" -EXTERN S32 clusterMode; +S32 clusterMode; #endif pthread_t tmpRegTidMap[20]; #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN unsigned int tlPost(void *handle); +unsigned int tlPost(void *handle); #ifdef XEON_SPECIFIC_CHANGES -EXTERN int WLS_WakeUp(void* h); +int WLS_WakeUp(void* h); #endif #endif @@ -165,19 +165,12 @@ EXTERN int WLS_WakeUp(void* h); * */ -#ifdef ANSI S16 SRegInit ( Ent ent, /* entity */ Inst inst, /* instance */ PAIFS16 initFnct /* initialization function */ ) -#else -S16 SRegInit(ent, inst, initFnct) -Ent ent; /* entity */ -Inst inst; /* instance */ -PAIFS16 initFnct; /* initialization function */ -#endif { /* ss021.103 - Addition for return value and pointer */ S16 ret; /* return value */ @@ -343,7 +336,6 @@ PAIFS16 initFnct; /* initialization function */ * File: ss_task.c * */ -#ifdef ANSI S16 SRegActvTsk ( Ent ent, /* entity */ @@ -352,14 +344,6 @@ Ttype ttype, /* task type */ Prior prior, /* task priority */ ActvTsk actvTsk /* activate task function */ ) -#else -S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk) -Ent ent; /* entity */ -Inst inst; /* instance */ -Ttype ttype; /* task type */ -Prior prior; /* task priority */ -ActvTsk actvTsk; /* activate task function */ -#endif { S16 ret; SSTskId sTskId; @@ -572,17 +556,11 @@ ActvTsk actvTsk; /* activate task function */ * File: ss_task.c * */ -#ifdef ANSI S16 SDeregInitTskTmr ( Ent ent, /* entity */ Inst inst /* instance */ ) -#else -S16 SDeregInitTskTmr(ent, inst) -Ent ent; /* entity */ -Inst inst; /* instance */ -#endif { SsTTskEntry *tTsk; SsSTskEntry *sTsk; @@ -809,7 +787,6 @@ Inst inst; /* instance */ /* ss029.103: modification: procId added */ #ifndef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SRegTTsk ( Ent ent, /* entity */ @@ -819,19 +796,8 @@ Prior prior, /* task priority */ PAIFS16 initTsk, /* initialization function */ ActvTsk actvTsk /* activation function */ ) -#else -S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk) -Ent ent; /* entity */ -Inst inst; /* instance */ -Ttype type; /* task type */ -Prior prior; /* task priority */ -PAIFS16 initTsk; /* initialization function */ -ActvTsk actvTsk; /* activation function */ -#endif - #else /* SS_MULTIPLE_PROCS */ -#ifdef ANSI S16 SRegTTsk ( ProcId proc, /* processor */ @@ -842,17 +808,6 @@ Prior prior, /* task priority */ PAIFS16 initTsk, /* initialization function */ ActvTsk actvTsk /* activation function */ ) -#else -S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk) -ProcId proc; /* processor */ -Ent ent; /* entity */ -Inst inst; /* instance */ -Ttype type; /* task type */ -Prior prior; /* task priority */ -PAIFS16 initTsk; /* initialization function */ -ActvTsk actvTsk; /* activation function */ -#endif - #endif /* SS_MULTIPLE_PROCS */ { @@ -860,7 +815,7 @@ ActvTsk actvTsk; /* activation function */ SsTTskEntry *tTsk; /* ss029.103: addition: multiple procIds related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif @@ -1129,23 +1084,14 @@ ActvTsk actvTsk; /* activation function */ * **/ #ifndef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SRegCbTsk ( Ent ent, /* entity */ Inst inst, /* instance */ ActvTsk cbTsk /* Callback Function */ ) -#else -S16 SRegCbTsk(ent, inst, cbTsk) -Ent ent; /* entity */ -Inst inst; /* instance */ -ActvTsk cbTsk; -#endif - #else /* SS_MULTIPLE_PROCS */ -#ifdef ANSI S16 SRegCbTsk ( ProcId proc, /* processor */ @@ -1153,20 +1099,13 @@ Ent ent, /* entity */ Inst inst, /* instance */ ActvTsk cbTsk ) -#else -S16 SRegCbTsk(proc, ent, inst, cbTsk) -ProcId proc; /* processor */ -Ent ent; /* entity */ -Inst inst; /* instance */ -ActvTsk cbTsk; -#endif #endif /* SS_MULTIPLE_PROCS */ { SsTTskEntry *tTsk; SsIdx idx; S16 ret = ROK; #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ @@ -1253,33 +1192,19 @@ ActvTsk cbTsk; /* ss029.103: addition: procId added */ #ifndef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SDeregTTsk ( Ent ent, /* entity */ Inst inst /* instance */ ) -#else -S16 SDeregTTsk(ent, inst) -Ent ent; /* entity */ -Inst inst; /* instance */ -#endif - #else /* SS_MULTIPLE_PROCS */ -#ifdef ANSI S16 SDeregTTsk ( ProcId proc, /* processor */ Ent ent, /* entity */ Inst inst /* instance */ ) -#else -S16 SDeregTTsk(proc, ent, inst) -ProcId proc; /* processor */ -Ent ent; /* entity */ -Inst inst; /* instance */ -#endif #endif /* SS_MULTIPLE_PROCS */ { S16 ret; @@ -1289,7 +1214,7 @@ Inst inst; /* instance */ SsTmrEntry *tmr; /* ss029.103: addition: multiple procIds related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ /* ss002.301 Additions */ Buffer *mBuf; @@ -1548,20 +1473,14 @@ Inst inst; /* instance */ * File: ss_task.c * */ -#ifdef ANSI S16 SCreateSTsk ( SSTskPrior tskPrior, /* task priority */ SSTskId *tskId /* filled in with system task ID */ ) -#else -S16 SCreateSTsk(tskPrior, tskId) -SSTskPrior tskPrior; /* task priority */ -SSTskId *tskId; /* filled in with system task ID */ -#endif { - S16 ret; - SsSTskEntry *sTsk; + S16 ret = ROK; + SsSTskEntry *sTsk = NULLP; @@ -1803,28 +1722,19 @@ SSTskId *tskId; /* filled in with system task ID */ * File: ss_task.c * */ -#ifdef ANSI S16 SRegLogCfg ( -U8 mode, +uint8_t mode, S8 *path, -U32 size, +uint32_t size, S8 *IPA, -U16 port +uint16_t port ) -#else -S16 SRegLogCfg(mode, path, size, IPA, port) -U8 mode; -S8 *path; -U32 size; -S8 *IPA; -U16 port -#endif { #ifdef WIN32 WSADATA wsaData; - U32 iRes; + uint32_t iRes; #endif /*ss013.301: Fixed Warnings for 32/64 bit compilation*/ @@ -1966,18 +1876,10 @@ U16 port * File: ss_task.c * --*/ -#ifdef ANSI -S16 SFlushBufToLog -( -S8 *logBuf -) -#else -S16 SFlushBufToLog(logBuf) -S8 *logBuf -#endif +S16 SFlushBufToLog (S8 *logBuf) { S8 *buffer; - PRIVATE U16 logFileCnt = 0; + static uint16_t logFileCnt = 0; S8 newFileName[SS_MAX_PATH]; #ifdef WIN32 size_t writeNum; @@ -1991,12 +1893,12 @@ S8 *logBuf if (osCp.logger.opt & 0x01) { - writeNum = fwrite(buffer, sizeof(U8), cmStrlen((U8 *)buffer), + writeNum = fwrite(buffer, sizeof(uint8_t), cmStrlen((uint8_t *)buffer), osCp.logger.filep); } if (osCp.logger.opt & 0x02) { - writeNum = sendto(osCp.logger.socketdes, buffer, cmStrlen((U8 *)buffer), 0, (struct sockaddr*)&osCp.logger.remoteAddr, sizeof(osCp.logger.remoteAddr)); + writeNum = sendto(osCp.logger.socketdes, buffer, cmStrlen((uint8_t *)buffer), 0, (struct sockaddr*)&osCp.logger.remoteAddr, sizeof(osCp.logger.remoteAddr)); /*ss013.301 : Returned after sending to socket*/ return ROK; } @@ -2037,14 +1939,7 @@ S8 *logBuf * File: ss_task.c * --*/ -#ifdef ANSI -S16 SCleanUp -( -Void -) -#else -S16 SCleanUp() -#endif +S16 SCleanUp(Void) { /*Flush the remaining data in the log file*/ @@ -2098,13 +1993,7 @@ S16 SCleanUp() * File: ss_task.c * */ -#ifdef ANSI -S16 SDeregLogCfg -( -) -#else S16 SDeregLogCfg() -#endif { @@ -2128,14 +2017,7 @@ S16 SDeregLogCfg() * File: ss_task.c * */ -#ifdef ANSI -Void SStartLogger -( -void -) -#else -Void SStartLogger() -#endif +Void SStartLogger(void) { if (osCp.logger.configured == TRUE) { @@ -2157,14 +2039,7 @@ Void SStartLogger() * File: ss_task.c * */ -#ifdef ANSI -Void SStopLogger -( -void -) -#else -Void SStopLogger() -#endif +Void SStopLogger(void) { osCp.logger.started = FALSE; } @@ -2190,17 +2065,12 @@ Void SStopLogger() * File: ss_task.c * */ -#ifdef ANSI S16 SRegCpuInfo ( SCpuInfo *cpuInfo /* Information about the cores/threads per core */ ) -#else -S16 SRegCpuInfo (cpuInfo) -SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ -#endif { - U32 coreCount = 0; + uint32_t coreCount = 0; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ /* check the number of cores */ @@ -2219,7 +2089,7 @@ SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ /* if the cpu register is supplied then use it */ for (; coreCount < cpuInfo->numCores; coreCount++) { - U32 thrCnt = 0; + uint32_t thrCnt = 0; for (;thrCnt < SS_MAX_THREADS_PER_CORE;thrCnt++) { osCp.mCInfo.coreInfo[coreCount].tskPerCoreLst[thrCnt] = -1; @@ -2253,17 +2123,11 @@ SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ * File: ss_task.c * */ -#ifdef ANSI S16 SGetAffinity ( 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 -S16 SGetAffinity(tskId, coreId) -SSTskId *tskId; /* filled in with system task ID */ -U32 *coreId; /* the core/processor id to which the affinity is set */ -#endif { S16 ret; @@ -2297,21 +2161,13 @@ U32 *coreId; /* the core/processor id to which the affinity i * File: ss_task.c * */ -#ifdef ANSI S16 SSetAffinity ( SSTskId *tskId, /* filled in with system task ID */ SsAffinityMode mode, /* the mode according to which the affinty is set */ -U32 coreId, /* the core/processor id to which the affinity has to be set */ +uint32_t coreId, /* the core/processor id to which the affinity has to be set */ SSTskId *tskAssociatedTskId /* filled in with system task ID of the associated layer */ ) -#else -S16 SSetAffinity(tskId, mode, coreId, tskAssociatedTskId) -SSTskId *tskId; /* filled in with system task ID */ -SsAffinityMode mode; /* the mode according to which the affinty is set */ -U32 coreId; /* the core/processor id to which the affinity has to be set */ -SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associated layer */ -#endif { S16 ret; @@ -2337,7 +2193,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat { case SS_AFFINITY_MODE_DEFAULT: { - U32 coreCounter = 0, coreIndex = 0; + uint32_t coreCounter = 0, coreIndex = 0; S8 repeatFlag = 1; SEARCH_FOR_CORE: /*ss013.301: Fixed Warnings for 32/64 bit compilation*/ @@ -2438,7 +2294,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat case SS_AFFINITY_MODE_ASSOC: { /* search for the associated tsk id in osCp */ - U32 coreIndex = 0, threadIndex = 0; + uint32_t coreIndex = 0, threadIndex = 0; Bool tskNotFound = TRUE; for (;tskNotFound && coreIndex < SS_MAX_CORES; coreIndex++) { @@ -2535,8 +2391,8 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat } /* end if */ else if (coreId == SS_DEFAULT_CORE) { - U32 coreCounter = 0; - U32 coreIndex = 0; + uint32_t coreCounter = 0; + uint32_t coreIndex = 0; /*ss013.301: Fixed Warnings for 32/64 bit compilation*/ for (coreIndex = osCp.mCInfo.currentCore; coreCounter < osCp.mCInfo.cpuInfo.numCores; @@ -2634,15 +2490,10 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat * File: ss_task.c * */ -#ifdef ANSI S16 SDestroySTsk ( SSTskId tskId /* system task to be destroyed */ ) -#else -S16 SDestroySTsk(tskId) -SSTskId tskId; /* system task to be destroyed */ -#endif { S16 ret; /* ss029.103: modification: the subscript should be of same type */ @@ -2652,7 +2503,7 @@ SSTskId tskId; /* system task to be destroyed */ /* ss002.301 Additions */ /*ss013.301 : changes related to 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*/ @@ -2873,10 +2724,10 @@ SSTskId tskId; /* system task to be destroyed */ if (osCp.sTskTbl[tskInd].tskId == sTsk->tskId) { /* search for the tskId in coreInfo */ - U32 coreId = 0; + uint32_t coreId = 0; for (coreId = 0; coreId < SS_MAX_CORES; coreId++) { - U32 thrId = 0; + uint32_t thrId = 0; for (thrId = 0; thrId < SS_MAX_THREADS_PER_CORE; thrId++) { if (sTsk->tskId == osCp.mCInfo.coreInfo[coreId].tskPerCoreLst[thrId]) @@ -2947,23 +2798,15 @@ SSTskId tskId; /* system task to be destroyed */ /* ss029.103: addition: procId added */ #ifndef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SAttachTTsk ( Ent ent, /* entity ID of the task */ Inst inst, /* instance ID of the task */ SSTskId sTskId /* system task to use */ ) -#else -S16 SAttachTTsk(ent, inst, sTskId) -Ent ent; /* entity ID of the task */ -Inst inst; /* instance ID of the task */ -SSTskId sTskId; /* system task to use */ -#endif #else /* SS_MULTIPLE_PROCS */ -#ifdef ANSI S16 SAttachTTsk ( ProcId proc, /* processor ID of the task */ @@ -2971,16 +2814,7 @@ Ent ent, /* entity ID of the task */ Inst inst, /* instance ID of the task */ SSTskId sTskId /* system task to use */ ) -#else -S16 SAttachTTsk(proc, ent, inst, sTskId) -ProcId proc; /* processor ID of the task */ -Ent ent; /* entity ID of the task */ -Inst inst; /* instance ID of the task */ -SSTskId sTskId; /* system task to use */ -#endif - #endif /* SS_MULTIPLE_PROCS */ - { S16 ret; S16 i; @@ -2988,7 +2822,7 @@ SSTskId sTskId; /* system task to use */ SsSTskEntry *sTsk; /* ss029.103: addition: multiple procIds related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ #ifdef SS_MULTICORE_SUPPORT SsTTskEntry *tTsk; @@ -3410,33 +3244,20 @@ SSTskId sTskId; /* system task to use */ /* ss029.103: addition: procId added */ #ifndef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SDetachTTsk ( Ent ent, /* entity ID of the task */ Inst inst /* instance ID of the task */ ) -#else -S16 SDetachTTsk(ent, inst) -Ent ent; /* entity ID of the task */ -Inst inst; /* instance ID of the task */ -#endif #else /* SS_MULTIPLE_PROCS */ -#ifdef ANSI S16 SDetachTTsk ( ProcId proc, /* processor ID of the task */ Ent ent, /* entity ID of the task */ Inst inst /* instance ID of the task */ ) -#else -S16 SDetachTTsk(proc, ent, inst) -ProcId proc; /* processor ID of the task */ -Ent ent; /* entity ID of the task */ -Inst inst; /* instance ID of the task */ -#endif #endif /* SS_MULTIPLE_PROCS */ @@ -3448,7 +3269,7 @@ Inst inst; /* instance ID of the task */ SsSTskEntry *sTsk; /* ss029.103: addition: multiple procIds related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ @@ -3744,17 +3565,11 @@ Inst inst; /* instance ID of the task */ * File: ss_task.c * */ -#ifdef ANSI S16 SPstTsk ( Pst *pst, /* post information */ Buffer *mBuf /* message to post */ ) -#else -S16 SPstTsk(pst, mBuf) -Pst *pst; /* post information */ -Buffer *mBuf; /* message to post */ -#endif { S16 r; S16 i; @@ -3777,8 +3592,8 @@ Buffer *mBuf; /* message to post */ #endif /* ss029.103: addition: multiple procIds related changes */ #ifdef SS_MULTIPLE_PROCS - U16 srcProcIdIdx; - U16 dstProcIdIdx; + uint16_t srcProcIdIdx; + uint16_t dstProcIdIdx; #endif /* SS_MULTIPLE_PROCS */ /*ss004.301: Cavium changes */ #ifdef SS_SEUM_CAVIUM @@ -3791,7 +3606,7 @@ Buffer *mBuf; /* message to post */ Pst tempPst; #ifdef MSPD_MLOG_NEW - U32 t = MacGetTick(); + uint32_t t = MacGetTick(); #endif @@ -3880,7 +3695,7 @@ Buffer *mBuf; /* message to post */ /* copy the Pst structure into a local duplicate */ for (i = 0; i < (S16)sizeof(Pst); i++) { - *(((U8 *)(&nPst)) + i) = *(((U8 *) pst) + i); + *(((uint8_t *)(&nPst)) + i) = *(((uint8_t *) pst) + i); } pst = &nPst; #ifdef SS_DRVR_SUPPORT @@ -4046,7 +3861,7 @@ Buffer *mBuf; /* message to post */ { for (j = 0; j < (S16)sizeof(Pst); j++) { - *(((U8 *)(&nPst)) + j) = *(((U8 *) pst) + j); + *(((uint8_t *)(&nPst)) + j) = *(((uint8_t *) pst) + j); } pst = &nPst; nPstUsed = TRUE; @@ -4184,7 +3999,7 @@ Buffer *mBuf; /* message to post */ /* plug the Pst structure into the message information portion */ msgInfo = (SsMsgInfo *) (mBuf->b_rptr); for (i = 0; i < (S16 )sizeof(Pst); i++) - *(((U8 *)(&msgInfo->pst)) + i) = *(((U8 *) &(tempPst)) + i); + *(((uint8_t *)(&msgInfo->pst)) + i) = *(((uint8_t *) &(tempPst)) + i); /* ss004.301 : Cavium cahnges */ #ifdef SS_SEUM_CAVIUM @@ -4280,7 +4095,7 @@ Buffer *mBuf; /* message to post */ ((prior * SS_MAX_MSG_PRI) + tempPst.prior)); #ifdef TENB_T2K3K_SPECIFIC_CHANGES { - extern Bool g_usettitmr; + Bool g_usettitmr; if (g_usettitmr) { if (tTsk->sTsk->tskPrior == PRIOR0) @@ -4392,18 +4207,13 @@ Buffer *mBuf; /* message to post */ */ /* ss029.103: modification: procId added */ -#ifdef ANSI S16 SGetTapaTskEntIds ( Ent *ent /* entity */ ) -#else -S16 SGetTapaTskEntIds(ent) -Ent *ent; /* entity */ -#endif { - U32 tskCnt = 0; + uint32_t tskCnt = 0; /* Get the tapa task entity Ids from the osCp structure */ for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++) @@ -4432,18 +4242,13 @@ Ent *ent; /* entity */ */ /* ss029.103: modification: procId added */ -#ifdef ANSI S16 SRegForHstGrm ( Ent ent /* entity */ ) -#else -S16 SRegForHstGrm(ent) -Ent ent; /* entity */ -#endif { - U32 tskCnt = 0; + uint32_t tskCnt = 0; S16 r = 0; @@ -4494,20 +4299,14 @@ Ent ent; /* entity */ * File: ss_task.c * */ -#ifdef ANSI S16 SGetHstGrmInfo ( Ent *entId, Bool *hstReg /* entity */ ) -#else -S16 SGetHstGrmInfo(entId, hstReg) -Ent *entId; -Bool *hstReg; /* entity */ -#endif { - U32 tskCnt = 0; + uint32_t tskCnt = 0; Bool found = FALSE; *hstReg = 0; @@ -4533,38 +4332,20 @@ Bool *hstReg; /* entity */ #endif /* SS_HISTOGRAM_SUPPORT */ #ifdef SS_WATCHDOG -#ifdef ANSI -S16 SInitWatchdog -( -U16 port -) -#else -S16 SInitWatchdog(port) -U16 port; -#endif +S16 SInitWatchdog(uint16_t port) { return ssdInitWatchDog(port); } -#ifdef ANSI S16 SRegCfgWd ( -U32 numNodes, -U8 *addr[], -U16 port[], -U32 timeout, +uint32_t numNodes, +uint8_t *addr[], +uint16_t port[], +uint32_t timeout, WdUserCallback callback, void *data ) -#else -S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data) -U32 numNodes; -U8 *addr[]; -U16 port[]; -U32 timeout; -WdUserCallback callback; -void *data; -#endif { Txt prntBuf[PRNTSZE]; int i = 0; @@ -4602,15 +4383,7 @@ void *data; return ROK; } -#ifdef ANSI -S16 SDeregCfgWd -( -void -) -#else S16 SDeregCfgWd(void) -void; -#endif { Txt prntBuf[PRNTSZE]; int i = 0; @@ -4640,15 +4413,10 @@ void; return ROK; } -#ifdef ANSI S16 SStartHrtBt ( -U8 timeInterval /* time interval */ +uint8_t timeInterval /* time interval */ ) -#else -S16 SStartHrtBt(timeInterval) -U8 timeInterval; -#endif { ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval); @@ -4657,15 +4425,7 @@ U8 timeInterval; return ROK; } -#ifdef ANSI -S16 SStopHrtBt -( -void -) -#else -S16 SStopHrtBt() -void -#endif +S16 SStopHrtBt(void) { osCp.wdCp.globWd.watchdogStop = 1; @@ -4673,17 +4433,11 @@ void return ROK; } -#ifdef ANSI S16 watchDgActvTsk ( Pst *pst, /* post */ Buffer *mBuf /* message buffer */ ) -#else -S16 watchDgActvTsk(pst, mBuf) -Pst *pst; /* post */ -Buffer *mBuf; /* message buffer */ -#endif { /* ss002.301 Fixed warnings */ #ifdef DEBUGP @@ -4700,23 +4454,17 @@ Buffer *mBuf; /* message buffer */ return ROK; } -#ifdef ANSI S16 watchDgRcvrActvTsk ( Pst *pst, /* post */ Buffer *mBuf /* message buffer */ ) -#else -S16 watchDgRcvrActvTsk(pst, mBuf) -Pst *pst; /* post */ -Buffer *mBuf; /* message buffer */ -#endif { #ifdef DEBUGP DateTime dt; #endif /* DEBUGP */ Txt prntBuf[PRNTSZE]; - U16 n; + uint16_t n; S16 err; struct sockaddr_in tmpaddr; Txt hbMsg[SS_WD_HB_MSG_SIZE]; @@ -4807,7 +4555,6 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef SS_MULTIPLE_PROCS -#ifdef ANSI S16 SGetThrdProf ( SSTskId *sTskId, @@ -4815,46 +4562,26 @@ ProcId procId, Ent ent, /* entity */ Inst inst, Event *curEvent, -U32 *curEvtTime, -U64 *totTime +uint32_t *curEvtTime, +uint64_t *totTime ) #else -S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime) -SSTskId *sTskId; -ProcId procId; -Ent ent; /* entity */ -Inst inst; -Event *curEvent; -U32 *curEvtTime; -U64 *totTime; -#endif -#else -#ifdef ANSI S16 SGetThrdProf ( SSTskId *sTskId, Ent ent, /* entity */ Inst inst, Event *curEvent, -U32 *curEvtTime, -U64 *totTime +uint32_t *curEvtTime, +uint64_t *totTime ) -#else -S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime) -SSTskId *sTskId; -Ent ent; /* entity */ -Inst inst; -Event *curEvent; -U32 *curEvtTime; -U64 *totTime; -#endif #endif /* SS_MULTIPLE_PROCS */ { S16 ret; SsIdx idx; SsTTskEntry *tTsk; #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif @@ -4929,15 +4656,7 @@ U64 *totTime; * File: ss_task.c * */ -#ifdef ANSI -S16 SRegTskInfo -( -U8 *cfgFile -) -#else -S16 SRegTskInfo(cfgFile) -U8 *cfgFile; -#endif +S16 SRegTskInfo(uint8_t *cfgFile) { return cmCfgrTskReg(cfgFile); }