X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg.h;h=a792b68a2a8a6a14ac295fca2fcdddf5fff34355;hb=refs%2Fchanges%2F97%2F4697%2F5;hp=2c039006606a844f31190298ad3d6d68dee9d871;hpb=069ae37558afd5aee2d1072bbf5b517cf665bdd8;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg.h b/src/5gnrmac/rg.h
index 2c0390066..a792b68a2 100755
--- a/src/5gnrmac/rg.h
+++ b/src/5gnrmac/rg.h
@@ -244,52 +244,6 @@ U32 macHeader[2];
 #define RG_MAX_DL_HARQ_NUM   8 
 #endif
 
-#define MAC_MEM_REGION       4
-#define MAC_POOL 1
-/* allocate and zero out a MAC static buffer */
-#define MAC_ALLOC(_datPtr, _size)                            \
-{                                                            \
-   S16 _ret;                                                 \
-   _ret = SGetSBuf(MAC_MEM_REGION, MAC_POOL,                 \
-                    (Data **)&_datPtr, _size);               \
-   if(_ret == ROK)                                           \
-      cmMemset((U8*)_datPtr, 0, _size);                      \
-   else                                                      \
-      _datPtr = NULLP;                                       \
-}
-
-/* free a static buffer */
-#define MAC_FREE(_datPtr, _size)                             \
-   if(_datPtr)                                               \
-      SPutSBuf(MAC_MEM_REGION, MAC_POOL,                     \
-         (Data *)_datPtr, _size);
-
-/* Allocate shared memory to be used for LWLC 
- * during inter-layer communication */
-#define MAC_ALLOC_SHRABL_BUF(_buf, _size)                    \
-{                                                            \
-   if(SGetStaticBuffer(MAC_MEM_REGION, MAC_POOL,             \
-      (Data **)&_buf, (Size) _size, 0) == ROK)               \
-   {                                                         \
-      cmMemset((U8 *)(_buf), 0, _size);                      \
-   }                                                         \
-   else                                                      \
-   {                                                         \
-      (_buf) = NULLP;                                        \
-   }                                                         \
-}
-
-/* Free shared memory, received through LWLC */
-#define MAC_FREE_SHRABL_BUF(_region, _pool,_buf, _size)       \
-{                                                            \
-   if (_buf != NULLP)                                        \
-   {                                                         \
-      (Void) SPutStaticBuffer(_region, _pool,                \
-            (Data *) _buf, (Size) _size, 0);                 \
-       _buf = NULLP;                                         \
-   }                                                         \
-}
-
 /* Free shared memory, received through LWLC */
 #define MAC_FREE_MEM(_region, _pool, _datPtr, _size)         \
    if(_datPtr)                                               \
@@ -334,7 +288,7 @@ U32 macHeader[2];
   if (_padBuf == NULLP) \
   { \
     RLOG0(L_ERROR, "RGERR_MUX_BLD_CEHDR_FAIL");\
-    RETVALUE(RFAILED);\
+    return RFAILED;\
   } \
   if (mInfo->endptr == NULLP) { \
     sduEnd = _sduBuf; \
@@ -690,7 +644,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME
 {\
    if(_inst >= RG_MAX_INST)\
    {\
-      RETVALUE(RFAILED);\
+      return RFAILED;\
    }\
 }
 
@@ -718,7 +672,7 @@ typedef enum
 {                                                                                                \
    if(rgCb[_inst].rgInit.logMask & SS_DIAG_LVL0)                                                         \
    {                                                                                             \
-      ssDiagFix(_tknId, _splArgEnum, ENTRG, rgCb[_inst].rgInit.inst, SS_DIAG_LVL0, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
+      ssDiagFix(_tknId, _splArgEnum, ENTMAC, rgCb[_inst].rgInit.inst, SS_DIAG_LVL0, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
    }                                                                                             \
 }
 
@@ -729,7 +683,7 @@ typedef enum
 {                                                                 \
    if(rgCb[_inst].rgInit.logMask & SS_DIAG_LVL1)                             \
    {                                                              \
-      ssDiagFix(_tknId, _splArgEnum, ENTRG, rgCb[_inst].rgInit.inst, SS_DIAG_LVL1, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
+      ssDiagFix(_tknId, _splArgEnum, ENTMAC, rgCb[_inst].rgInit.inst, SS_DIAG_LVL1, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
    }                                                              \
 }
 
@@ -740,7 +694,7 @@ typedef enum
 {                                                              \
    if(rgCb[_inst].rgInit.logMask & SS_DIAG_LVL2)                            \
    {                                                              \
-      ssDiagFix(_tknId, _splArgEnum, ENTRG, rgCb[_inst].rgInit.inst, SS_DIAG_LVL2, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
+      ssDiagFix(_tknId, _splArgEnum, ENTMAC, rgCb[_inst].rgInit.inst, SS_DIAG_LVL2, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
    }                                                              \
 }
 
@@ -751,7 +705,7 @@ typedef enum
 {                                                              \
    if(rgCb[_inst].rgInit.logMask & SS_DIAG_LVL3)                            \
    {                                                              \
-      ssDiagFix(_tknId, _splArgEnum, ENTRG, rgCb[_inst].rgInit.inst, SS_DIAG_LVL3, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
+      ssDiagFix(_tknId, _splArgEnum, ENTMAC, rgCb[_inst].rgInit.inst, SS_DIAG_LVL3, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
    }                                                              \
 }
 
@@ -762,7 +716,7 @@ typedef enum
 {                                                              \
    if(rgCb[_inst].rgInit.logMask & SS_DIAG_LVL4)                            \
    {                                                              \
-      ssDiagFix(_tknId, _splArgEnum, ENTRG, rgCb[_inst].rgInit.inst, SS_DIAG_LVL4, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
+      ssDiagFix(_tknId, _splArgEnum, ENTMAC, rgCb[_inst].rgInit.inst, SS_DIAG_LVL4, SS_DIAG_MSG_TYPE_FIXED, _splArg, _arg1, _arg2, _arg3, _arg4, _string);\
    }                                                              \
 }
   
@@ -800,7 +754,6 @@ typedef enum
 {                                                              \
 }
 #endif
-#define DEFAULT_CELLS 1
 #endif /* __RGH__ */
 
 /**********************************************************************