Restoring E2AP changes

[o-du/l2.git] / src / 5gnrrlc / kw_dbm_ul.c

diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c
index 63054fb..21b588b 100755 (executable)
--- a/src/5gnrrlc/kw_dbm_ul.c
+++ b/src/5gnrrlc/kw_dbm_ul.c
@@ -27,9 +27,6 @@
         File:    kw_dbm_ul.c
   
 *********************************************************************21*/
-static const char* RLOG_MODULE_NAME="DBM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=194;
 
 \f
 /* header (.h) include files */
@@ -73,15 +70,7 @@ static int RLOG_FILE_ID=194;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmUlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmUlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmUlInit(RlcCb *gCb)
 {
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp), 
@@ -92,7 +81,7 @@ RlcCb *gCb;
                             RLC_GET_MEM_REGION(gCb), 
                             RLC_GET_MEM_POOL(gCb)))
    {
-      RLOG0(L_ERROR, "UeLstCp Initialization Failed");
+      DU_LOG("\nERROR  -->  RLC_UL : UeLstCp Initialization Failed");
       return RFAILED;
    }
 
@@ -106,7 +95,7 @@ RlcCb *gCb;
                             RLC_GET_MEM_POOL(gCb)))
    {
       cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
-      RLOG0(L_ERROR, "CellLstCp Initialization Failed");
+      DU_LOG("\nERROR  -->  RLC_UL : CellLstCp Initialization Failed");
       return RFAILED;
    }
 
@@ -120,7 +109,7 @@ RlcCb *gCb;
    {
       cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
       cmHashListDeinit(&gCb->u.ulCb->cellLstCp);
-      RLOG0(L_ERROR, "transIdLstCp Initialization Failed");
+      DU_LOG("\nERROR  -->  RLC_UL : transIdLstCp Initialization Failed");
       return RFAILED;
    }
 
@@ -140,15 +129,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmUlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlDeInit(RlcCb *gCb)
 {
 
    /* De Initialize ueCb Hash List */
@@ -182,19 +163,12 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
 Void rlcDbmFetchUlRbCbByRbId
 (
 RlcCb         *gCb,
 CmLteRlcId   *rlcId,  
 RlcUlRbCb     **rbCb  
 )
-#else
-Void rlcDbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   *rlcId;    
-RlcUlRbCb     **rbCb;   
-#endif
 {
    *rbCb= NULLP;
 
@@ -205,19 +179,15 @@ RlcUlRbCb     **rbCb;
 
       if(rlcId->rbId >= RLC_MAX_RB_PER_CELL)
       {
-         RLOG_ARG3(L_ERROR,DBG_RBID,rlcId->rbId ,
-               "Invalid RbId, cellId:%d UEID:%d Max is [%d]",
-               rlcId->cellId, 
-               rlcId->ueId,
-               RLC_MAX_RB_PER_CELL);
+         DU_LOG("\nERROR  -->  RLC_UL : Invalid RbId, cellId:%d UEID:%d Max is [%d]",
+               rlcId->cellId, rlcId->ueId, RLC_MAX_RB_PER_CELL);
          return;
       }
 
       rlcDbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
       if(!cellCb)
       {
-         RLOG_ARG2(L_ERROR,DBG_CELLID,rlcId->cellId,
-               "CellCb not found RBID:%d UEID:%d",
+         DU_LOG("\nERROR  -->  RLC_UL : CellCb not found RBID:%d UEID:%d",
                rlcId->rbId,
                rlcId->ueId);
          return;
@@ -231,8 +201,7 @@ RlcUlRbCb     **rbCb;
 
       if (!(RLC_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
       {
-         RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId,
-               "Invalid RbId for RbType[%d] CELLID:%d UEID:%d", 
+         DU_LOG("\nERROR  -->  RLC_UL : Invalid RbId for RbType[%d] CELLID:%d UEID:%d", 
                rlcId->rbType,
                rlcId->cellId,
                rlcId->ueId);
@@ -241,8 +210,7 @@ RlcUlRbCb     **rbCb;
 
       if (rlcDbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
       {
-         RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId->cellId,
-               "UeId [%d]: UeCb not found RBID:%d",
+         DU_LOG("\nERROR  -->  RLC_UL : UeId [%d]: UeCb not found RBID:%d",
                rlcId->ueId,
                rlcId->rbId);
          return;
@@ -285,7 +253,7 @@ void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
       rlcDbmFetchUlCellCb(gCb,cellId, &cellCb);
       if(!cellCb)
       {
-         DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId: CellCb[%d] not found UEID:%d",\
+         DU_LOG("\nERROR  -->  RLC_UL : rlcDbmFetchUlRbCbFromLchId: CellCb[%d] not found UEID:%d",\
            cellId, ueId);
          return;
       }
@@ -296,7 +264,7 @@ void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
    
    if (rlcDbmFetchUlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
    {
-      DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId: UeId [%d]: UeCb not found",ueId);
+      DU_LOG("\nERROR  -->  RLC_UL : rlcDbmFetchUlRbCbFromLchId: UeId [%d]: UeCb not found",ueId);
       return;
    }
 
@@ -319,19 +287,12 @@ void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
  * @return  Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelAllUlRb
 (
 RlcCb       *gCb,
 RlcUlRbCb   **rbCbLst,          
-uint8_t         numRbCb            
+uint8_t     numRbCb            
 )
-#else
-Void rlcDbmDelAllUlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcUlRbCb   **rbCbLst;        
-uint8_t         numRbCb;         
-#endif
 {
    uint32_t idx; /* Index */
 
@@ -340,11 +301,11 @@ uint8_t         numRbCb;
       if (rbCbLst[idx] != NULLP)
       {
          /* Free the Buffers of RbCb */
-         if( CM_LTE_MODE_UM == rbCbLst[idx]->mode ) 
+         if( RLC_MODE_UM == rbCbLst[idx]->mode ) 
          {
             rlcUmmFreeUlRbCb(gCb,rbCbLst[idx]);
          }
-         else if(CM_LTE_MODE_AM == rbCbLst[idx]->mode) 
+         else if(RLC_MODE_AM == rbCbLst[idx]->mode) 
          {
             rlcAmmFreeUlRbCb(gCb,rbCbLst[idx]);
          }
@@ -374,7 +335,6 @@ uint8_t         numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlUeCb
 (
 RlcCb          *gCb,
@@ -382,13 +342,6 @@ CmLteRnti     ueId,
 CmLteCellId   cellId,    
 RlcUlUeCb      *ueCb    
 )
-#else
-S16 rlcDbmAddUlUeCb(gCb, ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;    
-CmLteCellId   cellId; 
-RlcUlUeCb      *ueCb;
-#endif
 {
 
    ueCb->ueId = ueId;
@@ -399,8 +352,7 @@ RlcUlUeCb      *ueCb;
                               (uint8_t *)&(ueCb->ueId),
                               (uint16_t) sizeof(CmLteRnti)))
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
-            "UeId[%u] HashList Insertion Failed",
+      DU_LOG("\nERROR  -->  RLC_UL : UeId[%u] HashList Insertion Failed",
             ueId);
       return RFAILED;
    }
@@ -426,22 +378,16 @@ RlcUlUeCb      *ueCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlTransaction 
 (
 RlcCb        *gCb,
 RlcUlCfgTmpData   *cfg
 )
-#else
-S16 rlcDbmAddUlTransaction(gCb, cfg)
-RlcCb        *gCb;
-RlcUlCfgTmpData   *cfg;
-#endif
 {
 #ifndef ALIGN_64BIT
-   RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
+   DU_LOG("\nDEBUG  -->  RLC_UL : (transId(%ld)", cfg->transId);
 #else
-   RLOG1(L_DEBUG, "(transId(%d))", cfg->transId);
+   DU_LOG("\nDEBUG  -->  RLC_UL : (transId(%d))", cfg->transId);
 #endif
 
    return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), 
@@ -467,19 +413,12 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmFindUlTransaction
 (
 RlcCb             *gCb,
-uint32_t              transId,
+uint32_t          transId,
 RlcUlCfgTmpData   **cfg
 )
-#else
-S16 rlcDbmFindUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-uint32_t              transId;
-RlcUlCfgTmpData   **cfg;
-#endif
 {
 
    if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
@@ -487,7 +426,7 @@ RlcUlCfgTmpData   **cfg;
                             sizeof (transId), 
                             RLC_DEF_SEQ_NUM,(PTR *) cfg))
    {
-      RLOG1(L_ERROR,"TransId [%ld] not found",transId);
+      DU_LOG("\nERROR  -->  RLC_UL : TransId [%d] not found",transId);
       return RFAILED;
    }
    return ROK;
@@ -510,22 +449,16 @@ RlcUlCfgTmpData   **cfg;
  *      -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmDelUlTransaction
 (
 RlcCb             *gCb,
 RlcUlCfgTmpData   *cfg       
 )
-#else
-S16 rlcDbmDelUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfg;     
-#endif
 {
 
    if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) 
    {
-      RLOG0(L_ERROR,"HashList Deletion failed");
+      DU_LOG("\nERROR  -->  RLC_UL : HashList Deletion failed");
       return RFAILED;
    }
 
@@ -546,15 +479,7 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmDelAllUlTransactions
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDelAllUlTransactions(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDelAllUlTransactions(RlcCb *gCb)
 {
    RlcUlCfgTmpData *cfg = NULL;
 
@@ -615,19 +540,12 @@ uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcUl
  * @return Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelUlUeCb
 (
 RlcCb       *gCb,
 RlcUlUeCb   *ueCb,       
 Bool       abortFlag   
 )
-#else
-Void rlcDbmDelUlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcUlUeCb   *ueCb;      
-Bool       abortFlag; 
-#endif
 {
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -646,8 +564,7 @@ Bool       abortFlag;
    /* Delete ueCb entry from ueLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) ueCb))
    {
-      RLOG_ARG1(L_ERROR,DBG_UEID,ueCb->ueId,
-            "HashList Deletion Failed cellId(%d)",
+      DU_LOG("\nERROR  -->  RLC_UL : HashList Deletion Failed cellId(%d)",
             ueCb->cellId);
    }
    /* kw005.201 ccpu00117318, updating the statistics */
@@ -669,15 +586,7 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlUe
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlUe(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlUe(RlcCb *gCb)
 {
    RlcUlUeCb *ueCb = NULLP;  /* UE Control Block */
 
@@ -710,19 +619,12 @@ RlcCb *gCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
 S16 rlcDbmAddUlCellCb
 (
 RlcCb          *gCb,
 CmLteCellId   cellId,    
 RlcUlCellCb    *cellCb  
 )
-#else
-S16 rlcDbmAddUlCellCb(gCb, cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;    
-RlcUlCellCb    *cellCb;  
-#endif
 {
    RlcUlCellCb *tCellCb; 
 
@@ -734,8 +636,7 @@ RlcUlCellCb    *cellCb;
                               (uint8_t *)&(tCellCb->cellId), 
                               (uint16_t) sizeof(CmLteCellId)))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId,
-            "HashList Insertion Failed");
+      DU_LOG("\nERROR  -->  RLC_UL : HashList Insertion Failed");
       return RFAILED;
    }
 
@@ -766,7 +667,7 @@ void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
                             (uint8_t *)&(cellId),sizeof(CmLteCellId), 
                             RLC_DEF_SEQ_NUM, (PTR*) cellCb))
    {
-      DU_LOG("\nRLC : rlcDbmFetchUlCellCb : CellCb[%d] not found", cellId);
+      DU_LOG("\nERROR  -->  RLC_UL : rlcDbmFetchUlCellCb : CellCb[%d] not found", cellId);
    }
 
    return;
@@ -785,17 +686,7 @@ void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelUlCellCb
-(
-RlcCb         *gCb,
-RlcUlCellCb   *cellCb     
-)
-#else
-Void rlcDbmDelUlCellCb(gCb, cellCb)
-RlcCb         *gCb;
-RlcUlCellCb   *cellCb;     
-#endif
+Void rlcDbmDelUlCellCb(RlcCb *gCb,RlcUlCellCb *cellCb)
 {
 
    /* Delete all rbCbs in cellCb */
@@ -804,8 +695,7 @@ RlcUlCellCb   *cellCb;
    /* Delete cellCb entry in hash list cellLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.ulCb->cellLstCp), (PTR) cellCb))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,
-            "HashList Deletion Failed");
+      DU_LOG("\nERROR  -->  RLC_UL : HashList Deletion Failed");
    }
    /* Deallocate cellCb */
    RLC_FREE(gCb, cellCb, sizeof(RlcUlCellCb));
@@ -824,15 +714,7 @@ RlcUlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlCell(RlcCb *gCb)
 {
    RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
 
@@ -860,15 +742,7 @@ RlcCb *gCb;
  * @param[in] gCb      RLC Instance Control Block
  *
 */
-#ifdef ANSI
-Void rlcDbmUlShutdown
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlShutdown(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlShutdown(RlcCb *gCb)
 {
 
    rlcDbmDelAllUlCell(gCb);