X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;fp=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=152212c9fe3e7084a8091cdf549e77bfc5847dc8;hb=5831bf6b3454aa200a92cd3e84209650734e4863;hp=8acc01ee8ecfa0a3e72f6e47bdbb8187c0d576e5;hpb=f59409f0901831b9e116b7d37cd4dbf247cdde1f;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index 8acc01ee8..152212c9f 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -97,11 +97,11 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti); #ifdef ANSI PUBLIC S16 kwDbmDlInit ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC S16 kwDbmDlInit(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { TRC3(kwDbmDlInit) @@ -136,33 +136,33 @@ KwCb *gCb; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC /* Initialize qcI Hash List */ - if(ROK != cmHashListInit(&(kwCb.kwL2Cb.qciHlCp), + if(ROK != cmHashListInit(&(rlcCb.kwL2Cb.qciHlCp), (U16) KW_QCI_LIST_BUCKET_SIZE, (U16) 0, (Bool) TRUE, (U16) CM_HASH_KEYTYPE_DEF, - kwCb.init.region, - kwCb.init.pool)) + rlcCb.init.region, + rlcCb.init.pool)) { cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for kwCb.qciHlCp"); + RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); RETVALUE(RFAILED); } /* Initialize tbHlCp Hash List */ - if(ROK != cmHashListInit(&(kwCb.kwL2Cb.tbHlCp), + if(ROK != cmHashListInit(&(rlcCb.kwL2Cb.tbHlCp), (U16) KW_TB_LIST_BUCKET_SIZE, (U16) 0, (Bool) FALSE, (U16) CM_HASH_KEYTYPE_DEF, - kwCb.init.region, - kwCb.init.pool)) + rlcCb.init.region, + rlcCb.init.pool)) { - cmHashListDeinit(&kwCb.kwL2Cb.qciHlCp); + cmHashListDeinit(&rlcCb.kwL2Cb.qciHlCp); cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); - RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for kwCb.tbHlCp"); + RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); RETVALUE(RFAILED); } #endif /* LTE_L2_MEAS */ @@ -181,11 +181,11 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmDlDeInit ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmDlDeInit(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { TRC3(kwDbmDlDeInit); @@ -200,10 +200,10 @@ KwCb *gCb; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC /* De Initialize qciCb Hash List */ - cmHashListDeinit(&(kwCb.kwL2Cb.qciHlCp)); + cmHashListDeinit(&(rlcCb.kwL2Cb.qciHlCp)); /* De Initialize tbHlCp Hash List */ - cmHashListDeinit(&(kwCb.kwL2Cb.tbHlCp)); + cmHashListDeinit(&(rlcCb.kwL2Cb.tbHlCp)); #endif /* LTE_L2_MEAS */ @@ -227,15 +227,15 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmFetchDlRbCbByRbId ( -KwCb *gCb, +RlcCb *gCb, CmLteRlcId *rlcId, -KwDlRbCb **rbCb +RlcDlRbCb **rbCb ) #else PUBLIC Void kwDbmFetchDlRbCbByRbId(gCb, rlcId, rbCb) -KwCb *gCb; +RlcCb *gCb; CmLteRlcId *rlcId; -KwDlRbCb **rbCb; +RlcDlRbCb **rbCb; #endif { TRC3(kwDbmFetchDlRbCbByRbId) @@ -245,7 +245,7 @@ KwDlRbCb **rbCb; /* Check for UE CB or CELL CB */ if (rlcId->ueId == 0) { - KwDlCellCb *cellCb; + RlcDlCellCb *cellCb; if(rlcId->rbId >= KW_MAX_RB_PER_CELL) { @@ -271,7 +271,7 @@ KwDlRbCb **rbCb; } else { - KwDlUeCb *ueCb; + RlcDlUeCb *ueCb; if (!(KW_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId))) { RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId, @@ -317,22 +317,22 @@ KwDlRbCb **rbCb; #ifdef ANSI PUBLIC Void kwDbmFetchDlRbCbFromLchId ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, CmLteLcId lcId, -KwDlRbCb **rbCb +RlcDlRbCb **rbCb ) #else PUBLIC Void kwDbmFetchDlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; CmLteLcId lcId; -KwDlRbCb **rbCb; +RlcDlRbCb **rbCb; #endif { - KwDlUeCb *ueCb; + RlcDlUeCb *ueCb; TRC3(kwDbmFetchDlRbCbFromLchId) @@ -340,7 +340,7 @@ KwDlRbCb **rbCb; /* Check for UE CB or CELL CB */ if (ueId == 0) { - KwDlCellCb *cellCb; + RlcDlCellCb *cellCb; kwDbmFetchDlCellCb(gCb, cellId, &cellCb); if(!cellCb) @@ -381,14 +381,14 @@ KwDlRbCb **rbCb; #ifdef ANSI PUBLIC Void kwDbmDelAllDlRb ( -KwCb *gCb, -KwDlRbCb **rbCbLst, +RlcCb *gCb, +RlcDlRbCb **rbCbLst, U8 numRbCb ) #else PUBLIC Void kwDbmDelAllDlRb(gCb, rbCbLst, numRbCb) -KwCb *gCb; -KwDlRbCb **rbCbLst; +RlcCb *gCb; +RlcDlRbCb **rbCbLst; U8 numRbCb; #endif { @@ -408,7 +408,7 @@ U8 numRbCb; { kwUmmFreeDlRbCb(gCb,rbCbLst[idx]); - KW_FREE (gCb,rbCbLst[idx], sizeof (KwDlRbCb)); + RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb)); } else if( CM_LTE_MODE_AM == rbCbLst[idx]->mode) { @@ -418,7 +418,7 @@ U8 numRbCb; else if(CM_LTE_MODE_TM == rbCbLst[idx]->mode) { cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCbLst[idx]->m.tm.sduQ)); - KW_FREE (gCb,rbCbLst[idx], sizeof (KwDlRbCb)); + RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb)); } } @@ -434,7 +434,7 @@ U8 numRbCb; * * @details * This function is invoked by CFG to create UeCb and insert into the - * Ue hashlist of KwCb. + * Ue hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] ueId UE Identifier @@ -449,25 +449,25 @@ U8 numRbCb; #ifdef ANSI PUBLIC S16 kwDbmCreateDlUeCb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -KwDlUeCb **ueCb +RlcDlUeCb **ueCb ) #else PUBLIC S16 kwDbmCreateDlUeCb(gCb,ueId, cellId, ueCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -KwDlUeCb **ueCb; +RlcDlUeCb **ueCb; #endif { - KwDlUeCb *tUeCb; + RlcDlUeCb *tUeCb; TRC3(kwDbmCreateDlUeCb) - KW_ALLOC(gCb,*ueCb, sizeof(KwDlUeCb)); + RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb)); #if (ERRCLASS & ERRCLS_ADD_RES) if (*ueCb == NULLP) @@ -506,7 +506,7 @@ KwDlUeCb **ueCb; * * @details * This function is invoked by CFG to fetch UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] ueId UE Identifier @@ -520,17 +520,17 @@ KwDlUeCb **ueCb; #ifdef ANSI PUBLIC S16 kwDbmFetchDlUeCb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -KwDlUeCb **ueCb +RlcDlUeCb **ueCb ) #else PUBLIC S16 kwDbmFetchDlUeCb(gCb,ueId, cellId, ueCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -KwDlUeCb **ueCb; +RlcDlUeCb **ueCb; #endif { @@ -550,7 +550,7 @@ KwDlUeCb **ueCb; * * @details * This function is invoked by CFG to delete UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * * @param[in] gCb RLC Instance Control Block @@ -563,14 +563,14 @@ KwDlUeCb **ueCb; #ifdef ANSI PUBLIC Void kwDbmDelDlUeCb ( -KwCb *gCb, -KwDlUeCb *ueCb, +RlcCb *gCb, +RlcDlUeCb *ueCb, Bool abortFlag ) #else PUBLIC Void kwDbmDelDlUeCb(gCb,eCb, abortFlag) -KwCb *gCb; -KwDlUeCb *ueCb; +RlcCb *gCb; +RlcDlUeCb *ueCb; Bool abortFlag; #endif { @@ -583,7 +583,7 @@ Bool abortFlag; defined(PJ_CMP_ASYNC)))*/ /* Delete all logical channels */ - KW_MEM_ZERO(ueCb->lCh,sizeof(KwDlLch) * KW_MAX_LCH_PER_UE); + KW_MEM_ZERO(ueCb->lCh,sizeof(RlcDlLch) * KW_MAX_LCH_PER_UE); /* Delete all SRB RbCbs in UeCb */ kwDbmDelAllDlRb(gCb,ueCb->srbCb, KW_MAX_SRB_PER_UE); @@ -602,7 +602,7 @@ Bool abortFlag; gCb->genSts.numUe--; /* Deallocate ueCb */ - KW_FREE(gCb,ueCb, sizeof(KwDlUeCb)); + RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb)); RETVOID; } /* kwDbmDelUeCb */ @@ -613,7 +613,7 @@ Bool abortFlag; * * @details * This function is invoked by CFG to delete all UeCbs from the Ue - * hashlist of KwCb. + * hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @@ -622,14 +622,14 @@ Bool abortFlag; #ifdef ANSI PUBLIC Void kwDbmDelAllDlUe ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmDelAllDlUe(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - KwDlUeCb *ueCb = NULLP; + RlcDlUeCb *ueCb = NULLP; TRC3(kwDbmDelAllDlUe) @@ -653,13 +653,13 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe ( -KwCb *gCb, -KwDlUeCb *ueCb +RlcCb *gCb, +RlcDlUeCb *ueCb ) #else PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb) -KwCb *gCb; -KwDlUeCb *ueCb; +RlcCb *gCb; +RlcDlUeCb *ueCb; #endif { U8 tbIdx; @@ -669,7 +669,7 @@ KwDlUeCb *ueCb; l2MeasTb = ueCb->l2MeasTbCb[tbIdx]; if(l2MeasTb != NULLP) { - KW_FREE(gCb,l2MeasTb, sizeof(KwL2MeasTb)); + RLC_FREE(gCb,l2MeasTb, sizeof(KwL2MeasTb)); ueCb->l2MeasTbCb[tbIdx] = NULLP; } } @@ -682,7 +682,7 @@ KwDlUeCb *ueCb; * * @details * This function is invoked by CFG to create CellCb and insert into - * the Cell hashlist of KwCb. + * the Cell hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellId Cell Identifier @@ -695,22 +695,22 @@ KwDlUeCb *ueCb; #ifdef ANSI PUBLIC S16 kwDbmCreateDlCellCb ( -KwCb *gCb, +RlcCb *gCb, CmLteCellId cellId, -KwDlCellCb **cellCb +RlcDlCellCb **cellCb ) #else PUBLIC S16 kwDbmCreateDlCellCb(gCb,cellId, cellCb) -KwCb *gCb; +RlcCb *gCb; CmLteCellId cellId; -KwDlCellCb **cellCb; +RlcDlCellCb **cellCb; #endif { - KwDlCellCb *tCellCb; + RlcDlCellCb *tCellCb; TRC3(kwDbmCreateDlCellCb) - KW_ALLOC(gCb,*cellCb, sizeof(KwDlCellCb)); + RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb)); #if (ERRCLASS & ERRCLS_ADD_RES) if (*cellCb == NULLP) { @@ -740,7 +740,7 @@ KwDlCellCb **cellCb; * * @details * This function is invoked by CFG to fetch UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellId Cell Identifier @@ -754,15 +754,15 @@ KwDlCellCb **cellCb; #ifdef ANSI PUBLIC S16 kwDbmFetchDlCellCb ( -KwCb *gCb, +RlcCb *gCb, CmLteCellId cellId, -KwDlCellCb **cellCb +RlcDlCellCb **cellCb ) #else PUBLIC S16 kwDbmFetchDlCellCb(gCb,cellId, cellCb) -KwCb *gCb; +RlcCb *gCb; CmLteCellId cellId; -KwDlCellCb **cellCb; +RlcDlCellCb **cellCb; #endif { TRC3(kwDbmFetchDlCellCb) @@ -789,7 +789,7 @@ KwDlCellCb **cellCb; * * @details * This function is invoked by CFG to delete CellCb from the Cell hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellCb Cell Control Block @@ -799,13 +799,13 @@ KwDlCellCb **cellCb; #ifdef ANSI PUBLIC Void kwDbmDelDlCellCb ( -KwCb *gCb, -KwDlCellCb *cellCb +RlcCb *gCb, +RlcDlCellCb *cellCb ) #else PUBLIC Void kwDbmDelDlCellCb(gCb,cellCb) -KwCb *gCb; -KwDlCellCb *cellCb; +RlcCb *gCb; +RlcDlCellCb *cellCb; #endif { TRC3(kwDbmDelDlCellCb) @@ -821,7 +821,7 @@ KwDlCellCb *cellCb; } /* Deallocate cellCb */ - KW_FREE(gCb, cellCb, sizeof(KwDlCellCb)); + RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb)); RETVOID; } /* kwDbmDelCellCb */ @@ -832,7 +832,7 @@ KwDlCellCb *cellCb; * * @details * This function is invoked by CFG to delete all UeCbs from the Ue - * hashlist of KwCb. + * hashlist of RlcCb. * @param[in] gCb RLC Instance Control Block * * @return Void @@ -840,14 +840,14 @@ KwDlCellCb *cellCb; #ifdef ANSI PUBLIC Void kwDbmDelAllDlCell ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmDelAllDlCell(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - KwDlCellCb *cellCb = NULLP; + RlcDlCellCb *cellCb = NULLP; TRC3(kwDbmDelAllDlCell) @@ -871,7 +871,7 @@ KwCb *gCb; * * @details * This function is invoked by LMM to delete all UeCbs from the Ue - * hashlist of KwCb and cellCbs from the Cell hashlist of kwCb. + * hashlist of RlcCb and cellCbs from the Cell hashlist of rlcCb. * * @param[in] gCb RLC Instance Control Block * @@ -880,11 +880,11 @@ KwCb *gCb; #ifdef ANSI PUBLIC S16 kwDbmDlShutdown ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC S16 kwDbmDlShutdown(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { TRC3(kwDbmDlShutdown)