X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_mem_wl.c;h=7c60b2a59cbc3a6fd6ca50d9f4b2123dd1b200d7;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=6372891c1e6e546fd579f148a613ca5baa2511d4;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index 6372891c1..7c60b2a59 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -115,7 +115,7 @@ The following functions are provided in this file. #ifdef L2_L3_SPLIT #include "mt_plat_t33.h" -extern S32 clusterMode; +S32 clusterMode; #endif #include "cm_lte.x" @@ -126,7 +126,7 @@ extern S32 clusterMode; #ifdef TENB_T2K3K_SPECIFIC_CHANGES /* selva */ uint32_t gMemoryAlarm; -PRIVATE uint32_t memoryCheckCounter; +static uint32_t memoryCheckCounter; #define NUM_CALLS_TO_CHECK_MEM_AGAIN 80 /* Number of calls after which need to check mem */ #ifndef L2_L3_SPLIT @@ -222,68 +222,68 @@ typedef struct cmMemDoubleFree PTR prvAllocPtr[8]; uint8_t stopBtInfo = FALSE; Buffer *palBuffer; -EXTERN Buffer *mtTskBuffer1; -EXTERN Buffer *mtTskBuffer2; +Buffer *mtTskBuffer1; +Buffer *mtTskBuffer2; #ifdef SS_USE_ICC_MEMORY -PRIVATE pthread_mutex_t iccAllocFreeLock; +static pthread_mutex_t iccAllocFreeLock; #else -PRIVATE pthread_mutex_t dynAllocFreeLock; +static pthread_mutex_t dynAllocFreeLock; #endif /* SS_USE_ICC_MEMORY */ #ifdef SS_MEM_WL_DEBUG -PRIVATE S16 cmInitBtInfo ARGS((void)); +static S16 cmInitBtInfo ARGS((void)); #endif #ifdef SS_USE_ICC_MEMORY #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); -PRIVATE S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); -PRIVATE S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); -PRIVATE S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); +static S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); +static S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); void InsertToT2kMemLeakInfo ARGS((uint32_t address, uint32_t size, uint32_t lineNo, char* fileName)); void RemoveFromT2kMemLeakInfo ARGS((uint32_t address, char *file, uint32_t line)); -PRIVATE uint32_t getT2kMemLeakIndex ARGS((uint32_t address)); +static uint32_t getT2kMemLeakIndex ARGS((uint32_t address)); #else -PRIVATE S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size)); -PRIVATE S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size)); #endif #else /* SS_USE_ICC_MEMORY */ -PRIVATE S16 cmDynAllocWithLock ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); -PRIVATE S16 cmDynFreeWithLock ARGS((Void *regionCb,Data *ptr, Size size)); -PRIVATE S16 cmDynAlloc ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); -PRIVATE S16 cmDynFree ARGS((Void *regionCb,Data *ptr, Size size)); +static S16 cmDynAllocWithLock ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); +static S16 cmDynFreeWithLock ARGS((Void *regionCb,Data *ptr, Size size)); +static S16 cmDynAlloc ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); +static S16 cmDynFree ARGS((Void *regionCb,Data *ptr, Size size)); #endif /* SS_USE_ICC_MEMORY */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); #else -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); #endif #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t); #else -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); #endif #ifndef USE_PURE -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); #endif -PRIVATE S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); -PRIVATE Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); +static S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); +static Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); /* cm_mem_c_001.main_22: Fixing warnings on GCC compiler */ #ifdef __cplusplus @@ -311,15 +311,15 @@ MemLkCb memLkCb; /* cm_mem_c_008.104 - Addition for memory calculator tool */ #ifdef MEMCAL_DEBUG -PRIVATE Txt prntBuf[200]; /* print buffer */ -PRIVATE uint8_t tryHeap=0; +static Txt prntBuf[200]; /* print buffer */ +static uint8_t tryHeap=0; #endif /* cm_mem_c_001.main_12 - addition for ssi enhancements prints */ /* cm_mem_c_001.main_20 Additions */ #if (defined(SSI_DEBUG_LEVEL1) || defined(SS_HISTOGRAM_SUPPORT)) #ifdef DEBUGP -PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ +static Txt dbgPrntBuf[200]; /* print buffer */ #endif /* DEBUGP */ #endif /*SSI_DEBUG_LEVEL1 || SS_HISTOGRAM_SUPPORT */ @@ -334,8 +334,8 @@ PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ #endif uint32_t num_times = 0; -EXTERN pthread_t tmpRegTidMap[20]; -extern Bool g_usettitmr; +pthread_t tmpRegTidMap[20]; +Bool g_usettitmr; void DumpLayersDebugInformation() { DumpSSIDemandQDebugInformation(); @@ -389,7 +389,7 @@ void DumpLayersDebugInformation() * */ #ifdef ANSI -PRIVATE Void cmMmStatBktInit +static Void cmMmStatBktInit ( Data **memAddr, CmMmRegCb *regCb, @@ -398,7 +398,7 @@ uint16_t bktIdx, uint16_t *lstMapIdx ) #else -PRIVATE Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) +static Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) Data **memAddr; CmMmRegCb *regCb; CmMmRegCfg *cfg; @@ -900,7 +900,7 @@ CmMmGlobRegCb *regCb; */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccAllocWithLock +static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -912,7 +912,7 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccAllocWithLock +static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -920,7 +920,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmIccAllocWithLock(regionCb, size, flags, ptr) +static S16 cmIccAllocWithLock(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -992,7 +992,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccFreeWithLock +static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ @@ -1003,14 +1003,14 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccFreeWithLock +static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmIccFreeWithLock(regionCb, ptr, size) +static S16 cmIccFreeWithLock(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -1060,7 +1060,7 @@ Size size; /* Size of the block */ */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccAlloc +static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1073,7 +1073,7 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccAlloc +static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1081,7 +1081,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmIccAlloc(regionCb, size, flags, ptr) +static S16 cmIccAlloc(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -1141,7 +1141,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ * */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmIccFree +static S16 cmIccFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ @@ -1151,14 +1151,14 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmIccFree +static S16 cmIccFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmIccFree(regionCb, ptr, size) +static S16 cmIccFree(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -1554,13 +1554,13 @@ CmMmRegCb *regCb; */ #ifdef ANSI -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForAlloc +static CmMmBlkSetElement* cmGetMemBlkSetForAlloc ( uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) #else -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForAlloc(bucketIndex, bkt) +static CmMmBlkSetElement* cmGetMemBlkSetForAlloc(bucketIndex, bkt) uint8_t bucketIndex; /* Index to the bucket list */ CmMmDynBktCb *bkt; /* Bucket list control block */ #endif @@ -1678,13 +1678,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ */ #ifdef ANSI -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForFree +static CmMmBlkSetElement* cmGetMemBlkSetForFree ( uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) #else -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForFree(bucketIndex, bkt) +static CmMmBlkSetElement* cmGetMemBlkSetForFree(bucketIndex, bkt) uint8_t bucketIndex; /* Index to the bucket list */ CmMmDynBktCb *bkt; /* Bucket list control block */ #endif @@ -1794,13 +1794,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ */ #ifdef ANSI -PRIVATE S16 cmRemoveAllocPtrFromList +static S16 cmRemoveAllocPtrFromList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) #else -PRIVATE S16 cmRemoveAllocPtrFromList(regionCb, ptr) +static S16 cmRemoveAllocPtrFromList(regionCb, ptr) CmMmDynRegCb *regionCb; /* Pointer to a region */ PTR ptr; #endif @@ -1860,13 +1860,13 @@ PTR ptr; */ #ifdef ANSI -PRIVATE S16 cmInsertAllocPtrToList +static S16 cmInsertAllocPtrToList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) #else -PRIVATE S16 cmInsertAllocPtrToList(regionCb, ptr) +static S16 cmInsertAllocPtrToList(regionCb, ptr) CmMmDynRegCb *regionCb; /* Pointer to a region */ PTR ptr; #endif @@ -1914,7 +1914,7 @@ PTR ptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef ANSI -PRIVATE S16 cmDynAllocWithLock +static S16 cmDynAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1922,7 +1922,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmDynAllocWithLock(regionCb, size, flags, ptr) +static S16 cmDynAllocWithLock(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -1967,7 +1967,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ /* cm_mem_c_001.main_15 : Additions */ #ifdef ANSI -PRIVATE S16 cmDynAlloc +static S16 cmDynAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1975,7 +1975,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmDynAlloc(regionCb, size, flags, ptr) +static S16 cmDynAlloc(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -2183,7 +2183,7 @@ int g_overused[5] = {0}; /* cm_mem_c_001.main_15 : Additions */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2196,7 +2196,7 @@ PRIVATE S16 cmAlloc #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2209,7 +2209,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -2222,7 +2222,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2234,7 +2234,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -2250,7 +2250,7 @@ Bool hstReg; #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2259,7 +2259,7 @@ Data **ptr, uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; uint32_t flags; @@ -2268,7 +2268,7 @@ uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2276,7 +2276,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr) +static S16 cmAlloc(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -2743,11 +2743,11 @@ S16 cmInitDoubleFreeList() * */ #ifdef ANSI -PRIVATE S16 cmInitBtInfo +static S16 cmInitBtInfo ( ) #else -PRIVATE S16 cmInitBtInfo (Void) +static S16 cmInitBtInfo (Void) #endif { regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); @@ -2852,14 +2852,14 @@ uint32_t idx; * */ #ifdef ANSI -PRIVATE S16 cmDynFreeWithLock +static S16 cmDynFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmDynFreeWithLock(regionCb, ptr, size) +static S16 cmDynFreeWithLock(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -2902,14 +2902,14 @@ Size size; /* Size of the block */ * */ #ifdef ANSI -PRIVATE S16 cmDynFree +static S16 cmDynFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmDynFree(regionCb, ptr, size) +static S16 cmDynFree(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -3100,7 +3100,7 @@ Size size; /* Size of the block */ /* cm_mem_c_001.main_15 : Additions */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -3111,7 +3111,7 @@ PRIVATE S16 cmFree #else #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -3122,7 +3122,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) Void *regionCb; Data *ptr; Size size; @@ -3135,14 +3135,14 @@ Bool hstReg; #else #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFree(regionCb, ptr, size) +static S16 cmFree(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3482,7 +3482,7 @@ Size size; /*cm_mem_c_001.main_21-added new function*/ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, @@ -3493,7 +3493,7 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, @@ -3501,7 +3501,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAllocWL(regionCb, size, flags, ptr) +static S16 cmAllocWL(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -3644,7 +3644,7 @@ Data **ptr; */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, @@ -3654,14 +3654,14 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFreeWL(regionCb, ptr, size) +static S16 cmFreeWL(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3804,14 +3804,14 @@ Size size; */ #ifdef ANSI -PRIVATE S16 cmCtl +static S16 cmCtl ( Void *regionCb, Event event, SMemCtl *memCtl ) #else -PRIVATE S16 cmCtl(regionCb, event, memCtl) +static S16 cmCtl(regionCb, event, memCtl) Void *regionCb; Event event; SMemCtl *memCtl; @@ -3936,14 +3936,14 @@ SMemCtl *memCtl; * */ #ifdef ANSI -PRIVATE Void cmMmHeapInit +static Void cmMmHeapInit ( Data *memAddr, CmMmHeapCb *heapCb, Size size ) #else -PRIVATE Void cmMmHeapInit (memAddr, heapCb, size) +static Void cmMmHeapInit (memAddr, heapCb, size) Data *memAddr; CmMmHeapCb *heapCb; Size size; @@ -4025,7 +4025,7 @@ Size size; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4037,7 +4037,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4049,7 +4049,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4060,7 +4060,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4073,7 +4073,7 @@ Bool hstReg; #else #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4081,7 +4081,7 @@ Size *size, uint32_t memType ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType) +static S16 cmHeapAlloc (heapCb, ptr, size, memType) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4089,14 +4089,14 @@ uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size) +static S16 cmHeapAlloc (heapCb, ptr, size) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4380,7 +4380,7 @@ Size *size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, @@ -4391,7 +4391,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -4402,14 +4402,14 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size) +static S16 cmHeapFree (heapCb, ptr, size) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -5631,12 +5631,12 @@ S32 count; * */ #ifdef ANSI -PRIVATE S16 cmMmBktSanityChk +static S16 cmMmBktSanityChk ( CmMmBkt *bkt ) #else -PRIVATE S16 cmMmBktSanityChk(bkt) +static S16 cmMmBktSanityChk(bkt) CmMmBkt *bkt; #endif { @@ -5692,12 +5692,12 @@ CmMmBkt *bkt; * */ #ifdef ANSI -PRIVATE S16 cmMmHeapSanityChk +static S16 cmMmHeapSanityChk ( CmMmHeapCb *heapCb ) #else -PRIVATE S16 cmMmHeapSanityChk(heapCb) +static S16 cmMmHeapSanityChk(heapCb) CmMmHeapCb *heapCb; #endif { @@ -5769,14 +5769,14 @@ CmMmBlkHdr *blkPtr; * */ #ifdef ANSI -PRIVATE S16 cmMmHashFunc +static S16 cmMmHashFunc ( CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx ) #else -PRIVATE S16 cmMmHashFunc (hashListCp, key, idx) +static S16 cmMmHashFunc (hashListCp, key, idx) CmMmHashListCp *hashListCp; /* hash list control point */ uint32_t key; /* key string */ uint16_t *idx; /* idx to return */ @@ -5811,7 +5811,7 @@ uint16_t *idx; /* idx to return */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInit +static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ uint16_t nmbBins, /* number of hash list bins */ @@ -5819,7 +5819,7 @@ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) +static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) CmMmHashListCp *hashListCp; /* hash list to initialize */ uint16_t nmbBins; /* number of hash list bins */ Region region; /* memory region to allocate bins */ @@ -5876,14 +5876,14 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListDeinit +static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListDeinit(hashListCp, region, pool) +static S16 cmMmHashListDeinit(hashListCp, region, pool) CmMmHashListCp *hashListCp; /* hash list to deinitialize */ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ @@ -5922,13 +5922,13 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInsert +static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ uint32_t key /* pointer to key */ ) #else -PRIVATE S16 cmMmHashListInsert(hashListCp, key) +static S16 cmMmHashListInsert(hashListCp, key) CmMmHashListCp *hashListCp; /* hash list to add to */ uint32_t key; /* pointer to key */ #endif @@ -6006,12 +6006,12 @@ uint32_t key; /* pointer to key */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListInit +static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListInit(hashListCp) +static S16 cmHstGrmHashListInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6046,12 +6046,12 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListDeInit +static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListDeInit(hashListCp) +static S16 cmHstGrmHashListDeInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6090,7 +6090,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFreeInsert +static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ uint32_t blkSz, /* size of the block freed */ @@ -6099,7 +6099,7 @@ uint8_t *fileName, /* file name */ uint8_t entId /* Tapa task which free the memory */ ) #else -PRIVATE S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) +static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) CmHstGrmHashListCp* hashListCp; /* hash list cp */ uint32_t blkSz; /* size of the block freed */ uint32_t line; /* line number */ @@ -6172,7 +6172,7 @@ uint8_t entId; /* Tapa task which frees the memory */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmAllocInsert +static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, uint32_t blkSz, @@ -6182,7 +6182,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) +static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) CmHstGrmHashListCp *hashListCp; uint32_t blkSz; uint32_t *reqSz; @@ -6259,7 +6259,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmGetHashIdxAndKey +static S16 cmHstGrmGetHashIdxAndKey ( uint8_t *fileName, uint32_t line, @@ -6267,7 +6267,7 @@ uint32_t *binIdx, uint32_t *key ) #else -PRIVATE S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) +static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) uint8_t *fileName; uint32_t line; uint32_t *binIdx; @@ -6308,7 +6308,7 @@ uint32_t *key; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFillEntry +static S16 cmHstGrmFillEntry ( CmMemEntries *entry, uint32_t key, @@ -6317,7 +6317,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) +static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) CmMemEntries *entry; uint32_t key; uint32_t line; @@ -6356,7 +6356,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFindEntry +static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, uint32_t key, @@ -6364,7 +6364,7 @@ uint32_t *binIdx, CmMemEntries **entry ) #else -PRIVATE S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) +static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) CmHstGrmHashListCp *hashListCp; uint32_t key; uint32_t *binIdx; @@ -6730,11 +6730,11 @@ Region region; * */ #ifdef ANSI -PRIVATE uint32_t isMemUsageAboveUpperThreshold( +static uint32_t isMemUsageAboveUpperThreshold( Region region ) #else -PRIVATE uint32_t isMemUsageAboveUpperThreshold(region) +static uint32_t isMemUsageAboveUpperThreshold(region) Region region; #endif {