Merge "Part -6 Classification of log [JIRA-ID ODUHIGH-275]"

[o-du/l2.git] / src / 5gnrrlc / kw_umm_dl.c

diff --git a/src/5gnrrlc/kw_umm_dl.c b/src/5gnrrlc/kw_umm_dl.c
index 10dfd86..9abac21 100755 (executable)
--- a/src/5gnrrlc/kw_umm_dl.c
+++ b/src/5gnrrlc/kw_umm_dl.c
@@ -69,18 +69,18 @@
 
 /* variables for logging :declared in BRDCM cl */
 #ifndef TENB_ACC
-extern U32 dldrops_kwu_um;
-extern U32 dlpkt_um;
-extern U32 buffer_occ;
-extern U32 dlrate_kwu;
+uint32_t dldrops_kwu_um;
+uint32_t dlpkt_um;
+uint32_t buffer_occ;
+uint32_t dlrate_kwu;
 #endif
 
-PRIVATE void rlcUmmEstHdrSz ARGS ((RlcUmDl *umUl));
+static void rlcUmmEstHdrSz ARGS ((RlcUmDl *umUl));
 
-PRIVATE Void rlcUmmCreatePdu ARGS ((RlcCb *gCb,
+static Void rlcUmmCreatePdu ARGS ((RlcCb *gCb,
                                   RlcDlRbCb *rbCb, 
                                   Buffer *pdu,
-                                  U8 fi,
+                                  uint8_t fi,
                                   KwPduInfo *datReqPduInfo));
 
 /** @addtogroup ummode */
@@ -473,7 +473,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
          else 
          {
             ODU_CAT_MSG(pdu, sdu->mBuf, M1M2);
-            RLC_FREE_BUF_WC(sdu->mBuf);
+            ODU_PUT_MSG_BUF(sdu->mBuf);
          }
 
          sdu->sduSz -= pduSz;
@@ -515,7 +515,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
       if ((lchInfo.numSdus != 0) && (l2MeasTb != NULLP) &&
           (l2MeasTb->numLchInfo < RLC_MAX_ACTV_DRB))
       {   
-         cmMemcpy((U8 *) &l2MeasTb->lchInfo[l2MeasTb->numLchInfo], (U8 *) &lchInfo, sizeof(RlclchInfo));
+         memcpy( &l2MeasTb->lchInfo[l2MeasTb->numLchInfo],  &lchInfo, sizeof(RlclchInfo));
          l2MeasTb->numLchInfo++;
       }
       l2MeasTb->txSegSduCnt += segSduCnt;
@@ -537,7 +537,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
       }
       else
       {
-         RLC_FREE_BUF_WC(pdu);
+         ODU_PUT_MSG_BUF(pdu);
       }
    }
    
@@ -571,25 +571,9 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
  *
  * @return  Void
 */ 
-#ifdef ANSI
-Void rlcDlUmmReEstablish
-(
-RlcCb         *gCb,
-CmLteRlcId   rlcId,
-Bool         sendReEst,
-RlcDlRbCb     *rbCb
-)
-#else
-Void rlcDlUmmReEstablish(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   rlcId;
-Bool         sendReEst;
-RlcDlRbCb       *rbCb;
-#endif
+Void rlcDlUmmReEstablish(RlcCb *gCb,CmLteRlcId rlcId,Bool sendReEst,RlcDlRbCb *rbCb)
 {
    /* The re-establishment indication is sent from the UL only */
-   TRC2(rlcDlUmmReEstablish)
-
 
    rlcUmmFreeDlRbCb(gCb, rbCb);
 
@@ -599,7 +583,7 @@ RlcDlRbCb       *rbCb;
       for SRB 1 */
    rlcDlUtlResetReestInProgress(rbCb);
    
-   RETVOID;
+   return;
 }
 /**
  * @brief   Handler to create the header and complete a PDU.
@@ -618,7 +602,7 @@ RlcDlRbCb       *rbCb;
  *
  * @return  Void
 */ 
-void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPduInfo *datReqPduInfo)
+static void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPduInfo *datReqPduInfo)
 {
    RlcSn     sn;        /*  Sequence Number */
    uint32_t  liCount;   /*  LI count */
@@ -735,7 +719,7 @@ void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPdu
  *
  * @return  Void
 */ 
-void rlcUmmEstHdrSz(RlcUmDl *umDl)
+static void rlcUmmEstHdrSz(RlcUmDl *umDl)
 {
    /* The header size is estimated as :
           If sdu count = 0 then 0
@@ -763,25 +747,9 @@ void rlcUmmEstHdrSz(RlcUmDl *umDl)
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcUmmDiscSdu
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,                
-U32        sduId                
-)
-#else
-Void rlcUmmDiscSdu(gCb,rbCb,sduId)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;                
-U32        sduId;                
-#endif
+Void rlcUmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId)
 {
    CmLList *tmpNode;  /* Temporary Node in SDU queue */
-   
-   TRC2(rlcUmmDiscSdu)
-
-  
    CM_LLIST_FIRST_NODE(&rbCb->m.umDl.sduQ,tmpNode);
 
    if (tmpNode)
@@ -796,7 +764,7 @@ U32        sduId;
       }
    }
 
-   RETVOID;
+   return;
 }
 
 /*
@@ -812,26 +780,14 @@ U32        sduId;
  *
  * @return Void
  */
-#ifdef ANSI
-Void rlcUmmFreeDlRbCb
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb
-)
-#else
-Void rlcUmmFreeDlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-#endif
+Void rlcUmmFreeDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb)
 {
-   TRC2(rlcUmmFreeDlRbCb)
-
 
    /* cat the SDU queue to the to be freed list */
    cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCb->m.umDl.sduQ));
    rlcUtlRaiseDlCleanupEvent(gCb);
 
-   RETVOID;
+   return;
 } /* rlcUmmFreeDlRbCb */
 
 /********************************************************************30**