From 3d078984f533661105aee11d52c0e5bd5e5481e4 Mon Sep 17 00:00:00 2001 From: barveankit Date: Tue, 28 Dec 2021 18:10:53 +0530 Subject: [PATCH] Renaming GET_UE_IDX to GET_UE_ID in RLC and its interfaces [Issue-ID: ODUHIGH-401] Signed-off-by: barveankit Change-Id: I5c6930092a6991b0d4c229f40fa675d2b3bc4133 --- src/5gnrmac/mac_msg_hdl.c | 4 ++-- src/5gnrrlc/rlc_msg_hdl.c | 20 ++++++++++---------- src/5gnrrlc/rlc_tmm_dl.c | 2 +- src/5gnrrlc/rlc_tmm_ul.c | 2 +- src/5gnrrlc/rlc_utl_dl.c | 10 +++++----- src/5gnrrlc/rlc_utl_ul.c | 4 ++-- src/cm/du_app_rlc_inf.h | 14 +++++++------- src/cm/rlc_mac_inf.h | 2 +- src/cu_stub/cu_f1ap_msg_hdl.h | 2 +- src/du_app/du_msg_hdl.c | 11 +++++------ src/du_app/du_ue_mgr.c | 24 ++++++++++++------------ 11 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 66a55b077..e59e9bb19 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -283,7 +283,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) { memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); dlBoInfo.cellId = dlData->boStatus[lcIdx].cellId; - GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueIdx); + GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueId); dlBoInfo.lcId = dlData->boStatus[lcIdx].lcId; dlBoInfo.dataVolume = dlData->boStatus[lcIdx].bo; sendDlRlcBoInfoToSch(&dlBoInfo); @@ -383,7 +383,7 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) DlRlcBoInfo dlBoInfo; dlBoInfo.cellId = boStatus->cellId; - GET_CRNTI(dlBoInfo.crnti, boStatus->ueIdx); + GET_CRNTI(dlBoInfo.crnti, boStatus->ueId); dlBoInfo.lcId = boStatus->lcId; dlBoInfo.dataVolume = boStatus->bo; diff --git a/src/5gnrrlc/rlc_msg_hdl.c b/src/5gnrrlc/rlc_msg_hdl.c index 0e2aa41bf..af317369a 100644 --- a/src/5gnrrlc/rlc_msg_hdl.c +++ b/src/5gnrrlc/rlc_msg_hdl.c @@ -64,7 +64,7 @@ uint8_t fillRlcUeCfgRsp(RlcUeCfgRsp *rlcCfgRsp, RlcCfgCfmInfo *rlcCRsp) uint8_t ret = ROK; rlcCfgRsp->cellId = rlcCRsp->cellId; - rlcCfgRsp->ueIdx = rlcCRsp->ueId; + rlcCfgRsp->ueId = rlcCRsp->ueId; for(idx = 0; idx < rlcCRsp->numEnt; idx++) { if(rlcCRsp->entCfgCfm[idx].status.status == CKW_CFG_CFM_OK) @@ -226,7 +226,7 @@ uint8_t fillRlcCfg(RlcCb *gCb, RlcCfgInfo *rlcUeCfg, RlcUeCfg *ueCfg) { uint8_t lcIdx; - rlcUeCfg->ueId = ueCfg->ueIdx; + rlcUeCfg->ueId = ueCfg->ueId; rlcUeCfg->cellId = ueCfg->cellId; rlcUeCfg->numEnt = ueCfg->numLcs; rlcUeCfg->transId = getTransId(); @@ -262,7 +262,7 @@ void fillRlcCfgFailureRsp(RlcCfgCfmInfo *cfgRsp, RlcUeCfg *ueCfg) { uint8_t cfgIdx =0; - cfgRsp->ueId = ueCfg->ueIdx; + cfgRsp->ueId = ueCfg->ueId; cfgRsp->cellId = ueCfg->cellId; cfgRsp->numEnt = ueCfg->numLcs; for(cfgIdx =0; cfgIdxnumLcs; cfgIdx++) @@ -353,7 +353,7 @@ uint8_t BuildAndSendRrcDeliveryReportToDu( RlcDlRrcMsgInfo *dlRrcMsgInfo ) if(rrcDelivery) { rrcDelivery->cellId = dlRrcMsgInfo->cellId; - rrcDelivery->ueIdx = dlRrcMsgInfo->ueIdx; + rrcDelivery->ueId = dlRrcMsgInfo->ueId; rrcDelivery->srbId = dlRrcMsgInfo->lcId ; rrcDelivery->rrcDeliveryStatus.deliveryStatus = PDCP_SN; rrcDelivery->rrcDeliveryStatus.triggeringMessage = PDCP_SN; @@ -402,7 +402,7 @@ uint8_t RlcProcDlRrcMsgTransfer(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo) datReqInfo->rlcId.rbType = dlRrcMsgInfo->rbType; datReqInfo->rlcId.rbId = dlRrcMsgInfo->rbId; - datReqInfo->rlcId.ueId = dlRrcMsgInfo->ueIdx; + datReqInfo->rlcId.ueId = dlRrcMsgInfo->ueId; datReqInfo->rlcId.cellId = dlRrcMsgInfo->cellId; datReqInfo->lcType = dlRrcMsgInfo->lcType; datReqInfo->sduId = ++(rlcCb[pst->dstInst]->dlSduId); @@ -491,7 +491,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) memset(cLchUlDat, 0, sizeof(RguCDatIndInfo)); cLchUlDat->cellId = ulData->cellId; - GET_UE_IDX(ulData->rnti, cLchUlDat->rnti); + GET_UE_ID(ulData->rnti, cLchUlDat->rnti); cLchUlDat->lcId = ulData->pduInfo[idx].lcId; /* Copy fixed buffer to message */ @@ -553,7 +553,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) if(dLchPduPres) { dLchUlDat->cellId = ulData->cellId; - GET_UE_IDX(ulData->rnti, dLchUlDat->rnti); + GET_UE_ID(ulData->rnti, dLchUlDat->rnti); for(idx = 0; idx < MAX_NUM_LC; idx++) { @@ -707,7 +707,7 @@ uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) RlcCfgCfmInfo *cfgRsp; Pst rspPst; - DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEIDX[%d]",ueCfg->cellId, ueCfg->ueIdx); + DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEIDX[%d]",ueCfg->cellId, ueCfg->ueId); rlcUeCb = RLC_GET_RLCCB(pst->dstInst); RLC_ALLOC(rlcUeCb, rlcUeCfg, sizeof(RlcCfgInfo)); @@ -777,7 +777,7 @@ uint8_t RlcProcDlUserDataTransfer(Pst *pst, RlcDlUserDataInfo *dlDataMsgInfo) datReqInfo->rlcId.rbType = RB_TYPE_DRB; datReqInfo->rlcId.rbId = dlDataMsgInfo->rbId; - datReqInfo->rlcId.ueId = dlDataMsgInfo->ueIdx; + datReqInfo->rlcId.ueId = dlDataMsgInfo->ueId; datReqInfo->rlcId.cellId = dlDataMsgInfo->cellId; datReqInfo->lcType = LCH_DTCH; datReqInfo->sduId = ++(rlcCb[pst->dstInst]->dlSduId); @@ -804,7 +804,7 @@ uint8_t RlcProcDlUserDataTransfer(Pst *pst, RlcDlUserDataInfo *dlDataMsgInfo) * Functionality: * sending UE delete response to DU * - * @params[in] uint8_t cellId, uint8_t ueIdx, UeDeleteResult result + * @params[in] uint8_t cellId, uint8_t ueId, UeDeleteResult result * * @return ROK - success * RFAILED - failure diff --git a/src/5gnrrlc/rlc_tmm_dl.c b/src/5gnrrlc/rlc_tmm_dl.c index a11d2e7c4..b49247238 100755 --- a/src/5gnrrlc/rlc_tmm_dl.c +++ b/src/5gnrrlc/rlc_tmm_dl.c @@ -413,7 +413,7 @@ static void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, RlcDatReqInf } boStatus->cellId = rbCb->rlcId.cellId; - boStatus->ueIdx = rbCb->rlcId.ueId; + boStatus->ueId = rbCb->rlcId.ueId; boStatus->commCh = TRUE; boStatus->lcId = rbCb->lch.lChId; boStatus->bo = bo; diff --git a/src/5gnrrlc/rlc_tmm_ul.c b/src/5gnrrlc/rlc_tmm_ul.c index 8094f7433..614254c4b 100755 --- a/src/5gnrrlc/rlc_tmm_ul.c +++ b/src/5gnrrlc/rlc_tmm_ul.c @@ -247,7 +247,7 @@ void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu) if (ulRrcMsgInfo) { ulRrcMsgInfo->cellId = rbCb->rlcId.cellId; - ulRrcMsgInfo->ueIdx = rbCb->rlcId.ueId; + ulRrcMsgInfo->ueId = rbCb->rlcId.ueId; ulRrcMsgInfo->lcId = rbCb->lch.lChId; RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, ulRrcMsgInfo->rrcMsg, msgLen); diff --git a/src/5gnrrlc/rlc_utl_dl.c b/src/5gnrrlc/rlc_utl_dl.c index 444879f6e..877e47182 100755 --- a/src/5gnrrlc/rlc_utl_dl.c +++ b/src/5gnrrlc/rlc_utl_dl.c @@ -298,7 +298,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) dlData->numPdu++; }/* For per PDU */ dlData->boStatus[dlData->numLc].cellId = datReqInfo->cellId; - GET_UE_IDX(datPerUe.rnti, dlData->boStatus[dlData->numLc].ueIdx); + GET_UE_ID(datPerUe.rnti, dlData->boStatus[dlData->numLc].ueId); dlData->boStatus[dlData->numLc].commCh = false; dlData->boStatus[dlData->numLc].lcId = datPerLch.lcId; dlData->boStatus[dlData->numLc].bo = datPerLch.boReport.bo + datPerLch.boReport.estRlcHdrSz; @@ -320,7 +320,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) break; } boStatus->cellId = dlData->cellId; - GET_UE_IDX(dlData->rnti, boStatus->ueIdx); + GET_UE_ID(dlData->rnti, boStatus->ueId); boStatus->commCh = FALSE; boStatus->lcId = dlData->boStatus[lchIdx].lcId; boStatus->bo = dlData->boStatus[lchIdx].bo; @@ -464,8 +464,8 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) { staInd = &staIndInfo->staInd[idx]; /* Fetch Ue control block */ - GET_UE_IDX(staInd->rnti, ueId); - if(ROK != rlcDbmFetchDlUeCb(gCb, ueId, staIndInfo->cellId,&ueCb)) + GET_UE_ID(staInd->rnti, ueId); + if(ROK != rlcDbmFetchDlUeCb(gCb, ueId, staIndInfo->cellId, &ueCb)) { /* Fetch UeCb failed */ DU_LOG("\nERROR --> RLC_DL : rlcUtlSendToMac: UeId[%u]:ueCb not found", @@ -704,7 +704,7 @@ uint8_t rlcUtlSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, int32_t bo, \ boStatus, sizeof(RlcBoStatus)); boStatus->cellId = rbCb->rlcId.cellId; - boStatus->ueIdx = rbCb->rlcId.ueId; + boStatus->ueId = rbCb->rlcId.ueId; boStatus->commCh = FALSE; boStatus->lcId = rbCb->lch.lChId; boStatus->bo = bo + estHdrSz; diff --git a/src/5gnrrlc/rlc_utl_ul.c b/src/5gnrrlc/rlc_utl_ul.c index 507d8c1f5..77ec0b590 100755 --- a/src/5gnrrlc/rlc_utl_ul.c +++ b/src/5gnrrlc/rlc_utl_ul.c @@ -232,7 +232,7 @@ uint8_t rlcUtlSendUlDataToDu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *sdu) if (ulRrcMsgInfo) { ulRrcMsgInfo->cellId = rbCb->rlcId.cellId; - ulRrcMsgInfo->ueIdx = rbCb->rlcId.ueId; + ulRrcMsgInfo->ueId = rbCb->rlcId.ueId; ulRrcMsgInfo->lcId = rbCb->lch.lChId; ODU_GET_MSG_LEN(sdu, (MsgLen *)&msgLen); RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, @@ -267,7 +267,7 @@ uint8_t rlcUtlSendUlDataToDu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *sdu) if (ulUserDatInfo) { ulUserDatInfo->cellId = rbCb->rlcId.cellId; - ulUserDatInfo->ueIdx = rbCb->rlcId.ueId; + ulUserDatInfo->ueId = rbCb->rlcId.ueId; ulUserDatInfo->rbId = rbCb->rlcId.rbId; ODU_GET_MSG_LEN(sdu, (MsgLen *)&msgLen); RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, ulUserDatInfo->userData, msgLen); diff --git a/src/cm/du_app_rlc_inf.h b/src/cm/du_app_rlc_inf.h index dfed87452..aea59cb31 100644 --- a/src/cm/du_app_rlc_inf.h +++ b/src/cm/du_app_rlc_inf.h @@ -197,7 +197,7 @@ typedef struct rlcBearerCfg typedef struct rlcUeCfg { uint16_t cellId; - uint8_t ueIdx; + uint8_t ueId; uint8_t numLcs; RlcBearerCfg rlcLcCfg[MAX_NUM_LC]; UeCfgState rlcUeCfgState; /* InActive / Completed */ @@ -206,7 +206,7 @@ typedef struct rlcUeCfg typedef struct rlcUeCfgRsp { uint16_t cellId; - uint16_t ueIdx; + uint16_t ueId; RlcRsp result; FailureReason reason; }RlcUeCfgRsp; @@ -228,7 +228,7 @@ typedef struct rlcUeDeleteRsp typedef struct ulRrcMsgInfo { uint16_t cellId; /* Cell Id */ - uint16_t ueIdx; /* UE Index */ + uint16_t ueId; /* UE Id */ uint8_t lcId; /* Logical channel Id */ uint16_t msgLen; /* RRC message length (in bytes) */ uint8_t *rrcMsg; /* RRC Message (UL-DCCH Message) */ @@ -238,7 +238,7 @@ typedef struct ulRrcMsgInfo typedef struct ulUserDatInfo { uint16_t cellId; /* Cell Id */ - uint16_t ueIdx; /* UE Index */ + uint16_t ueId; /* UE Id */ uint8_t rbId; uint16_t msgLen; /* User data length (in bytes) */ uint8_t *userData; /* User data (UL-DTCH Message) */ @@ -248,7 +248,7 @@ typedef struct ulUserDatInfo typedef struct dlRrcMsgInfo { uint16_t cellId; /* Cell Id */ - uint16_t ueIdx; /* UE index */ + uint16_t ueId; /* UE Id */ uint8_t rbType; /* Radio Bearer Type */ uint8_t rbId; /* Radio Bearer Id */ uint8_t lcType; /* Logical channel type */ @@ -297,7 +297,7 @@ typedef struct slicePmList typedef struct rrcDeliveryReportInfo { uint16_t cellId; - uint16_t ueIdx; + uint16_t ueId; uint8_t srbId; RrcDeliveryStatus rrcDeliveryStatus; }RrcDeliveryReport; @@ -306,7 +306,7 @@ typedef struct rrcDeliveryReportInfo typedef struct dlDataMsgInfo { uint16_t cellId; /* Cell Id */ - uint16_t ueIdx; /* UE index */ + uint16_t ueId; /* UE Id */ uint8_t rbId; /* Radio Bearer Id */ uint16_t msgLen; /* Message length */ Buffer *dlMsg; /* DL Data */ diff --git a/src/cm/rlc_mac_inf.h b/src/cm/rlc_mac_inf.h index 89748d9e6..5cbbc9ff6 100644 --- a/src/cm/rlc_mac_inf.h +++ b/src/cm/rlc_mac_inf.h @@ -34,7 +34,7 @@ typedef struct rlcBoStatus { uint16_t cellId; /*!< CELL ID */ - uint16_t ueIdx; /*!< UE ID */ + uint16_t ueId; /*!< UE ID */ bool commCh; /*!< Common or Dedicated Channel */ uint8_t lcId; /*!< Logical channel ID */ uint32_t bo; /*!< Buffer occupancy reported by RLC */ diff --git a/src/cu_stub/cu_f1ap_msg_hdl.h b/src/cu_stub/cu_f1ap_msg_hdl.h index a2bb39c79..8eb0cb59b 100644 --- a/src/cu_stub/cu_f1ap_msg_hdl.h +++ b/src/cu_stub/cu_f1ap_msg_hdl.h @@ -60,7 +60,7 @@ #define DRB_ID_TO_ADD_MOD MAX_DRB_SET_UE_CONTEXT_SETUP_REQ+1 /*The DRB ID: which will be added using Modification Procedure*/ /*Total num of DRBs added using UE COntext Setup and Modification procedures*/ -#define MAX_NUM_DRB_ADDED_PER_UE MAX_DRB_SET_UE_CONTEXT_SETUP_REQ + MAX_DRB_SET_UE_CONTEXT_MOD_REQ +#define MAX_NUM_DRB_ADDED_PER_UE (MAX_DRB_SET_UE_CONTEXT_SETUP_REQ + MAX_DRB_SET_UE_CONTEXT_MOD_REQ) #define CU_UE_F1AP_ID 0 #define DU_UE_F1AP_ID 1 diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index 4161082c5..95d7e33e0 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -1712,13 +1712,12 @@ uint8_t DuProcRlcUlRrcMsgTrans(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo) if(duGetCellCb(ulRrcMsgInfo->cellId, &cellCb) != ROK) return RFAILED; - if(ulRrcMsgInfo->ueIdx > 0) + if(ulRrcMsgInfo->ueId > 0) { - ueCb = cellCb->ueCb[ulRrcMsgInfo->ueIdx -1]; + ueCb = cellCb->ueCb[ulRrcMsgInfo->ueId -1]; - BuildAndSendULRRCMessageTransfer(ueCb, ulRrcMsgInfo->lcId, ulRrcMsgInfo->msgLen, \ - ulRrcMsgInfo->rrcMsg); + BuildAndSendULRRCMessageTransfer(ueCb, ulRrcMsgInfo->lcId, ulRrcMsgInfo->msgLen, ulRrcMsgInfo->rrcMsg); DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulRrcMsgInfo->rrcMsg, ulRrcMsgInfo->msgLen); DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulRrcMsgInfo, sizeof(RlcUlRrcMsgInfo)); @@ -1751,7 +1750,7 @@ uint8_t DuProcRlcRrcDeliveryReport(Pst *pst, RrcDeliveryReport *rrcDeliveryRepor if(duGetCellCb(rrcDeliveryReport->cellId, &cellCb) != ROK) return RFAILED; - ueCb = cellCb->ueCb[rrcDeliveryReport->ueIdx -1]; + ueCb = cellCb->ueCb[rrcDeliveryReport->ueId -1]; ret = BuildAndSendRrcDeliveryReport(ueCb.gnbCuUeF1apId, ueCb.gnbDuUeF1apId,rrcDeliveryReport); DU_FREE_SHRABL_BUF(pst->region, pst->pool, rrcDeliveryReport, sizeof(RrcDeliveryReport)); @@ -1793,7 +1792,7 @@ uint8_t DuProcRlcUlUserDataTrans(Pst *pst, RlcUlUserDatInfo *ulUserData) for(teIdx = 0; teIdx < duCb.numTeId; teIdx++) { /*TODO: If multiple Cell Support is enables then CellId also needs to be validated alongwith ueId and DrbId*/ - if((duCb.upTnlCfg[teIdx] != NULLP) && (duCb.upTnlCfg[teIdx]->ueIdx == ulUserData->ueIdx) && \ + if((duCb.upTnlCfg[teIdx] != NULLP) && (duCb.upTnlCfg[teIdx]->ueIdx == ulUserData->ueId) && \ (duCb.upTnlCfg[teIdx]->drbId == ulUserData->rbId)) { if(duCb.upTnlCfg[teIdx]->tnlCfg1) diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c index aae4869d1..74fe66d59 100644 --- a/src/du_app/du_ue_mgr.c +++ b/src/du_app/du_ue_mgr.c @@ -170,7 +170,7 @@ uint8_t fillDlUserDataInfo(uint32_t teId, RlcDlUserDataInfo *dlDataMsgInfo) if(duCb.upTnlCfg[teIdx]->tnlCfg1->teId == teId) { dlDataMsgInfo->cellId = duCb.upTnlCfg[teIdx]->cellId; - dlDataMsgInfo->ueIdx = duCb.upTnlCfg[teIdx]->ueIdx; + dlDataMsgInfo->ueId = duCb.upTnlCfg[teIdx]->ueIdx; dlDataMsgInfo->rbId = duCb.upTnlCfg[teIdx]->drbId; return ROK; } @@ -386,7 +386,7 @@ uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, F1DlRrcMsg /* Filling up the RRC msg info */ dlRrcMsgInfo->cellId = cellId; - dlRrcMsgInfo->ueIdx = ueCfg.ueIdx; + dlRrcMsgInfo->ueId = ueCfg.ueId; for(lcIdx = 0; lcIdx <= MAX_NUM_LC; lcIdx++) { if(ueCfg.rlcLcCfg[lcIdx].lcId == f1DlRrcMsg->srbId) @@ -1601,7 +1601,7 @@ uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueIdx,\ { /* Initial RB being Added */ rlcUeCfg->cellId = cellId; - rlcUeCfg->ueIdx = ueIdx; + rlcUeCfg->ueId = ueIdx; ret = fillRlcSrb1LcCfg(&rlcUeCfg->rlcLcCfg[0]); if(ret == ROK) rlcUeCfg->numLcs++; @@ -1616,7 +1616,7 @@ uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueIdx,\ duRlcDb->rlcUeCfgState = UE_CFG_INPROGRESS; /*Filling RlcUeCfg */ rlcUeCfg->cellId = cellId; - rlcUeCfg->ueIdx = ueIdx; + rlcUeCfg->ueId = ueIdx; for(dbIdx = 0; (dbIdx < ueCfgDb->numRlcLcs && ret == ROK); dbIdx++) { ret = fillDefaultRlcModeCfg(ueCfgDb->rlcLcCfg[dbIdx].rlcMode, &ueCfgDb->rlcLcCfg[dbIdx]); @@ -2253,7 +2253,7 @@ uint8_t duUpdateDuUeCbCfg(uint8_t ueIdx, uint8_t cellId) /*Filling RLC Ue Cfg */ ueCb->rlcUeCfg.cellId = cellId; - ueCb->rlcUeCfg.ueIdx = ueIdx; + ueCb->rlcUeCfg.ueId = ueIdx; ret = duUpdateRlcLcCfg(&ueCb->rlcUeCfg, ueCb->f1UeDb); if(ret == ROK) { @@ -2428,25 +2428,25 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) { if(pst->event == EVENT_RLC_UE_CREATE_RSP) { - DU_LOG("\nINFO --> DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx); - duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\ + DU_LOG("\nINFO --> DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueId); + duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].\ rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE; } else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP) { - DU_LOG("\nINFO --> DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx); - duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\ + DU_LOG("\nINFO --> DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueId); + duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].\ rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE; - if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK) + if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK) { - BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueIdx); + BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueId); } } } else { DU_LOG("\nERROR --> DU_APP: RLC UE CFG Response for EVENT[%d] : FAILED [UE IDX : %d, REASON :%d]",\ - pst->event, cfgRsp->ueIdx, cfgRsp->reason); + pst->event, cfgRsp->ueId, cfgRsp->reason); if((pst->event == EVENT_RLC_UE_RECONFIG_RSP)) { //TODO: update failure case in ue Context setup Response -- 2.16.6