X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=4ce1a88544f253a1bb8fdb2cc57ae86d6b77758b;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=373df48fa7577f83e80469bd9d61311faa23d424;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index 373df48fa..4ce1a8854 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -104,7 +104,6 @@ S16 rlcDbmDlInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlInit) /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), @@ -188,7 +187,6 @@ Void rlcDbmDlDeInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlDeInit); /* De Initialize ueCb Hash List */ @@ -224,22 +222,8 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -Void rlcDbmFetchDlRbCbByRbId -( -RlcCb *gCb, -CmLteRlcId *rlcId, -RlcDlRbCb **rbCb -) -#else -Void rlcDbmFetchDlRbCbByRbId(gCb, rlcId, rbCb) -RlcCb *gCb; -CmLteRlcId *rlcId; -RlcDlRbCb **rbCb; -#endif +void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb) { - TRC3(rlcDbmFetchDlRbCbByRbId) - *rbCb= NULLP; /* Check for UE CB or CELL CB */ @@ -249,22 +233,17 @@ RlcDlRbCb **rbCb; if(rlcId->rbId >= RLC_MAX_RB_PER_CELL) { - RLOG_ARG3(L_ERROR,DBG_RBID,rlcId->rbId , - "Invalid RbId, Max is [%d] UEID:%d CELLID:%d", - RLC_MAX_RB_PER_CELL, - rlcId->ueId, - rlcId->cellId); - RETVOID; + DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : Invalid RbId, Max is [%d] \ + UEID:%d CELLID:%d", RLC_MAX_RB_PER_CELL, rlcId->ueId, rlcId->cellId); + return; } rlcDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb); if(!cellCb) { - RLOG_ARG2(L_ERROR,DBG_CELLID,rlcId->cellId, - "CellCb not found UEID:%d RBID:%d", - rlcId->ueId, - rlcId->rbId); - RETVOID; + DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : CellCb[%d] not found UEID:%d \ + RBID:%d", rlcId->cellId, rlcId->ueId, rlcId->rbId); + return; } *rbCb = cellCb->rbCb[rlcId->rbId]; @@ -274,27 +253,22 @@ RlcDlRbCb **rbCb; RlcDlUeCb *ueCb; if (!(RLC_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId))) { - RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId, - "Invalid RbId for RbType[%d] RBID:%d CELLID:%d", - rlcId->rbType, - rlcId->ueId, - rlcId->cellId); - RETVOID; + DU_LOG("\n 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)) { - RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId->cellId, - "UeId [%d]: UeCb not found RBID:%d", - rlcId->ueId, - rlcId->rbId); - RETVOID; + DU_LOG("\n rlcDbmFetchDlRbCbByRbId : UeId [%d]: UeCb not found RBID:%d",\ + rlcId->ueId, rlcId->rbId); + return; } RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb); } - RETVOID; + return; } /* rlcDbmFetchDlRbCbByRbId */ @@ -314,29 +288,11 @@ RlcDlRbCb **rbCb; * @return Void * */ -#ifdef ANSI -Void rlcDbmFetchDlRbCbFromLchId -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -CmLteLcId lcId, -RlcDlRbCb **rbCb -) -#else -Void rlcDbmFetchDlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -CmLteLcId lcId; -RlcDlRbCb **rbCb; -#endif +void rlcDbmFetchDlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, \ +CmLteLcId lcId, RlcDlRbCb **rbCb) { RlcDlUeCb *ueCb; - TRC3(rlcDbmFetchDlRbCbFromLchId) - - /* Check for UE CB or CELL CB */ if (ueId == 0) { @@ -345,23 +301,24 @@ RlcDlRbCb **rbCb; rlcDbmFetchDlCellCb(gCb, cellId, &cellCb); if(!cellCb) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,"CellCb not found UEID:%d",ueId); - RETVOID; + DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: CellCb[%d] not found UEID:%d", \ + cellId, ueId); + return; } *rbCb = cellCb->lCh[lcId - 1].dlRbCb; - RETVOID; + return; } if (rlcDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID, cellId,"UeId [%d]: UeCb not found",ueId); - RETVOID; + DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: UeId [%d]: UeCb not found",ueId); + return; } *rbCb = ueCb->lCh[lcId - 1].dlRbCb; - RETVOID; + return; } /* rlcDbmFetchDlRbCbFromLchId */ @@ -394,8 +351,6 @@ U8 numRbCb; { U32 idx; - TRC3(rlcDbmDelAllDlRb) - for (idx = 0; idx < numRbCb; idx++) { @@ -464,9 +419,6 @@ RlcDlUeCb **ueCb; { RlcDlUeCb *tUeCb; - TRC3(rlcDbmCreateDlUeCb) - - RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -517,28 +469,10 @@ RlcDlUeCb **ueCb; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rlcDbmFetchDlUeCb -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -RlcDlUeCb **ueCb -) -#else -S16 rlcDbmFetchDlUeCb(gCb,ueId, cellId, ueCb) -RlcCb *gCb; -CmLteRnti ueId; -CmLteCellId cellId; -RlcDlUeCb **ueCb; -#endif +uint8_t rlcDbmFetchDlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcDlUeCb **ueCb) { - - TRC3(rlcDbmFetchDlUeCb) - - return (cmHashListFind(&(gCb->u.dlCb->ueLstCp), - (U8 *)&(ueId), + (uint8_t *)&(ueId), sizeof(CmLteRnti), RLC_DEF_SEQ_NUM, (PTR *) ueCb)); @@ -574,8 +508,6 @@ RlcDlUeCb *ueCb; Bool abortFlag; #endif { - TRC3(rlcDbmDelDlUeCb) - #if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC))) UNUSED(abortFlag); @@ -631,9 +563,6 @@ RlcCb *gCb; { RlcDlUeCb *ueCb = NULLP; - TRC3(rlcDbmDelAllDlUe) - - /* Until no more ueCb is ueLstCp hash list get and delete ueCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb, @@ -708,7 +637,6 @@ RlcDlCellCb **cellCb; { RlcDlCellCb *tCellCb; - TRC3(rlcDbmCreateDlCellCb) RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -751,23 +679,8 @@ RlcDlCellCb **cellCb; * -# RFAILED * */ -#ifdef ANSI -S16 rlcDbmFetchDlCellCb -( -RlcCb *gCb, -CmLteCellId cellId, -RlcDlCellCb **cellCb -) -#else -S16 rlcDbmFetchDlCellCb(gCb,cellId, cellCb) -RlcCb *gCb; -CmLteCellId cellId; -RlcDlCellCb **cellCb; -#endif +uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcDlCellCb **cellCb) { - TRC3(rlcDbmFetchDlCellCb) - - *cellCb = NULLP; if(ROK != cmHashListFind(&(gCb->u.dlCb->cellLstCp), @@ -776,7 +689,7 @@ RlcDlCellCb **cellCb; RLC_DEF_SEQ_NUM, (PTR*) cellCb)) { - RLOG_ARG0(L_ERROR,DBG_CELLID, cellId,"CellCb not found"); + DU_LOG("\nRLC : CellCb [%d] not found", cellId); return RFAILED; } @@ -808,8 +721,6 @@ RlcCb *gCb; RlcDlCellCb *cellCb; #endif { - TRC3(rlcDbmDelDlCellCb) - /* Delete all rbCbs in cellCb */ rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL); @@ -849,9 +760,6 @@ RlcCb *gCb; { RlcDlCellCb *cellCb = NULLP; - TRC3(rlcDbmDelAllDlCell) - - /* Until no more cellCb is ueLstCp hash list get and delete cellCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb, @@ -887,7 +795,6 @@ S16 rlcDbmDlShutdown(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlShutdown) rlcDbmDelAllDlCell(gCb);