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_utl_ul.c
diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c
index d3ce168..b4742a4 100755 (executable)
--- a/src/5gnrrlc/kw_utl_ul.c
+++ b/src/5gnrrlc/kw_utl_ul.c
@@ -43,22 +43,12 @@ static int RLOG_FILE_ID=210;
 */
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
+#include "common_def.h"
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
 #include <sys/time.h>
 #endif
 
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library defines */
-#include "cm_llist.h"      /* common link list  defines  */
-#include "cm_hash.h"       /* common hash list  defines */
-#include "cm_lte.h"        /* common LTE defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
 #include "lkw.h"           /* LKW defines */
@@ -70,16 +60,6 @@ static int RLOG_FILE_ID=210;
 #include "kw_ul.h"         /* RLC Uplink defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "ckw.x"           /* CKW includes */
 #include "kwu.x"           /* KWU includes */
 #include "lkw.x"           /* LKW includes */
@@ -118,19 +98,19 @@ PUBLIC KwAmRecBuf* kwUtlGetRecBuf(CmLListCp *recBufLst, KwSn sn);
 #ifdef ANSI
 PUBLIC S16 kwUtlRcvFrmLi
 (
-KwCb           *gCb,                              
+RlcCb           *gCb,                              
 KwDatIndInfo   *datIndInfo                       
 )
 #else
 PUBLIC S16 kwUtlRcvFrmLi(gCb,datIndInfo)  
-KwCb           *gCb;                     
+RlcCb           *gCb;                     
 KwDatIndInfo   *datIndInfo;             
 #endif
 {
    U32         count;      /* Loop Counter */
    KwPduInfo   *pduInfo;   /* PDU Information */
-   KwUlRbCb    *rbCb;      /* RB Control Block */
-   KwUlUeCb    *ueCb;      /* UE Control Block */
+   RlcUlRbCb    *rbCb;      /* RB Control Block */
+   RlcUlUeCb    *ueCb;      /* UE Control Block */
 /* kw005.201 added support for L2 Measurement */
 
    TRC2(kwUtlRcvFrmLi)
@@ -153,7 +133,7 @@ KwDatIndInfo   *datIndInfo;
          {
             if(datIndInfo->lchData[i].pdu.mBuf[j])
             {
-               KW_FREE_BUF_WC(datIndInfo->lchData[i].pdu.mBuf[j]);
+               RLC_FREE_BUF_WC(datIndInfo->lchData[i].pdu.mBuf[j]);
             }
          }
       }
@@ -188,7 +168,7 @@ KwDatIndInfo   *datIndInfo;
          {
             if(pduInfo->mBuf[j])
             {
-               KW_FREE_BUF_WC(pduInfo->mBuf[j]);
+               RLC_FREE_BUF_WC(pduInfo->mBuf[j]);
             }
          }
          continue;
@@ -237,19 +217,18 @@ KwDatIndInfo   *datIndInfo;
 #ifdef ANSI
 PUBLIC S16 kwUtlSndDatInd
 (
-KwCb       *gCb,
-KwUlRbCb   *rbCb,                   
+RlcCb       *gCb,
+RlcUlRbCb   *rbCb,                   
 Buffer     *sdu                    
 )
 #else
 PUBLIC S16 kwUtlSndDatInd(gCb,rbCb,sdu)
-KwCb       *gCb;
-KwUlRbCb   *rbCb;                  
+RlcCb       *gCb;
+RlcUlRbCb   *rbCb;                  
 Buffer     *sdu;                    
 #endif
 {
 #ifndef KW_PDCP
-   KwKwuSapCb      *kwKwSap;     /* KWU SAP Information */
    KwuDatIndInfo   *datIndInfo;   /* Data Indication Information */
    KwuDatIndInfo datIndInfoTmp;
 #endif
@@ -258,7 +237,6 @@ Buffer     *sdu;
 
 
 #ifndef KW_PDCP
-   kwKwSap = gCb->u.ulCb->kwuUlSap + KW_UI_PDCP;
    /* Creating static memory for KwuDatIndInfo. #else will be 
     * removed once the testing is done on all platforms */
    datIndInfo = &datIndInfoTmp;
@@ -270,7 +248,7 @@ Buffer     *sdu;
                "Memory allocation failed UEID:%d CELLID:%d",
                rbCb->rlcId.ueId,
                rbCb->rlcId.cellId);
-      KW_FREE_BUF(sdu);
+      RLC_FREE_BUF(sdu);
       RETVALUE(RFAILED);
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
@@ -295,7 +273,7 @@ Buffer     *sdu;
 } /* kwUtlSndDatInd */
 
 
-PRIVATE Void dumpRLCUlRbInformation(KwUlRbCb* ulRbCb)
+PRIVATE Void dumpRLCUlRbInformation(RlcUlRbCb* ulRbCb)
 {
    if(ulRbCb->mode == CM_LTE_MODE_UM)
    {
@@ -346,9 +324,9 @@ PRIVATE Void dumpRLCUlRbInformation(KwUlRbCb* ulRbCb)
 
 Void DumpRLCUlDebugInformation(Void)
 {
-   KwCb* ulInst = kwCb[0]; /* TODO : Check whether UL is 0 or 1 */
-   KwUlCb* ulCb = ulInst->u.ulCb;
-   KwUlUeCb *ueCb = NULLP; 
+   RlcCb* ulInst = rlcCb[0]; /* TODO : Check whether UL is 0 or 1 */
+   RlcUlCb* ulCb = ulInst->u.ulCb;
+   RlcUlUeCb *ueCb = NULLP; 
 
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&ulCb->ueLstCp, 
@@ -358,7 +336,7 @@ Void DumpRLCUlDebugInformation(Void)
       U32 i;
       for(i = 0; i< KW_MAX_SRB_PER_UE; i++)
       {
-         KwUlRbCb* ulRbCb = ueCb->srbCb[i]; 
+         RlcUlRbCb* ulRbCb = ueCb->srbCb[i]; 
          if(ulRbCb != NULLP)
          {
             dumpRLCUlRbInformation(ulRbCb);
@@ -366,7 +344,7 @@ Void DumpRLCUlDebugInformation(Void)
       }
       for(i = 0; i< KW_MAX_DRB_PER_UE; i++)
       {
-         KwUlRbCb* ulRbCb = ueCb->drbCb[i]; 
+         RlcUlRbCb* ulRbCb = ueCb->drbCb[i]; 
          if(ulRbCb != NULLP)
          {
             dumpRLCUlRbInformation(ulRbCb);
@@ -398,7 +376,7 @@ Void DumpRLCUlDebugInformation(Void)
  * @return  S16
  *      -# ROK 
  */
-S16 kwUtlL2MeasUlInit(KwCb *gCb)
+S16 kwUtlL2MeasUlInit(RlcCb *gCb)
 {
    U16             cntr;
 
@@ -428,14 +406,14 @@ S16 kwUtlL2MeasUlInit(KwCb *gCb)
 #ifdef ANSI
 PUBLIC  Void kwUtlCalUlIpThrPutIncTTI
 (
-KwCb                  *gCb,
-KwUlRbCb              *rbCb,
+RlcCb                  *gCb,
+RlcUlRbCb              *rbCb,
 U32                   ttiCnt
 )
 #else
 PUBLIC Void kwUtlCalUlIpThrPutIncTTI(gCb, rbCb, ttiCnt)
-KwCb                  *gCb;
-KwUlRbCb              *rbCb;
+RlcCb                  *gCb;
+RlcUlRbCb              *rbCb;
 U32                   ttiCnt;
 #endif
 {
@@ -507,15 +485,15 @@ U32                   ttiCnt;
 #ifdef ANSI
 PUBLIC  Void kwUtlCalUlIpThrPut
 (
-KwCb                  *gCb,
-KwUlRbCb              *rbCb,
+RlcCb                  *gCb,
+RlcUlRbCb              *rbCb,
 Buffer                *pdu,
 U32                   ttiCnt
 )
 #else
 PUBLIC Void kwUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
-   KwCb                  *gCb;
-   KwUlRbCb              *rbCb;
+   RlcCb                  *gCb;
+   RlcUlRbCb              *rbCb;
    Buffer                *pdu;
    U32                   ttiCnt;
 #endif
@@ -564,12 +542,12 @@ PUBLIC Void kwUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
 #ifdef ANSI
 PUBLIC S16 kwUtlHdlL2TmrExp
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 KwL2MeasEvtCb *measEvtCb
 )
 #else
 PUBLIC S16 kwUtlHdlL2TmrExp(measEvtCb)
-KwCb          *gCb;
+RlcCb          *gCb;
 KwL2MeasEvtCb *measEvtCb;
 #endif
 {
@@ -588,7 +566,7 @@ KwL2MeasEvtCb *measEvtCb;
       for(qciIdx = 0; qciIdx < measCb->val.nonIpThMeas.numQci;qciIdx++)
       {
          measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.numActvUe   +=   
-                     kwCb.kwL2Cb.numActUe[measCb->val.nonIpThMeas.qci[qciIdx]];
+                     rlcCb.kwL2Cb.numActUe[measCb->val.nonIpThMeas.qci[qciIdx]];
          measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.sampOc++;
       }
       measEvtCb->val.nonIpThMeas.measCb.numSamples--;
@@ -620,12 +598,12 @@ KwL2MeasEvtCb *measEvtCb;
 #ifdef ANSI
 PUBLIC S16 kwUtlSndUlL2MeasCfm
 (
-KwCb                  *gCb,
+RlcCb                  *gCb,
 KwL2MeasEvtCb         *measEvtCb
 )
 #else
 PUBLIC S16 kwUtlSndUlL2MeasCfm(gCb, measEvtCb)
-KwCb                  *gCb;
+RlcCb                  *gCb;
 KwL2MeasEvtCb         *measEvtCb;
 #endif
 {
@@ -728,13 +706,13 @@ KwL2MeasEvtCb         *measEvtCb;
 #ifdef ANSI
 PUBLIC S16 kwUtlSndUlL2MeasNCfm
 (
-KwCb           *gCb,
+RlcCb           *gCb,
 KwL2MeasReqEvt *measReqEvt,
 KwL2MeasCfmEvt *measCfmEvt
 )
 #else
 PUBLIC S16 kwUtlSndUlL2MeasNCfm(gCb, measReqEvt, measCfmEvt)
-KwCb           *gCb;
+RlcCb           *gCb;
 KwL2MeasReqEvt *measReqEvt;
 KwL2MeasCfmEvt *measCfmEvt;
 #endif
@@ -825,7 +803,7 @@ U8             *numLCh;
    }
 
    /* Check for total maximum number of Measurement Control Block */
-   if(kwCb.kwL2Cb.kwNumMeas >= LKW_MAX_L2MEAS )
+   if(rlcCb.kwL2Cb.kwNumMeas >= LKW_MAX_L2MEAS )
    {
       measCfmEvt->transId = measReqEvt->transId;
       measCfmEvt->measType = measType;
@@ -864,7 +842,7 @@ U8             *numLCh;
    for(qciIdx = 0; qciIdx < numQci; qciIdx++)
    {
       qci = qciVal[qciIdx];
-      ret = cmHashListFind(&(kwCb.kwL2Cb.qciHlCp), 
+      ret = cmHashListFind(&(rlcCb.kwL2Cb.qciHlCp), 
             (U8 *)&qci, (U16)sizeof(qci), 0, (PTR *)&rbCb);
       if(ret != ROK)
       {
@@ -884,7 +862,7 @@ U8             *numLCh;
    {
       for(qciIdx = 0; qciIdx < numQci; qciIdx++)
       {
-         if(kwCb.kwL2Cb.measOn[qci] & measReqEvt->measReq.measType)
+         if(rlcCb.kwL2Cb.measOn[qci] & measReqEvt->measReq.measType)
          {
             /* measurement is already ongoing */
             measCfmEvt->status.status = LCM_PRIM_NOK;
@@ -969,13 +947,13 @@ KwL2MeasCfmEvt *measCfmEvt;
 
 PUBLIC Void kwUtlResetUlL2MeasInKwRb
 (
-KwCb       *gCb,
+RlcCb       *gCb,
 KwL2MeasCb *measCb,
 U8             measType
 )
 #else
 PUBLIC Void kwUtlResetUlL2MeasInKwRb(measCb, measType)
-KwCb       *gCb;
+RlcCb       *gCb;
 KwL2MeasCb *measCb;
 U8             measType;
 #endif
@@ -983,7 +961,7 @@ U8             measType;
    U32           rbIdx;
    U32           ueIdx;
    U32           qciIdx;
-   KwUlUeCb         *ueCb = NULL;
+   RlcUlUeCb         *ueCb = NULL;
 
 
 
@@ -1191,13 +1169,13 @@ PUBLIC Void kwUtlDelRecBuf
 (
 CmLListCp        *recBufLst,
 KwAmRecBuf       *recBuf,
-KwCb              *gCb                              
+RlcCb              *gCb                              
 )
 #else
 PUBLIC Void kwUtlDelRecBuf(recBufLst, recBufi, gCb)
 CmLListCp        *recBufLst;
 KwAmRecBuf       *recBuf;
-KwCb             *gCb;                              
+RlcCb             *gCb;                              
 #endif
 {
    U32                 hashKey; 
@@ -1209,7 +1187,7 @@ KwCb             *gCb;
  
    recBufLstCp = &recBufLst[hashKey];
    cmLListDelFrm(recBufLstCp, &recBuf->lnk);
-   KW_FREE_WC(gCb, recBuf, sizeof(KwAmRecBuf));
+   RLC_FREE_WC(gCb, recBuf, sizeof(KwAmRecBuf));
 
    RETVOID;
 } /* kwUtlDelRecBuf */
O-RAN DU Layer 2