X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx_dl.c;h=fb2a464d0fe45d8bba5f0d719e079e21f91e13d5;hb=438594773b3c93b5bbe8d1cb1d16626a02238b8b;hp=96338e51238f46aaf3aba17f15a99f5e7bfd0e77;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c
index 96338e512..fb2a464d0 100755
--- a/src/5gnrrlc/kw_udx_dl.c
+++ b/src/5gnrrlc/kw_udx_dl.c
@@ -58,7 +58,7 @@ static int RLOG_FILE_ID=203;
 #define RLC_MODULE RLC_DBGMASK_UDX
 /* local defines */
 
-EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
+S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
                 RlcUdxStaPdu *pStaPdu, RlcUdxBufLst  *rlsPduLst));
 
 
@@ -82,19 +82,12 @@ EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxBndReq 
 (
 Pst    *pst,  
 SuId   suId, 
 SpId   spId 
 )
-#else
-S16 rlcDlUdxBndReq (pst, suId, spId)
-Pst    *pst;   
-SuId   suId;  
-SpId   spId; 
-#endif
 {
    RlcUdxDlSapCb   *udxSap;            /* pointer to session SAP */
    RlcCb           *tRlcCb;
@@ -179,19 +172,12 @@ SpId   spId;
  *  @return  S16
  *      -# ROK 
  */
-#ifdef ANSI
 S16 rlcDlUdxUbndReq
 (
 Pst      *pst,    
 SpId     spId,   
 Reason   reason 
 )
-#else
-S16 rlcDlUdxUbndReq(pst, spId, reason)
-Pst      *pst;   
-SpId     spId;   
-Reason   reason; 
-#endif
 {
    RlcUdxDlSapCb   *udxSap; 
    RlcCb           *tRlcCb;
@@ -240,23 +226,16 @@ Reason   reason;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxCfgReq
 (
 Pst          *pst,
 SpId         spId,
 RlcCfgInfo   *cfg
 )
-#else
-S16 rlcDlUdxCfgReq(pst, spId, cfg)
-Pst          *pst;
-SpId         spId;
-RlcCfgInfo   *cfg;
-#endif
 {
    RlcCfgCfmInfo   *cfgCfm; 
-   U8              idx;    
-   RlcCb            *tRlcCb;
+   uint8_t         idx;    
+   RlcCb           *tRlcCb;
    Pst             *pstUdxCfm;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -427,23 +406,14 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxUeIdChgReq
 (
 Pst         *pst, 
 SpId        spId, 
-U32         transId, 
+uint32_t    transId, 
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo)
-Pst         *pst;
-SpId        spId;
-U32         transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    CmStatus       status;
    RlcCb           *tRlcCb;
@@ -493,7 +463,6 @@ CkwUeInfo   *newUeInfo;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaPduReq
 (
 Pst             *pst,
@@ -501,13 +470,6 @@ SpId            spId,
 CmLteRlcId      *rlcId,
 RlcUdxDlStaPdu   *pStaPdu
 )
-#else
-S16  rlcDlUdxStaPduReq(pst, spId, rlcId, pStaPdu)
-Pst             *pst;
-SpId            spId;
-CmLteRlcId      *rlcId;
-RlcUdxDlStaPdu   *pStaPdu;
-#endif
 {
    RlcDlRbCb   *rbCb;
    RlcCb       *tRlcCb;
@@ -526,19 +488,19 @@ RlcUdxDlStaPdu   *pStaPdu;
       return RFAILED;
    }
 
-   AMDL.cntrlBo = pStaPdu->controlBo;
+   RLC_AMDL.cntrlBo = pStaPdu->controlBo;
    /* If there already exists a STAUS PDU, free it and take the new one
       into account */
-   if(AMDL.pStaPdu)
+   if(RLC_AMDL.pStaPdu)
    {
       RLC_FREE_SHRABL_BUF(pst->region, 
 			 pst->pool, 
-			 AMDL.pStaPdu, 
+			 RLC_AMDL.pStaPdu, 
 			 sizeof(RlcUdxDlStaPdu));
    }
    
-   AMDL.pStaPdu = pStaPdu;
-   rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &AMDL);             
+   RLC_AMDL.pStaPdu = pStaPdu;
+   rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &RLC_AMDL);             
 
    return  (ROK);
 }
@@ -556,7 +518,6 @@ RlcUdxDlStaPdu   *pStaPdu;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaUpdReq
 (
 Pst*          pst,
@@ -564,13 +525,6 @@ SpId          spId,
 CmLteRlcId    *rlcId,
 RlcUdxStaPdu   *pStaPdu
 )
-#else
-S16 rlcDlUdxStaUpdReq(pst, spId, rlcId,pStaPdu)
-Pst*          pst;
-SpId          spId;
-CmLteRlcId    *rlcId;
-RlcUdxStaPdu   *pStaPdu;
-#endif
 {
    RlcCb          *tRlcCb;
    RlcDlRbCb      *rbCb;
@@ -598,21 +552,15 @@ RlcUdxStaPdu   *pStaPdu;
 #ifdef LTE_L2_MEAS
 /**
 */
-#ifdef ANSI
 S16 rlcDlUdxL2MeasReq 
 (
 Pst            *pst, 
 RlcL2MeasReqEvt *measReqEvt 
 )
-#else
-S16 rlcDlUdxL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-RlcL2MeasReqEvt *measReqEvt;
-#endif
 {
-   U32            cntr;
-   U8             measType;
-   VOLATILE U32     startTime = 0;
+   uint32_t  cntr;
+   uint8_t   measType;
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb;
 
    /*starting Task*/
@@ -638,7 +586,7 @@ RlcL2MeasReqEvt *measReqEvt;
    else
    {
       /* for nonIpThroughput meas, enable only for the sent QCIs */
-      U32 i;
+      uint32_t i;
       for(i = 0; i < LKW_MAX_QCI; i++)
       {
          tRlcCb->u.dlCb->rlcL2Cb.measOn[i] |= measType;
@@ -671,24 +619,18 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasStopReq
 (
 Pst            *pst,
-U8             measType
+uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasStopReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
 {
   /* S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
-   U16            cntr;
-   U8             status = ROK;
+   uint16_t        cntr;
+   uint8_t         status = ROK;
 /*   RlcL2MeasCfmEvt          measCfmEvt;  */
-   VOLATILE U32     startTime = 0;
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb=NULLP;
    
    /*starting Task*/
@@ -732,22 +674,15 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasSendReq
 (
 Pst            *pst,
-U8             measType
+uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasSendReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
 {
    RlcL2MeasEvtCb *measEvtCb;
-   U16            cntr;
-   
-   VOLATILE U32     startTime = 0;
+   uint16_t            cntr;
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);