X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_umm_ul.c;h=5926729e980f3e19de1f4759d7f221ac41a819c8;hb=8bd856d0debe02bb5cc741a00c51cefcec982a15;hp=d316ff957848f86fd50b8538bc0c3e0f7eaa6d1d;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c
index d316ff957..5926729e9 100755
--- a/src/5gnrrlc/kw_umm_ul.c
+++ b/src/5gnrrlc/kw_umm_ul.c
@@ -65,18 +65,18 @@
 
 #define RLC_MODULE (RLC_DBGMASK_UM | RLC_DBGMASK_UL)
 
-uint8_t rlcUmmExtractHdr ARGS ((RlcCb *gCb, 
+static uint8_t rlcUmmExtractHdr ARGS ((RlcCb *gCb, 
                                    RlcUlRbCb *rbCb,
                                    Buffer *pdu,
                                    RlcUmHdr *umHdr));
 
-void rlcUmmReAssembleSdus ARGS ((RlcCb *gCb,
+static void rlcUmmReAssembleSdus ARGS ((RlcCb *gCb,
                                         RlcUlRbCb *rbCb,
                                         RlcUmRecBuf *umRecBuf));
 
 #ifndef TENB_ACC
 #ifndef LTE_PAL_ENB
-extern U32 isMemThreshReached(Region region);
+uint32_t isMemThreshReached(Region region);
 #endif
 #endif
 /**
@@ -92,7 +92,7 @@ extern U32 isMemThreshReached(Region region);
  *
  * @return  Void
 */ 
-void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn)
+static void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn)
 {
    RlcSn ur = RLC_UM_GET_VALUE(umUl->vrUr, *umUl);
    
@@ -123,7 +123,7 @@ void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn)
  *
  * @return  Void
 */
-int16_t rlcUmmCheckSnInReordWindow (RlcSn sn, CONSTANT RlcUmUl* CONSTANT umUl)  
+static int16_t rlcUmmCheckSnInReordWindow (RlcSn sn, const RlcUmUl* const umUl)  
 {
    return (RLC_UM_GET_VALUE(sn, *umUl) < RLC_UM_GET_VALUE(umUl->vrUh, *umUl)); 
 }
@@ -181,7 +181,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo)
 #ifndef RGL_SPECIFIC_CHANGES
 #ifndef TENB_ACC
 #ifndef LTE_PAL_ENB
-      extern uint32_t ulrate_rgu;
+      uint32_t ulrate_rgu;
       MsgLen len;
       ODU_GET_MSG_LEN(pdu, &len);
       ulrate_rgu += len;
@@ -207,7 +207,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo)
 #ifndef XEON_SPECIFIC_CHANGES    
      if(isMemThreshReached(rlcCb[0]->init.region) == TRUE)
      {
-        extern uint32_t rlculdrop;
+        uint32_t rlculdrop;
         rlculdrop++;
         RLC_FREE_BUF(pdu);
         RLC_FREE_WC(gCb, tmpRecBuf, sizeof(RlcUmRecBuf));
@@ -373,7 +373,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo)
  *
  * @return  Void
 */
-void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf)
+static void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf)
 {
    uint32_t  liCount;        /* LI count */
    uint32_t  count;          /* Loop counter */
@@ -521,19 +521,12 @@ void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf)
  *
  * @return  Void
 */ 
-#ifdef ANSI
 Void rlcUmmUlReEstablish
 (
 RlcCb         *gCb,
 CmLteRlcId   *rlcId,
 RlcUlRbCb     *rbCb
 )
-#else
-Void rlcUmmUlReEstablish(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   *rlcId;
-RlcUlRbCb     *rbCb;
-#endif
 {
    RlcSn         curSn;
    RlcSn         vrUh;
@@ -568,7 +561,7 @@ RlcUlRbCb     *rbCb;
    /* In the UM Mode always send reestablish-indication to Upper Latyer*/
    RlcUiKwuReEstCmpInd(&rlcKwSap->pst, rlcKwSap->suId, *rlcId);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -588,7 +581,7 @@ RlcUlRbCb     *rbCb;
  *      -# TRUE 
  *      -# FALSE
 */
-uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umHdr)
+static uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umHdr)
 {
    uint8_t   e;         /* Extension Bit */
    Data      dst[2];    /* Destination Buffer */
@@ -686,7 +679,7 @@ uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umH
    
       if ( e && umHdr->numLi < RLC_MAX_UL_LI)
       {
-         U8 tmp = ((dst[1]) & 0x08) >> 3;
+         uint8_t tmp = ((dst[1]) & 0x08) >> 3;
          umHdr->li[umHdr->numLi] = ( dst[1] & 0x07) << 8;
 
 
@@ -740,17 +733,11 @@ uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umH
  *
  * @return  Void
 */
-#ifdef ANSI
 Void rlcUmmReOrdTmrExp
 (
 RlcCb       *gCb,
 RlcUlRbCb   *rbCb     
 )
-#else
-Void rlcUmmReOrdTmrExp(gCb, rbCb)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;   
-#endif
 {
    RlcSn prevVrUr;   /* prevVrUr */
    prevVrUr = RLC_UMUL.vrUr;
@@ -797,17 +784,11 @@ RlcUlRbCb   *rbCb;
  * @return   void
  */
 
-#ifdef ANSI
 Void rlcUmmFreeUlRbCb
 (
 RlcCb       *gCb,
 RlcUlRbCb   *rbCb
 )
-#else
-Void rlcUmmFreeUlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;
-#endif
 {
    RlcSn         curSn = 0;           /* sequence number of PDU */
    RlcSn         windSz;              /* PDU window size */
@@ -835,7 +816,7 @@ RlcUlRbCb   *rbCb;
    }
    RLC_FREE_WC(gCb,rbCb->m.umUl.recBuf, (windSz ) * sizeof(RlcUmRecBuf*));
    rbCb->m.umUl.recBuf = NULLP;
-   RETVOID;
+   return;
 }