Merge "correction in F1AP message based on wireshark logs"

[o-du/l2.git] / src / cm / cm_mblk.c

diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c
index 97a2913..b46d8b2 100644 (file)
--- a/src/cm/cm_mblk.c
+++ b/src/cm/cm_mblk.c
@@ -84,7 +84,7 @@ PRIVATE Void cmAddMemNode ARGS((CmMemListCp *lCp,CmMemList *node));
 */
   
 #ifdef ANSI
-PUBLIC S16 cmAllocEvnt
+S16 cmAllocEvnt
 (
 Size            evntSize,    /* Size of the Event structure */
 Size            maxBlkSize,  /* Chunk Memory size */
@@ -92,7 +92,7 @@ Mem             *sMem,       /* Static memory region and pool */
 Ptr             *ptr         /* Location to place allocated event ptr */
 )
 #else
-PUBLIC S16 cmAllocEvnt (evntSize,maxBlkSize,sMem,ptr)
+S16 cmAllocEvnt (evntSize,maxBlkSize,sMem,ptr)
 Size            evntSize;   /* Size of the Event structure */
 Size            maxBlkSize; /* Memory size requested */
 Mem             *sMem;      /* Static Memory region and pool */
@@ -105,7 +105,6 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
   CmMemListCp   *memCp;     /* memory Link list control point */
   CmMemCb       *cb;        /* Allocated Memory Control Block */
 
-  TRC2(cmAllocEvnt)
 
   /* Validation check */
 #ifndef LTE_ENB_PAL
@@ -137,8 +136,8 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
      return RFAILED;
 
   /* Reset the contents */
-  cmMemset((U8 *)allocPtr, (U8 )0, 
-           (PTR)(maxBlkSize + sizeof(CmMemList)) );
+  memset(allocPtr, 0, 
+           (maxBlkSize + sizeof(CmMemList)) );
 
   /* The above allocated memory chunk is structured as follows 
 
@@ -201,21 +200,20 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
 */
   
 #ifdef ANSI
-PUBLIC Void cmInitMemCp
+Void cmInitMemCp
 (
 CmMemListCp     *memCp,     /* Memory control pointer */
 Size            maxBlkSize, /* Chunk Memory size */
 Mem             *sMem       /* Static memory region and pool */
 )
 #else
-PUBLIC Void cmInitMemCp (memCp,maxBlkSize,sMem)
+Void cmInitMemCp (memCp,maxBlkSize,sMem)
 CmMemListCp     *memCp;     /* Memory control pointer */
 Size            maxBlkSize; /* Memory size requested */
 Mem             *sMem;      /* Static Memory region and pool */
 #endif
 {
 
-  TRC2(cmInitMemCp)
 
   /* Intialise Memory Control Point */
   CM_INIT_MEMCP(memCp,maxBlkSize,sMem);
@@ -241,14 +239,14 @@ Mem             *sMem;      /* Static Memory region and pool */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmGetMem
+S16 cmGetMem
 (
 Ptr           memPtr,    /* Pointer to memCp */
 Size          size,      /* Memory size requested */
 Ptr           *allocPtr  /* location to place pointer */
 )
 #else
-PUBLIC S16 cmGetMem (memPtr,size,allocPtr)
+S16 cmGetMem (memPtr,size,allocPtr)
 Ptr          memPtr;    /* Pointer to memCp */
 Size         size;      /* Memory size requested */
 Ptr          *allocPtr; /* location to place pointer */
@@ -261,7 +259,6 @@ Ptr          *allocPtr; /* location to place pointer */
   /* cm_mblk_c_001.101: added local variable */
   Size       blkSize;  /* required block size */
 
-  TRC2(cmGetMem)
 
   memCp = (CmMemListCp *)memPtr;
   cb = &memCp->memCb; 
@@ -310,8 +307,8 @@ Ptr          *allocPtr; /* location to place pointer */
   /* Reset the contents */
   /* Initialise above allocated structure */
   /* cm_mblk_c_001.101: use blkSize instead of cb->maxSize */
-  cmMemset((U8 *)cb->initPtr, (U8 )0, 
-           (PTR)(blkSize + sizeof(CmMemList) ));
+  memset(&(cb->initPtr), 0, 
+           (blkSize + sizeof(CmMemList) ));
 
   /* The above allocated memory chunk is structured as follows 
 
@@ -360,7 +357,7 @@ Ptr          *allocPtr; /* location to place pointer */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmAllocEvntNoInit
+S16 cmAllocEvntNoInit
 (
 Size            evntSize,    /* Size of the Event structure */
 Size            maxBlkSize,  /* Chunk Memory size */
@@ -368,7 +365,7 @@ Mem             *sMem,       /* Static memory region and pool */
 Ptr             *ptr         /* Location to place allocated event ptr */
 )
 #else
-PUBLIC S16 cmAllocEvntNoInit (evntSize,maxBlkSize,sMem,ptr)
+S16 cmAllocEvntNoInit (evntSize,maxBlkSize,sMem,ptr)
 Size            evntSize;   /* Size of the Event structure */
 Size            maxBlkSize; /* Memory size requested */
 Mem             *sMem;      /* Static Memory region and pool */
@@ -381,7 +378,6 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
   CmMemListCp   *memCp;     /* memory Link list control point */
   CmMemCb       *cb;        /* Allocated Memory Control Block */
 
-  TRC2(cmAllocEvntNoInit)
 
   /* Validation check */
   if( evntSize > maxBlkSize)
@@ -401,8 +397,8 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
      return RFAILED;
 
   /* Reset the contents */
-  cmMemset((U8 *)allocPtr, (U8 )0, 
-           (PTR)(sizeof(CmMemList)) );
+  memset(allocPtr, 0, 
+           (sizeof(CmMemList)) );
 
   /* The above allocated memory chunk is structured as follows 
 
@@ -464,14 +460,14 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
 */
   
 #ifdef ANSI
-PUBLIC S16 cmGetMemNoInit
+S16 cmGetMemNoInit
 (
 Ptr           memPtr,    /* Pointer to memCp */
 Size          size,      /* Memory size requested */
 Ptr           *allocPtr  /* location to place pointer */
 )
 #else
-PUBLIC S16 cmGetMemNoInit (memPtr,size,allocPtr)
+S16 cmGetMemNoInit (memPtr,size,allocPtr)
 Ptr          memPtr;    /* Pointer to memCp */
 Size         size;      /* Memory size requested */
 Ptr          *allocPtr; /* location to place pointer */
@@ -484,7 +480,6 @@ Ptr          *allocPtr; /* location to place pointer */
   /* cm_mblk_c_001.101: added local variable */
   Size       blkSize;  /* required block size */
 
-  TRC2(cmGetMemNoInit)
 
   memCp = (CmMemListCp *)memPtr;
   cb = &memCp->memCb; 
@@ -510,7 +505,7 @@ Ptr          *allocPtr; /* location to place pointer */
     {
       /* Requested memory is available in present chunk */
       *allocPtr = (Ptr) cb->runPtr;
-      //cmMemset((U8 *)*allocPtr, (U8 )0, 
+      //memset(*allocPtr, (U8 )0, 
         //   (PTR)(size) );
       cb->memAllocated += size;
       cb->runPtr += size;
@@ -535,8 +530,8 @@ Ptr          *allocPtr; /* location to place pointer */
   /* Reset the contents */
   /* Initialise above allocated structure */
   /* cm_mblk_c_001.101: use blkSize instead of cb->maxSize */
-  cmMemset((U8 *)cb->initPtr, (U8 )0, 
-           (PTR)(sizeof(CmMemList)));
+  memset(&(cb->initPtr), 0, 
+           (sizeof(CmMemList)));
   /* The above allocated memory chunk is structured as follows 
 
   +-------------------+
@@ -584,12 +579,12 @@ Ptr          *allocPtr; /* location to place pointer */
 */
   
 #ifdef ANSI
-PUBLIC Void cmFreeMem
+Void cmFreeMem
 (
 Ptr    memPtr      /* Link List CP */
 )
 #else
-PUBLIC Void cmFreeMem (memPtr)
+Void cmFreeMem (memPtr)
 Ptr    memPtr;     /* Link List CP */
 #endif
 {
@@ -600,7 +595,6 @@ Ptr    memPtr;     /* Link List CP */
   CmMemList   *prevNode; /* Pointer to previous node */
   CmMemListCp *lcp;      /* Memory Link List */
 
-  TRC2(cmFreeMem)
 
   lcp = (CmMemListCp *)memPtr;
 
@@ -668,7 +662,6 @@ CmMemListCp *lCp;               /* list control point */
 CmMemList   *node;              /* node to be added */
 #endif
 {
-   TRC3(cmAddMemNode);
 
    lCp->count++;
 
@@ -705,13 +698,13 @@ CmMemList   *node;              /* node to be added */
 */
   
 #ifdef ANSI
-PUBLIC Void cmGetMemStatus
+Void cmGetMemStatus
 (
 Ptr             memPtr,    /* Memory control pointer */
 CmMemStatus     *status    /* memory region,pool and status */
 )
 #else
-PUBLIC Void cmGetMemStatus (memPtr,status)
+Void cmGetMemStatus (memPtr,status)
 Ptr             memPtr;   /* Memory control pointer */
 CmMemStatus     *status;  /* memory region,pool and status */
 #endif
@@ -719,7 +712,6 @@ CmMemStatus     *status;  /* memory region,pool and status */
 
   CmMemListCp *memCp;    /* Memory Link List */
 
-  TRC3(cmGetMemStatus)
 
   memCp = (CmMemListCp *)memPtr;