Replaced old SSI function with new macros jira id - ODUHIGH-212

[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 6cb027c..50ece80 100755 (executable)
--- a/src/5gnrrlc/kw_utl_ul.c
+++ b/src/5gnrrlc/kw_utl_ul.c
@@ -98,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)
@@ -133,12 +133,12 @@ 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]);
             }
          }
       }
       
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef LTE_L2_MEAS
@@ -168,7 +168,7 @@ KwDatIndInfo   *datIndInfo;
          {
             if(pduInfo->mBuf[j])
             {
-               KW_FREE_BUF_WC(pduInfo->mBuf[j]);
+               RLC_FREE_BUF_WC(pduInfo->mBuf[j]);
             }
          }
          continue;
@@ -196,7 +196,7 @@ KwDatIndInfo   *datIndInfo;
 #endif
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -217,14 +217,14 @@ 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
 {
@@ -248,8 +248,8 @@ Buffer     *sdu;
                "Memory allocation failed UEID:%d CELLID:%d",
                rbCb->rlcId.ueId,
                rbCb->rlcId.cellId);
-      KW_FREE_BUF(sdu);
-      RETVALUE(RFAILED);
+      RLC_FREE_BUF(sdu);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
 
@@ -269,11 +269,11 @@ Buffer     *sdu;
 
    KwUiKwuDatInd(&gCb->genCfg.lmPst, datIndInfo, sdu);
 #endif   
-   RETVALUE(ROK);
+   return ROK;
 } /* kwUtlSndDatInd */
 
 
-PRIVATE Void dumpRLCUlRbInformation(KwUlRbCb* ulRbCb)
+PRIVATE Void dumpRLCUlRbInformation(RlcUlRbCb* ulRbCb)
 {
    if(ulRbCb->mode == CM_LTE_MODE_UM)
    {
@@ -324,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, 
@@ -336,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);
@@ -344,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);
@@ -376,7 +376,7 @@ Void DumpRLCUlDebugInformation(Void)
  * @return  S16
  *      -# ROK 
  */
-S16 kwUtlL2MeasUlInit(KwCb *gCb)
+S16 kwUtlL2MeasUlInit(RlcCb *gCb)
 {
    U16             cntr;
 
@@ -386,7 +386,7 @@ S16 kwUtlL2MeasUlInit(KwCb *gCb)
       cmMemset((U8 *)&(gCb->u.ulCb->kwL2Cb.kwL2EvtCb[cntr]), 0, sizeof(KwL2MeasEvtCb));
    }
    gCb->u.ulCb->kwL2Cb.kwL2EvtCb[KW_L2MEAS_UL_IP].measCb.measType = LKW_L2MEAS_UL_IP;
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  *
@@ -406,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
 {
@@ -485,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
@@ -542,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
 {
@@ -566,18 +566,18 @@ 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--;
       kwStartTmr(gCb, (PTR)measEvtCb, KW_EVT_L2_TMR); 
-      RETVALUE(ROK);
+      return ROK;
    }
 #endif
 
    kwUtlSndUlL2MeasCfm(gCb, measEvtCb);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* kwUtlHdlL2TmrExp */
 /**
  *
@@ -598,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
 {
@@ -683,7 +683,7 @@ KwL2MeasEvtCb         *measEvtCb;
       measCfmEvt.val.ipThMeas.numUes = cfmIdx; 
    }
    KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, &measCfmEvt);
-   RETVALUE(ROK);
+   return ROK;
 } /* kwUtlSndUlL2MeasCfm */
 /**
  *
@@ -706,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
@@ -720,7 +720,7 @@ KwL2MeasCfmEvt *measCfmEvt;
    TRC3(kwUtlSndUlL2MeasNCfm)
 
    KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt);
-   RETVALUE(ROK);
+   return ROK;
 } /* kwUtlSndL2MeasNCfm */
 
 #ifdef LTE_L2_MEAS_RLC
@@ -786,7 +786,7 @@ U8             *numLCh;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*User can either request for Active UE,*
     *Dl delay, Dl discard, Uu Loss OR Dl ip throughput, Ul ip throughput. */
@@ -799,17 +799,17 @@ U8             *numLCh;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* 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;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_EXCEED_NUMMEAS;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Check that number of samples should be a non-zero value */
@@ -820,7 +820,7 @@ U8             *numLCh;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_ZERO_NUMSAM;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Check that measurement period  should be completely divisible *
     * number of sample.                                             */
@@ -832,7 +832,7 @@ U8             *numLCh;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_NUMSAM;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    {
       numQci = measReqEvt->measReq.val.nonIpThMeas.numQci;
@@ -842,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)
       {
@@ -857,12 +857,12 @@ U8             *numLCh;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_QCI;
       measCfmEvt->measType = measType;
       measCfmEvt->transId = measReqEvt->transId;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    {
       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;
@@ -876,10 +876,10 @@ U8             *numLCh;
    if(measCfmEvt->val.nonIpThMeas.numCfm > 0)
    {
       measCfmEvt->transId = measReqEvt->transId;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }/* kwUtlValidateL2Meas */
 #endif
 
@@ -911,7 +911,7 @@ KwL2MeasCfmEvt *measCfmEvt;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*User can either request for Active UE,*
     *Dl delay, Dl discard, Uu Loss OR Dl ip throughput, Ul ip throughput. */
@@ -924,9 +924,9 @@ KwL2MeasCfmEvt *measCfmEvt;
       measCfmEvt->measType = measType;
       measCfmEvt->status.status = LCM_PRIM_NOK;
       measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* kwUtlValidateL2Meas */
 
 /**
@@ -947,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
@@ -961,7 +961,7 @@ U8             measType;
    U32           rbIdx;
    U32           ueIdx;
    U32           qciIdx;
-   KwUlUeCb         *ueCb = NULL;
+   RlcUlUeCb         *ueCb = NULL;
 
 
 
@@ -1144,11 +1144,11 @@ KwSn             sn;
       recBuf = (KwAmRecBuf *) node->node;
       if(recBuf->amHdr.sn == sn)
       {
-         RETVALUE(recBuf);
+         return (recBuf);
       }
       CM_LLIST_NEXT_NODE(recBufLstCp, node);
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 } /* kwUtlStoreRecBuf */
 /**
  *
@@ -1169,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; 
@@ -1187,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 */