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

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

diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c
index 5e7873d..343e20d 100755 (executable)
--- a/src/5gnrrlc/kw_ptli.c
+++ b/src/5gnrrlc/kw_ptli.c
@@ -27,27 +27,14 @@
         File:    kw_ptli.c
   
 *********************************************************************21*/
-static const char* RLOG_MODULE_NAME="LIM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=238;
+
 /** @file kw_ptli.c 
 @brief RLC Lower Interface
 */
 
 \f
 /* 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 */
@@ -62,16 +49,6 @@ static int RLOG_FILE_ID=238;
 #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 */
@@ -85,6 +62,10 @@ static int RLOG_FILE_ID=238;
 #include "ss_rbuf.h"
 #include "ss_rbuf.x"
 
+#ifdef EGTP_TEST
+#include "mac_stub.h"
+#endif /* EGTP_TEST */
+
 #ifndef LCKWLIRGU
 #define PTKWRGU
 #endif
@@ -107,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
 
 \f
@@ -147,33 +128,45 @@ PUBLIC RguBndReq kwLiRguUbndReqMt[] =
 
 /* RGU Dedicated Channel Data Request primitive */
 
-PUBLIC RguDDatReq rlcMacSendDlDataOpts[] =
+PUBLIC RlcMacDlData rlcMacSendDlDataOpts[] =
 {
+#ifdef EGTP_TEST
+   macStubSendDlData,
+   macStubSendDlData,
+   macStubSendDlData,
+#else /* EGTP_TEST */
 #ifdef LCKWLIRGU
-   packSendDlData,            /* 0 - loosely coupled */
+   packDlData,            /* 0 - loosely coupled */
 #endif /* LCRGUIRGU */
 #ifdef RG 
-   RgUiRguDDatReq,            /* 1 - tightly coupled, MAC  */
+   MacRlcProcDlData,      /* 1 - tightly coupled, MAC  */
 #endif /* RG */
 #ifdef LCKWLIRGU
-   packSendDlData,            /* 0 - loosely coupled */
+   packDlData,            /* 0 - loosely coupled */
 #endif /* LCRGUIRGU */
+#endif /* EGTP_TEST */
 };
 
 
 /* RLC logical Channel Status primitive */
 
-PUBLIC RguDStaRsp rlcMacSendBOStatusOpts[] =
+PUBLIC RlcMacBoStatus rlcMacSendBOStatusOpts[] =
 {
+#ifdef EGTP_TEST
+   macStubBOStatus,
+   macStubBOStatus,
+   macStubBOStatus,
+#else /* EGTP_TEST */
 #ifdef LCKWLIRGU
-   packSendBOStatus,            /* 0 - loosely coupled */
+   packBOStatus,            /* 0 - loosely coupled */
 #endif /* LCRGUIRGU */
 #ifdef RG 
-   RgUiRguDStaRsp,            /* 1 - tightly coupled, MAC  */
+   MacRlcProcBOStatus,            /* 1 - tightly coupled, MAC  */
 #endif /* RG */
 #ifdef LCKWLIRGU
-   packSendBOStatus,            /* 0 - LWLC loosely coupled */
+   packBOStatus,            /* 0 - LWLC loosely coupled */
 #endif /* LCRGUIRGU */
+#endif /* EGTP_TEST */
 };
 
 /* kw005.201 added support for L2 Measurement */
@@ -236,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 */
 
@@ -279,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 */
 
@@ -327,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 */
 
@@ -379,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 */
 
@@ -434,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 */
 
@@ -443,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
 {
@@ -508,7 +501,7 @@ Void;
        break;
    }
 #endif
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -547,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
@@ -590,7 +583,7 @@ Void              *staRsp;
       SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktDrop++;
       ret1 = RFAILED;
    }
-   RETVALUE(ret1);
+   return (ret1);
 } /* cmPkKwuDatReq */
 
 #endif
@@ -629,7 +622,7 @@ Void             *datReq;
       SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].pktDrop++;
       ret1 = RFAILED;
    }
-   RETVALUE(ret1);
+   return (ret1);
 } /* cmPkKwuDatReq */
 
 #endif