{
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);
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;
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)
{
uint8_t lcIdx;
- rlcUeCfg->ueId = ueCfg->ueIdx;
+ rlcUeCfg->ueId = ueCfg->ueId;
rlcUeCfg->cellId = ueCfg->cellId;
rlcUeCfg->numEnt = ueCfg->numLcs;
rlcUeCfg->transId = getTransId();
{
uint8_t cfgIdx =0;
- cfgRsp->ueId = ueCfg->ueIdx;
+ cfgRsp->ueId = ueCfg->ueId;
cfgRsp->cellId = ueCfg->cellId;
cfgRsp->numEnt = ueCfg->numLcs;
for(cfgIdx =0; cfgIdx<ueCfg->numLcs; cfgIdx++)
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;
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);
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 */
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++)
{
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));
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);
* 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
}
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;
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);
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;
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;
{
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",
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;
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,
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);
typedef struct rlcUeCfg
{
uint16_t cellId;
- uint8_t ueIdx;
+ uint8_t ueId;
uint8_t numLcs;
RlcBearerCfg rlcLcCfg[MAX_NUM_LC];
UeCfgState rlcUeCfgState; /* InActive / Completed */
typedef struct rlcUeCfgRsp
{
uint16_t cellId;
- uint16_t ueIdx;
+ uint16_t ueId;
RlcRsp result;
FailureReason reason;
}RlcUeCfgRsp;
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) */
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) */
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 */
typedef struct rrcDeliveryReportInfo
{
uint16_t cellId;
- uint16_t ueIdx;
+ uint16_t ueId;
uint8_t srbId;
RrcDeliveryStatus rrcDeliveryStatus;
}RrcDeliveryReport;
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 */
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 */
#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
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));
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));
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)
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;
}
/* 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)
{
/* Initial RB being Added */
rlcUeCfg->cellId = cellId;
- rlcUeCfg->ueIdx = ueIdx;
+ rlcUeCfg->ueId = ueIdx;
ret = fillRlcSrb1LcCfg(&rlcUeCfg->rlcLcCfg[0]);
if(ret == ROK)
rlcUeCfg->numLcs++;
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]);
/*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)
{
{
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