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
Merge "[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-531] RIC Subscription Modification...
[o-du/l2.git]
/
src
/
5gnrmac
/
rg.h
diff --git
a/src/5gnrmac/rg.h
b/src/5gnrmac/rg.h
index
fca0089
..
13eb03b
100755
(executable)
--- a/
src/5gnrmac/rg.h
+++ b/
src/5gnrmac/rg.h
@@
-36,8
+36,6
@@
#ifndef __RGH__
#define __RGH__
#ifndef __RGH__
#define __RGH__
-#include "rl_interface.h"
-#include "rl_common.h"
#ifdef L2_OPTMZ
#ifdef L2_OPTMZ
@@
-246,9
+244,7
@@
uint32_t macHeader[2];
/* Free shared memory, received through LWLC */
#define MAC_FREE_MEM(_region, _pool, _datPtr, _size) \
/* Free shared memory, received through LWLC */
#define MAC_FREE_MEM(_region, _pool, _datPtr, _size) \
- if(_datPtr) \
- SPutSBuf(_region, _pool,(Data *)_datPtr, _size); \
- _datPtr = NULL;
+ MAC_FREE(_datPtr, _size); \
#define RG_LCG_ISCFGD(lcg) ((lcg)->lcgId != RG_INVALID_LCG_ID)
/* Corrected the check for dlCcchId */
#define RG_LCG_ISCFGD(lcg) ((lcg)->lcgId != RG_INVALID_LCG_ID)
/* Corrected the check for dlCcchId */
@@
-287,7
+283,7
@@
uint32_t macHeader[2];
ssGetDBufOfSize(mInfo->region,_size, &_padBuf); \
if (_padBuf == NULLP) \
{ \
ssGetDBufOfSize(mInfo->region,_size, &_padBuf); \
if (_padBuf == NULLP) \
{ \
-
RLOG0(L_ERROR, "
RGERR_MUX_BLD_CEHDR_FAIL");\
+
DU_LOG("\nERROR --> MAC :
RGERR_MUX_BLD_CEHDR_FAIL");\
return RFAILED;\
} \
if (mInfo->endptr == NULLP) { \
return RFAILED;\
} \
if (mInfo->endptr == NULLP) { \
@@
-378,13
+374,13
@@
toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
#define RG_NULL_CHECK(_inst, _ptr ) \
if((_ptr) == NULLP) \
{ \
#define RG_NULL_CHECK(_inst, _ptr ) \
if((_ptr) == NULLP) \
{ \
-
RGDBGERRNEW(_inst, (rgPBuf(_inst),"Null Pointer detected")
);\
+
DU_LOG("\nERROR --> MAC : Null Pointer detected"
);\
SExit();\
}
#define RG_ARRAY_BOUND_CHECK(_inst, _array, _idxVal) \
if((_idxVal) >= (sizeof(_array)/sizeof(_array[0]))) \
{ \
SExit();\
}
#define RG_ARRAY_BOUND_CHECK(_inst, _array, _idxVal) \
if((_idxVal) >= (sizeof(_array)/sizeof(_array[0]))) \
{ \
-
RGDBGERRNEW(_inst, (rgPBuf(_inst),"Array Bound Check Failed")
);\
+
DU_LOG("\nERROR --> MAC : Array Bound Check Failed"
);\
SExit();\
}
#else
SExit();\
}
#else
@@
-656,8
+652,6
@@
toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
/* Value used to set nDmrs in uplink grant if nDmrs is not applicable */
#define RG_INVALID_NDMRS 10
/* Value used to set nDmrs in uplink grant if nDmrs is not applicable */
#define RG_INVALID_NDMRS 10
-#define RG_SEND_TRC_IND(_inst,_mBuf, _event) rgLMMTrcInd(_inst,_mBuf, _event)
-
/* Note: Any changes to these enums should reflect to */
/** @details Enums for special argument
*
/* Note: Any changes to these enums should reflect to */
/** @details Enums for special argument
*