X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=583b6c988cfa1252478fa4385f11b42101dc2318;hb=ba2574ac618b40905509604da8d3a2b1b9e39664;hp=9626822368272fb0aebb766f0246b5a36c49326c;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 962682236..583b6c988 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -102,6 +102,12 @@ #include #endif /* SS_WATCHDOG */ +#ifdef SS_USE_WLS_MEM +#include +#include +#include +#endif + /* header/extern include files (.x) */ #include "gen.x" /* general layer */ @@ -153,24 +159,20 @@ #include "sys/syscall.h" #endif -#if defined(RGL_SPECIFIC_CHANGES) || defined(INTEL_WLS) +#if defined(RGL_SPECIFIC_CHANGES) || defined(INTEL_WLS) || defined(SS_USE_WLS_MEM) #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); +S16 rgBatchProc (Void); #endif #ifdef RLC_MAC_DAT_REQ_RBUF -EXTERN S16 rgDlDatReqBatchProc ARGS(( +S16 rgDlDatReqBatchProc ARGS(( Void)); #endif #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -EXTERN S16 rgBatchProc ARGS(( +S16 rgBatchProc ARGS(( Void)); #endif @@ -202,14 +204,7 @@ Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); void dump_external(void); -#ifdef ANSI -PRIVATE Void mtDelSigals -( -Void -) -#else -PRIVATE Void mtDelSignals() -#endif +static Void mtDelSigals(Void) { struct sigaction sa; @@ -223,7 +218,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) { @@ -324,18 +319,18 @@ void *pthreadCreateHdlr(void* arg); Buffer *mtTskBuffer1; Buffer *mtTskBuffer2; -EXTERN pthread_t tmpRegTidMap[20]; -EXTERN U8 stopBtInfo; -EXTERN S16 SGlobMemInfoShow(void); +pthread_t tmpRegTidMap[20]; +uint8_t stopBtInfo; + S16 SGlobMemInfoShow(void); #endif /* SS_LOCKLESS_MEMORY */ #ifdef L2_L3_SPLIT -EXTERN APP_CONTEXT AppContext; -EXTERN S32 clusterMode; +APP_CONTEXT AppContext; +S32 clusterMode; #endif #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN unsigned int tlPost(void *handle); +unsigned int tlPost(void *handle); #endif /* forward references */ @@ -346,56 +341,56 @@ Void *mtTskHdlrT2kL2 ARGS((Void*)); void mtSigUsr2Hndlr ARGS((void)); #endif -PRIVATE S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); -PRIVATE Void *mtTskHdlr ARGS((void *)); -PRIVATE S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); +static S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); +static Void *mtTskHdlr ARGS((void *)); +static S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); -PRIVATE Void *mtTmrHdlr ARGS((void *)); -PRIVATE Void mtTimeout ARGS((PTR tCb, S16 evnt)); +static Void *mtTmrHdlr ARGS((void *)); +static Void mtTimeout ARGS((PTR tCb, S16 evnt)); /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ -PRIVATE Void mtIntSigHndlr ARGS((int)); -PRIVATE Void mtExitClnup ARGS((void)); +static Void mtIntSigHndlr ARGS((int)); +static Void mtExitClnup ARGS((void)); #ifdef CONAVL -PRIVATE Void *mtConHdlr ARGS((void *)); +static Void *mtConHdlr ARGS((void *)); #endif #ifndef L2_L3_SPLIT #ifdef SS_DRVR_SUPPORT -PRIVATE Void *mtIsTskHdlr ARGS((void *)); +static Void *mtIsTskHdlr ARGS((void *)); #endif #endif /* mt020.201 - Addition for no command line available */ #ifndef NOCMDLINE -PRIVATE Void mtGetOpts ARGS((void)); +static Void mtGetOpts ARGS((void)); /* mt003.301 Additions - File Based task registration made * common for both MULTICORE and NON-MULTICORE */ -PRIVATE Bool fileBasedMemCfg = FALSE; +static Bool fileBasedMemCfg = FALSE; #endif /* mt033.201 - addition of local function to print the statistics such as * (size vs. numAttempts) and (allocations vs. deallocations) */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 SPrintRegMemStats ARGS((Region region)); +static S16 SPrintRegMemStats ARGS((Region region)); #endif /* SSI_DEBUG_LEVEL1 */ #ifdef SS_MULTICORE_SUPPORT -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void); -PRIVATE SsSTskEntry* ssdReAddTmrSTsk ARGS((U8 idx)); +static SsSTskEntry* ssdAddTmrSTsk(Void); +static SsSTskEntry* ssdReAddTmrSTsk ARGS((uint8_t idx)); #ifndef SS_LOCKLESS_MEMORY #ifndef RGL_SPECIFIC_CHANGES -PRIVATE S16 ssdInitMemInfo ARGS((void)); +static S16 ssdInitMemInfo ARGS((void)); #endif #endif #endif /* mt005.301: Cavium changes */ #ifdef SS_SEUM_CAVIUM -PRIVATE Void *workRcvTsk ARGS((void *)); +static Void *workRcvTsk ARGS((void *)); #endif /* SS_SEUM_CAVIUM */ #ifdef SS_THR_REG_MAP @@ -409,8 +404,8 @@ 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 @@ -434,6 +429,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } } @@ -460,6 +456,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -470,6 +467,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -480,6 +478,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -490,9 +489,33 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } - } + }, + { + SS_DFLT_REGION + 5, 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 } + } + }, + { + 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 @@ -512,7 +535,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -523,7 +547,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -534,7 +559,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -545,7 +571,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -556,13 +583,38 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} + } + }, + { + SS_DFLT_REGION + 5, /* 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} + } + }, + { + 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 */ @@ -586,7 +638,8 @@ MtGlobMemCfg mtGlobMemoCfg = {MT_BKT_0_DSIZE, (MT_BKT_0_NUMBLKS + MT_BKT_0_NUMBLKS), SS_DFLT_MEM_BLK_SET_SIZE}, {MT_BKT_1_DSIZE, MT_BKT_1_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, {MT_BKT_2_DSIZE, MT_BKT_2_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, - {MT_BKT_3_DSIZE, MT_BKT_3_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE} + {MT_BKT_3_DSIZE, MT_BKT_3_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, + {MT_BKT_4_DSIZE, MT_BKT_4_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE} #else {1024, 12800 /* MT_BKT_0_NUMBLKS */, SS_DFLT_MEM_BLK_SET_SIZE}, {1664, 12800 /* MT_BKT_1_NUMBLKS */, SS_DFLT_MEM_BLK_SET_SIZE}, @@ -620,7 +673,8 @@ MtMemCfg mtMemoCfg = {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_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} #else {256, 491520}, /* 60 pages of 2M*/ {512, 12288}, /* 3 pages of 2M */ @@ -659,7 +713,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -670,7 +725,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -681,7 +737,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -692,10 +749,34 @@ MtMemCfg mtMemoCfg = {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_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 */ + 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 */ + 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 */ } } - #endif /* SS_LOCKLESS_MEMORY */ STATIC_MEM_CFG } @@ -712,27 +793,34 @@ S16 msOptInd; /* SGetOpt vars */ S8 *msOptArg; /* SGetOpt vars */ -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) typedef struct _MtRegMemSz { - U32 reqdSz; - U8 *startAddr; + uint32_t reqdSz; + uint8_t *startAddr; }MtRegMemSz; -PRIVATE MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; +#ifdef SS_USE_WLS_MEM +static MtRegMemSz mtDynMemSz[MT_MAX_BKTS]; +static S16 SPartitionWlsDynMem(); +static S16 SAllocateWlsDynMem(); +#endif +#ifdef INTEL_WLS +static MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; +#endif #endif /* private variable declarations */ /* mt018.201 - change mtCMMRegCfg as array of pointers */ -PRIVATE CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; -PRIVATE CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; +static CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; +static CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; /* mt003.301 - Fixed compilation warnings */ /*mt004.301-addede new veriable for FAP*/ /*mt010.301 - removed veriable defined for FA*/ -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) #ifdef NTL_LIB void mtSetNtlHdl(unsigned int hdl) @@ -746,21 +834,33 @@ unsigned int mtGetNtlHdl() } #endif /* NTL_LIB */ - -void * mtGetWlsHdl() +void mtGetWlsHdl(void **hdlr) { - return (osCp.wls.intf); -} + *hdlr = osCp.wls.intf; +} #ifdef XEON_MULTIPLE_CELL_CHANGES -EXTERN S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; -EXTERN S16 smWrReadWlsConfigParams (Void); +S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; +S16 smWrReadWlsConfigParams (Void); #endif -PRIVATE int SOpenWlsIntf() +static int SOpenWlsIntf() { + uint8_t i; void *hdl; - #define WLS_DEVICE_NAME "/dev/wls" + #define WLS_DEVICE_NAME "wls0" + + char *my_argv[] = {"gnodeb", "-c3", "--proc-type=auto", "--file-prefix", WLS_DEVICE_NAME, "--iova-mode=pa"}; + printf("Calling rte_eal_init: "); + for (i = 0; i < RTE_DIM(my_argv); i++) + { + printf("%s ", my_argv[i]); + } + printf("\n"); + + if (rte_eal_init(RTE_DIM(my_argv), my_argv) < 0) + rte_panic("Cannot init EAL\n"); + #ifdef XEON_SPECIFIC_CHANGES #ifdef XEON_MULTIPLE_CELL_CHANGES @@ -769,7 +869,7 @@ PRIVATE int SOpenWlsIntf() hdl = WLS_Open(WLS_DEVICE_NAME, 1); #endif #else - hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, (512 *1024 * 1024)); + hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, WLS_MEM_SIZE); #endif osCp.wls.intf = hdl; @@ -803,17 +903,11 @@ PRIVATE 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 @@ -825,7 +919,7 @@ char **argv; /* argument vector */ } /* end of if statement */ #endif -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) if(!SOpenWlsIntf()) return (0); #endif /* INTEL_WLS */ @@ -863,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 { @@ -905,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; @@ -1064,21 +1145,14 @@ S16 ssdInitGen() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitGen -( -void -) -#else -Void ssdDeinitGen() -#endif +Void ssdDeinitGen(void) { sem_destroy(&osCp.dep.ssStarted); - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY #ifdef USE_MALLOC @@ -1097,24 +1171,17 @@ Void ssdDeinitGen() * File: cm_mem.c * */ -#ifdef ANSI 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 -S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ -CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be - added to global region */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; @@ -1155,26 +1222,19 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be * File: cm_mem.c * */ -#ifdef ANSI 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 -S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ -CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated - with new set values */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; Data **basePtr; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; @@ -1217,21 +1277,13 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated * File: cm_mem.c * */ -#ifdef ANSI 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 -S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 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 */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1304,21 +1356,13 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock * File: cm_mem.c * */ -#ifdef ANSI 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 -S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 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 */ -#endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; @@ -1374,21 +1418,14 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock #define NUM_CALLS_TO_CHECK_MEM_DYN_AGAIN 100 -U32 gDynMemAlrm[4]; -PRIVATE U32 memoryCheckCounter; +uint32_t gDynMemAlrm[4]; +static uint32_t memoryCheckCounter; -#ifdef ANSI -U32 isMemThreshReached( -Region reg -) -#else -U32 isMemThreshReached(reg) -Region reg; -#endif +uint32_t isMemThreshReached(Region reg) { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; - U8 bktIdx= reg; + uint8_t bktIdx= reg; globReg = osCp.globRegCb; @@ -1448,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; @@ -1473,25 +1502,70 @@ Region region; #endif /* SS_USE_ICC_MEMORY */ #ifdef T2K_MEM_LEAK_DBG -extern RegionMemLeakInfo regMemLeakInfo; +RegionMemLeakInfo regMemLeakInfo; #endif /* T2K_MEM_LEAK_DBG */ +#ifdef SS_USE_WLS_MEM +static S16 SPartitionWlsDynMem() +{ + uint32_t i; + uint8_t *bktMemStrtAddr = (uint8_t *)(((uint8_t*)osCp.wls.allocAddr) + (4 * 1024 * 1024)); + + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + mtDynMemSz[i].startAddr = bktMemStrtAddr; + bktMemStrtAddr += mtDynMemSz[i].reqdSz; + } + + printf("Global Memory Info: \n"); + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + printf("mtDynMemSz[%d]: [0x%016lx]\n", i, (unsigned long int)mtDynMemSz[i].startAddr); + } + return ROK; +} + +static S16 SAllocateWlsDynMem() +{ + uint32_t reqdMemSz; + uint32_t i; + reqdMemSz = 0; + memset(&mtDynMemSz[0], 0, sizeof(mtDynMemSz)); + + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + reqdMemSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); + mtDynMemSz[i].reqdSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); + } + osCp.wls.allocAddr = WLS_Alloc(osCp.wls.intf, +#ifdef INTEL_L1_V19_10 + WLS_MEMORY_SIZE); +#else + (reqdMemSz + (4 * 1024 * 1024))); +#endif + printf("\n *************** \n WLS memory: %lx, %d\n", (PTR)osCp.wls.allocAddr, reqdMemSz); + SPartitionWlsDynMem(); + return ROK; +} + +#endif + #ifdef INTEL_WLS 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]; @@ -1505,7 +1579,7 @@ S16 SPartitionWlsMemory() 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 */ } @@ -1539,12 +1613,12 @@ Void SChkAddrValid(int type, int region, PTR ptr) } #endif /* SS_MEM_WL_DEBUG */ -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,7 +1629,7 @@ 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 */ @@ -1565,8 +1639,8 @@ S16 SPartitionStaticMemory(U8 *startAddr) S16 SAllocateWlsMem() { - U32 reqdMemSz; - U32 i, j; + uint32_t reqdMemSz; + uint32_t i, j; MtRegCfg *region; reqdMemSz = 0; @@ -1599,10 +1673,10 @@ S16 SAllocateWlsMem() 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); @@ -1650,27 +1724,20 @@ S16 SAllocateStaticMem() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitMem -( -void -) -#else -S16 ssdInitMem() -#endif +S16 ssdInitMem(void) { /* mt018.201 - added local variable */ - U8 i; - U16 j; - U8 k; - MtRegCfg *region; + uint8_t i =0; + uint16_t j =0; + uint8_t k =0; + MtRegCfg *region = NULLP; Txt errMsg[256] = {'\0'}; #ifdef SS_LOCKLESS_MEMORY - CmMmDynRegCb *dynRegCb; + CmMmDynRegCb *dynRegCb =0; #ifdef SS_USE_ICC_MEMORY #else - CmMmGlobRegCb *globReg; - Size memSize; + CmMmGlobRegCb *globReg = NULLP; + Size memSize =0; #endif #endif /* SS_LOCKLESS_MEMORY */ @@ -1711,13 +1778,22 @@ S16 ssdInitMem() globReg = (CmMmGlobRegCb *)osCp.globRegCb; +#ifdef SS_USE_WLS_MEM + SAllocateWlsDynMem(); +#endif + for(i = 0; i < mtGlobMemoCfg.numBkts; i++) { memSize = (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); +#if !defined (INTEL_WLS) && defined (SS_USE_WLS_MEM) + globReg->bktTbl[i].startAddr = (Data *)mtDynMemSz[i].startAddr; + printf("Starting Address of Bkt Entry [%d]: [0x%016lx], memSize[%d]\n", i, (unsigned long int)globReg->bktTbl[i].startAddr, memSize); +#else #ifndef INTEL_WLS globReg->bktTbl[i].startAddr = (Data *)calloc(memSize, sizeof(Data)); #else globReg->bktTbl[i].startAddr = (Data *)mtRegMemSz[i].startAddr; +#endif #endif if(globReg->bktTbl[i].startAddr == NULLP) { @@ -1753,6 +1829,7 @@ S16 ssdInitMem() #endif return RFAILED; } + dynRegCb->bktTbl[k].poolId = k; dynRegCb->bktTbl[k].size = mtGlobMemoCfg.bkt[k].blkSize; dynRegCb->bktTbl[k].blkSetRelThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetRelThreshold; dynRegCb->bktTbl[k].blkSetAcquireThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetAcquireThreshold; @@ -1770,7 +1847,7 @@ S16 ssdInitMem() #endif /* SS_LOCKLESS_MEMORY */ #ifdef T2K_MEM_LEAK_DBG - U8 reg; + uint8_t reg =0; /* Initailize mem leak tool memorys for debguing */ regMemLeakInfo.numActvRegions=0; for(reg=0; reg vAddr); - free(mtCMMRegCb[k]); - free(mtCMMRegCfg[k]); - } - free(mtCMMRegCb[i]); - return RFAILED; - } + { + for (k = 0; k < i; k++) + { + cmMmRegDeInit(mtCMMRegCb[k]); + free(mtCMMRegCfg[k]->vAddr); + free(mtCMMRegCb[k]); + free(mtCMMRegCfg[k]); + } + free(mtCMMRegCb[i]); + return RFAILED; + } /* allocate space for the region */ @@ -1939,7 +2016,6 @@ S16 ssdInitMem() cmInitMemLeakMdl(); #endif /* SS_MEM_LEAK_STS */ - return ROK; } @@ -1957,17 +2033,10 @@ S16 ssdInitMem() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitMem -( -void -) -#else -Void ssdDeinitMem() -#endif +Void ssdDeinitMem(void) { /* mt018.201 - added local variables */ - U8 i; + uint8_t i; /* mt008.301 Additions */ #ifdef SS_MEM_LEAK_STS @@ -1982,7 +2051,7 @@ Void ssdDeinitMem() free(mtCMMRegCfg[i]); } - RETVOID; + return; } @@ -2000,19 +2069,12 @@ 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 */ #if defined(SS_MULTICORE_SUPPORT) ||defined(SS_AFFINITY_SUPPORT) - U32 tskInd = 0; + uint32_t tskInd = 0; #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ @@ -2043,17 +2105,10 @@ S16 ssdInitTsk() * File: mt_ss.c * */ -#ifdef ANSI -Void ssdDeinitTsk -( -void -) -#else -Void ssdDeinitTsk() -#endif +Void ssdDeinitTsk(void) { - RETVOID; + return; } @@ -2072,14 +2127,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 @@ -2150,14 +2198,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)); @@ -2170,7 +2211,7 @@ Void ssdDeinitDrvr() } #endif - RETVOID; + return; } #endif /* SS_DRVR_SUPPORT */ @@ -2189,14 +2230,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; @@ -2206,7 +2240,7 @@ 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 */ @@ -2286,14 +2320,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; @@ -2310,7 +2337,7 @@ 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 */ @@ -2333,7 +2360,7 @@ Void ssdDeinitTmr() #endif /* SS_MULTICORE_SUPPORT */ /* mt008.301: Terminate the timer thread on exit */ while(pthread_cancel(osCp.dep.tmrHdlrTID)); - RETVOID; + return; } @@ -2351,14 +2378,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 @@ -2457,14 +2477,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 @@ -2474,23 +2487,15 @@ Void ssdDeinitLog() #endif /* CONRD */ #endif /* CONVAL */ - RETVOID; + return; } /* mt001.301 : Additions */ #ifdef SS_WATCHDOG -#ifdef ANSI -S16 ssdInitWatchDog -( -U16 port -) -#else -S16 ssdInitWatchDog(port) -U16 port; -#endif +S16 ssdInitWatchDog(uint16_t port) { - U8 idx; + uint8_t idx; Txt prntBuf[PRNTSZE]; Pst pst; Buffer *mBuf; @@ -2545,7 +2550,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++) @@ -2603,15 +2608,7 @@ U16 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; @@ -2631,7 +2628,6 @@ Pst *pst; } #ifdef SS_MULTIPLE_PROCS -#ifdef ANSI S16 ssdWatchDgActvTmr ( ProcId proc, @@ -2639,17 +2635,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 */ { @@ -2658,17 +2644,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 @@ -2718,19 +2698,12 @@ S16 event; /* timer number */ } -#ifdef ANSI Void ssdStartWatchDgTmr ( -void *cb, -S16 event, -U16 wait +void *cb, +S16 event, +uint16_t wait ) -#else -Void ssdStartWatchDgTmr(cb, event, wait) -void *cb; -S16 event; -U16 wait; -#endif { CmTmrArg arg; int i; @@ -2770,20 +2743,14 @@ U16 wait; arg.max = 1; cmPlcCbTq(&arg); - RETVOID; + 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 @@ -2820,20 +2787,14 @@ S16 event; arg.max = 1; cmRmvCbTq(&arg); - RETVOID; + return; } -#ifdef ANSI S16 ssdSndHrtBtMsg ( -Bool restart, -U32 type +Bool restart, +uint32_t type ) -#else -S16 ssdSndHrtBtMsg(restart, type) -Bool restart; -U32 type; -#endif { S16 ret = ROK; #ifdef DEBUGP @@ -2917,14 +2878,7 @@ U32 type; * File: mt_ss.c * */ -#ifdef ANSI -PRIVATE Void mtGetOpts -( -void -) -#else -PRIVATE Void mtGetOpts() -#endif +static Void mtGetOpts(void) { S32 argc; S8 **argv; @@ -2933,7 +2887,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; @@ -3260,7 +3214,7 @@ PRIVATE Void mtGetOpts() msOptInd = 1; - RETVOID; + return; } #endif @@ -3301,19 +3255,12 @@ PRIVATE 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 @@ -3415,14 +3362,7 @@ char *opts; /* options */ * File: mt_ss.c * */ -#ifdef ANSI -Void ssdStart -( -void -) -#else -Void ssdStart() -#endif +Void ssdStart(void) { S16 i; @@ -3436,7 +3376,7 @@ Void ssdStart() } - RETVOID; + return; } @@ -3459,15 +3399,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; @@ -3543,15 +3478,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; @@ -3572,22 +3502,17 @@ 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; /* struct sched_param param_sched;*/ #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif @@ -3694,7 +3619,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 */ @@ -3706,7 +3631,6 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ } -#ifdef ANSI int SCreatePThread ( pthread_t* tid, @@ -3714,17 +3638,10 @@ 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 - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif SPThreadCreateArg* threadArg = (SPThreadCreateArg*)malloc(sizeof(SPThreadCreateArg)); @@ -3780,17 +3697,11 @@ void* arg; * */ -#ifdef ANSI -PRIVATE S16 ssdSetPthreadAttr +static S16 ssdSetPthreadAttr ( S32 tskPrior, pthread_attr_t *attr ) -#else -PRIVATE S16 ssdSetPthreadAttr(sTsk, attr) -S32 tskPrior, -pthread_attr_t *attr -#endif { struct sched_param param; @@ -3858,30 +3769,24 @@ pthread_attr_t *attr * File: ss_task.c * */ -#ifdef ANSI 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 -S16 ssdGetAffinity(tskId, coreId) -SSTskId *tskId; /* filled in with system task ID */ -U32 *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*/ #ifdef SS_LINUX @@ -3974,20 +3879,14 @@ U32 *coreId; /* the core/processor id to which the affinity i * File: ss_task.c * */ -#ifdef ANSI S16 ssdSetAffinity ( SSTskId *tskId, /* filled in with system task ID */ -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 */ ) -#else -S16 ssdSetAffinity(tskId, coreId) -SSTskId *tskId; /* filled in with system task ID */ -U32 coreId; /* the core/processor id to which the affinity has to be set */ -#endif { - U32 tskInd = 0; + uint32_t tskInd = 0; #ifdef SS_LINUX pthread_t tId = 0; @@ -3995,7 +3894,7 @@ U32 coreId; /* the core/processor id to which the affinity h /*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*/ @@ -4086,15 +3985,10 @@ U32 coreId; /* the core/processor id to which the affinity h * 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; @@ -4147,14 +4041,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SThreadYield -( -void -) -#else -S16 SThreadYield() -#endif +S16 SThreadYield(void) { @@ -4198,15 +4085,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; @@ -4247,15 +4129,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; @@ -4292,17 +4169,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; @@ -4317,7 +4188,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); @@ -4354,7 +4225,6 @@ Reason reason; /* reset reason */ * File: mt_ss.c * */ -#ifdef ANSI Void ssdLogError ( Ent ent, /* Calling layer's entity id */ @@ -4367,19 +4237,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; @@ -4468,7 +4325,7 @@ Txt *errDesc; /* description of error */ #endif - RETVOID; + return; } #ifdef ENB_RELAY @@ -4487,15 +4344,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 { @@ -4516,15 +4368,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 { @@ -4539,31 +4386,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 @@ -4691,18 +4525,13 @@ SsIdx idx; //#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 ysMtRcvPhyMsg(Void); -#ifdef ANSI +Void ysMtTskHdlr(Void); +Void ysMtPollPhyMsg(uint8_t region); +Void ysMtRcvPhyMsg(Void); Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) -#else -Void *mtTskHdlrT2kL2(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { S16 ret; @@ -4728,17 +4557,12 @@ Ptr tskPtr; /* pointer to task entry */ return (NULLP); } #else -EXTERN Void ysMtTskHdlr(Void); -EXTERN Void YsPhyRecvMsg(); -#ifdef ANSI +Void ysMtTskHdlr(Void); +Void YsPhyRecvMsg(); Void *mtTskHdlrT2kL2 ( Ptr tskPtr /* pointer to task entry */ ) -#else -Void *mtTskHdlrT2kL2(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { S16 ret; SsSTskEntry *sTsk; @@ -4790,15 +4614,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; @@ -4829,17 +4645,12 @@ 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; + S16 ret = ROK; SsSTskEntry *sTsk; /* get out the system task entry from the parameter */ @@ -4856,11 +4667,6 @@ 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); @@ -4900,25 +4706,20 @@ 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; - SsIdx idx; - SsTTskEntry *tTsk; - Buffer *mBuf; + S16 i =0; + S16 ret =0; + SsIdx idx =0; + SsTTskEntry *tTsk=NULLP; + Buffer *mBuf=NULLP; #ifdef SS_PERF - Buffer *mBuf2; + Buffer *mBuf2=NULLP; #endif - SsMsgInfo *mInfo; + SsMsgInfo *mInfo=NULLP; Pst nPst; /* mt028.201: modification: multiple procs support related changes */ #ifndef SS_MULTIPLE_PROCS @@ -4928,8 +4729,8 @@ SsSTskEntry *sTsk /* mt015.301 Initialized the timer activation functions with NULLP */ PFS16 tmrActvFn = NULLP; #else - PAIFTMRS16 tmrActvFn; - U16 procIdIdx; + PAIFTMRS16 tmrActvFn =NULLP; + uint16_t procIdIdx =0; #endif /* SS_MULTIPLE_PROCS */ /* mt003.301 Modifications */ #ifdef SS_THREAD_PROFILE @@ -5078,7 +4879,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 @@ -5090,7 +4891,7 @@ SsSTskEntry *sTsk { #ifndef RGL_SPECIFIC_CHANGES #ifdef SS_TSKLOG_ENABLE - U32 t = MacGetTick(); + uint32_t t = MacGetTick(); #endif #endif /* mt003.301 Modifications */ @@ -5106,8 +4907,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 @@ -5306,13 +5107,7 @@ Bool g_usettitmr; /* * Fun: mtTmrHdlrPublic */ -#ifdef ANSI -Void mtTmrHdlrPublic -( -) -#else Void mtTmrHdlrPublic() -#endif { if (SLock(&osCp.tmrTblLock) != ROK) { @@ -5343,30 +5138,24 @@ Void mtTmrHdlrPublic() * */ /*mt041.201 Modified SSI tick handling in mtTmrHdlr() */ -#ifdef ANSI -PRIVATE Void *mtTmrHdlr +static Void *mtTmrHdlr ( void *parm /* unused */ ) -#else - /* mt009.21: addition */ -PRIVATE Void *mtTmrHdlr(parm) -void *parm; /* unused */ -#endif { /*mt004.301-addede new region*/ /* mt010.301 Removed SS_FAP portion and * 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; + static uint32_t err_in_usec; /*mt013.301 : doesn't need TRC macro ,as this will never return*/ @@ -5506,17 +5295,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; @@ -5529,11 +5312,11 @@ 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 @@ -5546,7 +5329,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 */ @@ -5557,7 +5340,7 @@ S16 evnt; /* event */ */ if (tEnt->used == FALSE) { - RETVOID; + return; } @@ -5579,7 +5362,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT017, ERRZERO, "Could not get message"); #endif - RETVOID; + return; } mInfo = (SsMsgInfo *)mBuf->b_rptr; @@ -5620,7 +5403,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT018, ret, "Could not lock TAPA task table"); #endif - RETVOID; + return; } #endif @@ -5639,7 +5422,7 @@ S16 evnt; /* event */ SS_RELEASE_SEMA(&osCp.tTskTblSem); #endif SPutMsg(mBuf); - RETVOID; + return; } @@ -5651,7 +5434,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 */ @@ -5668,7 +5451,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY mInfo->pst.region = tTsk->sTsk->region; @@ -5687,7 +5470,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } /* Fix for ccpu00130657 */ #ifdef TENB_T2K3K_SPECIFIC_CHANGES @@ -5723,7 +5506,7 @@ S16 evnt; /* event */ MLogTask(131313, RESOURCE_LARM, t, GetTIMETICK()); #endif #endif - RETVOID; + return; } @@ -5742,16 +5525,10 @@ S16 evnt; /* event */ * File: mt_ss.c * */ -#ifdef ANSI -PRIVATE Void *mtConHdlr +static Void *mtConHdlr ( Ptr parm /* unused */ ) -#else - /* mt009.21: addition */ -PRIVATE Void *mtConHdlr(parm) -Ptr parm; /* unused */ -#endif { int fd; Data data; @@ -5810,17 +5587,11 @@ Ptr parm; /* unused */ * File: mt_ss.c * */ -#ifdef ANSI /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr +static Void *mtIsTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) -#else - /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr(tskPtr) -Ptr tskPtr; /* pointer to task entry */ -#endif { #if (ERRCLASS & ERRCLS_DEBUG) int ret; @@ -5915,15 +5686,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; @@ -5934,7 +5697,7 @@ int arg; #endif #endif - RETVOID; + return; } /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ @@ -5951,14 +5714,7 @@ int arg; * File: mt_ss.c * */ -#ifdef ANSI -Void mtExitClnup -( -void -) -#else -Void mtExitClnup() -#endif +Void mtExitClnup(void) { Ticks ticks; S8 buf[128]; @@ -6013,17 +5769,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 */ @@ -6083,14 +5833,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 @@ -6127,15 +5870,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); @@ -6161,15 +5899,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; --*/ @@ -6204,12 +5937,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 @@ -6240,20 +5973,15 @@ 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 */ -PRIVATE U64 now; - U64 to_sec = 1000000; - U64 to_nsec = 1000; +static uint64_t now; + uint64_t to_sec = 1000000; + uint64_t to_nsec = 1000; #ifndef SS_LINUX struct timespec ptime; #else @@ -6306,15 +6034,10 @@ PRIVATE U64 now; * File: mt_ss.c * */ -#ifdef ANSI S16 SGetSysTime ( Ticks *sysTime /* system time */ ) -#else -S16 SGetSysTime(sysTime) -Ticks *sysTime; /* system time */ -#endif { @@ -6353,19 +6076,12 @@ Ticks *sysTime; /* system time */ * File: mt_ss.c * */ -#ifdef ANSI S16 SGetRefTime ( -U32 refTime, /* reference time */ -U32 *sec, -U32 *usec +uint32_t refTime, /* reference time */ +uint32_t *sec, +uint32_t *usec ) -#else -S16 SGetRefTime(refTime, sec, usec) -U32 refTime; /* reference time */ -U32 *sec; -U32 *usec; -#endif { #ifndef SS_LINUX @@ -6388,7 +6104,7 @@ U32 *usec; 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"); return RFAILED; @@ -6422,15 +6138,10 @@ U32 *usec; * File: mt_ss.c * */ -#ifdef ANSI S16 SRandom ( Random *value /* random number */ ) -#else -S16 SRandom(value) -Random *value; /* random number */ -#endif { @@ -6464,14 +6175,7 @@ Random *value; /* random number */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SExitTsk -( -void -) -#else -S16 SExitTsk() -#endif +S16 SExitTsk(void) { @@ -6492,14 +6196,7 @@ S16 SExitTsk() * File: mt_ss.c * */ -#ifdef ANSI -S16 SExitInt -( -void -) -#else -S16 SExitInt() -#endif +S16 SExitInt(void) { @@ -6524,14 +6221,7 @@ S16 SExitInt() * File: mt_ss.c * */ -#ifdef ANSI -S16 SHoldInt -( -void -) -#else -S16 SHoldInt() -#endif +S16 SHoldInt(void) { @@ -6552,14 +6242,7 @@ S16 SHoldInt() * File: mt_ss.c * */ -#ifdef ANSI -S16 SRelInt -( -void -) -#else -S16 SRelInt() -#endif +S16 SRelInt(void) { @@ -6581,14 +6264,7 @@ S16 SRelInt() * File: mt_ss.c * */ -#ifdef ANSI -INLINE S16 SEnbInt -( -void -) -#else -INLINE S16 SEnbInt() -#endif +inline S16 SEnbInt(void) { @@ -6610,14 +6286,7 @@ INLINE S16 SEnbInt() * File: mt_ss.c * */ -#ifdef ANSI -INLINE S16 SDisInt -( -void -) -#else -INLINE S16 SDisInt() -#endif +inline S16 SDisInt(void) { @@ -6639,17 +6308,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 { @@ -6675,17 +6338,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 { @@ -6714,17 +6371,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; @@ -6788,17 +6439,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; @@ -6866,17 +6511,11 @@ Inst inst; /* instance */ * File: mt_ss.c * */ -#ifdef ANSI -INLINE S16 SSetIntPend +inline S16 SSetIntPend ( -U16 id, /* driver task identifier */ +uint16_t id, /* driver task identifier */ Bool flag /* flag */ ) -#else -INLINE S16 SSetIntPend(id, flag) -U16 id; /* driver task identifier */ -Bool flag; /* flag */ -#endif { MtIsFlag isFlag; @@ -6921,16 +6560,9 @@ Bool flag; /* flag */ * File: mt_ss.c * */ -#ifdef ANSI -S16 SGlobMemInfoShow -( -Void -) -#else -S16 SGlobMemInfoShow() -#endif +S16 SGlobMemInfoShow(Void) { - U16 idx; + uint16_t idx; Txt prntBuf[100]; CmMmGlobRegCb *globReg; @@ -7022,19 +6654,13 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) * File: mt_ss.c * */ -#ifdef ANSI S16 SRegInfoShow ( Region region, -U32 *availmem +uint32_t *availmem ) -#else -S16 SRegInfoShow(region, availmem) -Region region; -U32 *availmem; -#endif { - U16 idx; + uint16_t idx; Txt prntBuf[100]; @@ -7127,23 +6753,17 @@ U32 *availmem; #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 +static Void SInitMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) -#else -PRIVATE Void SInitMemThreshold(region, maxBkt) -Region region; -U8 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; @@ -7153,21 +6773,15 @@ U8 maxBkt; } } -#ifdef ANSI S16 SRegReachedMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) -#else -S16 SRegReachedMemThreshold(region, maxBkt) -Region region; -U8 maxBkt; -#endif { - U8 idx = 0; - U8 memStatus = 3; - PRIVATE U8 initFlag = 1; + uint8_t idx = 0; + uint8_t memStatus = 3; + static uint8_t initFlag = 1; if(initFlag) { initFlag = 0; @@ -7210,19 +6824,13 @@ U8 maxBkt; * File: mt_ss.c * */ -#ifdef ANSI S16 SGetRegInfo ( Region region, SsMemDbgInfo *dbgInfo ) -#else -S16 SGetRegInfo(region, dbgInfo) -Region region; -SsMemDbgInfo *dbgInfo; -#endif { - U32 idx; + uint32_t idx; #if (ERRCLASS & ERRCLS_INT_PAR) @@ -7267,17 +6875,11 @@ SsMemDbgInfo *dbgInfo; return ROK; } -#ifdef ANSI S16 SGetRegPoolInfo ( -U8 *numRegion, -U8 *numPool +uint8_t *numRegion, +uint8_t *numPool ) -#else -S16 SGetRegPoolInfo(numRegion, numPool) -U8 *numRegion; -U8 *numPool; -#endif { /* Send number of Region available */ *numRegion = mtMemoCfg.numRegions; @@ -7310,22 +6912,16 @@ U8 *numPool; * File: mt_ss.c * */ -#ifdef ANSI S16 SPrintRegMemStatusInfo ( Region region, -U8 typeFlag +uint8_t typeFlag ) -#else -S16 SPrintRegMemStatusInfo(region, typeFlag) -Region region; -U8 typeFlag; -#endif { Txt prntBuf[150]; - U32 idx; - U32 statMemSize; - U32 dynMemSize; + uint32_t idx; + uint32_t statMemSize; + uint32_t dynMemSize; #if (ERRCLASS & ERRCLS_INT_PAR) @@ -7424,20 +7020,12 @@ U8 typeFlag; * File: mt_ss.c * */ -#ifdef ANSI -PRIVATE S16 SPrintRegMemStats -( -Region region -) -#else -PRIVATE S16 SPrintRegMemStats(region) -Region region; -#endif +static S16 SPrintRegMemStats(Region region) { CmMmHashListCp *hashListCp; Txt prntBuf[150]; - U32 idx; - U32 cntEnt; + uint32_t idx; + uint32_t cntEnt; hashListCp = &mtCMMRegCb[region]->hashListCp; @@ -7530,19 +7118,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]; @@ -7558,7 +7139,7 @@ S16 errCode; SDisplay(0, prntBuf); } - RETVOID; + return; } /* @@ -7577,15 +7158,10 @@ S16 errCode; * File: mt_ss.c * */ -#ifdef ANSI S16 SPrintRegMemProfile ( Region region ) -#else -S16 SPrintRegMemProfile(region) -Region region; -#endif { CmMmHeapCb *heapCb; CmMmRegCb *regCb; @@ -7594,8 +7170,8 @@ Region region; Size offsetToNxtBlk; Size hdrSize; Txt prntBuf[250]; - U32 idx; - U32 blkCnt; + uint32_t idx; + uint32_t blkCnt; @@ -7811,15 +7387,10 @@ Region region; * File: mt_ss.c * --*/ -#ifdef ANSI S16 SGetTimeStamp ( S8 *ts ) -#else -S16 SGetTimeStamp(ts) -S8 *ts; -#endif { #ifndef SS_LINUX @@ -7881,14 +7452,7 @@ S8 *ts; * File: mt_ss.c * --*/ -#ifdef ANSI -U32 SGetSystemTsk -( -Void -) -#else -U32 SGetSystemTsk() -#endif +uint32_t SGetSystemTsk(Void) { return (pthread_self()); @@ -7910,11 +7474,7 @@ U32 SGetSystemTsk() * File: mt_ss.c * --*/ -#ifdef ANSI -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void) -#else -PRIVATE SsSTskEntry* ssdAddTmrSTsk() -#endif +static SsSTskEntry* ssdAddTmrSTsk(Void) { SsSTskEntry *sTsk; S16 ret; @@ -8040,17 +7600,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdInitLockNew -( -SLockInfo *lockId, -U8 lockType -) -#else -S16 ssdInitLockNew(lockId, lockType) -SLockInfo *lockId; -U8 lockType; -#endif +S16 ssdInitLockNew(SLockInfo *lockId,uint8_t lockType) { #ifdef SS_REC_LOCK_SUPPORT @@ -8130,17 +7680,7 @@ U8 lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdLockNew -( -SLockInfo *lockId, -U8 lockType -) -#else -S16 ssdLockNew(lockId, lockType) -SLockInfo *lockId; -U8 lockType; -#endif +S16 ssdLockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; @@ -8228,17 +7768,7 @@ U8 lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdUnlockNew -( -SLockInfo *lockId, -U8 lockType -) -#else -S16 ssdUnlockNew(lockId, lockType) -SLockInfo *lockId; -U8 lockType; -#endif +S16 ssdUnlockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; @@ -8294,17 +7824,7 @@ U8 lockType; * File: mt_ss.c * */ -#ifdef ANSI -S16 ssdDestroyLockNew -( -SLockInfo *lockId, -U8 lockType -) -#else -S16 ssdDestroyLockNew(lockId, lockType) -SLockInfo *lockId; -U8 lockType; -#endif +S16 ssdDestroyLockNew(SLockInfo *lockId,uint8_t lockType) { Txt prntBuf[PRNTSZE]; S16 retVal = ROK; @@ -8367,14 +7887,7 @@ U8 lockType; * File: * **/ -#ifdef ANSI -S16 ssInitRcvWork -( - void - ) -#else -S16 ssInitRcvWork() -#endif +S16 ssInitRcvWork(void) { pthread_attr_t attr; pthread_t thread; @@ -8419,15 +7932,7 @@ S16 ssInitRcvWork() * **/ -#ifdef ANSI -PRIVATE void *workRcvTsk -( - Ptr ptr - ) -#else -PRIVATE void *workRcvTsk (ptr) - Ptr ptr; -#endif +static void *workRcvTsk(Ptr ptr) { cvmx_wqe_t *workPtr; @@ -8514,7 +8019,7 @@ PRIVATE void *workRcvTsk (ptr) #endif /* SS_SEUM_CAVIUM */ #ifdef TENB_RTLIN_CHANGES -S16 SInitLock(SLockId *l, U8 t) +S16 SInitLock(SLockId *l, uint8_t t) { S16 r = 0; pthread_mutexattr_t prior; @@ -8593,9 +8098,9 @@ pthread_t threadId, /* Thread Id of system task */ Region region /* Region associated with thread */ ) { - PRIVATE U32 createdThreads; - PRIVATE pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; - U32 indx; + static uint32_t createdThreads; + static pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; + uint32_t indx; /* Here 0xFF is considered as invalid region and if the mapping table @@ -8676,9 +8181,9 @@ 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 return RFAILED; } @@ -8707,17 +8212,11 @@ pthread_t threadId /* Thread Id of system task */ * File: pt_ss.c * */ -#ifdef ANSI S16 SStartTask ( -VOLATILE U32 *startTime, -U32 taskId +volatile uint32_t *startTime, +uint32_t taskId ) -#else -S16 SStartTask(startTime, taskId) -VOLATILE U32 *startTime; -U32 taskId; -#endif { #ifdef MSPD_MLOG_NEW *startTime = GetTIMETICK(); @@ -8740,19 +8239,13 @@ U32 taskId; * File: pt_ss.c * */ -#ifdef ANSI S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +volatile uint32_t startTime, +uint32_t taskId ) -#else -S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; -#endif { - /*U32 stopTime;*/ + /*uint32_t stopTime;*/ switch(taskId) { case PID_MAC_HARQ_IND: @@ -8789,33 +8282,21 @@ U32 taskId; return ROK; } #else -#ifdef ANSI S16 SStartTask ( -VOLATILE U32 * startTime, -U32 taskId +volatile uint32_t * startTime, +uint32_t taskId ) -#else -S16 SStartTask(startTime, taskId) -VOLATILE U32 * startTime; -U32 taskId; -#endif { *startTime = 0; return ROK; } -#ifdef ANSI S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +volatile uint32_t startTime, +uint32_t taskId ) -#else -S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; -#endif { return ROK; } @@ -8830,32 +8311,26 @@ U32 taskId; * * @return Void - function is always success */ -#ifdef ANSI Void UpdateSocCpuInfo ( CmCpuStatsInfo *cpuInfo, -U8 idx +uint8_t idx ) -#else -Void UpdateSocCpuInfo(*cpuInfo, idx) -CmCpuStatsInfo *cpuInfo; -U8 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 */ @@ -8863,7 +8338,7 @@ U8 idx; { printf("fgets to get the free mips available failed\n"); fclose(mipsFd); - RETVOID; + return; } strtok(mipsStr, " "); @@ -8877,7 +8352,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++; } } @@ -8889,7 +8364,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++; } } @@ -8903,7 +8378,7 @@ U8 idx; } fclose(mipsFd); - RETVOID; + return; } #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #ifdef SS_MULTICORE_SUPPORT @@ -8921,14 +8396,9 @@ U8 idx; * File: mt_ss.c * --*/ -#ifdef ANSI -PRIVATE SsSTskEntry* ssdReAddTmrSTsk( -U8 idx +static SsSTskEntry* ssdReAddTmrSTsk( +uint8_t idx ) -#else -PRIVATE SsSTskEntry* ssdReAddTmrSTsk(idx) -U8 idx; -#endif { SsSTskEntry *sTsk; S16 ret; @@ -9039,25 +8509,18 @@ U8 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; #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 */