X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tmm_ul.c;h=0f50d58da5e1197cc712da16bd103cebd27287a9;hb=ed6746a6081339633c3baa314251fcc11b98ce10;hp=55337b357d84d68d412a198788e8bccdfce003c4;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c
index 55337b357..0f50d58da 100755
--- a/src/5gnrrlc/kw_tmm_ul.c
+++ b/src/5gnrrlc/kw_tmm_ul.c
@@ -67,31 +67,25 @@ static int RLOG_FILE_ID=201;
 
 #if defined(PRE_DEF_UE_CTX) || defined(PRE_DEF_UE_CTX_HO)
 #ifdef EG_GEN_LOAD_5GTF
-extern U32 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,
-U8 rrcMsgType
+uint8_t rrcMsgType
 )
-#else
-Void AddUeContext(crnti,rrcMsgType)
-CmLteRnti   crnti,
-U8 rrcMsgType 
-#endif
 {
    KwuDatIndInfo   *datIndInfo;   /* Data Indication Information */
-   U8 rrcConReq[6] ={ 0x50, 0x30, 0x30, 0x30, 0x30, 0x34 };
-   U8 rrcConSetupComplete[34] ={ 0x20, 0x00, 0x3e, 0x0e, 0x82, 0x02, 0x10, 0x12, 0x20, 0x02, 0x20, 0x64, 0xa8, 0x2c, 0x48, 0x05, 0x00, 0x80, 0x00, 0x08, 0x04, 0x03, 0xa0, 0x02, 0xa0, 0x10, 0x12, 0x20, 0x02, 0x20, 0x64, 0xa8, 0x2c, 0x48};
+   uint8_t rrcConReq[6] ={ 0x50, 0x30, 0x30, 0x30, 0x30, 0x34 };
+   uint8_t rrcConSetupComplete[34] ={ 0x20, 0x00, 0x3e, 0x0e, 0x82, 0x02, 0x10, 0x12, 0x20, 0x02, 0x20, 0x64, 0xa8, 0x2c, 0x48, 0x05, 0x00, 0x80, 0x00, 0x08, 0x04, 0x03, 0xa0, 0x02, 0xa0, 0x10, 0x12, 0x20, 0x02, 0x20, 0x64, 0xa8, 0x2c, 0x48};
 #ifndef CA_PAL_5GTF 
-   U8 rrcUeCapabilityInfo[12] ={0x38, 0x01, 0x00, 0x80, 0x1b, 0xff, 0x0c, 0x00, 0x20, 0x00, 0x80, 0x00};
+   uint8_t rrcUeCapabilityInfo[12] ={0x38, 0x01, 0x00, 0x80, 0x1b, 0xff, 0x0c, 0x00, 0x20, 0x00, 0x80, 0x00};
 #else
-  /* U8 rrcUeCapabilityInfo[44] ={0x38,0x01,0x02,0x84,0x9b,0xff,0x0c,0x00,0x20,0x00,0x80,0x1f,0xfe,0xf4,0x4f,0xe0,0x40,0x03,0x80,0x11,0x04,0x0c,0x20,0x88,0x20,0x7f,0xff,0xff,0xff,0xf3,0xff,0x81,0xff,0xff,0xff,0xff,0x7f,0xf0,0x3f,0xff,0xff,0xff,0xe0,0x00};
+  /* uint8_t rrcUeCapabilityInfo[44] ={0x38,0x01,0x02,0x84,0x9b,0xff,0x0c,0x00,0x20,0x00,0x80,0x1f,0xfe,0xf4,0x4f,0xe0,0x40,0x03,0x80,0x11,0x04,0x0c,0x20,0x88,0x20,0x7f,0xff,0xff,0xff,0xf3,0xff,0x81,0xff,0xff,0xff,0xff,0x7f,0xf0,0x3f,0xff,0xff,0xff,0xe0,0x00};
 */
-U8 rrcUeCapabilityInfo[] = 
+uint8_t rrcUeCapabilityInfo[] = 
 {
  0x38,0x01,0x03,0x34,0x9b,0xff,0x0c,0x00,0x20,0x00,0x80,0x1f,0xfe,0xf4,0x4f,0xe0
  ,0x40,0x09,0x80,0x11,0x04,0x0c,0x20,0x88,0x20,0x63,0x04,0x41,0x03,0x20,0x22,0x08
@@ -100,8 +94,8 @@ U8 rrcUeCapabilityInfo[] =
 };
 
 #endif
-   U8 rrcSecurityModeComplete[2] ={0x28, 0x80};
-   U8 rrcReconfigComplete[2] ={0x10, 0x80};
+   uint8_t rrcSecurityModeComplete[2] ={0x28, 0x80};
+   uint8_t rrcReconfigComplete[2] ={0x10, 0x80};
 
    Buffer *pdu;
 
@@ -109,7 +103,6 @@ U8 rrcUeCapabilityInfo[] =
 #ifdef PJ
    Pst ulPst2 ={100,100,217,0,216,0,PRIOR0,0,68,0,1,0,0};
 #endif
-  TRC2(rlcTmmRcvFrmMac) 
 
   if(1 == rrcMsgType)
   {
@@ -217,7 +210,7 @@ U8 rrcUeCapabilityInfo[] =
 #endif
 #endif
  }
- RETVOID;
+ return;
 }
 #endif 
 /** @addtogroup tmmode */
@@ -305,22 +298,14 @@ 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
 {
-   TRC2(rlcUlTmmReEstablish)
-
    RLOG_ARG0(L_DEBUG,DBG_RBID,rbCb->rlcId.rbId,"do nothing for TMM for ReEstablish");
-   RETVOID;
+   return;
 }
 
 #ifdef _cplusplus