UL data path changes at Phy stub, RLC UL UM and DU APP [Issue-ID: ODUHIGH-262]

[o-du/l2.git] / src / 5gnrrlc / kw_lim.c

diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c
index ba46450..67b2288 100755 (executable)
--- a/src/5gnrrlc/kw_lim.c
+++ b/src/5gnrrlc/kw_lim.c
@@ -75,7 +75,7 @@ static int RLOG_FILE_ID=196;
 #include "rlc_mac_inf.h"
 
 #ifdef __cplusplus
-EXTERN "C" {
+extern "C" {
 #endif /* __cplusplus */
 
 \f
@@ -99,22 +99,10 @@ EXTERN "C" {
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 RlcLiRguBndCfm
-(
-Pst    *pst,   
-SuId   suId, 
-U8     status 
-)
-#else
-S16 RlcLiRguBndCfm (pst, suId, status)
-Pst    *pst; 
-SuId   suId;
-U8     status;
-#endif
+S16 RlcLiRguBndCfm(Pst *pst,SuId suId,uint8_t status)
 {
-   U16          event;     /* Event */
-   U16          cause;     /* Cause */
+   uint16_t      event;     /* Event */
+   uint16_t      cause;     /* Cause */
    RlcRguSapCb   *rguSap;   /* RGU SAP Control Block */
    RlcCb         *tRlcCb;
 
@@ -157,7 +145,7 @@ U8     status;
    {
       case RLC_SAP_BINDING:
       {
-         rlcStopTmr (tRlcCb,(PTR)rguSap, RLC_EVT_WAIT_BNDCFM);
+         rlcStopTmr (tRlcCb,(PTR)rguSap, EVENT_RLC_WAIT_BNDCFM);
 
          rguSap->retryCnt = 0;
           
@@ -469,24 +457,12 @@ uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo *staInd)
  *    -# RFAILED 
  *
 */ 
-#ifdef ANSI
-S16 RlcLiRguFlowCntrlInd
-(
-Pst              *pst,  
-SuId             suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 RlcLiRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst              *pst; 
-SuId             suId; 
-RguFlowCntrlInd  *flowCntrlInd; 
-#endif
+S16 RlcLiRguFlowCntrlInd(Pst *pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
    RlcCb       *tRlcCb; 
    RlcDlRbCb   *rbCb = NULLP;
-   U32        idx;
-   U32        lcIdx;
+   uint32_t    idx;
+   uint32_t    lcIdx;
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
    for (idx = 0; idx < flowCntrlInd->numUes; idx++)
@@ -503,7 +479,7 @@ RguFlowCntrlInd  *flowCntrlInd;
                rlcUtlTrigPdbFlowCntrl(tRlcCb, rbCb, lcInfo->pktAdmitCnt);
                continue;
             }
-            if (rbCb->mode == CM_LTE_MODE_AM)
+            if (rbCb->mode == RLC_MODE_AM)
             {
                if ((rbCb->m.amDl.retxLst.count != 0) || 
                    ((rbCb->m.amDl.bo == 0) || 
@@ -551,26 +527,14 @@ RguFlowCntrlInd  *flowCntrlInd;
  *      -# RFAILED
  *
  */
-#ifdef ANSI
-S16 RlcLiRguHqStaInd
-(
-Pst                *pst, 
-SuId               suId,
-RguHarqStatusInd   *staInd 
-)
-#else
-S16 RlcLiRguHqStaInd(pst,suId,staInd)
-Pst                *pst;  
-SuId               suId; 
-RguHarqStatusInd   *staInd;
-#endif
+S16 RlcLiRguHqStaInd(Pst *pst, SuId suId,RguHarqStatusInd *staInd)
 {
 
    RlcUeKey   ueKey;
-   S16       ret; 
-   RlcDlUeCb    *ueCb;
-   U8        tbIdx;
-   RlcCb       *tRlcCb; 
+   S16        ret; 
+   RlcDlUeCb  *ueCb;
+   uint8_t    tbIdx;
+   RlcCb      *tRlcCb; 
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
    ueKey.cellId = staInd->cellId;