X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=39fc8700f5b372349f2601e620d6e392d2c3f1ca;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=305c32f01b92caf274ea097e17b1a67e92acec2d;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index 305c32f01..39fc8700f 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -24,7 +24,7 @@ Desc: Source code for Database Module functions such as, - - kwDbmInit + - rlcDbmInit - kwDbmDeInit - kwDbmCreateRbCb - kwDbmFetchRbCb @@ -75,13 +75,13 @@ static int RLOG_FILE_ID=193; #ifdef TENB_STATS -EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti); +TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti); #endif /** * @file gp_dbm_dl.c * @brief RLC Downlink database module */ -#define KW_MODULE KW_DBGMASK_DUT +#define RLC_MODULE RLC_DBGMASK_DUT /** @@ -94,26 +94,17 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti); * -# ROK * -# RFAILED */ -#ifdef ANSI -PUBLIC S16 kwDbmDlInit -( -RlcCb *gCb -) -#else -PUBLIC S16 kwDbmDlInit(gCb) -RlcCb *gCb; -#endif +S16 rlcDbmDlInit(RlcCb *gCb) { - TRC3(kwDbmDlInit) /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), - (U16) KW_UE_LIST_BUCKET_SIZE, - (U16) 0, + (uint16_t) RLC_UE_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) FALSE, - (U16) CM_HASH_KEYTYPE_CONID, - KW_GET_MEM_REGION(gCb), - KW_GET_MEM_POOL(gCb))) + (uint16_t) CM_HASH_KEYTYPE_CONID, + RLC_GET_MEM_REGION(gCb), + RLC_GET_MEM_POOL(gCb))) { RLOG0(L_ERROR, "UeLstCp Initialization Failed"); return RFAILED; @@ -121,12 +112,12 @@ RlcCb *gCb; /* Initialize cellCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->cellLstCp), - (U16) KW_CELL_LIST_BUCKET_SIZE, - (U16) 0, + (uint16_t) RLC_CELL_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) FALSE, - (U16) CM_HASH_KEYTYPE_CONID, - KW_GET_MEM_REGION(gCb), - KW_GET_MEM_POOL(gCb))) + (uint16_t) CM_HASH_KEYTYPE_CONID, + RLC_GET_MEM_REGION(gCb), + RLC_GET_MEM_POOL(gCb))) { cmHashListDeinit(&gCb->u.dlCb->ueLstCp); RLOG0(L_ERROR, "CellLstCp Initialization Failed"); @@ -136,39 +127,39 @@ RlcCb *gCb; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC /* Initialize qcI Hash List */ - if(ROK != cmHashListInit(&(rlcCb.kwL2Cb.qciHlCp), - (U16) KW_QCI_LIST_BUCKET_SIZE, - (U16) 0, + if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.qciHlCp), + (uint16_t) RLC_QCI_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) TRUE, - (U16) CM_HASH_KEYTYPE_DEF, + (uint16_t) CM_HASH_KEYTYPE_DEF, rlcCb.init.region, rlcCb.init.pool)) { cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); + RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); return RFAILED; } /* Initialize tbHlCp Hash List */ - if(ROK != cmHashListInit(&(rlcCb.kwL2Cb.tbHlCp), - (U16) KW_TB_LIST_BUCKET_SIZE, - (U16) 0, + if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.tbHlCp), + (uint16_t) RLC_TB_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) FALSE, - (U16) CM_HASH_KEYTYPE_DEF, + (uint16_t) CM_HASH_KEYTYPE_DEF, rlcCb.init.region, rlcCb.init.pool)) { - cmHashListDeinit(&rlcCb.kwL2Cb.qciHlCp); + cmHashListDeinit(&rlcCb.rlcL2Cb.qciHlCp); cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); + RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); return RFAILED; } #endif /* LTE_L2_MEAS */ return ROK; -} /* kwDbmDlInit */ +} /* rlcDbmDlInit */ /** @@ -178,17 +169,8 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -PUBLIC Void kwDbmDlDeInit -( -RlcCb *gCb -) -#else -PUBLIC Void kwDbmDlDeInit(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDlDeInit(RlcCb *gCb) { - TRC3(kwDbmDlDeInit); /* De Initialize ueCb Hash List */ @@ -200,15 +182,15 @@ RlcCb *gCb; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC /* De Initialize qciCb Hash List */ - cmHashListDeinit(&(rlcCb.kwL2Cb.qciHlCp)); + cmHashListDeinit(&(rlcCb.rlcL2Cb.qciHlCp)); /* De Initialize tbHlCp Hash List */ - cmHashListDeinit(&(rlcCb.kwL2Cb.tbHlCp)); + cmHashListDeinit(&(rlcCb.rlcL2Cb.tbHlCp)); #endif /* LTE_L2_MEAS */ - RETVOID; -} /* kwDbmDlDeInit */ + return; +} /* rlcDbmDlDeInit */ /** @@ -224,22 +206,8 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -PUBLIC Void kwDbmFetchDlRbCbByRbId -( -RlcCb *gCb, -CmLteRlcId *rlcId, -RlcDlRbCb **rbCb -) -#else -PUBLIC Void kwDbmFetchDlRbCbByRbId(gCb, rlcId, rbCb) -RlcCb *gCb; -CmLteRlcId *rlcId; -RlcDlRbCb **rbCb; -#endif +void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb) { - TRC3(kwDbmFetchDlRbCbByRbId) - *rbCb= NULLP; /* Check for UE CB or CELL CB */ @@ -247,24 +215,19 @@ RlcDlRbCb **rbCb; { RlcDlCellCb *cellCb; - if(rlcId->rbId >= KW_MAX_RB_PER_CELL) + 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", - KW_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; } - kwDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb); + 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]; @@ -272,30 +235,25 @@ RlcDlRbCb **rbCb; else { RlcDlUeCb *ueCb; - if (!(KW_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId))) + 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 != kwDbmFetchDlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb)) + 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; } - KW_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb); + RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb); } - RETVOID; -} /* kwDbmFetchDlRbCbByRbId */ + return; +} /* rlcDbmFetchDlRbCbByRbId */ /** @@ -314,55 +272,38 @@ RlcDlRbCb **rbCb; * @return Void * */ -#ifdef ANSI -PUBLIC Void kwDbmFetchDlRbCbFromLchId -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -CmLteLcId lcId, -RlcDlRbCb **rbCb -) -#else -PUBLIC Void kwDbmFetchDlRbCbFromLchId(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(kwDbmFetchDlRbCbFromLchId) - - /* Check for UE CB or CELL CB */ if (ueId == 0) { RlcDlCellCb *cellCb; - kwDbmFetchDlCellCb(gCb, cellId, &cellCb); + 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 (kwDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK) + 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; -} /* kwDbmFetchDlRbCbFromLchId */ + return; +} /* rlcDbmFetchDlRbCbFromLchId */ /** @@ -378,23 +319,9 @@ RlcDlRbCb **rbCb; * @return Void * */ -#ifdef ANSI -PUBLIC Void kwDbmDelAllDlRb -( -RlcCb *gCb, -RlcDlRbCb **rbCbLst, -U8 numRbCb -) -#else -PUBLIC Void kwDbmDelAllDlRb(gCb, rbCbLst, numRbCb) -RlcCb *gCb; -RlcDlRbCb **rbCbLst; -U8 numRbCb; -#endif +Void rlcDbmDelAllDlRb(RlcCb *gCb,RlcDlRbCb **rbCbLst,uint8_t numRbCb) { - U32 idx; - - TRC3(kwDbmDelAllDlRb) + uint32_t idx; for (idx = 0; idx < numRbCb; idx++) @@ -402,20 +329,20 @@ U8 numRbCb; if (rbCbLst[idx] != NULLP) { #ifdef LTE_L2_MEAS - KW_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, (rbCbLst[idx])); + 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) { - kwUmmFreeDlRbCb(gCb,rbCbLst[idx]); + 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) { - kwAmmFreeDlRbCb(gCb,rbCbLst[idx]); + 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)); @@ -425,8 +352,8 @@ U8 numRbCb; } - RETVOID; -} /* kwDbmDelAllDlRb */ + return; +} /* rlcDbmDelAllDlRb */ /** @@ -446,27 +373,10 @@ U8 numRbCb; * -# RFAILED * */ -#ifdef ANSI -PUBLIC S16 kwDbmCreateDlUeCb -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -RlcDlUeCb **ueCb -) -#else -PUBLIC S16 kwDbmCreateDlUeCb(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; - TRC3(kwDbmCreateDlUeCb) - - RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -485,8 +395,8 @@ RlcDlUeCb **ueCb; if (ROK != cmHashListInsert(&(gCb->u.dlCb->ueLstCp), (PTR)tUeCb, - (U8 *)&(tUeCb->ueId), - (U16) sizeof(CmLteRnti))) + (uint8_t *)&(tUeCb->ueId), + (uint16_t) sizeof(CmLteRnti))) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellId, "UeId[%u] HashList Insertion Failed", @@ -517,32 +427,14 @@ RlcDlUeCb **ueCb; * -# ROK * -# RFAILED */ -#ifdef ANSI -PUBLIC S16 kwDbmFetchDlUeCb -( -RlcCb *gCb, -CmLteRnti ueId, -CmLteCellId cellId, -RlcDlUeCb **ueCb -) -#else -PUBLIC S16 kwDbmFetchDlUeCb(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(kwDbmFetchDlUeCb) - - return (cmHashListFind(&(gCb->u.dlCb->ueLstCp), - (U8 *)&(ueId), + (uint8_t *)&(ueId), sizeof(CmLteRnti), - KW_DEF_SEQ_NUM, + RLC_DEF_SEQ_NUM, (PTR *) ueCb)); -} /* kwDbmFetchDlUeCb */ +} /* rlcDbmFetchDlUeCb */ /** @@ -560,22 +452,8 @@ RlcDlUeCb **ueCb; * @return Void * */ -#ifdef ANSI -PUBLIC Void kwDbmDelDlUeCb -( -RlcCb *gCb, -RlcDlUeCb *ueCb, -Bool abortFlag -) -#else -PUBLIC Void kwDbmDelDlUeCb(gCb,eCb, abortFlag) -RlcCb *gCb; -RlcDlUeCb *ueCb; -Bool abortFlag; -#endif +Void rlcDbmDelDlUeCb(RlcCb *gCb,RlcDlUeCb *ueCb,Bool abortFlag) { - TRC3(kwDbmDelDlUeCb) - #if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC))) UNUSED(abortFlag); @@ -583,13 +461,13 @@ Bool abortFlag; defined(PJ_CMP_ASYNC)))*/ /* Delete all logical channels */ - KW_MEM_ZERO(ueCb->lCh,sizeof(RlcDlLch) * KW_MAX_LCH_PER_UE); + RLC_MEM_ZERO(ueCb->lCh,sizeof(RlcDlLch) * RLC_MAX_LCH_PER_UE); /* Delete all SRB RbCbs in UeCb */ - kwDbmDelAllDlRb(gCb,ueCb->srbCb, KW_MAX_SRB_PER_UE); + rlcDbmDelAllDlRb(gCb,ueCb->srbCb, RLC_MAX_SRB_PER_UE); /* Delete all DRB RbCbs in UeCb */ - kwDbmDelAllDlRb(gCb,ueCb->drbCb, KW_MAX_DRB_PER_UE); + rlcDbmDelAllDlRb(gCb,ueCb->drbCb, RLC_MAX_DRB_PER_UE); /* Delete ueCb entry from ueLstCp */ if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb)) @@ -604,7 +482,7 @@ Bool abortFlag; /* Deallocate ueCb */ RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb)); - RETVOID; + return; } /* kwDbmDelUeCb */ @@ -619,61 +497,40 @@ Bool abortFlag; * * @return Void */ -#ifdef ANSI -PUBLIC Void kwDbmDelAllDlUe -( -RlcCb *gCb -) -#else -PUBLIC Void kwDbmDelAllDlUe(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDelAllDlUe(RlcCb *gCb) { RlcDlUeCb *ueCb = NULLP; - TRC3(kwDbmDelAllDlUe) - - /* Until no more ueCb is ueLstCp hash list get and delete ueCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb, (PTR *)&ueCb)) { /* Delete ueCb */ - kwDbmDelDlUeCb(gCb,ueCb, TRUE); + rlcDbmDelDlUeCb(gCb,ueCb, TRUE); ueCb = NULLP; } - RETVOID; + return; } /* kwDbmDelAllUe */ /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS -#ifdef ANSI -PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe -( -RlcCb *gCb, -RlcDlUeCb *ueCb -) -#else -PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb) -RlcCb *gCb; -RlcDlUeCb *ueCb; -#endif +Void rlcDbmDelAllDlL2MeasTbFrmUe(RlcCb *gCb,RlcDlUeCb *ueCb) { - U8 tbIdx; - KwL2MeasTb *l2MeasTb = NULLP; - for(tbIdx = 0; tbIdx < KW_MAX_TB_PER_UE; tbIdx++) + uint8_t tbIdx; + RlcL2MeasTb *l2MeasTb = NULLP; + for(tbIdx = 0; tbIdx < RLC_MAX_TB_PER_UE; tbIdx++) { l2MeasTb = ueCb->l2MeasTbCb[tbIdx]; if(l2MeasTb != NULLP) { - RLC_FREE(gCb,l2MeasTb, sizeof(KwL2MeasTb)); + RLC_FREE(gCb,l2MeasTb, sizeof(RlcL2MeasTb)); ueCb->l2MeasTbCb[tbIdx] = NULLP; } } - RETVOID; + return; }/* End of kwDbmDelL2MeasTb */ #endif /* LTE_L2_MEAS */ @@ -692,23 +549,10 @@ RlcDlUeCb *ueCb; * -# ROK * -# RFAILED */ -#ifdef ANSI -PUBLIC S16 kwDbmCreateDlCellCb -( -RlcCb *gCb, -CmLteCellId cellId, -RlcDlCellCb **cellCb -) -#else -PUBLIC S16 kwDbmCreateDlCellCb(gCb,cellId, cellCb) -RlcCb *gCb; -CmLteCellId cellId; -RlcDlCellCb **cellCb; -#endif +S16 rlcDbmCreateDlCellCb(RlcCb *gCb,CmLteCellId cellId,RlcDlCellCb **cellCb) { RlcDlCellCb *tCellCb; - TRC3(kwDbmCreateDlCellCb) RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -724,15 +568,15 @@ RlcDlCellCb **cellCb; if(ROK != cmHashListInsert(&(gCb->u.dlCb->cellLstCp), (PTR) tCellCb, - (U8 *)&(tCellCb->cellId), - (U16) sizeof(CmLteCellId))) + (uint8_t *)&(tCellCb->cellId), + (uint16_t) sizeof(CmLteCellId))) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellId,"HashList Insertion Failed"); return RFAILED; } - return ROK; -} /* kwDbmCreateDlCellCb */ + return (ROK); +} /* rlcDbmCreateDlCellCb */ /** @@ -751,32 +595,17 @@ RlcDlCellCb **cellCb; * -# RFAILED * */ -#ifdef ANSI -PUBLIC S16 kwDbmFetchDlCellCb -( -RlcCb *gCb, -CmLteCellId cellId, -RlcDlCellCb **cellCb -) -#else -PUBLIC S16 kwDbmFetchDlCellCb(gCb,cellId, cellCb) -RlcCb *gCb; -CmLteCellId cellId; -RlcDlCellCb **cellCb; -#endif +uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcDlCellCb **cellCb) { - TRC3(kwDbmFetchDlCellCb) - - *cellCb = NULLP; if(ROK != cmHashListFind(&(gCb->u.dlCb->cellLstCp), - (U8 *)&(cellId), + (uint8_t *)&(cellId), sizeof(CmLteCellId), - KW_DEF_SEQ_NUM, + 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; } @@ -796,23 +625,11 @@ RlcDlCellCb **cellCb; * * @return Void */ -#ifdef ANSI -PUBLIC Void kwDbmDelDlCellCb -( -RlcCb *gCb, -RlcDlCellCb *cellCb -) -#else -PUBLIC Void kwDbmDelDlCellCb(gCb,cellCb) -RlcCb *gCb; -RlcDlCellCb *cellCb; -#endif +Void rlcDbmDelDlCellCb(RlcCb *gCb,RlcDlCellCb *cellCb) { - TRC3(kwDbmDelDlCellCb) - /* Delete all rbCbs in cellCb */ - kwDbmDelAllDlRb(gCb,cellCb->rbCb, KW_MAX_RB_PER_CELL); + rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL); /* Delete cellCb entry in hash list cellLstCp */ if(ROK != cmHashListDelete(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb)) @@ -823,7 +640,7 @@ RlcDlCellCb *cellCb; /* Deallocate cellCb */ RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb)); - RETVOID; + return; } /* kwDbmDelCellCb */ @@ -837,33 +654,22 @@ RlcDlCellCb *cellCb; * * @return Void */ -#ifdef ANSI -PUBLIC Void kwDbmDelAllDlCell -( -RlcCb *gCb -) -#else -PUBLIC Void kwDbmDelAllDlCell(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDelAllDlCell(RlcCb *gCb) { RlcDlCellCb *cellCb = NULLP; - TRC3(kwDbmDelAllDlCell) - - /* Until no more cellCb is ueLstCp hash list get and delete cellCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb, (PTR *)&cellCb)) { - kwDbmDelDlCellCb(gCb, cellCb); + rlcDbmDelDlCellCb(gCb, cellCb); cellCb = NULLP; } - RETVOID; -} /* kwDbmDelAllDlCell */ + return; +} /* rlcDbmDelAllDlCell */ /** @@ -877,23 +683,14 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -PUBLIC S16 kwDbmDlShutdown -( -RlcCb *gCb -) -#else -PUBLIC S16 kwDbmDlShutdown(gCb) -RlcCb *gCb; -#endif +S16 rlcDbmDlShutdown(RlcCb *gCb) { - TRC3(kwDbmDlShutdown) - kwDbmDelAllDlCell(gCb); + rlcDbmDelAllDlCell(gCb); - kwDbmDelAllDlUe(gCb); + rlcDbmDelAllDlUe(gCb); - kwDbmDlDeInit(gCb); + rlcDbmDlDeInit(gCb); return ROK;