X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_utils.h;h=16166d09419521d2a47f82bf0a56b96353ebc169;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=6a7c53a1335c0cc7b91359358208446536115511;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_utils.h b/src/5gnrmac/mac_utils.h
index 6a7c53a13..16166d094 100644
--- a/src/5gnrmac/mac_utils.h
+++ b/src/5gnrmac/mac_utils.h
@@ -19,18 +19,31 @@
 /* Contains common utility definitions to be used at MAC */
 
 #define MAX_SHORT_BSR_TABLE_ENTRIES 32
+#define MAX_LONG_BSR_TABLE_ENTRIES  256
 #define MAC_MEM_REGION   4
 #define MAC_POOL         1
 
+#ifdef ODU_MEMORY_DEBUG_LOG
+#define MAC_MEM_LOG(_macro, _file, _line, _func, _size, _datPtr)\
+{\
+   printf("\n%s=== %s +%d, %s, %lu, %p",           \
+      _macro, _file, _line, _func, (uint64_t)_size, _datPtr); \
+}
+#else
+#define MAC_MEM_LOG(_macro, _file, _line, _func, _size, _dataPtr){\
+}
+#endif
+
 /* allocate and zero out a MAC static buffer */
 #define MAC_ALLOC(_datPtr, _size)                            \
 {                                                            \
    uint8_t _ret;                                             \
    _ret = SGetSBuf(MAC_MEM_REGION, MAC_POOL,                 \
-	 (Data **)&_datPtr, _size);                          \
+	 (Data **)&_datPtr, _size);                               \
    if(_ret == ROK)                                           \
    {                                                         \
-      cmMemset((uint8_t *)_datPtr, 0, _size);                \
+      memset(_datPtr, 0, _size);                             \
+      MAC_MEM_LOG("MAC_ALLOC", __FILE__, __LINE__, __FUNCTION__, _size, _datPtr);\
    }                                                         \
    else                                                      \
    {                                                         \
@@ -43,8 +56,10 @@
 {                                                            \
    if(_datPtr)                                               \
    {                                                         \
+      MAC_MEM_LOG("MAC_FREE", __FILE__, __LINE__, __FUNCTION__, _size, _datPtr);\
       SPutSBuf(MAC_MEM_REGION, MAC_POOL,                     \
-	    (Data *)_datPtr, _size);                         \
+	    (Data *)_datPtr, _size);                              \
+      _datPtr = NULLP;                                       \
    }                                                         \
 }
 
@@ -53,9 +68,10 @@
 #define MAC_ALLOC_SHRABL_BUF(_buf, _size)                    \
 {                                                            \
    if(SGetStaticBuffer(MAC_MEM_REGION, MAC_POOL,             \
-	    (Data **)&_buf, (Size) _size, 0) == ROK)         \
+	    (Data **)&_buf, (Size) _size, 0) == ROK)              \
    {                                                         \
-      cmMemset((uint8_t *)(_buf), 0, _size);                 \
+      MAC_MEM_LOG("MAC_ALLOC_SHRABL_BUF", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\
+      memset((_buf), 0, _size);                              \
    }                                                         \
    else                                                      \
    {                                                         \
@@ -68,6 +84,7 @@
 {                                                            \
    if (_buf != NULLP)                                        \
    {                                                         \
+      MAC_MEM_LOG("MAC_FREE_SHRABL_BUF", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\
       (Void) SPutStaticBuffer(_region, _pool,                \
 	    (Data *) _buf, (Size) _size, 0);                 \
       _buf = NULLP;                                          \
@@ -78,7 +95,7 @@
 #define FILL_PST_MAC_TO_DUAPP(_pst, _event)                     \
 {                                                           \
    _pst.selector  = ODU_SELECTOR_LWLC;                      \
-   _pst.srcEnt    = ENTRG;                                  \
+   _pst.srcEnt    = ENTMAC;                                  \
    _pst.dstEnt    = ENTDUAPP;                               \
    _pst.dstInst   = 0;                                      \
    _pst.srcInst   = macCb.macInst;                          \
@@ -96,8 +113,8 @@
 #define FILL_PST_MAC_TO_SCH(_pst, _event)                       \
 {                                                           \
    _pst.selector  = ODU_SELECTOR_TC;                        \
-   _pst.srcEnt    = ENTRG;                                  \
-   _pst.dstEnt    = ENTRG;                                  \
+   _pst.srcEnt    = ENTMAC;                                  \
+   _pst.dstEnt    = ENTMAC;                                  \
    _pst.dstInst   = 1;                                      \
    _pst.srcInst   = macCb.macInst;                          \
    _pst.dstProcId = macCb.procId;                           \
@@ -114,8 +131,8 @@
 #define FILL_PST_MAC_TO_RLC(_pst, _dstInst, _event)        \
 {                                                      \
    pst.selector  = ODU_SELECTOR_LWLC;                  \
-   pst.srcEnt    = ENTRG;                              \
-   pst.dstEnt    = ENTKW;                              \
+   pst.srcEnt    = ENTMAC;                              \
+   pst.dstEnt    = ENTRLC;                              \
    pst.dstInst   = _dstInst;                           \
    pst.srcInst   = macCb.macInst;                      \
    pst.dstProcId = macCb.procId;                       \
@@ -128,6 +145,10 @@
    pst.intfVer   = 0;                                  \
 }
 
+/* Function declaration */
+uint32_t shortBsrBytesTable[MAX_SHORT_BSR_TABLE_ENTRIES];
+uint32_t longBsrBytesTable[MAX_LONG_BSR_TABLE_ENTRIES];
+
 /**********************************************************************
          End of file
 **********************************************************************/