Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
removed ANSI part -2 JIRA ID - ODUHIGH-249
[o-du/l2.git]
/
src
/
mt
/
ss_task.c
diff --git
a/src/mt/ss_task.c
b/src/mt/ss_task.c
index
5255445
..
8a63958
100644
(file)
--- 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"
#include "signal.h"
#include "mt_plat_t33.h"
#include "mt_4gmx.x"
-
EXTERN
S32 clusterMode;
+S32 clusterMode;
#endif
#endif
-
PUBLIC
pthread_t tmpRegTidMap[20];
+pthread_t tmpRegTidMap[20];
#ifdef TENB_T2K3K_SPECIFIC_CHANGES
#ifdef TENB_T2K3K_SPECIFIC_CHANGES
-
EXTERN
unsigned int tlPost(void *handle);
+unsigned int tlPost(void *handle);
#ifdef XEON_SPECIFIC_CHANGES
#ifdef XEON_SPECIFIC_CHANGES
-
EXTERN
int WLS_WakeUp(void* h);
+int WLS_WakeUp(void* h);
#endif
#endif
#endif
#endif
@@
-166,14
+166,14
@@
EXTERN int WLS_WakeUp(void* h);
*/
#ifdef ANSI
*/
#ifdef ANSI
-
PUBLIC
S16 SRegInit
+S16 SRegInit
(
Ent ent, /* entity */
Inst inst, /* instance */
PAIFS16 initFnct /* initialization function */
)
#else
(
Ent ent, /* entity */
Inst inst, /* instance */
PAIFS16 initFnct /* initialization function */
)
#else
-
PUBLIC
S16 SRegInit(ent, inst, initFnct)
+S16 SRegInit(ent, inst, initFnct)
Ent ent; /* entity */
Inst inst; /* instance */
PAIFS16 initFnct; /* initialization function */
Ent ent; /* entity */
Inst inst; /* instance */
PAIFS16 initFnct; /* initialization function */
@@
-183,7
+183,6
@@
PAIFS16 initFnct; /* initialization function */
S16 ret; /* return value */
SsTTskEntry *tTsk;
S16 ret; /* return value */
SsTTskEntry *tTsk;
- TRC1(SRegInit);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-345,7
+344,7
@@
PAIFS16 initFnct; /* initialization function */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SRegActvTsk
+S16 SRegActvTsk
(
Ent ent, /* entity */
Inst inst, /* instance */
(
Ent ent, /* entity */
Inst inst, /* instance */
@@
-354,7
+353,7
@@
Prior prior, /* task priority */
ActvTsk actvTsk /* activate task function */
)
#else
ActvTsk actvTsk /* activate task function */
)
#else
-
PUBLIC
S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk)
+S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk)
Ent ent; /* entity */
Inst inst; /* instance */
Ttype ttype; /* task type */
Ent ent; /* entity */
Inst inst; /* instance */
Ttype ttype; /* task type */
@@
-368,7
+367,6
@@
ActvTsk actvTsk; /* activate task function */
/* ss021.103 - Addition for pointer */
SsTTskEntry *tTsk;
/* ss021.103 - Addition for pointer */
SsTTskEntry *tTsk;
- TRC1(SRegActvTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-575,13
+573,13
@@
ActvTsk actvTsk; /* activate task function */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SDeregInitTskTmr
+S16 SDeregInitTskTmr
(
Ent ent, /* entity */
Inst inst /* instance */
)
#else
(
Ent ent, /* entity */
Inst inst /* instance */
)
#else
-
PUBLIC
S16 SDeregInitTskTmr(ent, inst)
+S16 SDeregInitTskTmr(ent, inst)
Ent ent; /* entity */
Inst inst; /* instance */
#endif
Ent ent; /* entity */
Inst inst; /* instance */
#endif
@@
-594,7
+592,6
@@
Inst inst; /* instance */
Bool destroySTsk;
Bool destroySTsk;
- TRC1(SDeregInitTskTmr);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-813,7
+810,7
@@
Inst inst; /* instance */
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SRegTTsk
+S16 SRegTTsk
(
Ent ent, /* entity */
Inst inst, /* instance */
(
Ent ent, /* entity */
Inst inst, /* instance */
@@
-823,7
+820,7
@@
PAIFS16 initTsk, /* initialization function */
ActvTsk actvTsk /* activation function */
)
#else
ActvTsk actvTsk /* activation function */
)
#else
-
PUBLIC
S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk)
+S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk)
Ent ent; /* entity */
Inst inst; /* instance */
Ttype type; /* task type */
Ent ent; /* entity */
Inst inst; /* instance */
Ttype type; /* task type */
@@
-835,7
+832,7
@@
ActvTsk actvTsk; /* activation function */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PUBLIC
S16 SRegTTsk
+S16 SRegTTsk
(
ProcId proc, /* processor */
Ent ent, /* entity */
(
ProcId proc, /* processor */
Ent ent, /* entity */
@@
-846,7
+843,7
@@
PAIFS16 initTsk, /* initialization function */
ActvTsk actvTsk /* activation function */
)
#else
ActvTsk actvTsk /* activation function */
)
#else
-
PUBLIC
S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk)
+S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk)
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
@@
-863,10
+860,9
@@
ActvTsk actvTsk; /* activation function */
SsTTskEntry *tTsk;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
SsTTskEntry *tTsk;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
-
U16
procIdIdx;
+
uint16_t
procIdIdx;
#endif
#endif
- TRC1(SRegTTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-1134,14
+1130,14
@@
ActvTsk actvTsk; /* activation function */
**/
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
**/
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SRegCbTsk
+S16 SRegCbTsk
(
Ent ent, /* entity */
Inst inst, /* instance */
ActvTsk cbTsk /* Callback Function */
)
#else
(
Ent ent, /* entity */
Inst inst, /* instance */
ActvTsk cbTsk /* Callback Function */
)
#else
-
PUBLIC
S16 SRegCbTsk(ent, inst, cbTsk)
+S16 SRegCbTsk(ent, inst, cbTsk)
Ent ent; /* entity */
Inst inst; /* instance */
ActvTsk cbTsk;
Ent ent; /* entity */
Inst inst; /* instance */
ActvTsk cbTsk;
@@
-1150,7
+1146,7
@@
ActvTsk cbTsk;
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PUBLIC
S16 SRegCbTsk
+S16 SRegCbTsk
(
ProcId proc, /* processor */
Ent ent, /* entity */
(
ProcId proc, /* processor */
Ent ent, /* entity */
@@
-1158,7
+1154,7
@@
Inst inst, /* instance */
ActvTsk cbTsk
)
#else
ActvTsk cbTsk
)
#else
-
PUBLIC
S16 SRegCbTsk(proc, ent, inst, cbTsk)
+S16 SRegCbTsk(proc, ent, inst, cbTsk)
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
@@
-1170,10
+1166,9
@@
ActvTsk cbTsk;
SsIdx idx;
S16 ret = ROK;
#ifdef SS_MULTIPLE_PROCS
SsIdx idx;
S16 ret = ROK;
#ifdef SS_MULTIPLE_PROCS
-
U16
procIdIdx;
+
uint16_t
procIdIdx;
#endif /* SS_MULTIPLE_PROCS */
#endif /* SS_MULTIPLE_PROCS */
- TRC1(SRegCbTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST)
#if (ERRCLASS & ERRCLS_INT_PAR)
if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST)
@@
-1259,13
+1254,13
@@
ActvTsk cbTsk;
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SDeregTTsk
+S16 SDeregTTsk
(
Ent ent, /* entity */
Inst inst /* instance */
)
#else
(
Ent ent, /* entity */
Inst inst /* instance */
)
#else
-
PUBLIC
S16 SDeregTTsk(ent, inst)
+S16 SDeregTTsk(ent, inst)
Ent ent; /* entity */
Inst inst; /* instance */
#endif
Ent ent; /* entity */
Inst inst; /* instance */
#endif
@@
-1273,14
+1268,14
@@
Inst inst; /* instance */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PUBLIC
S16 SDeregTTsk
+S16 SDeregTTsk
(
ProcId proc, /* processor */
Ent ent, /* entity */
Inst inst /* instance */
)
#else
(
ProcId proc, /* processor */
Ent ent, /* entity */
Inst inst /* instance */
)
#else
-
PUBLIC
S16 SDeregTTsk(proc, ent, inst)
+S16 SDeregTTsk(proc, ent, inst)
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
@@
-1294,13
+1289,12
@@
Inst inst; /* instance */
SsTmrEntry *tmr;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
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;
SsMsgInfo *mInfo;
#endif /* SS_MULTIPLE_PROCS */
/* ss002.301 Additions */
Buffer *mBuf;
SsMsgInfo *mInfo;
- TRC1(SDeregTTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-1555,13
+1549,13
@@
Inst inst; /* instance */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SCreateSTsk
+S16 SCreateSTsk
(
SSTskPrior tskPrior, /* task priority */
SSTskId *tskId /* filled in with system task ID */
)
#else
(
SSTskPrior tskPrior, /* task priority */
SSTskId *tskId /* filled in with system task ID */
)
#else
-
PUBLIC
S16 SCreateSTsk(tskPrior, tskId)
+S16 SCreateSTsk(tskPrior, tskId)
SSTskPrior tskPrior; /* task priority */
SSTskId *tskId; /* filled in with system task ID */
#endif
SSTskPrior tskPrior; /* task priority */
SSTskId *tskId; /* filled in with system task ID */
#endif
@@
-1570,7
+1564,6
@@
SSTskId *tskId; /* filled in with system task ID */
SsSTskEntry *sTsk;
SsSTskEntry *sTsk;
- TRC1(SCreateSTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-1811,34
+1804,33
@@
SSTskId *tskId; /* filled in with system task ID */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SRegLogCfg
+S16 SRegLogCfg
(
(
-
U8
mode,
+
uint8_t
mode,
S8 *path,
S8 *path,
-
U32
size,
+
uint32_t
size,
S8 *IPA,
S8 *IPA,
-
U16
port
+
uint16_t
port
)
#else
)
#else
-
PUBLIC
S16 SRegLogCfg(mode, path, size, IPA, port)
-
U8
mode;
+S16 SRegLogCfg(mode, path, size, IPA, port)
+
uint8_t
mode;
S8 *path;
S8 *path;
-
U32
size;
+
uint32_t
size;
S8 *IPA;
S8 *IPA;
-
U16
port
+
uint16_t
port
#endif
{
#ifdef WIN32
WSADATA wsaData;
#endif
{
#ifdef WIN32
WSADATA wsaData;
-
U32
iRes;
+
uint32_t
iRes;
#endif
/*ss013.301: Fixed Warnings for 32/64 bit compilation*/
struct sockaddr_in localAddr={0};
struct sockaddr_in remoteAddr ={0};
#endif
/*ss013.301: Fixed Warnings for 32/64 bit compilation*/
struct sockaddr_in localAddr={0};
struct sockaddr_in remoteAddr ={0};
- TRC1(SRegLogCfg);
#if (ERRCLASS & ERRCLS_INT_PAR)
#endif
#if (ERRCLASS & ERRCLS_INT_PAR)
#endif
@@
-1944,7
+1936,7
@@
U16 port
}
}
-
cmMemset((U8*)
osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer));
+
memset(
osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer));
osCp.logger.maxBufSiz = SS_MAX_LOGBUF_SIZE;
osCp.logger.curBufSiz = 0;
osCp.logger.maxBufSiz = SS_MAX_LOGBUF_SIZE;
osCp.logger.curBufSiz = 0;
@@
-1975,17
+1967,17
@@
U16 port
*
--*/
#ifdef ANSI
*
--*/
#ifdef ANSI
-
PUBLIC
S16 SFlushBufToLog
+S16 SFlushBufToLog
(
S8 *logBuf
)
#else
(
S8 *logBuf
)
#else
-
PUBLIC
S16 SFlushBufToLog(logBuf)
+S16 SFlushBufToLog(logBuf)
S8 *logBuf
#endif
{
S8 *buffer;
S8 *logBuf
#endif
{
S8 *buffer;
-
PRIVATE U16
logFileCnt = 0;
+
static uint16_t
logFileCnt = 0;
S8 newFileName[SS_MAX_PATH];
#ifdef WIN32
size_t writeNum;
S8 newFileName[SS_MAX_PATH];
#ifdef WIN32
size_t writeNum;
@@
-1994,25
+1986,24
@@
S8 *logBuf
#endif
FILE* oldFileP;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
#endif
FILE* oldFileP;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SFlushBufToLog)
buffer = logBuf;
if (osCp.logger.opt & 0x01)
{
buffer = 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)
{
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;
}
osCp.logger.curNumFlush++;
if(osCp.logger.curNumFlush == osCp.logger.maxNumFlush)
{
/*ss013.301 : Returned after sending to socket*/
return ROK;
}
osCp.logger.curNumFlush++;
if(osCp.logger.curNumFlush == osCp.logger.maxNumFlush)
{
-
cmMemset((U8 *)
newFileName,'\0',sizeof(newFileName));
+
memset(
newFileName,'\0',sizeof(newFileName));
/*Store the current File*/
oldFileP = osCp.logger.filep;
/*Open a new file and use it as a new log file*/
/*Store the current File*/
oldFileP = osCp.logger.filep;
/*Open a new file and use it as a new log file*/
@@
-2047,16
+2038,15
@@
S8 *logBuf
*
--*/
#ifdef ANSI
*
--*/
#ifdef ANSI
-
PUBLIC
S16 SCleanUp
+S16 SCleanUp
(
Void
)
#else
(
Void
)
#else
-
PUBLIC
S16 SCleanUp()
+S16 SCleanUp()
#endif
{
#endif
{
- TRC1(SCleanUp);
/*Flush the remaining data in the log file*/
SLock(&osCp.logger.bufLock);
if(osCp.logger.started == FALSE)
/*Flush the remaining data in the log file*/
SLock(&osCp.logger.bufLock);
if(osCp.logger.started == FALSE)
@@
-2109,16
+2099,15
@@
PUBLIC S16 SCleanUp()
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SDeregLogCfg
+S16 SDeregLogCfg
(
)
#else
(
)
#else
-
PUBLIC
S16 SDeregLogCfg()
+S16 SDeregLogCfg()
#endif
{
#endif
{
- TRC1(SDeregLogCfg);
SCleanUp();
SCleanUp();
@@
-2140,12
+2129,12
@@
PUBLIC S16 SDeregLogCfg()
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
Void SStartLogger
+Void SStartLogger
(
void
)
#else
(
void
)
#else
-
PUBLIC
Void SStartLogger()
+Void SStartLogger()
#endif
{
if (osCp.logger.configured == TRUE)
#endif
{
if (osCp.logger.configured == TRUE)
@@
-2169,12
+2158,12
@@
PUBLIC Void SStartLogger()
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
Void SStopLogger
+Void SStopLogger
(
void
)
#else
(
void
)
#else
-
PUBLIC
Void SStopLogger()
+Void SStopLogger()
#endif
{
osCp.logger.started = FALSE;
#endif
{
osCp.logger.started = FALSE;
@@
-2202,19
+2191,18
@@
PUBLIC Void SStopLogger()
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SRegCpuInfo
+S16 SRegCpuInfo
(
SCpuInfo *cpuInfo /* Information about the cores/threads per core */
)
#else
(
SCpuInfo *cpuInfo /* Information about the cores/threads per core */
)
#else
-
PUBLIC
S16 SRegCpuInfo (cpuInfo)
+S16 SRegCpuInfo (cpuInfo)
SCpuInfo *cpuInfo; /* Information about the cores/threads per core */
#endif
{
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*/
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SRegCpuInfo)
/* check the number of cores */
if ( cpuInfo->numCores > SS_MAX_CORES ||
cpuInfo->threadsPerCore > SS_MAX_THREADS_PER_CORE ||
/* check the number of cores */
if ( cpuInfo->numCores > SS_MAX_CORES ||
cpuInfo->threadsPerCore > SS_MAX_THREADS_PER_CORE ||
@@
-2231,7
+2219,7
@@
SCpuInfo *cpuInfo; /* Information about the cores/threads per core */
/* if the cpu register is supplied then use it */
for (; coreCount < cpuInfo->numCores; coreCount++)
{
/* 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;
for (;thrCnt < SS_MAX_THREADS_PER_CORE;thrCnt++)
{
osCp.mCInfo.coreInfo[coreCount].tskPerCoreLst[thrCnt] = -1;
@@
-2266,21
+2254,20
@@
SCpuInfo *cpuInfo; /* Information about the cores/threads per core */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SGetAffinity
+S16 SGetAffinity
(
SSTskId *tskId, /* filled in with system task ID */
(
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
)
#else
-
PUBLIC
S16 SGetAffinity(tskId, coreId)
+S16 SGetAffinity(tskId, coreId)
SSTskId *tskId; /* filled in with system task ID */
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
{
S16 ret;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
#endif
{
S16 ret;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SGetAffinity)
/* implementation specific */
ret = ssdGetAffinity(tskId, coreId);
/* implementation specific */
ret = ssdGetAffinity(tskId, coreId);
@@
-2311,25
+2298,24
@@
U32 *coreId; /* the core/processor id to which the affinity i
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SSetAffinity
+S16 SSetAffinity
(
SSTskId *tskId, /* filled in with system task ID */
SsAffinityMode mode, /* the mode according to which the affinty is set */
(
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
SSTskId *tskAssociatedTskId /* filled in with system task ID of the associated layer */
)
#else
-
PUBLIC
S16 SSetAffinity(tskId, mode, coreId, tskAssociatedTskId)
+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 */
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 */
#endif
{
S16 ret;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associated layer */
#endif
{
S16 ret;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SSetAffinity)
/* validate the mode */
if (mode < SS_AFFINITY_MODE_DEFAULT ||
mode > SS_AFFINITY_MODE_EXCL)
/* validate the mode */
if (mode < SS_AFFINITY_MODE_DEFAULT ||
mode > SS_AFFINITY_MODE_EXCL)
@@
-2351,7
+2337,7
@@
SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat
{
case SS_AFFINITY_MODE_DEFAULT:
{
{
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*/
S8 repeatFlag = 1;
SEARCH_FOR_CORE:
/*ss013.301: Fixed Warnings for 32/64 bit compilation*/
@@
-2452,7
+2438,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 */
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++)
{
Bool tskNotFound = TRUE;
for (;tskNotFound && coreIndex < SS_MAX_CORES; coreIndex++)
{
@@
-2549,8
+2535,8
@@
SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat
} /* end if */
else if (coreId == SS_DEFAULT_CORE)
{
} /* 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;
/*ss013.301: Fixed Warnings for 32/64 bit compilation*/
for (coreIndex = osCp.mCInfo.currentCore;
coreCounter < osCp.mCInfo.cpuInfo.numCores;
@@
-2649,12
+2635,12
@@
SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SDestroySTsk
+S16 SDestroySTsk
(
SSTskId tskId /* system task to be destroyed */
)
#else
(
SSTskId tskId /* system task to be destroyed */
)
#else
-
PUBLIC
S16 SDestroySTsk(tskId)
+S16 SDestroySTsk(tskId)
SSTskId tskId; /* system task to be destroyed */
#endif
{
SSTskId tskId; /* system task to be destroyed */
#endif
{
@@
-2666,11
+2652,10
@@
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)
/* 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*/
#endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT*/
- TRC1(SDestroySTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-2888,10
+2873,10
@@
SSTskId tskId; /* system task to be destroyed */
if (osCp.sTskTbl[tskInd].tskId == sTsk->tskId)
{
/* search for the tskId in coreInfo */
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++)
{
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])
for (thrId = 0; thrId < SS_MAX_THREADS_PER_CORE; thrId++)
{
if (sTsk->tskId == osCp.mCInfo.coreInfo[coreId].tskPerCoreLst[thrId])
@@
-2963,14
+2948,14
@@
SSTskId tskId; /* system task to be destroyed */
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SAttachTTsk
+S16 SAttachTTsk
(
Ent ent, /* entity ID of the task */
Inst inst, /* instance ID of the task */
SSTskId sTskId /* system task to use */
)
#else
(
Ent ent, /* entity ID of the task */
Inst inst, /* instance ID of the task */
SSTskId sTskId /* system task to use */
)
#else
-
PUBLIC
S16 SAttachTTsk(ent, inst, sTskId)
+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 */
Ent ent; /* entity ID of the task */
Inst inst; /* instance ID of the task */
SSTskId sTskId; /* system task to use */
@@
-2979,7
+2964,7
@@
SSTskId sTskId; /* system task to use */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PUBLIC
S16 SAttachTTsk
+S16 SAttachTTsk
(
ProcId proc, /* processor ID of the task */
Ent ent, /* entity ID of the task */
(
ProcId proc, /* processor ID of the task */
Ent ent, /* entity ID of the task */
@@
-2987,7
+2972,7
@@
Inst inst, /* instance ID of the task */
SSTskId sTskId /* system task to use */
)
#else
SSTskId sTskId /* system task to use */
)
#else
-
PUBLIC
S16 SAttachTTsk(proc, ent, inst, sTskId)
+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 */
ProcId proc; /* processor ID of the task */
Ent ent; /* entity ID of the task */
Inst inst; /* instance ID of the task */
@@
-3003,7
+2988,7
@@
SSTskId sTskId; /* system task to use */
SsSTskEntry *sTsk;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
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;
#endif /* SS_MULTIPLE_PROCS */
#ifdef SS_MULTICORE_SUPPORT
SsTTskEntry *tTsk;
@@
-3013,7
+2998,6
@@
SSTskId sTskId; /* system task to use */
#endif
#endif
- TRC1(SAttachTTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-3427,13
+3411,13
@@
SSTskId sTskId; /* system task to use */
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SDetachTTsk
+S16 SDetachTTsk
(
Ent ent, /* entity ID of the task */
Inst inst /* instance ID of the task */
)
#else
(
Ent ent, /* entity ID of the task */
Inst inst /* instance ID of the task */
)
#else
-
PUBLIC
S16 SDetachTTsk(ent, inst)
+S16 SDetachTTsk(ent, inst)
Ent ent; /* entity ID of the task */
Inst inst; /* instance ID of the task */
#endif
Ent ent; /* entity ID of the task */
Inst inst; /* instance ID of the task */
#endif
@@
-3441,14
+3425,14
@@
Inst inst; /* instance ID of the task */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PUBLIC
S16 SDetachTTsk
+S16 SDetachTTsk
(
ProcId proc, /* processor ID of the task */
Ent ent, /* entity ID of the task */
Inst inst /* instance ID of the task */
)
#else
(
ProcId proc, /* processor ID of the task */
Ent ent, /* entity ID of the task */
Inst inst /* instance ID of the task */
)
#else
-
PUBLIC
S16 SDetachTTsk(proc, ent, inst)
+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 */
ProcId proc; /* processor ID of the task */
Ent ent; /* entity ID of the task */
Inst inst; /* instance ID of the task */
@@
-3464,10
+3448,9
@@
Inst inst; /* instance ID of the task */
SsSTskEntry *sTsk;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
SsSTskEntry *sTsk;
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
-
U16
procIdIdx;
+
uint16_t
procIdIdx;
#endif /* SS_MULTIPLE_PROCS */
#endif /* SS_MULTIPLE_PROCS */
- TRC1(SDetachTTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-3762,13
+3745,13
@@
Inst inst; /* instance ID of the task */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SPstTsk
+S16 SPstTsk
(
Pst *pst, /* post information */
Buffer *mBuf /* message to post */
)
#else
(
Pst *pst, /* post information */
Buffer *mBuf /* message to post */
)
#else
-
PUBLIC
S16 SPstTsk(pst, mBuf)
+S16 SPstTsk(pst, mBuf)
Pst *pst; /* post information */
Buffer *mBuf; /* message to post */
#endif
Pst *pst; /* post information */
Buffer *mBuf; /* message to post */
#endif
@@
-3794,8
+3777,8
@@
Buffer *mBuf; /* message to post */
#endif
/* ss029.103: addition: multiple procIds related changes */
#ifdef SS_MULTIPLE_PROCS
#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
#endif /* SS_MULTIPLE_PROCS */
/*ss004.301: Cavium changes */
#ifdef SS_SEUM_CAVIUM
@@
-3808,10
+3791,9
@@
Buffer *mBuf; /* message to post */
Pst tempPst;
#ifdef MSPD_MLOG_NEW
Pst tempPst;
#ifdef MSPD_MLOG_NEW
-
U32
t = MacGetTick();
+
uint32_t
t = MacGetTick();
#endif
#endif
- TRC1(SPstTsk);
#if (ERRCLASS & ERRCLS_INT_PAR)
#if (ERRCLASS & ERRCLS_INT_PAR)
@@
-3898,7
+3880,7
@@
Buffer *mBuf; /* message to post */
/* copy the Pst structure into a local duplicate */
for (i = 0; i < (S16)sizeof(Pst); i++)
{
/* 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
}
pst = &nPst;
#ifdef SS_DRVR_SUPPORT
@@
-4064,7
+4046,7
@@
Buffer *mBuf; /* message to post */
{
for (j = 0; j < (S16)sizeof(Pst); j++)
{
{
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;
}
pst = &nPst;
nPstUsed = TRUE;
@@
-4169,7
+4151,7
@@
Buffer *mBuf; /* message to post */
*/
tTsk = &osCp.tTskTbl[dstIdx];
*/
tTsk = &osCp.tTskTbl[dstIdx];
-
cmMemcpy((U8*)&tempPst, (U8*)
pst, sizeof(Pst));
+
memcpy(&tempPst,
pst, sizeof(Pst));
if(tTsk->cbTsk != NULLP)
{
retValue = tTsk->cbTsk(&tempPst,mBuf);
if(tTsk->cbTsk != NULLP)
{
retValue = tTsk->cbTsk(&tempPst,mBuf);
@@
-4202,7
+4184,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++)
/* 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
/* ss004.301 : Cavium cahnges */
#ifdef SS_SEUM_CAVIUM
@@
-4298,7
+4280,7
@@
Buffer *mBuf; /* message to post */
((prior * SS_MAX_MSG_PRI) + tempPst.prior));
#ifdef TENB_T2K3K_SPECIFIC_CHANGES
{
((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)
if (g_usettitmr)
{
if (tTsk->sTsk->tskPrior == PRIOR0)
@@
-4308,8
+4290,8
@@
Buffer *mBuf; /* message to post */
if ((srctTsk->sTsk == tTsk->sTsk)
#if defined(SPLIT_RLC_DL_TASK) && !defined(RLC_MAC_DAT_REQ_RBUF)
||
if ((srctTsk->sTsk == tTsk->sTsk)
#if defined(SPLIT_RLC_DL_TASK) && !defined(RLC_MAC_DAT_REQ_RBUF)
||
- ((pst->dstEnt == ENT
RG
) &&
- (pst->srcEnt == ENT
KW
) &&
+ ((pst->dstEnt == ENT
MAC
) &&
+ (pst->srcEnt == ENT
RLC
) &&
(pst->event == EVTRGUDDATREQ))
#endif
)
(pst->event == EVTRGUDDATREQ))
#endif
)
@@
-4411,19
+4393,18
@@
Buffer *mBuf; /* message to post */
/* ss029.103: modification: procId added */
#ifdef ANSI
/* ss029.103: modification: procId added */
#ifdef ANSI
-
PUBLIC
S16 SGetTapaTskEntIds
+S16 SGetTapaTskEntIds
(
Ent *ent /* entity */
)
#else
(
Ent *ent /* entity */
)
#else
-
PUBLIC
S16 SGetTapaTskEntIds(ent)
+S16 SGetTapaTskEntIds(ent)
Ent *ent; /* entity */
#endif
{
Ent *ent; /* entity */
#endif
{
-
U32
tskCnt = 0;
+
uint32_t
tskCnt = 0;
- TRC1(SGetTapaTskEntIds);
/* Get the tapa task entity Ids from the osCp structure */
for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
{
/* Get the tapa task entity Ids from the osCp structure */
for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
{
@@
-4452,20
+4433,19
@@
Ent *ent; /* entity */
/* ss029.103: modification: procId added */
#ifdef ANSI
/* ss029.103: modification: procId added */
#ifdef ANSI
-
PUBLIC
S16 SRegForHstGrm
+S16 SRegForHstGrm
(
Ent ent /* entity */
)
#else
(
Ent ent /* entity */
)
#else
-
PUBLIC
S16 SRegForHstGrm(ent)
+S16 SRegForHstGrm(ent)
Ent ent; /* entity */
#endif
{
Ent ent; /* entity */
#endif
{
-
U32
tskCnt = 0;
+
uint32_t
tskCnt = 0;
S16 r = 0;
S16 r = 0;
- TRC1(SRegForHstGrm);
SS_ACQUIRE_SEMA(&osCp.tTskTblSem, r);
if (r != ROK)
SS_ACQUIRE_SEMA(&osCp.tTskTblSem, r);
if (r != ROK)
@@
-4515,23
+4495,22
@@
Ent ent; /* entity */
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SGetHstGrmInfo
+S16 SGetHstGrmInfo
(
Ent *entId,
Bool *hstReg /* entity */
)
#else
(
Ent *entId,
Bool *hstReg /* entity */
)
#else
-
PUBLIC
S16 SGetHstGrmInfo(entId, hstReg)
+S16 SGetHstGrmInfo(entId, hstReg)
Ent *entId;
Bool *hstReg; /* entity */
#endif
{
Ent *entId;
Bool *hstReg; /* entity */
#endif
{
-
U32
tskCnt = 0;
+
uint32_t
tskCnt = 0;
Bool found = FALSE;
*hstReg = 0;
Bool found = FALSE;
*hstReg = 0;
- TRC1(SGetHstGrmInfo);
for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
{
if( *entId == osCp.tTskTbl[tskCnt].ent)
for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++)
{
if( *entId == osCp.tTskTbl[tskCnt].ent)
@@
-4555,34
+4534,34
@@
Bool *hstReg; /* entity */
#ifdef SS_WATCHDOG
#ifdef ANSI
#ifdef SS_WATCHDOG
#ifdef ANSI
-
PUBLIC
S16 SInitWatchdog
+S16 SInitWatchdog
(
(
-
U16
port
+
uint16_t
port
)
#else
)
#else
-
PUBLIC
S16 SInitWatchdog(port)
-
U16
port;
+S16 SInitWatchdog(port)
+
uint16_t
port;
#endif
{
return ssdInitWatchDog(port);
}
#ifdef ANSI
#endif
{
return ssdInitWatchDog(port);
}
#ifdef ANSI
-
PUBLIC
S16 SRegCfgWd
+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
WdUserCallback callback,
void *data
)
#else
-
PUBLIC
S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data)
-
U32
numNodes;
-
U8
*addr[];
-
U16
port[];
-
U32
timeout;
+S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data)
+
uint32_t
numNodes;
+
uint8_t
*addr[];
+
uint16_t
port[];
+
uint32_t
timeout;
WdUserCallback callback;
void *data;
#endif
WdUserCallback callback;
void *data;
#endif
@@
-4591,7
+4570,6
@@
void *data;
int i = 0;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
int i = 0;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SRegCfgWd)
osCp.wdCp.globWd.timeout = timeout;
osCp.wdCp.globWd.callback = callback;
osCp.wdCp.globWd.timeout = timeout;
osCp.wdCp.globWd.callback = callback;
@@
-4625,12
+4603,12
@@
void *data;
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 SDeregCfgWd
+S16 SDeregCfgWd
(
void
)
#else
(
void
)
#else
-
PUBLIC
S16 SDeregCfgWd(void)
+S16 SDeregCfgWd(void)
void;
#endif
{
void;
#endif
{
@@
-4638,7
+4616,6
@@
void;
int i = 0;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
int i = 0;
/*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/
- TRC1(SDeregCfgWd)
osCp.wdCp.globWd.timeout = 0;
osCp.wdCp.globWd.callback = 0;
osCp.wdCp.globWd.timeout = 0;
osCp.wdCp.globWd.callback = 0;
@@
-4664,16
+4641,15
@@
void;
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 SStartHrtBt
+S16 SStartHrtBt
(
(
-
U8
timeInterval /* time interval */
+
uint8_t
timeInterval /* time interval */
)
#else
)
#else
-
PUBLIC
S16 SStartHrtBt(timeInterval)
-
U8
timeInterval;
+S16 SStartHrtBt(timeInterval)
+
uint8_t
timeInterval;
#endif
{
#endif
{
- TRC1(SStartHrtBt);
ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval);
ssdSndHrtBtMsg(TRUE, SS_WD_HB_REQ);
ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval);
ssdSndHrtBtMsg(TRUE, SS_WD_HB_REQ);
@@
-4682,16
+4658,15
@@
U8 timeInterval;
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 SStopHrtBt
+S16 SStopHrtBt
(
void
)
#else
(
void
)
#else
-
PUBLIC
S16 SStopHrtBt()
+S16 SStopHrtBt()
void
#endif
{
void
#endif
{
- TRC1(SStopHrtBt);
osCp.wdCp.globWd.watchdogStop = 1;
osCp.wdCp.globWd.watchdogStop = 1;
@@
-4699,13
+4674,13
@@
void
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 watchDgActvTsk
+S16 watchDgActvTsk
(
Pst *pst, /* post */
Buffer *mBuf /* message buffer */
)
#else
(
Pst *pst, /* post */
Buffer *mBuf /* message buffer */
)
#else
-
PUBLIC
S16 watchDgActvTsk(pst, mBuf)
+S16 watchDgActvTsk(pst, mBuf)
Pst *pst; /* post */
Buffer *mBuf; /* message buffer */
#endif
Pst *pst; /* post */
Buffer *mBuf; /* message buffer */
#endif
@@
-4716,7
+4691,6
@@
Buffer *mBuf; /* message buffer */
Txt prntBuf[PRNTSZE];
#endif /* DEBUGP */
Txt prntBuf[PRNTSZE];
#endif /* DEBUGP */
- TRC3(watchDgActvTsk)
#ifdef DEBUGP
SGetDateTime(&dt);
sprintf(prntBuf,"watchDgActvTsk: Time: %02d:%02d:%02d\n",dt.hour,dt.min, dt.sec
#ifdef DEBUGP
SGetDateTime(&dt);
sprintf(prntBuf,"watchDgActvTsk: Time: %02d:%02d:%02d\n",dt.hour,dt.min, dt.sec
@@
-4727,13
+4701,13
@@
Buffer *mBuf; /* message buffer */
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 watchDgRcvrActvTsk
+S16 watchDgRcvrActvTsk
(
Pst *pst, /* post */
Buffer *mBuf /* message buffer */
)
#else
(
Pst *pst, /* post */
Buffer *mBuf /* message buffer */
)
#else
-
PUBLIC
S16 watchDgRcvrActvTsk(pst, mBuf)
+S16 watchDgRcvrActvTsk(pst, mBuf)
Pst *pst; /* post */
Buffer *mBuf; /* message buffer */
#endif
Pst *pst; /* post */
Buffer *mBuf; /* message buffer */
#endif
@@
-4742,7
+4716,7
@@
Buffer *mBuf; /* message buffer */
DateTime dt;
#endif /* DEBUGP */
Txt prntBuf[PRNTSZE];
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];
S16 err;
struct sockaddr_in tmpaddr;
Txt hbMsg[SS_WD_HB_MSG_SIZE];
@@
-4753,7
+4727,6
@@
Buffer *mBuf; /* message buffer */
int socklen = sizeof(struct sockaddr);
#endif
int socklen = sizeof(struct sockaddr);
#endif
- TRC3(watchDgActvTsk)
#ifdef DEBUGP
SGetDateTime(&dt);
#ifdef DEBUGP
SGetDateTime(&dt);
@@
-4835,45
+4808,45
@@
Buffer *mBuf; /* message buffer */
*/
#ifdef SS_MULTIPLE_PROCS
#ifdef ANSI
*/
#ifdef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PUBLIC
S16 SGetThrdProf
+S16 SGetThrdProf
(
SSTskId *sTskId,
ProcId procId,
Ent ent, /* entity */
Inst inst,
Event *curEvent,
(
SSTskId *sTskId,
ProcId procId,
Ent ent, /* entity */
Inst inst,
Event *curEvent,
-
U32
*curEvtTime,
-
U64
*totTime
+
uint32_t
*curEvtTime,
+
uint64_t
*totTime
)
#else
)
#else
-
PUBLIC
S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime)
+S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime)
SSTskId *sTskId;
ProcId procId;
Ent ent; /* entity */
Inst inst;
Event *curEvent;
SSTskId *sTskId;
ProcId procId;
Ent ent; /* entity */
Inst inst;
Event *curEvent;
-
U32
*curEvtTime;
-
U64
*totTime;
+
uint32_t
*curEvtTime;
+
uint64_t
*totTime;
#endif
#else
#ifdef ANSI
#endif
#else
#ifdef ANSI
-
PUBLIC
S16 SGetThrdProf
+S16 SGetThrdProf
(
SSTskId *sTskId,
Ent ent, /* entity */
Inst inst,
Event *curEvent,
(
SSTskId *sTskId,
Ent ent, /* entity */
Inst inst,
Event *curEvent,
-
U32
*curEvtTime,
-
U64
*totTime
+
uint32_t
*curEvtTime,
+
uint64_t
*totTime
)
#else
)
#else
-
PUBLIC
S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime)
+S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime)
SSTskId *sTskId;
Ent ent; /* entity */
Inst inst;
Event *curEvent;
SSTskId *sTskId;
Ent ent; /* entity */
Inst inst;
Event *curEvent;
-
U32
*curEvtTime;
-
U64
*totTime;
+
uint32_t
*curEvtTime;
+
uint64_t
*totTime;
#endif
#endif /* SS_MULTIPLE_PROCS */
{
#endif
#endif /* SS_MULTIPLE_PROCS */
{
@@
-4881,11
+4854,10
@@
U64 *totTime;
SsIdx idx;
SsTTskEntry *tTsk;
#ifdef SS_MULTIPLE_PROCS
SsIdx idx;
SsTTskEntry *tTsk;
#ifdef SS_MULTIPLE_PROCS
-
U16
procIdIdx;
+
uint16_t
procIdIdx;
#endif
#endif
- TRC1(SGetThrdProf);
#if (ERRCLASS & ERRCLS_INT_PAR)
/* check entity and instance range */
#if (ERRCLASS & ERRCLS_INT_PAR)
/* check entity and instance range */
@@
-4958,13
+4930,13
@@
U64 *totTime;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 SRegTskInfo
+S16 SRegTskInfo
(
(
-
U8
*cfgFile
+
uint8_t
*cfgFile
)
#else
)
#else
-
PUBLIC
S16 SRegTskInfo(cfgFile)
-
U8
*cfgFile;
+S16 SRegTskInfo(cfgFile)
+
uint8_t
*cfgFile;
#endif
{
return cmCfgrTskReg(cfgFile);
#endif
{
return cmCfgrTskReg(cfgFile);