X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tmm_ul.c;h=20e11f561ae38f19a40dad90b6542a99799926d9;hb=069f38324ca51afc183962404383802ae8a5553c;hp=de636d08daeafd016cc4ef03cd7a569dd48275e4;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c
index de636d08d..20e11f561 100755
--- a/src/5gnrrlc/kw_tmm_ul.c
+++ b/src/5gnrrlc/kw_tmm_ul.c
@@ -18,7 +18,7 @@
 
 /**********************************************************************
 
-     Name:     LTE-RLC Layer 
+     Name:     NR RLC Layer 
   
      Type:     C file
   
@@ -33,9 +33,6 @@
      File:     kw_tmm_ul.c
 
 **********************************************************************/
-static const char* RLOG_MODULE_NAME="TMM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=201;
 
 /** @file kw_tmm_ul.c
 @brief RLC Transparent Mode module
@@ -67,21 +64,15 @@ static int RLOG_FILE_ID=201;
 
 #if defined(PRE_DEF_UE_CTX) || defined(PRE_DEF_UE_CTX_HO)
 #ifdef EG_GEN_LOAD_5GTF
-extern uint32_t loadStart;
+uint32_t loadStart;
 #endif
 
-EXTERN S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf);
-#ifdef ANSI
+S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf);
 Void AddUeContext
 (
 CmLteRnti   crnti,
 uint8_t rrcMsgType
 )
-#else
-Void AddUeContext(crnti,rrcMsgType)
-CmLteRnti   crnti,
-uint8_t rrcMsgType 
-#endif
 {
    KwuDatIndInfo   *datIndInfo;   /* Data Indication Information */
    uint8_t rrcConReq[6] ={ 0x50, 0x30, 0x30, 0x30, 0x30, 0x34 };
@@ -126,8 +117,7 @@ uint8_t rrcUeCapabilityInfo[] =
   
    SAddPstMsgMult(rrcConReq,6,pdu);
 
-   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);
+   DU_LOG("\nINFO  -->  RLC_UL : Profiling Framework Sending RRC Connection Req to RRC for UE :%d\n",crnti);
    rlcSendUlDataToDu(&ulPst1, datIndInfo, pdu);
  }
  else if(2 == rrcMsgType)
@@ -143,8 +133,7 @@ uint8_t rrcUeCapabilityInfo[] =
   
     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);
+    DU_LOG("\nINFO  -->  RLC_UL : Profiling Framework: Sending RRC Connection Setup Complete to RRC for UE :%d\n",crnti);
 #ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
 #endif
@@ -166,8 +155,7 @@ uint8_t rrcUeCapabilityInfo[] =
 #else    
     SAddPstMsgMult(rrcUeCapabilityInfo,sizeof(rrcUeCapabilityInfo),pdu);
 #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);
+    DU_LOG("\nINFO  -->  RLC_UL : Profiling Framework: Sending RRC UE Capability Info to RRC for UE :%d\n",crnti);
 #ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
 #endif
@@ -187,8 +175,7 @@ uint8_t rrcUeCapabilityInfo[] =
   
     SAddPstMsgMult(rrcSecurityModeComplete,2,pdu);
 
-    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);
+    DU_LOG("\nINFO  -->  RLC_UL : Profiling Framework: Sending RRC Security Mode Complete to RRC for UE :%d\n",crnti);
 #ifdef PJ
     PjUiPjuDatInd(&ulPst2, 1, &pdcpId, pdu);
 #endif
@@ -207,8 +194,7 @@ uint8_t rrcUeCapabilityInfo[] =
   
     SAddPstMsgMult(rrcReconfigComplete,2,pdu);
 
-    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);
+    DU_LOG("\nINFO  -->  RLC_UL : 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
@@ -280,12 +266,12 @@ void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu)
       }
       else
       {
-         DU_LOG("\nRLC : rlcTmmRcvFrmMac: Memory allocation failed for UL RRC Msg");
+         DU_LOG("\nERROR  -->  RLC_UL : rlcTmmRcvFrmMac: Memory allocation failed for UL RRC Msg");
       }
    }
    else
    {
-      DU_LOG("\nRLC : rlcTmmRcvFrmMac: Memory allocation failed for ulRrcMsgInfo");
+      DU_LOG("\nERROR  -->  RLC_UL : rlcTmmRcvFrmMac: Memory allocation failed for ulRrcMsgInfo");
    }
  
    return;
@@ -304,20 +290,13 @@ void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu)
  *    -# ROK 
  *       
  **/
-#ifdef ANSI
 Void rlcTmmUlReEstablish
 (
 RlcCb        *gCb,
 RlcUlRbCb    *rbCb        
 )
-#else
-Void rlcTmmUlReEstablish(rbCb)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;          
-#endif
 {
-
-   RLOG_ARG0(L_DEBUG,DBG_RBID,rbCb->rlcId.rbId,"do nothing for TMM for ReEstablish");
+   DU_LOG("\nINFO  -->  RLC_UL : do nothing for TMM for ReEstablish");
    return;
 }