X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Frlc_utils.h;h=14a5e0dec6c584df0244cc3ea55c488cd8baaa8a;hb=3eb33bcb19a8e47fcf8b58b417d6fa05919952cf;hp=2bb5fba784b91299d4079e9d435dc6d26ec2d624;hpb=5cf1b5ae6066676b1da1105618dfd845d648eeeb;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/rlc_utils.h b/src/5gnrrlc/rlc_utils.h
index 2bb5fba78..14a5e0dec 100755
--- a/src/5gnrrlc/rlc_utils.h
+++ b/src/5gnrrlc/rlc_utils.h
@@ -107,8 +107,8 @@ extern "C" {
 #ifdef ODU_MEMORY_DEBUG_LOG
 #define RLC_MEM_LOG(_macro, _file, _line, _func, _size, _datPtr)\
 {\
-   printf("\n%s=== %s +%d, %s, %d, %p\n",           \
-         _macro, _file, _line, _func, _size, _datPtr); \
+   printf("\n%s=== %s +%d, %s, %lu, %p",           \
+         _macro, _file, _line, _func, (uint64_t)_size, _datPtr); \
 }
 #else
 #define RLC_MEM_LOG(_macro, _file, _line, _func, _size, _dataPtr) {}
@@ -1116,7 +1116,6 @@ do                                               \
 #define RLC_DL_INST   1
 
 #define PDCP_SN 1
-#define RLC_REASSEMBLY_TMR_BASE   5   /* Used to calculate timer value from enum values */
 
 /* Fill Pst structure for sending msg from RLC to DUAPP */
 #define FILL_PST_RLC_TO_DUAPP(_pst, _srcInst, _event) \
@@ -1709,13 +1708,6 @@ typedef struct rlcUlCb
 #endif /* LTE_L2_MEAS */
 }RlcUlCb;
 
-typedef enum
-{
-   SEARCH,
-   CREATE,
-   DELETE
-}RlcSnssaiActionType;
-
 typedef struct rlcThptPerUe
 {
    uint16_t ueId;
@@ -1811,11 +1803,11 @@ uint8_t  rlcUeDeleteTmrExpiry(PTR cb);
 
 void rlcSnssaiThptTmrExpiry(PTR cb);
 RlcTptPerSnssai* rlcHandleSnssaiTputlist(RlcCb *gCb, Snssai *snssai,\
-                                  RlcSnssaiActionType action, Direction dir);
+                                ActionTypeLL  action, Direction dir);
 uint8_t rlcCalculateTputPerSnssai(CmLListCp *snssaiList, Direction dir);
 uint8_t rlcDelTputSnssaiList(RlcCb *gCb, Direction dir);
 uint8_t BuildSliceReportToDu(uint8_t snssaiCnt);
-bool rlcFindSliceEntry(uint32_t snssaiVal, uint8_t *snssaiIdx,\
+bool rlcFindSliceEntry(SliceIdentifier snssaiVal, uint8_t *snssaiIdx,\
                       SlicePmList *sliceStats);
 
 #ifdef LTE_L2_MEAS