X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ptli.c;h=343e20d8c66343b790eb04952af5374346b74322;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=e0402ff31e0c8740540f84de94ae6c783f434a3a;hpb=fe3e15254e67fd96dbfabec4bf7245c3b64ee415;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c
index e0402ff31..343e20d8c 100755
--- a/src/5gnrrlc/kw_ptli.c
+++ b/src/5gnrrlc/kw_ptli.c
@@ -34,18 +34,7 @@
 
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-
-#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 "common_def.h"
 #include "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -60,16 +49,6 @@
 #include "kw.h"            /* RLC 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 "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */
@@ -109,7 +88,7 @@ PUBLIC S16 kwLiRguDatReqRbuf(Pst *Post,SpId spId,Void *datReq);
 PUBLIC S16 kwLiRguStaRspRbuf(Pst *Post,SpId spId,Void  *staRsp);
 #endif
 #if defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)
-EXTERN S16 KwDlHarqStaBatchProc (Void);
+EXTERN S16 RlcDlHarqStaBatchProc (Void);
 #endif
 
 
@@ -250,7 +229,7 @@ SpId spId;                      /* Service Provider Id */
    /* jump to specific primitive depending on configured selector */
    (*kwLiRguBndReqMt[post->selector])(post, suId, spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwLiRguBndReq */
 
@@ -293,7 +272,7 @@ Reason      reason;
    /* jump to specific primitive depending on configured selector */
    (*kwLiRguUbndReqMt[post->selector])(post, spId, reason);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwLiRguUbndReq */
 
@@ -341,13 +320,13 @@ RlcMacData        *dlData;
 
       SPutStaticBuffer(post->region, post->pool,                      
                       (Data *) datReq, sizeof(RguDDatReqInfo), 0);             
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #else
    /* jump to specific primitive depending on configured selector */
    (*rlcMacSendDlDataOpts[post->selector])(post, spId, dlData);
 #endif 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwLiRguDDatReq */
 
@@ -393,13 +372,13 @@ RlcMacBOStatus    *boSta;
        post->event= EVTRGUDSTARSP;
       if((kwLiRguStaRspRbuf(post, spId, staRsp)) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #endif 
    /* jump to specific primitive depending on configured selector */
    (*rlcMacSendBOStatusOpts[post->selector])(post, spId, boSta);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of RlcMacSendBOStatus */
 
@@ -448,7 +427,7 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
    /* jump to specific primitive depending on configured selector */
    (*kwLiRguL2MUlThrpMeasReqMt[post->selector])(post, spId, l2mUlThrpMeasReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwLiRguL2MUlThrpMeasReq */
 
@@ -457,16 +436,16 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
 
 
 #ifdef MAC_RLC_UL_RBUF
-PUBLIC S16 kwUlBatchProc ARGS ((Void));
+PUBLIC S16 rlcUlBatchProc ARGS ((Void));
 EXTERN Void kwUtlFreeUlRBuf ARGS((void));
 
 #ifdef ANSI
-PUBLIC S16 kwUlBatchProc
+PUBLIC S16 rlcUlBatchProc
 (
 Void
 )
 #else
-PUBLIC S16 kwUlBatchProc()
+PUBLIC S16 rlcUlBatchProc()
 Void;
 #endif
 {
@@ -522,7 +501,7 @@ Void;
       	break;
    }
 #endif
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -561,11 +540,11 @@ PUBLIC Void kwUtlFreeUlRBuf()
          {
             if(datInd->lchData[numLch].pdu.mBuf[numPdu])
             {
-               KW_FREE_BUF_WC(datInd->lchData[numLch].pdu.mBuf[numPdu]);
+               RLC_FREE_BUF_WC(datInd->lchData[numLch].pdu.mBuf[numPdu]);
             }
          }
       }
-      KW_PST_FREE(0, 0, datInd, sizeof(RguDDatIndInfo)); 
+      RLC_PST_FREE(0, 0, datInd, sizeof(RguDDatIndInfo)); 
    }
 }
 #endif
@@ -604,7 +583,7 @@ Void              *staRsp;
       SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktDrop++;
       ret1 = RFAILED;
    }
-   RETVALUE(ret1);
+   return (ret1);
 } /* cmPkKwuDatReq */
 
 #endif
@@ -643,7 +622,7 @@ Void             *datReq;
       SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].pktDrop++;
       ret1 = RFAILED;
    }
-   RETVALUE(ret1);
+   return (ret1);
 } /* cmPkKwuDatReq */
 
 #endif