X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_ul.c;h=07e9588683bf6ed7c4d5416ceef2a4934ef21066;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=cdd5f6bc032d2979dbdbdb6f6f59cdd55535aa29;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c
index cdd5f6bc0..07e958868 100755
--- a/src/5gnrrlc/kw_dbm_ul.c
+++ b/src/5gnrrlc/kw_dbm_ul.c
@@ -83,8 +83,6 @@ S16 rlcDbmUlInit(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcUlDbmInit)
-
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp), 
                             (U16) RLC_UE_LIST_BUCKET_SIZE,
@@ -152,8 +150,6 @@ Void rlcDbmUlDeInit(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcDbmUlDeInit);
-
 
    /* De Initialize ueCb Hash List */
    cmHashListDeinit(&(gCb->u.ulCb->ueLstCp));
@@ -200,8 +196,6 @@ CmLteRlcId   *rlcId;
 RlcUlRbCb     **rbCb;   
 #endif
 {
-   TRC3(rlcDbmFetchUlRbCbByRbId)
-
    *rbCb= NULLP;
 
    /* Check for UE CB or CELL CB */
@@ -276,29 +270,11 @@ RlcUlRbCb     **rbCb;
  * @return  Void
  *
 */
-#ifdef ANSI
-Void rlcDbmFetchUlRbCbFromLchId
-(
-RlcCb          *gCb,
-CmLteRnti     ueId,      
-CmLteCellId   cellId,   
-CmLteLcId     lcId,    
-RlcUlRbCb      **rbCb  
-)
-#else
-Void rlcDbmFetchUlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;     
-CmLteCellId   cellId;  
-CmLteLcId     lcId;   
-RlcUlRbCb      **rbCb;
-#endif
+void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
+   CmLteLcId lcId, RlcUlRbCb **rbCb)
 {
    RlcUlUeCb *ueCb;
 
-   TRC3(rlcDbmFetchUlRbCbFromLchId)
-
-
    *rbCb = NULLP;
    
    /* Check for UE CB or CELL CB */
@@ -309,23 +285,24 @@ RlcUlRbCb      **rbCb;
       rlcDbmFetchUlCellCb(gCb,cellId, &cellCb);
       if(!cellCb)
       {
-         RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,"CellCb not found UEID:%d",ueId);
-         RETVOID;
+         DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId: CellCb[%d] not found UEID:%d",\
+	    cellId, ueId);
+         return;
       }
 
       *rbCb = cellCb->lCh[lcId - 1].ulRbCb;
-      RETVOID;
+      return;
    }
    
    if (rlcDbmFetchUlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID, cellId,"UeId [%d]: UeCb not found",ueId);
-      RETVOID;
+      DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId: UeId [%d]: UeCb not found",ueId);
+      return;
    }
 
    *rbCb = ueCb->lCh[lcId - 1].ulRbCb;
 
-   RETVOID;
+   return;
 } /* kwDbmFetchRbCbFromLchId */
 
 
@@ -358,9 +335,6 @@ U8         numRbCb;
 {
    U32 idx; /* Index */
 
-   TRC3(rlcDbmDelAllUlRb)
-
-
    for (idx = 0; idx < numRbCb; idx++)
    {
       if (rbCbLst[idx] != NULLP)
@@ -416,8 +390,6 @@ CmLteCellId   cellId;
 RlcUlUeCb      *ueCb;
 #endif
 {
-   TRC3(rlcDbmAddUlUeCb)
-
 
    ueCb->ueId = ueId;
    ueCb->cellId = cellId;
@@ -466,8 +438,6 @@ RlcCb        *gCb;
 RlcUlCfgTmpData   *cfg;
 #endif
 {
-   TRC3(rlcDbmAddUlTransaction)
-
 #ifndef ALIGN_64BIT
    RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
 #else
@@ -511,7 +481,6 @@ U32              transId;
 RlcUlCfgTmpData   **cfg;
 #endif
 {
-   TRC3(rlcDbmFindUlTransaction)
 
    if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
                             (U8 *) &transId, 
@@ -553,8 +522,6 @@ RlcCb             *gCb;
 RlcUlCfgTmpData   *cfg;     
 #endif
 {
-   TRC3(rlcDbmDelUlTransaction)
-
 
    if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) 
    {
@@ -591,8 +558,6 @@ RlcCb *gCb;
 {
    RlcUlCfgTmpData *cfg = NULL;
 
-   TRC3(kwDbmDelAllUlTransctions)
-
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->transIdLstCp), 
                                    (PTR) cfg, 
@@ -626,27 +591,10 @@ RlcCb *gCb;
  *    -# ROK 
  *    -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmFetchUlUeCb
-(
-RlcCb          *gCb,
-CmLteRnti     ueId,  
-CmLteCellId   cellId, 
-RlcUlUeCb      **ueCb   
-)
-#else
-S16 rlcDbmFetchUlUeCb(gCb,ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;     
-CmLteCellId   cellId;    
-RlcUlUeCb      **ueCb;     
-#endif
+uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcUlUeCb **ueCb)
 {
-   TRC3(rlcDbmFetchUlUeCb)
-
-
    return (cmHashListFind(&(gCb->u.ulCb->ueLstCp), 
-                           (U8 *)&(ueId), sizeof(CmLteRnti),
+                           (uint8_t *)&(ueId), sizeof(CmLteRnti),
                            RLC_DEF_SEQ_NUM, 
                            (PTR *) ueCb));
 }
@@ -681,8 +629,6 @@ RlcUlUeCb   *ueCb;
 Bool       abortFlag; 
 #endif
 {
-   TRC3(rlcDbmDelUlUeCb)
-
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
    UNUSED(abortFlag);
@@ -735,9 +681,6 @@ RlcCb *gCb;
 {
    RlcUlUeCb *ueCb = NULLP;  /* UE Control Block */
 
-   TRC3(rlcDbmDelAllUlUe)
-
-
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->ueLstCp), 
                                    (PTR) ueCb, 
@@ -783,10 +726,6 @@ RlcUlCellCb    *cellCb;
 {
    RlcUlCellCb *tCellCb; 
 
-   TRC3(rlcDbmAddUlCellCb)
-
-
-
    tCellCb = cellCb;
    tCellCb->cellId = cellId;
 
@@ -820,32 +759,17 @@ RlcUlCellCb    *cellCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-Void rlcDbmFetchUlCellCb
-(
-RlcCb          *gCb,
-CmLteCellId   cellId,     
-RlcUlCellCb    **cellCb   
-)
-#else
-Void rlcDbmFetchUlCellCb(gCb, cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;    
-RlcUlCellCb    **cellCb;  
-#endif
+void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
 {
-   TRC3(rlcDbmFetchUlCellCb)
-
-
    *cellCb = NULLP;
    if(ROK != cmHashListFind(&(gCb->u.ulCb->cellLstCp), 
-                            (U8 *)&(cellId),sizeof(CmLteCellId), 
+                            (uint8_t *)&(cellId),sizeof(CmLteCellId), 
                             RLC_DEF_SEQ_NUM, (PTR*) cellCb))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID, cellId,"CellCb not found");
+      DU_LOG("\nRLC : rlcDbmFetchUlCellCb : CellCb[%d] not found", cellId);
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -873,8 +797,6 @@ RlcCb         *gCb;
 RlcUlCellCb   *cellCb;     
 #endif
 {
-   TRC3(rlcDbmDelUlCellCb)
-
 
    /* Delete all rbCbs in cellCb */
    rlcDbmDelAllUlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL);
@@ -914,9 +836,6 @@ RlcCb *gCb;
 {
    RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
 
-   TRC3(rlcDbmDelAllUlCell)
-
-
    /* Until no more cellCb is ueLstCp hash list get and delete cellCb */
    while (ROK == cmHashListGetNext(&(gCb->u.ulCb->cellLstCp), 
                                    (PTR) cellCb, 
@@ -951,7 +870,6 @@ Void rlcDbmUlShutdown(gCb)
 RlcCb *gCb;
 #endif
 {
-   TRC3(rlcDbmUlShutdown)
 
    rlcDbmDelAllUlCell(gCb);