X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx_dl.c;h=8a2790055d0e064f439c07d750e8d3b24680c64d;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=12812cbfddf702540d75bb7a69dd828fdee24cf2;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c
index 12812cbfd..8a2790055 100755
--- a/src/5gnrrlc/kw_udx_dl.c
+++ b/src/5gnrrlc/kw_udx_dl.c
@@ -18,7 +18,7 @@
 
 /**********************************************************************
  
-    Name:   LTE RLC layer
+    Name:   NR RLC layer
  
     Type:   C include file
  
@@ -27,9 +27,6 @@
     File:   kw_udx_dl.c
 
 **********************************************************************/
-static const char* RLOG_MODULE_NAME="UDX";
-static int RLOG_MODULE_ID=262144;
-static int RLOG_FILE_ID=203;
 
 /* header include files (.h) */
 #include "common_def.h"
@@ -82,19 +79,12 @@ 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;
@@ -128,7 +118,7 @@ SpId   spId;
          /* Update the State */
          udxSap->state = RLC_SAP_BND;
 
-         RLOG1(L_INFO, "UDX SAP state [%d]", udxSap->state);
+         DU_LOG("\nINFO   --> RLC_DL : UDX SAP state [%d]", udxSap->state);
          break;
       }
       /* SAP is already bound */
@@ -146,7 +136,7 @@ SpId   spId;
             RLC_SEND_SAPID_ALARM(tRlcCb, spId, 
                                 LKW_EVENT_UDX_BND_REQ, LCM_CAUSE_INV_PAR_VAL);
 
-            RLOG0(L_ERROR, "UDX SAP already Bound");
+            DU_LOG("\nERROR  --> RLC_DL : UDX SAP already Bound");
             rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK);
          }
          break;
@@ -158,7 +148,7 @@ SpId   spId;
          RLC_SEND_SAPID_ALARM(tRlcCb,spId, 
                              LKW_EVENT_CKW_BND_REQ, LCM_CAUSE_INV_STATE);
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
-         RLOG0(L_ERROR, "Invalid UDX SAP State in Bind Req");
+         DU_LOG("\nERROR  --> RLC_DL : Invalid UDX SAP State in Bind Req");
          rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK);
          break;
       }
@@ -179,19 +169,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;
@@ -205,7 +188,7 @@ Reason   reason;
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 
-   RLOG2(L_DEBUG,"Unbind Req for spId[%d], reason[%d]", 
+   DU_LOG("\nDEBUG  --> RLC_DL : Unbind Req for spId[%d], reason[%d]", 
                 spId, reason);
    UNUSED(reason);
    /* disable upper sap (CKW) */
@@ -240,19 +223,12 @@ 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; 
    uint8_t         idx;    
@@ -279,7 +255,7 @@ RlcCfgInfo   *cfg;
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (cfgCfm == NULLP)
    {
-      RLOG0(L_FATAL,"Memory Allocation Failed.");
+      DU_LOG("\nERROR  --> RLC_DL : Memory Allocation Failed.");
       /* kw002.201 Freeing from proper region */
       /* RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); */
       return RFAILED;
@@ -305,7 +281,7 @@ RlcCfgInfo   *cfg;
                   if (rlcCfgAddDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                               entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Addition Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Addition Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -319,7 +295,7 @@ RlcCfgInfo   *cfg;
                   if (rlcCfgReCfgDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                            entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"ReCfg Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : ReCfg Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -334,7 +310,7 @@ RlcCfgInfo   *cfg;
                   if (rlcCfgDelDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                         entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Deletion Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                   } 
                }
@@ -357,7 +333,7 @@ RlcCfgInfo   *cfg;
                   if (rlcCfgReEstDlRb(tRlcCb,cfg->ueId, cfg->cellId,
                                      sndReEst,entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Reest Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Reest Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -370,7 +346,7 @@ RlcCfgInfo   *cfg;
                if (rlcCfgDelDlUe(tRlcCb,cfg->ueId, cfg->cellId,
                                 entCfg, entCfgCfm) != ROK)
                {
-                  RLOG_ARG1(L_ERROR,DBG_UEID,cfg->ueId,"deletion Failed due to[%d]",
+                  DU_LOG("\nERROR  --> RLC_DL : deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                }
                break;
@@ -380,7 +356,7 @@ RlcCfgInfo   *cfg;
                if (rlcCfgDelDlCell(tRlcCb,cfg->cellId,entCfg,entCfgCfm) 
                                                                 != ROK )
                {
-                  RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->cellId,"deletion Failed due to[%d]",
+                  DU_LOG("\nERROR  --> RLC_DL : deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                } 
                break;
@@ -390,7 +366,7 @@ RlcCfgInfo   *cfg;
             {
                RLC_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType,\
                                    CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_CFG);
-               RLOG0(L_ERROR, "Invalid CfgType");
+               DU_LOG("\nERROR  --> RLC_DL : Invalid CfgType");
             }
       }
    }
@@ -427,7 +403,6 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxUeIdChgReq
 (
 Pst         *pst, 
@@ -436,14 +411,6 @@ uint32_t    transId,
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo)
-Pst         *pst;
-SpId        spId;
-uint32_t    transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    CmStatus       status;
    RlcCb           *tRlcCb;
@@ -469,7 +436,7 @@ CkwUeInfo   *newUeInfo;
    
    if (rlcCfgDlUeIdChng(tRlcCb, ueInfo, newUeInfo, &status) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,"Failure due to[%d]",
+      DU_LOG("\nERROR  --> RLC_DL : Failure due to[%d]",
              status.reason);
    }
    rlcDlUdxUeIdChgCfm(&(tRlcCb->u.dlCb->udxDlSap[spId].pst),
@@ -493,7 +460,6 @@ CkwUeInfo   *newUeInfo;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaPduReq
 (
 Pst             *pst,
@@ -501,13 +467,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;
@@ -517,7 +476,7 @@ RlcUdxDlStaPdu   *pStaPdu;
    rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb); /* Fetch DBM RbCb */
    if (!rbCb)
    {
-      RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found",
+      DU_LOG("\nERROR  --> RLC_DL : CellId [%u]:RbId[%d] not found",
             rlcId->cellId,rlcId->rbId);
       RLC_FREE_SHRABL_BUF(pst->region, 
 			 pst->pool, 
@@ -526,19 +485,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 +515,6 @@ RlcUdxDlStaPdu   *pStaPdu;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaUpdReq
 (
 Pst*          pst,
@@ -564,13 +522,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;
@@ -580,7 +531,7 @@ RlcUdxStaPdu   *pStaPdu;
    rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb);
    if (!rbCb)
    {
-      RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found",
+      DU_LOG("\nERROR  --> RLC_DL : CellId [%u]:RbId[%d] not found",
             rlcId->cellId,rlcId->rbId);
       return RFAILED;
    }
@@ -598,17 +549,11 @@ RlcUdxStaPdu   *pStaPdu;
 #ifdef LTE_L2_MEAS
 /**
 */
-#ifdef ANSI
 S16 rlcDlUdxL2MeasReq 
 (
 Pst            *pst, 
 RlcL2MeasReqEvt *measReqEvt 
 )
-#else
-S16 rlcDlUdxL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-RlcL2MeasReqEvt *measReqEvt;
-#endif
 {
    uint32_t  cntr;
    uint8_t   measType;
@@ -671,17 +616,11 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasStopReq
 (
 Pst            *pst,
 uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasStopReq (pst, measType)
-Pst            *pst;
-uint8_t         measType;
-#endif
 {
   /* S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
@@ -732,17 +671,11 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasSendReq
 (
 Pst            *pst,
 uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasSendReq (pst, measType)
-Pst            *pst;
-uint8_t         measType;
-#endif
 {
    RlcL2MeasEvtCb *measEvtCb;
    uint16_t            cntr;