remove/replaced PRIVATE and EXTERN keywords

[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..8d6f13b 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 */
@@ -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;
@@ -588,8 +588,6 @@ RlcDlRbCb       *rbCb;
 #endif
 {
    /* The re-establishment indication is sent from the UL only */
-   TRC2(rlcDlUmmReEstablish)
-
 
    rlcUmmFreeDlRbCb(gCb, rbCb);
 
@@ -599,7 +597,7 @@ RlcDlRbCb       *rbCb;
       for SRB 1 */
    rlcDlUtlResetReestInProgress(rbCb);
    
-   RETVOID;
+   return;
 }
 /**
  * @brief   Handler to create the header and complete a PDU.
@@ -618,7 +616,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 +733,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
@@ -768,20 +766,16 @@ Void rlcUmmDiscSdu
 (
 RlcCb       *gCb,
 RlcDlRbCb   *rbCb,                
-U32        sduId                
+uint32_t        sduId                
 )
 #else
 Void rlcUmmDiscSdu(gCb,rbCb,sduId)
 RlcCb       *gCb;
 RlcDlRbCb   *rbCb;                
-U32        sduId;                
+uint32_t        sduId;                
 #endif
 {
    CmLList *tmpNode;  /* Temporary Node in SDU queue */
-   
-   TRC2(rlcUmmDiscSdu)
-
-  
    CM_LLIST_FIRST_NODE(&rbCb->m.umDl.sduQ,tmpNode);
 
    if (tmpNode)
@@ -796,7 +790,7 @@ U32        sduId;
       }
    }
 
-   RETVOID;
+   return;
 }
 
 /*
@@ -824,14 +818,12 @@ RlcCb       *gCb;
 RlcDlRbCb   *rbCb;
 #endif
 {
-   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**