From f27b7e83366beb014dd32e1eb6d22d8901501eeb Mon Sep 17 00:00:00 2001 From: barveankit Date: Wed, 29 Dec 2021 15:35:54 +0530 Subject: [PATCH] Renaming UE IDX to UE ID in SCH and its interfaces [Issue-ID: ODUHIGH-401] Signed-off-by: barveankit Change-Id: I6bd98803c6c0bbdea6e0fcbb3f2691932cce157d --- src/5gnrmac/mac.h | 1 + src/5gnrmac/mac_ue_mgr.c | 6 +++--- src/5gnrsch/sch.c | 6 +++--- src/5gnrsch/sch.h | 5 ++--- src/5gnrsch/sch_common.c | 12 ++++++------ src/5gnrsch/sch_rach.c | 18 +++++++++--------- src/5gnrsch/sch_ue_mgr.c | 27 +++++++++++++-------------- src/5gnrsch/sch_utils.c | 6 +++--- src/cm/mac_sch_interface.h | 2 +- 9 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/5gnrmac/mac.h b/src/5gnrmac/mac.h index 6f611b2cd..a9acee322 100644 --- a/src/5gnrmac/mac.h +++ b/src/5gnrmac/mac.h @@ -260,6 +260,7 @@ uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t ueIdx, uint8_t schInfoIdx); uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]); +void freeMacSliceCfgReq(MacSliceCfgReq *cfgReq,Pst *pst); #endif /********************************************************************** End of file diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c index 8b92f9552..73d9394da 100644 --- a/src/5gnrmac/mac_ue_mgr.c +++ b/src/5gnrmac/mac_ue_mgr.c @@ -2345,7 +2345,7 @@ uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) /* Filling UE Config response */ memset(cfgRsp, 0, sizeof(MacUeCfgRsp)); cfgRsp->cellId = schCfgRsp->cellId; - cfgRsp->ueIdx = schCfgRsp->ueIdx; + cfgRsp->ueIdx = schCfgRsp->ueId; cfgRsp->result = result; /* Fill Post structure and send UE Create response*/ @@ -2385,7 +2385,7 @@ uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) /* Filling UE Config response */ memset(cfgRsp, 0, sizeof(MacUeCfgRsp)); cfgRsp->cellId = schCfgRsp->cellId; - cfgRsp->ueIdx = schCfgRsp->ueIdx; + cfgRsp->ueIdx = schCfgRsp->ueId; cfgRsp->result = result; /* Fill Post structure and send UE Create response*/ @@ -2467,7 +2467,7 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp) #endif GET_CELL_IDX(schCfgRsp->cellId, cellIdx); - ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx); + ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueId); if(ueCfg == NULLP) { DU_LOG("\nERROR --> MAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event); diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index f0bf4e79d..d5580faf1 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -960,7 +960,7 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) return RFAILED; } - GET_UE_IDX(dlBoInfo->crnti, ueId); + GET_UE_ID(dlBoInfo->crnti, ueId); ueCb = &cell->ueCb[ueId-1]; lcId = dlBoInfo->lcId; CHECK_LCID(lcId, isLcIdValid); @@ -1073,7 +1073,7 @@ uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd) } /* Adding UE Id to list of pending UEs to be scheduled */ - addUeToBeScheduled(cellCb, ueCb->ueIdx); + addUeToBeScheduled(cellCb, ueCb->ueId); return ROK; } @@ -1120,7 +1120,7 @@ uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd) ueCb->srRcvd = true; /* Adding UE Id to list of pending UEs to be scheduled */ - addUeToBeScheduled(cellCb, ueCb->ueIdx); + addUeToBeScheduled(cellCb, ueCb->ueId); } return ROK; } diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 1b262b3c7..0c0b7abd9 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -267,7 +267,7 @@ typedef struct schLcPrbEstimate */ typedef struct schUeCb { - uint16_t ueIdx; + uint16_t ueId; uint16_t crnti; SchUeCfgCb ueCfg; SchUeState state; @@ -373,12 +373,11 @@ uint8_t schBroadcastSsbAlloc(SchCellCb *cell, SlotTimingInfo slotTime, DlBrdcstA uint8_t schBroadcastSib1Alloc(SchCellCb *cell, SlotTimingInfo slotTime, DlBrdcstAlloc *dlBrdcstAlloc); bool schProcessRaReq(SchCellCb *cellCb, SlotTimingInfo currTime, uint8_t ueId); bool schProcessMsg4Req(SchCellCb *cell, SlotTimingInfo currTime, uint8_t ueId); -uint8_t schFillRar(SchCellCb *cell, SlotTimingInfo rarTime, uint16_t ueIdx, RarAlloc *rarAlloc, uint8_t k0Index); +uint8_t schFillRar(SchCellCb *cell, SlotTimingInfo rarTime, uint16_t ueId, RarAlloc *rarAlloc, uint8_t k0Index); uint8_t schDlRsrcAllocDlMsg(SchCellCb *cell, SlotTimingInfo slotTime, uint16_t crnti, uint32_t tbSize, DlMsgAlloc *dlMsgAlloc, uint16_t startPRB, uint8_t pdschStartSymbol, uint8_t pdschNumSymbols); uint8_t schDlRsrcAllocMsg4(SchCellCb *cell, SlotTimingInfo msg4Time, uint8_t ueId, DlMsgAlloc *msg4Alloc,\ uint8_t pdschStartSymbol, uint8_t pdschNumSymbols); -uint16_t schAccumalateLcBoSize(SchCellCb *cell, uint16_t ueIdx); uint8_t allocatePrbDl(SchCellCb *cell, SlotTimingInfo slotTime, uint8_t startSymbol, uint8_t symbolLength, \ uint16_t *startPrb, uint16_t numPrb); void fillDlMsgInfo(DlMsgInfo *dlMsgInfo, uint8_t crnti); diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c index 89f565ecd..4907c773c 100644 --- a/src/5gnrsch/sch_common.c +++ b/src/5gnrsch/sch_common.c @@ -408,14 +408,14 @@ uint8_t fillUlSchedPucchDedicatedCfg(SchCellCb *cell, SchPucchCfg *pucchDedCfg,\ uint16_t fillPucchResourceInfo(SchPucchInfo *schPucchInfo, Inst inst, SlotTimingInfo slotInfo) { - uint8_t ret = ROK, ueIdx = 0, pucchIdx = 0; + uint8_t ret = ROK, ueId = 0, ueIdx = 0, pucchIdx = 0; SchCellCb *cell = schCb[inst].cells[inst]; SchPucchCfgCmn *pucchCfg = NULLP; SchBwpParams *ulBwp = NULLP; uint16_t startPrb; - GET_UE_IDX(schPucchInfo->rnti, ueIdx); - ueIdx--; + GET_UE_ID(schPucchInfo->rnti, ueId); + ueIdx = ueId -1; if(cell->ueCb[ueIdx].ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfgPres) { /* fill pucch dedicated cfg */ @@ -751,7 +751,7 @@ uint16_t schAllocPucchResource(SchCellCb *cell, SlotTimingInfo pucchTime, uint16 uint8_t schDlRsrcAllocDlMsg(SchCellCb *cell, SlotTimingInfo slotTime, uint16_t crnti, uint32_t tbSize, DlMsgAlloc *dlMsgAlloc, uint16_t startPRB, uint8_t pdschStartSymbol, uint8_t pdschNumSymbols) { - uint8_t ueIdx; + uint8_t ueId=0; PdcchCfg *pdcch = NULLP; PdschCfg *pdsch = NULLP; BwpCfg *bwp = NULLP; @@ -764,8 +764,8 @@ uint8_t schDlRsrcAllocDlMsg(SchCellCb *cell, SlotTimingInfo slotTime, uint16_t c pdsch = &dlMsgAlloc->dlMsgSchedInfo[dlMsgAlloc->numSchedInfo].dlMsgPdschCfg; bwp = &dlMsgAlloc->dlMsgSchedInfo[dlMsgAlloc->numSchedInfo].bwp; - GET_UE_IDX(crnti, ueIdx); - ueCb = cell->ueCb[ueIdx-1]; + GET_UE_ID(crnti, ueId); + ueCb = cell->ueCb[ueId-1]; coreset1 = ueCb.ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; pdschCfg = ueCb.ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg; diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 562ebe2d0..d9c8e9bb5 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -223,11 +223,11 @@ uint16_t calculateRaRnti(uint8_t symbolIdx, uint8_t slotIdx, uint8_t freqIdx) **/ void createSchRaCb(uint16_t tcrnti, Inst schInst) { - uint8_t ueIdx = 0; + uint8_t ueId = 0; - GET_UE_IDX(tcrnti, ueIdx); - schCb[schInst].cells[schInst]->raCb[ueIdx -1].tcrnti = tcrnti; - schCb[schInst].cells[schInst]->raCb[ueIdx -1].msg4recvd = FALSE; + GET_UE_ID(tcrnti, ueId); + schCb[schInst].cells[schInst]->raCb[ueId -1].tcrnti = tcrnti; + schCb[schInst].cells[schInst]->raCb[ueId -1].msg4recvd = FALSE; } /** @@ -553,7 +553,7 @@ uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) SchRaReq *raReq = NULLP; float slotDuration; uint8_t winNumSlots; - uint8_t ueIdx; + uint8_t ueId; if(cell == NULLP) { @@ -562,8 +562,8 @@ uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) } /* Storing RA request in cellCb */ - GET_UE_IDX(rachInd->crnti, ueIdx); - if(ueIdx <= 0) + GET_UE_ID(rachInd->crnti, ueId); + if(ueId <= 0) { DU_LOG("\nERROR --> SCH: Invalid CRNTI [%d]", rachInd->crnti); return RFAILED; @@ -589,10 +589,10 @@ uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) /* Adding window size to window start time to get window end time */ ADD_DELTA_TO_TIME(raReq->winStartTime, raReq->winEndTime, winNumSlots); - cell->raReq[ueIdx -1] = raReq; + cell->raReq[ueId -1] = raReq; /* Adding UE Id to list of pending UEs to be scheduled */ - addUeToBeScheduled(cell, ueIdx); + addUeToBeScheduled(cell, ueId); return ROK; } diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index e3e01a557..2e411cbe7 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -73,7 +73,7 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ cfgRsp->cellId = ueCfg->cellId; cfgRsp->crnti = ueCfg->crnti; - GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx); + GET_UE_ID(ueCfg->crnti, cfgRsp->ueId); cfgRsp->rsp = result; /* Filling response post */ @@ -504,7 +504,7 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) * ****************************************************************/ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) { - uint8_t ueIdx, lcIdx, ret = ROK; + uint8_t ueId, lcIdx, ret = ROK; SchCellCb *cellCb = NULLP; SchUeCb *ueCb = NULLP; SchUeCfgRsp cfgRsp; @@ -524,15 +524,15 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ - GET_UE_IDX(ueCfg->crnti, ueIdx); - ueCb = &cellCb->ueCb[ueIdx -1]; + GET_UE_ID(ueCfg->crnti, ueId); + ueCb = &cellCb->ueCb[ueId -1]; if(ueCb) { if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) { - DU_LOG("\nDEBUG --> SCH : CRNTI %d already configured ", ueCfg->crnti); - SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); - return ROK; + DU_LOG("\nDEBUG --> SCH : CRNTI %d already configured ", ueCfg->crnti); + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); + return ROK; } } else @@ -544,15 +544,14 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) /* Fill received Ue Configuration in UeCb */ memset(ueCb, 0, sizeof(SchUeCb)); - GET_UE_IDX(ueCfg->crnti, ueIdx); - ueCb->ueIdx = ueIdx; + ueCb->ueId = ueId; ueCb->crnti = ueCfg->crnti; ueCb->state = SCH_UE_STATE_ACTIVE; ret = fillSchUeCb(ueCb, ueCfg); if(ret == ROK) { cellCb->numActvUe++; - SET_ONE_BIT(ueCb->ueIdx, cellCb->actvUeBitMap); + SET_ONE_BIT(ueCb->ueId, cellCb->actvUeBitMap); ueCb->cellCb = cellCb; ueCb->srRcvd = false; ueCb->bsrRcvd = false; @@ -738,7 +737,7 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo) * ****************************************************************/ uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) { - uint8_t ueIdx, lcIdx, ret = ROK; + uint8_t ueId, lcIdx, ret = ROK; SchCellCb *cellCb = NULLP; SchUeCb *ueCb = NULLP; SchUeCfgRsp cfgRsp; @@ -758,8 +757,8 @@ uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ - GET_UE_IDX(ueCfg->crnti, ueIdx); - ueCb = &cellCb->ueCb[ueIdx -1]; + GET_UE_ID(ueCfg->crnti, ueId); + ueCb = &cellCb->ueCb[ueId -1]; if(!ueCb) { @@ -1028,7 +1027,7 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) } else { - GET_UE_IDX(ueDelete->crnti, ueId); + GET_UE_ID(ueDelete->crnti, ueId); if(( cellCb->ueCb[ueId-1].crnti == ueDelete->crnti) && ( cellCb->ueCb[ueId-1].state == SCH_UE_STATE_ACTIVE)) { deleteSchUeCb(&cellCb->ueCb[ueId-1]); diff --git a/src/5gnrsch/sch_utils.c b/src/5gnrsch/sch_utils.c index a53232cd4..90b979d87 100644 --- a/src/5gnrsch/sch_utils.c +++ b/src/5gnrsch/sch_utils.c @@ -1143,9 +1143,9 @@ uint16_t schCalcTbSizeFromNPrb(uint16_t numPrb, uint16_t mcs, uint8_t numSymbols **/ SchUeCb* schGetUeCb(SchCellCb *cellCb, uint16_t crnti) { - uint16_t ueIdx; - GET_UE_IDX(crnti, ueIdx); - return &(cellCb->ueCb[ueIdx -1]); + uint16_t ueId; + GET_UE_ID(crnti, ueId); + return &(cellCb->ueCb[ueId -1]); } /** diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index 77e5148bb..860389197 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -1568,7 +1568,7 @@ typedef struct schUeCfg typedef struct schUeCfgRsp { - uint16_t ueIdx; + uint16_t ueId; uint16_t cellId; uint16_t crnti; SchMacRsp rsp; -- 2.16.6