Code Review / o-du / l2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
RLC UeCb Changes
[o-du/l2.git] / src / 5gnrrlc / kw_umm_ul.c
diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c
index 2f6755e..3761777 100755 (executable)
--- a/src/5gnrrlc/kw_umm_ul.c
+++ b/src/5gnrrlc/kw_umm_ul.c
@@ -69,13 +69,13 @@ static int RLOG_FILE_ID=240;
 
 #define KW_MODULE (KW_DBGMASK_UM | KW_DBGMASK_UL)
 
-PRIVATE S16 kwUmmExtractHdr ARGS ((KwCb *gCb, 
-                                   KwUlRbCb *rbCb,
+PRIVATE S16 kwUmmExtractHdr ARGS ((RlcCb *gCb, 
+                                   RlcUlRbCb *rbCb,
                                    Buffer *pdu,
                                    KwUmHdr *umHdr));
 
-PRIVATE Void kwUmmReAssembleSdus ARGS ((KwCb *gCb,
-                                        KwUlRbCb *rbCb,
+PRIVATE Void kwUmmReAssembleSdus ARGS ((RlcCb *gCb,
+                                        RlcUlRbCb *rbCb,
                                         KwUmRecBuf *umRecBuf));
 
 #ifndef TENB_ACC
@@ -154,15 +154,15 @@ PRIVATE S16 kwUmmCheckSnInReordWindow (KwSn sn,
 #ifdef ANSI
 PUBLIC Void kwUmmProcessPdus
 (
-KwCb      *gCb,
-KwUlRbCb  *rbCb,                   /* Rb Control Block */
+RlcCb      *gCb,
+RlcUlRbCb  *rbCb,                   /* Rb Control Block */
 KwPduInfo *pduInfo,                 /* Pdu  data and related information */
 U32       ttiCnt                  /* ttiCnt received from MAC */
 )
 #else
 PUBLIC Void kwUmmProcessPdus(rbCb,pduInfo,ttiCnt)
-KwCb      *gCb;
-KwUlRbCb  *rbCb;                   /* Rb Control Block */
+RlcCb      *gCb;
+RlcUlRbCb  *rbCb;                   /* Rb Control Block */
 KwPduInfo *pduInfo;                /* Pdu  data and related information */
 U32       ttiCnt;                  /* ttiCnt received from MAC */
 #endif
@@ -170,14 +170,14 @@ U32       ttiCnt;                  /* ttiCnt received from MAC */
 #ifdef ANSI
 PUBLIC Void kwUmmProcessPdus
 (
-KwCb      *gCb,
-KwUlRbCb  *rbCb,                /* Rb Control Block */
+RlcCb      *gCb,
+RlcUlRbCb  *rbCb,                /* Rb Control Block */
 KwPduInfo *pduInfo              /* Pdu  data and related information */
 )
 #else
 PUBLIC Void kwUmmProcessPdus(rbCb,pduInfo)
-KwCb      *gCb;
-KwUlRbCb  *rbCb;                /* Rb Control Block */
+RlcCb      *gCb;
+RlcUlRbCb  *rbCb;                /* Rb Control Block */
 KwPduInfo *pduInfo;             /* Pdu  data and related information */
 #endif
 #endif
@@ -225,7 +225,7 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
 #endif      
 #endif      
       /* create a buffer to be later inserted into the reception buffer */
-      KW_ALLOC_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
+      RLC_ALLOC_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
 #if (ERRCLASS & ERRCLS_ADD_RES)
       if (tmpRecBuf == NULLP)
       {   
@@ -244,12 +244,12 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
 #ifndef LTE_PAL_ENB
     /* Changed the condition to TRUE from ROK  */
 #ifndef XEON_SPECIFIC_CHANGES    
-     if(isMemThreshReached(kwCb[0]->init.region) == TRUE)
+     if(isMemThreshReached(rlcCb[0]->init.region) == TRUE)
      {
         extern U32 rlculdrop;
         rlculdrop++;
-        KW_FREE_BUF(pdu);
-        KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
+        RLC_FREE_BUF(pdu);
+        RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
         /*Fix for CR ccpu00144030: If threshhold is hit then also count
          *should be incrmented */
         count++;
@@ -270,7 +270,7 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
          /* Header extraction is a problem. 
           * log an error and free the allocated memory */
          /* ccpu00136940 */
-         KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
+         RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
          SPutMsg(pdu);
          count++;
          /* kw005.201 ccpu00117318, updating the statistics */
@@ -294,8 +294,8 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
                   rbCb->rlcId.ueId,
                   rbCb->rlcId.cellId);
 
-         KW_FREE_BUF(pdu);
-         KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
+         RLC_FREE_BUF(pdu);
+         RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf));
          count++;
          /* kw005.201 ccpu00117318, updating the statistics */
          gCb->genSts.unexpPdusRecv++;
@@ -341,7 +341,7 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
                if (recBuf[sn])
                {
                   kwUmmReAssembleSdus(gCb,rbCb,recBuf[sn]);
-                  KW_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf));
+                  RLC_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf));
                   recBuf[sn] = NULLP;
                }
                sn = (sn + 1) & KW_UMUL.modBitMask;
@@ -363,7 +363,7 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
          while (recBuf[sn] && tSn < tVrUr)
          {
             kwUmmReAssembleSdus(gCb,rbCb,recBuf[sn]);
-            KW_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf));
+            RLC_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf));
             recBuf[sn] = NULLP;
             sn = (sn + 1) & KW_UMUL.modBitMask;
             tSn = KW_UM_GET_VALUE(sn, KW_UMUL);
@@ -420,14 +420,14 @@ KwPduInfo *pduInfo;             /* Pdu  data and related information */
 #ifdef ANSI
 PRIVATE Void kwUmmReAssembleSdus
 (
-KwCb         *gCb,
-KwUlRbCb     *rbCb,   
+RlcCb         *gCb,
+RlcUlRbCb     *rbCb,   
 KwUmRecBuf   *umRecBuf 
 )
 #else
 PRIVATE Void kwUmmReAssembleSdus(gCb,rbCb,umRecBuf)
-KwCb         *gCb;
-KwUlRbCb     *rbCb;     
+RlcCb         *gCb;
+RlcUlRbCb     *rbCb;     
 KwUmRecBuf   *umRecBuf; 
 #endif
 {
@@ -494,7 +494,7 @@ KwUmRecBuf   *umRecBuf;
                 (sn == ((rbCb->m.umUl.sn + 1) & rbCb->m.umUl.modBitMask)))
             {
                SCatMsg(*partialSdu,sdu,M1M2);
-               KW_FREE_BUF(sdu);
+               RLC_FREE_BUF(sdu);
                if (liCount > 0 || !(fi & 1))
                {
                   kwUtlSndDatInd(gCb,rbCb,*partialSdu);
@@ -506,11 +506,11 @@ KwUmRecBuf   *umRecBuf;
                 /* Partial Sdu stored is not valid now.So free it */
                if (*partialSdu)
                {
-                  KW_FREE_BUF(*partialSdu);
+                  RLC_FREE_BUF(*partialSdu);
                   *partialSdu = NULLP;
                }
                   
-               KW_FREE_BUF(sdu);
+               RLC_FREE_BUF(sdu);
                sdu = NULLP;
             }
          }
@@ -518,7 +518,7 @@ KwUmRecBuf   *umRecBuf;
          {
             if (*partialSdu)
             {
-               KW_FREE_BUF(*partialSdu);  /* RLC mem leak fix */
+               RLC_FREE_BUF(*partialSdu);  /* RLC mem leak fix */
                *partialSdu = NULLP;
             }
             
@@ -583,15 +583,15 @@ KwUmRecBuf   *umRecBuf;
 #ifdef ANSI
 PUBLIC Void kwUmmUlReEstablish
 (
-KwCb         *gCb,
+RlcCb         *gCb,
 CmLteRlcId   *rlcId,
-KwUlRbCb     *rbCb
+RlcUlRbCb     *rbCb
 )
 #else
 PUBLIC Void kwUmmUlReEstablish(gCb, rlcId, rbCb)
-KwCb         *gCb;
+RlcCb         *gCb;
 CmLteRlcId   *rlcId;
-KwUlRbCb     *rbCb;
+RlcUlRbCb     *rbCb;
 #endif
 {
    KwSn         curSn;
@@ -616,7 +616,7 @@ KwUlRbCb     *rbCb;
       if ( recBuf[curSn] != NULLP )
       {
          kwUmmReAssembleSdus(gCb,rbCb,recBuf[curSn]);
-         KW_FREE_WC(gCb,recBuf[curSn],sizeof(KwUmRecBuf));
+         RLC_FREE_WC(gCb,recBuf[curSn],sizeof(KwUmRecBuf));
          recBuf[curSn] = NULLP;
       } 
       curSn = (curSn + 1) & rbCb->m.umUl.modBitMask;
@@ -653,15 +653,15 @@ KwUlRbCb     *rbCb;
 #ifdef ANSI
 PRIVATE S16 kwUmmExtractHdr
 (
-KwCb       *gCb,
-KwUlRbCb   *rbCb, 
+RlcCb       *gCb,
+RlcUlRbCb   *rbCb, 
 Buffer     *pdu, 
 KwUmHdr    *umHdr 
 )
 #else
 PRIVATE S16 kwUmmExtractHdr(gCb, rbCb, pdu, umHdr)
-KwCb       *gCb;
-KwUlRbCb   *rbCb; 
+RlcCb       *gCb;
+RlcUlRbCb   *rbCb; 
 Buffer     *pdu; 
 KwUmHdr    *umHdr; 
 #endif
@@ -842,13 +842,13 @@ KwUmHdr    *umHdr;
 #ifdef ANSI
 PUBLIC Void kwUmmReOrdTmrExp
 (
-KwCb       *gCb,
-KwUlRbCb   *rbCb     
+RlcCb       *gCb,
+RlcUlRbCb   *rbCb     
 )
 #else
 PUBLIC Void kwUmmReOrdTmrExp(gCb, rbCb)
-KwCb       *gCb;
-KwUlRbCb   *rbCb;   
+RlcCb       *gCb;
+RlcUlRbCb   *rbCb;   
 #endif
 {
    KwSn prevVrUr;   /* prevVrUr */
@@ -869,9 +869,9 @@ KwUlRbCb   *rbCb;
          kwUmmReAssembleSdus(gCb, rbCb, KW_UMUL.recBuf[prevVrUr]);
          if(KW_UMUL.recBuf[prevVrUr]->pdu != NULLP) /* RLC mem leak fix */
          {
-            KW_FREE_BUF(KW_UMUL.recBuf[prevVrUr]->pdu);
+            RLC_FREE_BUF(KW_UMUL.recBuf[prevVrUr]->pdu);
          }
-         KW_FREE_WC(gCb, KW_UMUL.recBuf[prevVrUr], sizeof(KwUmRecBuf));
+         RLC_FREE_WC(gCb, KW_UMUL.recBuf[prevVrUr], sizeof(KwUmRecBuf));
          KW_UMUL.recBuf[prevVrUr] = NULLP;
       }
 
@@ -903,13 +903,13 @@ KwUlRbCb   *rbCb;
 #ifdef ANSI
 PUBLIC Void kwUmmFreeUlRbCb
 (
-KwCb       *gCb,
-KwUlRbCb   *rbCb
+RlcCb       *gCb,
+RlcUlRbCb   *rbCb
 )
 #else
 PUBLIC Void kwUmmFreeUlRbCb(gCb,rbCb)
-KwCb       *gCb;
-KwUlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcUlRbCb   *rbCb;
 #endif
 {
    KwSn         curSn = 0;           /* sequence number of PDU */
@@ -931,15 +931,15 @@ KwUlRbCb   *rbCb;
    {
       if (umRecBuf[curSn] != NULLP)
       {
-         KW_FREE_BUF_WC(umRecBuf[curSn]->pdu);
+         RLC_FREE_BUF_WC(umRecBuf[curSn]->pdu);
          umRecBuf[curSn]->pdu = NULLP;
 
-         KW_FREE_WC(gCb, umRecBuf[curSn], sizeof(KwUmRecBuf));
+         RLC_FREE_WC(gCb, umRecBuf[curSn], sizeof(KwUmRecBuf));
          umRecBuf[curSn] = NULLP;
       }
       curSn++;
    }
-   KW_FREE_WC(gCb,rbCb->m.umUl.recBuf, (windSz ) * sizeof(KwUmRecBuf*));
+   RLC_FREE_WC(gCb,rbCb->m.umUl.recBuf, (windSz ) * sizeof(KwUmRecBuf*));
    rbCb->m.umUl.recBuf = NULLP;
    RETVOID;
 } 
O-RAN DU Layer 2