Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Temporary fix of o1 compilation .[Issue-Id: ODUHIGH-285]
[o-du/l2.git]
/
src
/
cm
/
cm_mblk.x
diff --git
a/src/cm/cm_mblk.x
b/src/cm/cm_mblk.x
index
ec460cf
..
85ab722
100755
(executable)
--- a/
src/cm/cm_mblk.x
+++ b/
src/cm/cm_mblk.x
@@
-33,7
+33,7
@@
#define __CMMBLKX__
#ifdef __cplusplus
#define __CMMBLKX__
#ifdef __cplusplus
-
EXTERN
"C" {
+
extern
"C" {
#endif
/************************************************
#endif
/************************************************
@@
-44,7
+44,7
@@
typedef struct cmMemCb
{
Size maxSize; /* Size of memory chunk */
Mem sMem; /* Static memory region and pool */
{
Size maxSize; /* Size of memory chunk */
Mem sMem; /* Static memory region and pool */
-
U32
memAllocated; /* amount of memory already allocated */
+
uint32_t
memAllocated; /* amount of memory already allocated */
PTR initPtr; /* Initial pointer */
PTR runPtr; /* Start of avaliable memory chunk */
} CmMemCb;
PTR initPtr; /* Initial pointer */
PTR runPtr; /* Start of avaliable memory chunk */
} CmMemCb;
@@
-70,7
+70,7
@@
typedef struct cmMemListCp
{
CmMemList *first; /* first entry in list */
CmMemList *last; /* last entry in list */
{
CmMemList *first; /* first entry in list */
CmMemList *last; /* last entry in list */
-
U32
count; /* number of entries */
+
uint32_t
count; /* number of entries */
CmMemCb memCb; /* Memory Control Block */
}CmMemListCp;
CmMemCb memCb; /* Memory Control Block */
}CmMemListCp;
@@
-80,7
+80,7
@@
typedef struct cmMemListCp
typedef struct cmMemStatus
{
Mem sMem; /* Static Memory region,pool */
typedef struct cmMemStatus
{
Mem sMem; /* Static Memory region,pool */
-
U32
memBlkCnt; /* Memory Blocks Count */
+
uint32_t
memBlkCnt; /* Memory Blocks Count */
Size maxBlkSize; /* Size of memory Block */
Size memAllocated; /* Memory allocated off chunk */
} CmMemStatus;
Size maxBlkSize; /* Size of memory Block */
Size memAllocated; /* Memory allocated off chunk */
} CmMemStatus;
@@
-91,44
+91,44
@@
typedef struct cmMemStatus
***********************************************/
#ifdef TFU_ALLOC_EVENT_NO_INIT
***********************************************/
#ifdef TFU_ALLOC_EVENT_NO_INIT
-
EXTERN
S16 cmAllocEvntNoInit ARGS((
+ S16 cmAllocEvntNoInit ARGS((
Size evntSize,
Size maxBlkSize,
Mem *sMem,
Ptr *ptr));
#endif
#ifdef TFU_ALLOC_EVENT_NO_INIT
Size evntSize,
Size maxBlkSize,
Mem *sMem,
Ptr *ptr));
#endif
#ifdef TFU_ALLOC_EVENT_NO_INIT
-
EXTERN
S16 cmGetMemNoInit ARGS((
+ S16 cmGetMemNoInit ARGS((
Ptr memPtr,
Size size,
Ptr *allocPtr));
#endif
Ptr memPtr,
Size size,
Ptr *allocPtr));
#endif
-
EXTERN
S16 cmAllocEvnt ARGS((
+ S16 cmAllocEvnt ARGS((
Size evntSize,
Size maxBlkSize,
Mem *sMem,
Ptr *ptr));
Size evntSize,
Size maxBlkSize,
Mem *sMem,
Ptr *ptr));
-
EXTERN
Void cmInitMemCp ARGS((
+ Void cmInitMemCp ARGS((
CmMemListCp *memCp,
Size maxBlkSize,
Mem *sMem ));
#ifdef TFU_ALLOC_EVENT_NO_INIT
CmMemListCp *memCp,
Size maxBlkSize,
Mem *sMem ));
#ifdef TFU_ALLOC_EVENT_NO_INIT
-
EXTERN
S16 cmGetMemNoInit ARGS((
+ S16 cmGetMemNoInit ARGS((
Ptr memPtr,
Size size,
Ptr *allocPtr));
#endif
Ptr memPtr,
Size size,
Ptr *allocPtr));
#endif
-
EXTERN
S16 cmGetMem ARGS((
+ S16 cmGetMem ARGS((
Ptr memPtr,
Size size,
Ptr *allocPtr));
Ptr memPtr,
Size size,
Ptr *allocPtr));
-
EXTERN
Void cmFreeMem ARGS((
+ Void cmFreeMem ARGS((
Ptr memPtr));
Ptr memPtr));
-
EXTERN
Void cmGetMemStatus ARGS((
+ Void cmGetMemStatus ARGS((
Ptr memPtr,
CmMemStatus *status));
Ptr memPtr,
CmMemStatus *status));