X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tmm_ul.c;h=d9d735b441e449eb2db51b24e6eb181ef41b9753;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=6accebd95f824c0a82824a4c4bdc3cede8fd8c1e;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c
index 6accebd95..d9d735b44 100755
--- a/src/5gnrrlc/kw_tmm_ul.c
+++ b/src/5gnrrlc/kw_tmm_ul.c
@@ -25,9 +25,9 @@
      Desc:     Source code for RLC Transparent mode assembly and
                reassembly.This file contains following functions
                 
-                  --kwTmmQSdu
-                  --kwTmmSndToLi
-                  --kwTmmRcvFrmLi
+                  --rlcTmmQSdu
+                  --rlcTmmSendToMac
+                  --rlcTmmRcvFrmMac
                   --kwTmmReEstablish 
 
      File:     kw_tmm_ul.c
@@ -72,13 +72,13 @@ extern U32 loadStart;
 
 EXTERN S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf);
 #ifdef ANSI
-PUBLIC Void AddUeContext
+Void AddUeContext
 (
 CmLteRnti   crnti,
 U8 rrcMsgType
 )
 #else
-PUBLIC Void AddUeContext(crnti,rrcMsgType)
+Void AddUeContext(crnti,rrcMsgType)
 CmLteRnti   crnti,
 U8 rrcMsgType 
 #endif
@@ -109,7 +109,6 @@ U8 rrcUeCapabilityInfo[] =
 #ifdef PJ
    Pst ulPst2 ={100,100,217,0,216,0,PRIOR0,0,68,0,1,0,0};
 #endif
-  TRC2(kwTmmRcvFrmLi) 
 
   if(1 == rrcMsgType)
   {
@@ -129,7 +128,7 @@ 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, datIndInfo, pdu);
+   rlcSendUlDataToDu(&ulPst1, datIndInfo, pdu);
  }
  else if(2 == rrcMsgType)
  {
@@ -223,7 +222,7 @@ U8 rrcUeCapabilityInfo[] =
 /** @addtogroup tmmode */
 /*@{*/
 
-#define KW_MODULE (KW_DBGMASK_TM | KW_DBGMASK_UL)
+#define RLC_MODULE (RLC_DBGMASK_TM | RLC_DBGMASK_UL)
 
 /**
  * @brief
@@ -245,53 +244,19 @@ U8 rrcUeCapabilityInfo[] =
  *    -# RFAILED 
  */
 #ifdef CCPU_OPT
-#ifdef ANSI
-PUBLIC Void kwTmmRcvFrmLi
-(
-RlcCb        *gCb,
-RlcUlRbCb    *rbCb,  
-CmLteRnti   tCrnti,  
-Buffer      *pdu      
-)
-#else
-PUBLIC Void kwTmmRcvFrmLi(gCb,rbCb, tCrnti, pdu)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;  
-CmLteRnti   tCrnti; 
-Buffer      *pdu;  
-#endif
-#else
-#ifdef ANSI
-PUBLIC Void kwTmmRcvFrmLi
-(
-RlcCb       *gCb,
-RlcUlRbCb   *rbCb,         
-Buffer     *pdu            
-)
+void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, CmLteRnti tCrnti, Buffer *pdu)
 #else
-PUBLIC Void kwTmmRcvFrmLi(gCb,rbCb, pdu)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;         
-Buffer     *pdu;         
+void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu)
 #endif
-#endif 
 {
    RlcUlRrcMsgInfo  *ulRrcMsgInfo;
    uint16_t         msgLen;
    uint16_t         copyLen;    /* Number of bytes copied */
    Pst              pst;
  
-   TRC2(kwTmmRcvFrmLi) 
-
    gCb->genSts.pdusRecv++;
-   SFndLenMsg(pdu, (MsgLen *)&msgLen);
+   ODU_GET_MSG_LEN(pdu, (MsgLen *)&msgLen);
    gCb->genSts.bytesRecv += msgLen;
-   /* If trace flag is enabled send the trace indication */
-   if(gCb->init.trc == TRUE)
-   {
-      /* Populate the trace params */
-      kwLmmSendTrc(gCb, EVENT_UL_RRC_MSG_TRANS_TO_DU, pdu);
-   }
   
    /* Filling UL RRC Message Info */
    RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL,
@@ -305,25 +270,25 @@ Buffer     *pdu;
          ulRrcMsgInfo->rrcMsg, msgLen);
       if (ulRrcMsgInfo->rrcMsg)
       {
-         SCpyMsgFix(pdu, 0, msgLen, ulRrcMsgInfo->rrcMsg, (MsgLen *)&copyLen);
+         ODU_COPY_MSG_TO_FIX_BUF(pdu, 0, msgLen, ulRrcMsgInfo->rrcMsg, (MsgLen *)&copyLen);
          ulRrcMsgInfo->msgLen = msgLen;
 
          /* Sending UL RRC Message transfeer to DU APP */
          memset(&pst, 0, sizeof(Pst));
-         FILL_PST_RLC_TO_DUAPP(pst, SFndProcId(), RLC_UL_INST, EVENT_UL_RRC_MSG_TRANS_TO_DU);
+         FILL_PST_RLC_TO_DUAPP(pst, RLC_UL_INST, EVENT_UL_RRC_MSG_TRANS_TO_DU);
          rlcSendUlRrcMsgToDu(&pst, ulRrcMsgInfo);
       }
       else
       {
-         DU_LOG("\nRLC : Memory allocation failed");
+         DU_LOG("\nRLC : rlcTmmRcvFrmMac: Memory allocation failed for UL RRC Msg");
       }
    }
    else
    {
-      DU_LOG("\nRLC : Memory allocation failed");
+      DU_LOG("\nRLC : rlcTmmRcvFrmMac: Memory allocation failed for ulRrcMsgInfo");
    }
  
-   RETVOID;
+   return;
 }
 
 /**
@@ -340,18 +305,17 @@ Buffer     *pdu;
  *       
  **/
 #ifdef ANSI
-PUBLIC Void kwTmmUlReEstablish
+Void rlcTmmUlReEstablish
 (
 RlcCb        *gCb,
 RlcUlRbCb    *rbCb        
 )
 #else
-PUBLIC Void kwTmmUlReEstablish(rbCb)
+Void rlcTmmUlReEstablish(rbCb)
 RlcCb        *gCb;
-KwRbCb      *rbCb;          
+RlcUlRbCb    *rbCb;          
 #endif
 {
-   TRC2(rlcUlTmmReEstablish)
 
    RLOG_ARG0(L_DEBUG,DBG_RBID,rbCb->rlcId.rbId,"do nothing for TMM for ReEstablish");
    RETVOID;