X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tmm_ul.c;h=70f89320d4478e258628261c9b791a30e60dcb68;hb=f59409f0901831b9e116b7d37cd4dbf247cdde1f;hp=4011621f4aef0df389eb8e0bb0ef1b5a68590c19;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c
index 4011621f4..70f89320d 100755
--- a/src/5gnrrlc/kw_tmm_ul.c
+++ b/src/5gnrrlc/kw_tmm_ul.c
@@ -42,18 +42,7 @@ static int RLOG_FILE_ID=201;
 */
 
 /* 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 */
@@ -65,16 +54,6 @@ static int RLOG_FILE_ID=201;
 #include "kw_ul.h"
 
 /* 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 */
@@ -124,8 +103,9 @@ U8 rrcUeCapabilityInfo[] =
    Buffer *pdu;
 
    Pst ulPst1 ={100,100,217,0,215,0,PRIOR0,0,81,1,1,0,0};
+#ifdef PJ
    Pst ulPst2 ={100,100,217,0,216,0,PRIOR0,0,68,0,1,0,0};
-
+#endif
   TRC2(kwTmmRcvFrmLi) 
 
   if(1 == rrcMsgType)
@@ -146,33 +126,37 @@ U8 rrcUeCapabilityInfo[] =
 
    RLOG1(L_INFO,"Profiling Framework Sending RRC Connection Req to RRC for UE :%d\n",crnti);
    printf("Profiling Framework Sending RRC Connection Req to RRC for UE :%d\n",crnti);
-   KwUiKwuDatInd(&ulPst1, 1, datIndInfo, pdu);
+   KwUiKwuDatInd(&ulPst1, datIndInfo, pdu);
  }
  else if(2 == rrcMsgType)
  {
+#ifdef PJ
     CmLtePdcpId pdcpId;
     pdcpId.cellId = 1;
     pdcpId.ueId = crnti;
     pdcpId.rbId = 1;
     pdcpId.rbType = 0;
-   
+#endif   
     SGetMsg(DFLT_REGION, DFLT_POOL, (Buffer **) &pdu);
   
     SAddPstMsgMult(rrcConSetupComplete,34,pdu);
 
     RLOG1(L_INFO,"Profiling Framework: Sending RRC Connection Setup Complete to RRC for UE :%d\n",crnti);
     printf("Profiling Framework: Sending RRC Connection Setup Complete to RRC for UE :%d\n",crnti);
+#ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
+#endif
  }
  
  else if(3 == rrcMsgType)
  {
+#ifdef PJ
     CmLtePdcpId pdcpId;
     pdcpId.cellId = 1;
     pdcpId.ueId = crnti;
     pdcpId.rbId = 1;
     pdcpId.rbType = 0;
-   
+#endif   
     SGetMsg(DFLT_REGION, DFLT_POOL, (Buffer **) &pdu);
   
 #ifndef CA_PAL_5GTF 
@@ -182,15 +166,20 @@ U8 rrcUeCapabilityInfo[] =
 #endif
     RLOG1(L_INFO,"Profiling Framework: Sending RRC UE Capability Info to RRC for UE :%d\n",crnti);
     printf("Profiling Framework: Sending RRC UE Capability Info to RRC for UE :%d\n",crnti);
+#ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
+#endif
+
  }
  else if(4 == rrcMsgType)
  {
+#ifdef PJ
     CmLtePdcpId pdcpId;
     pdcpId.cellId = 1;
     pdcpId.ueId = crnti;
     pdcpId.rbId = 1;
     pdcpId.rbType = 0;
+#endif
    
     SGetMsg(DFLT_REGION, DFLT_POOL, (Buffer **) &pdu);
   
@@ -198,15 +187,19 @@ U8 rrcUeCapabilityInfo[] =
 
     RLOG1(L_INFO,"Profiling Framework: Sending RRC Security Mode Complete to RRC for UE :%d\n",crnti);
     printf("Profiling Framework: Sending RRC Security Mode Complete to RRC for UE :%d\n",crnti);
+#ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
+#endif
  }
  else if(5 == rrcMsgType)
  {
+#ifdef PJ
     CmLtePdcpId pdcpId;
     pdcpId.cellId = 1;
     pdcpId.ueId = crnti;
     pdcpId.rbId = 1;
     pdcpId.rbType = 0;
+#endif
    
     SGetMsg(DFLT_REGION, DFLT_POOL, (Buffer **) &pdu);
   
@@ -214,9 +207,11 @@ U8 rrcUeCapabilityInfo[] =
 
     RLOG1(L_INFO,"Profiling Framework: Sending RRC Reconfig Complete to RRC for UE :%d\n",crnti);
     printf("Profiling Framework: Sending RRC Reconfig Complete to RRC for UE :%d\n",crnti);
+#ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
 #ifdef EG_GEN_LOAD_5GTF
     loadStart=1;
+#endif
 #endif
  }
  RETVOID;
@@ -314,7 +309,7 @@ Buffer     *pdu;
       kwLmmSendTrc(gCb,KWU_EVT_DAT_IND, pdu);
    }
    KwUiKwuDatInd( &gCb->u.ulCb->kwuUlSap->pst, 
-                  gCb->u.ulCb->kwuUlSap->suId, 
+                  //gCb->u.ulCb->kwuUlSap->suId, 
                   datIndInfo, pdu);
    
    RETVOID;