X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=39fc8700f5b372349f2601e620d6e392d2c3f1ca;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;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..39fc8700f 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -75,7 +75,7 @@ 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 @@ -94,24 +94,15 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti); * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rlcDbmDlInit -( -RlcCb *gCb -) -#else -S16 rlcDbmDlInit(gCb) -RlcCb *gCb; -#endif +S16 rlcDbmDlInit(RlcCb *gCb) { - TRC3(rlcDbmDlInit) /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), - (U16) RLC_UE_LIST_BUCKET_SIZE, - (U16) 0, + (uint16_t) RLC_UE_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) FALSE, - (U16) CM_HASH_KEYTYPE_CONID, + (uint16_t) CM_HASH_KEYTYPE_CONID, RLC_GET_MEM_REGION(gCb), RLC_GET_MEM_POOL(gCb))) { @@ -121,10 +112,10 @@ RlcCb *gCb; /* Initialize cellCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->cellLstCp), - (U16) RLC_CELL_LIST_BUCKET_SIZE, - (U16) 0, + (uint16_t) RLC_CELL_LIST_BUCKET_SIZE, + (uint16_t) 0, (Bool) FALSE, - (U16) CM_HASH_KEYTYPE_CONID, + (uint16_t) CM_HASH_KEYTYPE_CONID, RLC_GET_MEM_REGION(gCb), RLC_GET_MEM_POOL(gCb))) { @@ -137,10 +128,10 @@ RlcCb *gCb; #ifdef LTE_L2_MEAS_RLC /* Initialize qcI Hash List */ if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.qciHlCp), - (U16) RLC_QCI_LIST_BUCKET_SIZE, - (U16) 0, + (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)) { @@ -152,10 +143,10 @@ RlcCb *gCb; /* Initialize tbHlCp Hash List */ if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.tbHlCp), - (U16) RLC_TB_LIST_BUCKET_SIZE, - (U16) 0, + (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)) { @@ -178,17 +169,8 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -Void rlcDbmDlDeInit -( -RlcCb *gCb -) -#else -Void rlcDbmDlDeInit(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDlDeInit(RlcCb *gCb) { - TRC3(rlcDbmDlDeInit); /* De Initialize ueCb Hash List */ @@ -207,7 +189,7 @@ RlcCb *gCb; #endif /* LTE_L2_MEAS */ - RETVOID; + return; } /* rlcDbmDlDeInit */ @@ -224,22 +206,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 +217,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 +237,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 +272,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 +285,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 */ @@ -378,23 +319,9 @@ RlcDlRbCb **rbCb; * @return Void * */ -#ifdef ANSI -Void rlcDbmDelAllDlRb -( -RlcCb *gCb, -RlcDlRbCb **rbCbLst, -U8 numRbCb -) -#else -Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb) -RlcCb *gCb; -RlcDlRbCb **rbCbLst; -U8 numRbCb; -#endif +Void rlcDbmDelAllDlRb(RlcCb *gCb,RlcDlRbCb **rbCbLst,uint8_t numRbCb) { - U32 idx; - - TRC3(rlcDbmDelAllDlRb) + uint32_t idx; for (idx = 0; idx < numRbCb; idx++) @@ -404,18 +331,18 @@ U8 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)); @@ -425,7 +352,7 @@ U8 numRbCb; } - RETVOID; + return; } /* rlcDbmDelAllDlRb */ @@ -446,27 +373,10 @@ U8 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; - TRC3(rlcDbmCreateDlUeCb) - - 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,28 +427,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)); @@ -560,22 +452,8 @@ RlcDlUeCb **ueCb; * @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) { - TRC3(rlcDbmDelDlUeCb) - #if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC))) UNUSED(abortFlag); @@ -604,7 +482,7 @@ Bool abortFlag; /* Deallocate ueCb */ RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb)); - RETVOID; + return; } /* kwDbmDelUeCb */ @@ -619,21 +497,10 @@ Bool abortFlag; * * @return Void */ -#ifdef ANSI -Void rlcDbmDelAllDlUe -( -RlcCb *gCb -) -#else -Void rlcDbmDelAllDlUe(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDelAllDlUe(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, @@ -645,24 +512,14 @@ RlcCb *gCb; ueCb = NULLP; } - RETVOID; + return; } /* kwDbmDelAllUe */ /* 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) { - U8 tbIdx; + uint8_t tbIdx; RlcL2MeasTb *l2MeasTb = NULLP; for(tbIdx = 0; tbIdx < RLC_MAX_TB_PER_UE; tbIdx++) { @@ -673,7 +530,7 @@ RlcDlUeCb *ueCb; ueCb->l2MeasTbCb[tbIdx] = NULLP; } } - RETVOID; + return; }/* End of kwDbmDelL2MeasTb */ #endif /* LTE_L2_MEAS */ @@ -692,23 +549,10 @@ 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; - TRC3(rlcDbmCreateDlCellCb) RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -724,8 +568,8 @@ 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; @@ -751,32 +595,17 @@ 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), - (U8 *)&(cellId), + (uint8_t *)&(cellId), sizeof(CmLteCellId), 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,20 +625,8 @@ RlcDlCellCb **cellCb; * * @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) { - TRC3(rlcDbmDelDlCellCb) - /* Delete all rbCbs in cellCb */ rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL); @@ -823,7 +640,7 @@ RlcDlCellCb *cellCb; /* Deallocate cellCb */ RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb)); - RETVOID; + return; } /* kwDbmDelCellCb */ @@ -837,21 +654,10 @@ RlcDlCellCb *cellCb; * * @return Void */ -#ifdef ANSI -Void rlcDbmDelAllDlCell -( -RlcCb *gCb -) -#else -Void rlcDbmDelAllDlCell(gCb) -RlcCb *gCb; -#endif +Void rlcDbmDelAllDlCell(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, @@ -862,7 +668,7 @@ RlcCb *gCb; cellCb = NULLP; } - RETVOID; + return; } /* rlcDbmDelAllDlCell */ @@ -877,17 +683,8 @@ RlcCb *gCb; * * @return Void */ -#ifdef ANSI -S16 rlcDbmDlShutdown -( -RlcCb *gCb -) -#else -S16 rlcDbmDlShutdown(gCb) -RlcCb *gCb; -#endif +S16 rlcDbmDlShutdown(RlcCb *gCb) { - TRC3(rlcDbmDlShutdown) rlcDbmDelAllDlCell(gCb);