RLC UeCb Changes

[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 8b84123..26c98dc 100755 (executable)
--- a/src/5gnrrlc/kw_umm_dl.c
+++ b/src/5gnrrlc/kw_umm_dl.c
@@ -80,8 +80,8 @@ extern U32 dlrate_kwu;
 
 PRIVATE Void kwUmmEstHdrSz ARGS ((KwUmDl *umUl));
 
-PRIVATE Void kwUmmCreatePdu ARGS ((KwCb *gCb,
-                                  KwDlRbCb *rbCb, 
+PRIVATE Void kwUmmCreatePdu ARGS ((RlcCb *gCb,
+                                  RlcDlRbCb *rbCb, 
                                   Buffer *pdu,
                                   U8 fi,
                                   KwPduInfo *datReqPduInfo));
@@ -109,15 +109,15 @@ PRIVATE Void kwUmmCreatePdu ARGS ((KwCb *gCb,
 #ifdef ANSI
 PUBLIC Void kwUmmQSdu       
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb, 
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb, 
 KwuDatReqInfo   *datReq,  
 Buffer          *mBuf 
 )
 #else
 PUBLIC Void kwUmmQSdu(gCb,rbCb,datReq,mBuf)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwuDatReqInfo   *datReq; 
 Buffer          *mBuf;
 #endif
@@ -129,7 +129,7 @@ Buffer          *mBuf;
 
    KW_UPD_L2_DL_TOT_SDU_STS(gCb,rbCb);
 
-   KW_ALLOC_WC(gCb, sdu, (Size)sizeof(KwSdu));
+   RLC_ALLOC_WC(gCb, sdu, (Size)sizeof(KwSdu));
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if ( sdu == NULLP )
    {
@@ -168,7 +168,7 @@ Buffer          *mBuf;
    
    kwUmmEstHdrSz(&rbCb->m.umDl);
 
-   if(!kwDlUtlIsReestInProgress(rbCb))
+   if(!rlcDlUtlIsReestInProgress(rbCb))
    {
       kwUtlSndDStaRsp(gCb,rbCb,rbCb->m.umDl.bo,rbCb->m.umDl.estHdrSz,FALSE,0);
    }
@@ -179,7 +179,7 @@ Buffer          *mBuf;
    if((rbCb->rbL2Cb.measOn & LKW_L2MEAS_ACT_UE) &&
       (rbCb->ueCb->numActRb[rbCb->qci]++ == 0))
    {
-     kwCb.kwL2Cb.numActUe[rbCb->qci]++;
+     rlcCb.kwL2Cb.numActUe[rbCb->qci]++;
    }
 #endif
 
@@ -208,14 +208,14 @@ Buffer          *mBuf;
 #ifdef ANSI
 PUBLIC Void kwUmmProcessSdus
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,   
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,   
 KwDatReq   *datReq   
 )
 #else
 PUBLIC Void kwUmmProcessSdus(gCb, rbCb, datReq)
-KwCb       *gCb;
-KwDlRbCb   *rbCb; 
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb; 
 KwDatReq   *datReq;
 #endif
 {
@@ -511,7 +511,7 @@ KwDatReq   *datReq;
          else 
          {
             SCatMsg(pdu, sdu->mBuf, M1M2);
-            KW_FREE_BUF_WC(sdu->mBuf);
+            RLC_FREE_BUF_WC(sdu->mBuf);
          }
 
          sdu->sduSz -= pduSz;
@@ -538,7 +538,7 @@ KwDatReq   *datReq;
    {
       if(--(rbCb->ueCb->numActRb[rbCb->qci]) == 0)
       {
-         kwCb.kwL2Cb.numActUe[rbCb->qci]--;
+         rlcCb.kwL2Cb.numActUe[rbCb->qci]--;
       }
    }
 #endif /* LTE_L2_MEAS */
@@ -575,7 +575,7 @@ KwDatReq   *datReq;
       }
       else
       {
-         KW_FREE_BUF_WC(pdu);
+         RLC_FREE_BUF_WC(pdu);
       }
    }
    
@@ -610,23 +610,23 @@ KwDatReq   *datReq;
  * @return  Void
 */ 
 #ifdef ANSI
-PUBLIC Void kwDlUmmReEstablish
+PUBLIC Void rlcDlUmmReEstablish
 (
-KwCb         *gCb,
+RlcCb         *gCb,
 CmLteRlcId   rlcId,
 Bool         sendReEst,
-KwDlRbCb     *rbCb
+RlcDlRbCb     *rbCb
 )
 #else
-PUBLIC Void kwDlUmmReEstablish(gCb, rlcId, rbCb)
-KwCb         *gCb;
+PUBLIC Void rlcDlUmmReEstablish(gCb, rlcId, rbCb)
+RlcCb         *gCb;
 CmLteRlcId   rlcId;
 Bool         sendReEst;
-KwDlRbCb       *rbCb;
+RlcDlRbCb       *rbCb;
 #endif
 {
    /* The re-establishment indication is sent from the UL only */
-   TRC2(kwDlUmmReEstablish)
+   TRC2(rlcDlUmmReEstablish)
 
 
    kwUmmFreeDlRbCb(gCb, rbCb);
@@ -635,7 +635,7 @@ KwDlRbCb       *rbCb;
 
    /* this would have been set when re-establishment was triggered
       for SRB 1 */
-   kwDlUtlResetReestInProgress(rbCb);
+   rlcDlUtlResetReestInProgress(rbCb);
    
    RETVOID;
 }
@@ -659,16 +659,16 @@ KwDlRbCb       *rbCb;
 #ifdef ANSI
 PRIVATE Void kwUmmCreatePdu
 (
-KwCb        *gCb,
-KwDlRbCb    *rbCb,           
+RlcCb        *gCb,
+RlcDlRbCb    *rbCb,           
 Buffer      *pdu,           
 U8          fi, 
 KwPduInfo   *datReqPduInfo
 )
 #else
 PRIVATE Void kwUmmCreatePdu(gCb, rbCb, pdu, fi, datReqPduInfo)
-KwCb        *gCb;
-KwDlRbCb    *rbCb;          
+RlcCb        *gCb;
+RlcDlRbCb    *rbCb;          
 Buffer      *pdu;           
 U8          fi;
 KwPduInfo   *datReqPduInfo
@@ -831,14 +831,14 @@ KwUmDl *umDl;
 #ifdef ANSI
 PUBLIC Void kwUmmDiscSdu
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,                
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,                
 U32        sduId                
 )
 #else
 PUBLIC Void kwUmmDiscSdu(gCb,rbCb,sduId)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;                
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;                
 U32        sduId;                
 #endif
 {
@@ -880,13 +880,13 @@ U32        sduId;
 #ifdef ANSI
 PUBLIC Void kwUmmFreeDlRbCb
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb
 )
 #else
 PUBLIC Void kwUmmFreeDlRbCb(gCb,rbCb)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 #endif
 {
    TRC2(kwUmmFreeDlRbCb)