X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=b9de678404524974edb194ce5387ef2efd5a5cb5;hb=a5c3f55c615bff6a466e8273084757e8d339689e;hp=f051b7c448b2f414f9dfa31d67e2c30dd75662b1;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index f051b7c44..b9de67840 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -47,9 +47,6 @@ File: kw_dbm_dl.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="DBM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=193; /* header (.h) include files */ @@ -75,7 +72,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,42 +91,33 @@ 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))) { - RLOG0(L_ERROR, "UeLstCp Initialization Failed"); + DU_LOG("\nERROR --> RLC_DL : UeLstCp Initialization Failed"); return RFAILED; } /* 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))) { cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "CellLstCp Initialization Failed"); + DU_LOG("\nERROR --> RLC_DL : CellLstCp Initialization Failed"); return RFAILED; } @@ -137,32 +125,32 @@ 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)) { cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); + DU_LOG("\nERROR --> RLC_DL : rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); return RFAILED; } /* 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)) { cmHashListDeinit(&rlcCb.rlcL2Cb.qciHlCp); cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); + DU_LOG("\nERROR --> RLC_DL : rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); return RFAILED; } #endif /* LTE_L2_MEAS */ @@ -178,17 +166,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 +186,7 @@ RlcCb *gCb; #endif /* LTE_L2_MEAS */ - RETVOID; + return; } /* rlcDbmDlDeInit */ @@ -235,7 +214,7 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb) if(rlcId->rbId >= RLC_MAX_RB_PER_CELL) { - DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : Invalid RbId, Max is [%d] \ + DU_LOG("\nERROR --> RLC_DL : rlcDbmFetchDlRbCbByRbId : Invalid RbId, Max is [%d] \ UEID:%d CELLID:%d", RLC_MAX_RB_PER_CELL, rlcId->ueId, rlcId->cellId); return; } @@ -243,7 +222,7 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb) rlcDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb); if(!cellCb) { - DU_LOG("\nRLC : rlcDbmFetchDlRbCbByRbId : CellCb[%d] not found UEID:%d \ + DU_LOG("\nERROR --> RLC_DL : rlcDbmFetchDlRbCbByRbId : CellCb[%d] not found UEID:%d \ RBID:%d", rlcId->cellId, rlcId->ueId, rlcId->rbId); return; } @@ -255,14 +234,14 @@ void rlcDbmFetchDlRbCbByRbId(RlcCb *gCb,CmLteRlcId *rlcId, RlcDlRbCb **rbCb) RlcDlUeCb *ueCb; if (!(RLC_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId))) { - DU_LOG("\n rlcDbmFetchDlRbCbByRbId : Invalid RbId[%d] for RbType[%d] \ + DU_LOG("\nERROR --> RLC_DL : 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)) { - DU_LOG("\n rlcDbmFetchDlRbCbByRbId : UeId [%d]: UeCb not found RBID:%d",\ + DU_LOG("\nERROR --> RLC_DL : rlcDbmFetchDlRbCbByRbId : UeId [%d]: UeCb not found RBID:%d",\ rlcId->ueId, rlcId->rbId); return; } @@ -303,7 +282,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb) rlcDbmFetchDlCellCb(gCb, cellId, &cellCb); if(!cellCb) { - DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: CellCb[%d] not found UEID:%d", \ + DU_LOG("\nERROR --> RLC_DL : rlcDbmFetchDlRbCbFromLchId: CellCb[%d] not found UEID:%d", \ cellId, ueId); return; } @@ -314,7 +293,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb) if (rlcDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK) { - DU_LOG("\nRLC: rlcDbmFetchDlRbCbFromLchId: UeId [%d]: UeCb not found",ueId); + DU_LOG("\nERROR --> RLC_DL : rlcDbmFetchDlRbCbFromLchId: UeId [%d]: UeCb not found",ueId); return; } @@ -337,23 +316,9 @@ CmLteLcId lcId, 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++) @@ -363,18 +328,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)); @@ -384,7 +349,7 @@ U8 numRbCb; } - RETVOID; + return; } /* rlcDbmDelAllDlRb */ @@ -405,34 +370,16 @@ 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) if (*ueCb == NULLP) { - RLOG_ARG1(L_FATAL,DBG_UEID,ueId, - "Memory allocation failed cellID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed cellID:%d", cellId); return RFAILED; } @@ -444,11 +391,10 @@ 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", + DU_LOG("\nERROR --> RLC_DL : UeId[%u] HashList Insertion Failed", ueId); return RFAILED; } @@ -501,22 +447,8 @@ uint8_t rlcDbmFetchDlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcDl * @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); @@ -535,8 +467,7 @@ Bool abortFlag; /* Delete ueCb entry from ueLstCp */ if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,ueCb->cellId, - "UeId[%u] HashList Insertion Failed", + DU_LOG("\nERROR --> RLC_DL : UeId[%u] HashList Insertion Failed", ueCb->ueId); } /* kw005.201 ccpu00117318, updating the statistics */ @@ -545,7 +476,7 @@ Bool abortFlag; /* Deallocate ueCb */ RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb)); - RETVOID; + return; } /* kwDbmDelUeCb */ @@ -560,21 +491,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, @@ -586,24 +506,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++) { @@ -614,7 +524,7 @@ RlcDlUeCb *ueCb; ueCb->l2MeasTbCb[tbIdx] = NULLP; } } - RETVOID; + return; }/* End of kwDbmDelL2MeasTb */ #endif /* LTE_L2_MEAS */ @@ -633,29 +543,16 @@ 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) if (*cellCb == NULLP) { - RLOG_ARG0(L_FATAL, DBG_CELLID,cellId,"Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed"); return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -665,10 +562,10 @@ 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"); + DU_LOG("\nERROR --> RLC_DL : HashList Insertion Failed"); return RFAILED; } @@ -697,12 +594,12 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcDlCellCb **cellC *cellCb = NULLP; if(ROK != cmHashListFind(&(gCb->u.dlCb->cellLstCp), - (U8 *)&(cellId), + (uint8_t *)&(cellId), sizeof(CmLteCellId), RLC_DEF_SEQ_NUM, (PTR*) cellCb)) { - DU_LOG("\nRLC : CellCb [%d] not found", cellId); + DU_LOG("\nERROR --> RLC_DL : CellCb [%d] not found", cellId); return RFAILED; } @@ -722,20 +619,8 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcDlCellCb **cellC * * @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); @@ -743,13 +628,13 @@ RlcDlCellCb *cellCb; /* Delete cellCb entry in hash list cellLstCp */ if(ROK != cmHashListDelete(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"HashList Deletion Failed"); + DU_LOG("\nERROR --> RLC_DL : HashList Deletion Failed"); } /* Deallocate cellCb */ RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb)); - RETVOID; + return; } /* kwDbmDelCellCb */ @@ -763,21 +648,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, @@ -788,7 +662,7 @@ RlcCb *gCb; cellCb = NULLP; } - RETVOID; + return; } /* rlcDbmDelAllDlCell */ @@ -803,17 +677,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);