X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg.h;h=13eb03bc5bb0334f0b8f8afced6725fd81c199f1;hb=e54c2aae19e97065def9e5ab2d1488477b1ea209;hp=a792b68a2a8a6a14ac295fca2fcdddf5fff34355;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg.h b/src/5gnrmac/rg.h
index a792b68a2..13eb03bc5 100755
--- a/src/5gnrmac/rg.h
+++ b/src/5gnrmac/rg.h
@@ -36,8 +36,6 @@
 #ifndef __RGH__
 #define __RGH__
 
-#include "rl_interface.h"
-#include "rl_common.h"
 
 
 #ifdef L2_OPTMZ
@@ -52,8 +50,8 @@
 
 #define RG_MAC_HDR_SIZE 250
 #define RG_MAC_CE_SIZE  250
-U32 MacPtrAddress;
-U32 macHeader[2];
+uint32_t MacPtrAddress;
+uint32_t macHeader[2];
 
 #define RG_ADD_DBuf(_dBuf,_size,_mBuf)\
 { \
@@ -62,7 +60,7 @@ U32 macHeader[2];
   ssGetDBufOfSize(mInfo->region,_size, &_dBuf); \
   SUpdMsg(_mBuf, _dBuf,0);\
   _dBuf->b_wptr = _dBuf->b_rptr =  (_dBuf->b_datap->db_base + 5);\
-  MacPtrAddress = (U32)_dBuf->b_wptr;\
+  MacPtrAddress = (uint32_t)_dBuf->b_wptr;\
 }
 #endif
 
@@ -246,9 +244,7 @@ U32 macHeader[2];
 
 /* 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 */
@@ -287,7 +283,7 @@ U32 macHeader[2];
   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) { \
@@ -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)  \
    {                                               \
-      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]))) \
    {                                               \
-      RGDBGERRNEW(_inst, (rgPBuf(_inst),"Array Bound Check Failed"));\
+      DU_LOG("\nERROR  -->  MAC : Array Bound Check Failed");\
       SExit();\
    }
 #else
@@ -427,7 +423,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
 #ifdef L2_OPTMZ
 #define RG_FREE_TB(_tb)\
 {\
-   U32 lchIdx, pduIdx;\
+   uint32_t lchIdx, pduIdx;\
    SResetMBuf(_tb->macHdr);\
    SResetMBuf(_tb->macCes);\
    _tb->tbPres = FALSE;\
@@ -451,7 +447,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
 
 #define RG_FREE_SAVED_TB(_tb)\
 {\
-   U32 lchIdx, pduIdx;\
+   uint32_t lchIdx, pduIdx;\
    RG_FREE_MSG(_tb->macHdr);\
    RG_FREE_MSG(_tb->macCes);\
    _tb->tbPres = FALSE;\
@@ -491,7 +487,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
  **********************************************************/
 #define RG_DROP_RGUDDATREQ_MBUF(_datReq)\
 {\
-   U32 idx5,idx6,idx7;\
+   uint32_t idx5,idx6,idx7;\
    for (idx5=0; idx5 < _datReq.nmbOfTbs; idx5++)\
    {\
       for (idx6=0; idx6 < _datReq.datReqTb[idx5].nmbLch; idx6++)\
@@ -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
 
-#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
  *