X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Frlc_umm_dl.c;fp=src%2F5gnrrlc%2Fkw_umm_dl.c;h=2d89241bd2d61da871f8d76558b6b1e2776c445d;hb=70e1fb5996d93ef4973ffb654ee6a66228e9031c;hp=430adca402e214cc57e0bdaeeb13271e1d10ec3a;hpb=d48ca6903f310645ef58f09ad965f589660be068;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_umm_dl.c b/src/5gnrrlc/rlc_umm_dl.c
similarity index 97%
rename from src/5gnrrlc/kw_umm_dl.c
rename to src/5gnrrlc/rlc_umm_dl.c
index 430adca40..2d89241bd 100755
--- a/src/5gnrrlc/kw_umm_dl.c
+++ b/src/5gnrrlc/rlc_umm_dl.c
@@ -31,11 +31,11 @@
                   --rlcUmmReAssembleSdus
                   --kwUmmReEstablish 
 
-     File:     kw_umm_dl.c
+     File:     rlc_umm_dl.c
 
 **********************************************************************/
 /** 
- * @file kw_umm_dl.c
+ * @file rlc_umm_dl.c
  * @brief RLC Unacknowledged Mode downlink module
 */
 
@@ -46,12 +46,10 @@
 #include "kwu.h"                /* RLC service user */
 #include "lkw.h"                /* LM Interface */
 #include "rgu.h"                /* MAC layer */
-#include "kw_env.h"             /* RLC environment options */
+#include "rlc_env.h"             /* RLC environment options */
+#include "rlc_err.h"
+
 
-#include "kw.h"                 /* RLC layer */
-#include "kw_err.h"
-#include "kw_udx.h"
-#include "kw_dl.h"
 
 
 /* header/extern include files (.x) */
@@ -61,9 +59,9 @@
 #include "lkw.x"                /* LM Interface */
 #include "rgu.x"                /* MAC later */
 
-#include "kw.x"                 /* RLC layer */
-#include "kw_udx.x"
-#include "kw_dl.x"
+#include "rlc_utils.h"                 /* RLC layer */
+#include "rlc_dl_ul_inf.h"
+#include "rlc_dl.h"
 
 #define RLC_MODULE (RLC_DBGMASK_UM | RLC_DBGMASK_DL)
 
@@ -241,7 +239,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
             RLC_UPD_L2_DL_DISC_SDU_STS(gCb, rbCb);
 #endif
             rbCb->m.umDl.bo -= sdu->sduSz;
-            RLC_RMV_SDU(gCb,&rbCb->m.umDl.sduQ,sdu);
+            RLC_REMOVE_SDU(gCb,&rbCb->m.umDl.sduQ,sdu);
             continue;
          }
       }
@@ -365,7 +363,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
               umHdr.so = 0;
          }
          rlcUmmCreatePdu(gCb, rbCb, pdu, &umHdr, pduInfo);
-         RLC_RMV_SDU(gCb,&(rbCb->m.umDl.sduQ),sdu); /* kw003.201 */
+         RLC_REMOVE_SDU(gCb,&(rbCb->m.umDl.sduQ),sdu); /* kw003.201 */
          rlcUtlIncrementKwuStsSduTx(gCb->u.dlCb->rlcKwuDlSap + rbCb->k1wuSapId);
          pdu = NULLP;
       }
@@ -600,7 +598,7 @@ Void rlcUmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId)
       if (sdu->mode.um.sduId == sduId && sdu->mode.um.isSegmented == FALSE)
       {
 /* kw005.201 added support for L2 Measurement */
-         RLC_RMV_SDU(gCb,&rbCb->m.umDl.sduQ,sdu);
+         RLC_REMOVE_SDU(gCb,&rbCb->m.umDl.sduQ,sdu);
          gCb->genSts.numSduDisc++;         
       }
    }