X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=b9de678404524974edb194ce5387ef2efd5a5cb5;hb=a5c3f55c615bff6a466e8273084757e8d339689e;hp=c69fd18a190784e5c6302ea26564fb3ded452412;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c
index c69fd18a1..b9de67840 100755
--- a/src/5gnrrlc/kw_dbm_dl.c
+++ b/src/5gnrrlc/kw_dbm_dl.c
@@ -47,9 +47,6 @@
         File:    kw_dbm_dl.c
   
 *********************************************************************21*/
-static const char* RLOG_MODULE_NAME="DBM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=193;
 
 
 /* header (.h) include files */
@@ -94,15 +91,7 @@ TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti);
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmDlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlInit(RlcCb *gCb)
 {
 
    /* Initialize ueCb Hash List */
@@ -114,7 +103,7 @@ RlcCb *gCb;
                             RLC_GET_MEM_REGION(gCb), 
                             RLC_GET_MEM_POOL(gCb)))
    {   
-      RLOG0(L_ERROR, "UeLstCp Initialization Failed");
+      DU_LOG("\nERROR  -->  RLC_DL : UeLstCp Initialization Failed");
       return RFAILED;
    }
 
@@ -128,7 +117,7 @@ RlcCb *gCb;
                             RLC_GET_MEM_POOL(gCb)))
    {
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
-      RLOG0(L_ERROR, "CellLstCp Initialization Failed");
+      DU_LOG("\nERROR  -->  RLC_DL : CellLstCp Initialization Failed");
       return RFAILED;
    }
 
@@ -145,7 +134,7 @@ RlcCb *gCb;
    {
       cmHashListDeinit(&gCb->u.dlCb->cellLstCp);
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
-      RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp");
+      DU_LOG("\nERROR  -->  RLC_DL : rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp");
       return RFAILED;
    }
    
@@ -161,7 +150,7 @@ RlcCb *gCb;
       cmHashListDeinit(&rlcCb.rlcL2Cb.qciHlCp);
       cmHashListDeinit(&gCb->u.dlCb->cellLstCp);
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
-      RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp");
+      DU_LOG("\nERROR  -->  RLC_DL : rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp");
       return RFAILED;
    }
 #endif /* LTE_L2_MEAS */
@@ -177,15 +166,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDlDeInit(RlcCb *gCb)
 {
 
 
@@ -233,7 +214,7 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb)
       
       if(rlcId->rbId >= RLC_MAX_RB_PER_CELL)
       {
-         DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : Invalid RbId, Max is [%d] \
+         DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbByRbId : Invalid RbId, Max is [%d] \
 	    UEID:%d CELLID:%d", RLC_MAX_RB_PER_CELL, rlcId->ueId, rlcId->cellId);
          return;
       }
@@ -241,7 +222,7 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb)
       rlcDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb);
       if(!cellCb)
       {
-         DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : CellCb[%d] not found UEID:%d \
+         DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbByRbId : CellCb[%d] not found UEID:%d \
 	    RBID:%d", rlcId->cellId, rlcId->ueId, rlcId->rbId);
          return;
       }
@@ -253,14 +234,14 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb)
       RlcDlUeCb *ueCb;
       if (!(RLC_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
       {
-         DU_LOG("\n rlcDbmFetchDlRbCbByRbId : Invalid RbId[%d] for RbType[%d] \
+         DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbByRbId : Invalid RbId[%d] for RbType[%d] \
 	    RBID:%d CELLID:%d", rlcId->rbId, rlcId->rbType, rlcId->ueId, rlcId->cellId);
          return;
       }
       
       if (ROK != rlcDbmFetchDlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb))
       {
-         DU_LOG("\n rlcDbmFetchDlRbCbByRbId : UeId [%d]: UeCb not found RBID:%d",\
+         DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbByRbId : UeId [%d]: UeCb not found RBID:%d",\
             rlcId->ueId, rlcId->rbId);
          return;
       }
@@ -301,7 +282,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb)
       rlcDbmFetchDlCellCb(gCb, cellId, &cellCb);
       if(!cellCb)
       {
-         DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: CellCb[%d] not found UEID:%d", \
+         DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbFromLchId: CellCb[%d] not found UEID:%d", \
 	    cellId, ueId);
          return;
       }
@@ -312,7 +293,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb)
 
    if (rlcDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK)
    {
-      DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: UeId [%d]: UeCb not found",ueId);
+      DU_LOG("\nERROR  -->  RLC_DL : rlcDbmFetchDlRbCbFromLchId: UeId [%d]: UeCb not found",ueId);
       return;
    }
 
@@ -335,19 +316,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb)
  * @return  Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlRb
-(
-RlcCb       *gCb,
-RlcDlRbCb   **rbCbLst,
-uint8_t     numRbCb 
-)
-#else
-Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcDlRbCb   **rbCbLst;
-uint8_t     numRbCb;   
-#endif
+Void rlcDbmDelAllDlRb(RlcCb *gCb,RlcDlRbCb **rbCbLst,uint8_t numRbCb)
 {
    uint32_t idx;
 
@@ -359,18 +328,18 @@ uint8_t     numRbCb;
 #ifdef LTE_L2_MEAS
          RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, (rbCbLst[idx]));
 #endif
-         if( CM_LTE_MODE_UM == rbCbLst[idx]->mode)
+         if( RLC_MODE_UM == rbCbLst[idx]->mode)
          {
             rlcUmmFreeDlRbCb(gCb,rbCbLst[idx]);
 
             RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
          }
-         else if( CM_LTE_MODE_AM == rbCbLst[idx]->mode)
+         else if( RLC_MODE_AM == rbCbLst[idx]->mode)
          {
             rlcAmmFreeDlRbCb(gCb,rbCbLst[idx]);
          }
          /* ccpu00136940 */
-         else if(CM_LTE_MODE_TM == rbCbLst[idx]->mode)
+         else if(RLC_MODE_TM == rbCbLst[idx]->mode)
          {
             cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCbLst[idx]->m.tm.sduQ));
             RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
@@ -401,21 +370,7 @@ uint8_t     numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlUeCb
-(
-RlcCb          *gCb,
-CmLteRnti     ueId,  
-CmLteCellId   cellId,
-RlcDlUeCb      **ueCb 
-)
-#else
-S16 rlcDbmCreateDlUeCb(gCb,ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;
-CmLteCellId   cellId;
-RlcDlUeCb      **ueCb;
-#endif
+S16 rlcDbmCreateDlUeCb(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcDlUeCb **ueCb)
 {
    RlcDlUeCb *tUeCb;        
 
@@ -424,8 +379,7 @@ RlcDlUeCb      **ueCb;
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (*ueCb == NULLP)
    {   
-      RLOG_ARG1(L_FATAL,DBG_UEID,ueId,
-            "Memory allocation failed cellID:%d",
+      DU_LOG("\nERROR  -->  RLC_DL : Memory allocation failed cellID:%d",
             cellId);
       return RFAILED;
    }
@@ -440,8 +394,7 @@ RlcDlUeCb      **ueCb;
                                (uint8_t *)&(tUeCb->ueId),
                                (uint16_t) sizeof(CmLteRnti)))
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
-            "UeId[%u] HashList Insertion Failed",
+      DU_LOG("\nERROR  -->  RLC_DL : UeId[%u] HashList Insertion Failed",
             ueId);
       return RFAILED;
    }
@@ -494,19 +447,7 @@ uint8_t rlcDbmFetchDlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcDl
  * @return Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelDlUeCb
-(
-RlcCb       *gCb,
-RlcDlUeCb   *ueCb,   
-Bool       abortFlag 
-)
-#else
-Void rlcDbmDelDlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcDlUeCb   *ueCb; 
-Bool       abortFlag;
-#endif
+Void rlcDbmDelDlUeCb(RlcCb *gCb,RlcDlUeCb *ueCb,Bool abortFlag)
 {
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -526,8 +467,7 @@ Bool       abortFlag;
    /* Delete ueCb entry from ueLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb))
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,ueCb->cellId,
-            "UeId[%u] HashList Insertion Failed",
+      DU_LOG("\nERROR  -->  RLC_DL : UeId[%u] HashList Insertion Failed",
             ueCb->ueId);
    }
    /* kw005.201 ccpu00117318, updating the statistics */
@@ -551,15 +491,7 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlUe
-(
-RlcCb  *gCb
-)
-#else
-Void rlcDbmDelAllDlUe(gCb)
-RlcCb  *gCb;
-#endif
+Void rlcDbmDelAllDlUe(RlcCb  *gCb)
 {
    RlcDlUeCb *ueCb = NULLP; 
 
@@ -579,17 +511,7 @@ RlcCb  *gCb;
 
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-Void rlcDbmDelAllDlL2MeasTbFrmUe
-(
-RlcCb      *gCb,
-RlcDlUeCb  *ueCb
-)
-#else
-Void rlcDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb)
-RlcCb      *gCb;
-RlcDlUeCb  *ueCb;
-#endif
+Void rlcDbmDelAllDlL2MeasTbFrmUe(RlcCb *gCb,RlcDlUeCb  *ueCb)
 {
    uint8_t       tbIdx;
    RlcL2MeasTb   *l2MeasTb = NULLP;
@@ -621,19 +543,7 @@ RlcDlUeCb  *ueCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlCellCb
-(
-RlcCb          *gCb,
-CmLteCellId   cellId, 
-RlcDlCellCb    **cellCb 
-)
-#else
-S16 rlcDbmCreateDlCellCb(gCb,cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;   
-RlcDlCellCb    **cellCb;
-#endif
+S16 rlcDbmCreateDlCellCb(RlcCb *gCb,CmLteCellId cellId,RlcDlCellCb **cellCb)
 {
    RlcDlCellCb *tCellCb; 
    
@@ -642,7 +552,7 @@ RlcDlCellCb    **cellCb;
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (*cellCb == NULLP)
    {
-      RLOG_ARG0(L_FATAL, DBG_CELLID,cellId,"Memory allocation failed");
+      DU_LOG("\nERROR  -->  RLC_DL : Memory allocation failed");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
@@ -655,7 +565,7 @@ RlcDlCellCb    **cellCb;
                               (uint8_t *)&(tCellCb->cellId), 
                               (uint16_t) sizeof(CmLteCellId)))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cellId,"HashList Insertion Failed");
+      DU_LOG("\nERROR  -->  RLC_DL : HashList Insertion Failed");
       return RFAILED;
    }
 
@@ -689,7 +599,7 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId  cellId, RlcDlCellCb **cellC
                             RLC_DEF_SEQ_NUM, 
                             (PTR*) cellCb))
    {
-      DU_LOG("\nRLC : CellCb [%d] not found", cellId);
+      DU_LOG("\nERROR  -->  RLC_DL : CellCb [%d] not found", cellId);
       return RFAILED;
    }
 
@@ -709,17 +619,7 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId  cellId, RlcDlCellCb **cellC
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelDlCellCb
-(
-RlcCb         *gCb,
-RlcDlCellCb   *cellCb  
-)
-#else
-Void rlcDbmDelDlCellCb(gCb,cellCb)
-RlcCb         *gCb;
-RlcDlCellCb   *cellCb;
-#endif
+Void rlcDbmDelDlCellCb(RlcCb *gCb,RlcDlCellCb *cellCb)
 {
 
    /* Delete all rbCbs in cellCb */
@@ -728,7 +628,7 @@ RlcDlCellCb   *cellCb;
    /* Delete cellCb entry in hash list cellLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"HashList Deletion Failed");
+      DU_LOG("\nERROR  -->  RLC_DL : HashList Deletion Failed");
    }
 
    /* Deallocate cellCb */
@@ -748,15 +648,7 @@ RlcDlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllDlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllDlCell(RlcCb *gCb)
 {
    RlcDlCellCb *cellCb = NULLP;
 
@@ -785,15 +677,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-S16 rlcDbmDlShutdown
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlShutdown(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlShutdown(RlcCb *gCb)
 {
 
    rlcDbmDelAllDlCell(gCb);