From 8e65f271cc5bc90bc6a8d1adac108ab3bcdf75d1 Mon Sep 17 00:00:00 2001 From: barveankit Date: Tue, 21 Dec 2021 18:30:14 +0530 Subject: [PATCH] Renaming GET_UE_IDX to GET_UE_ID in 5gnrmac [Issue-ID: ODUHIGH-401] Signed-off-by: barveankit Change-Id: I6a50a8f2ac832bd994008d3085f18a5c8de990a1 Signed-off-by: barveankit --- src/5gnrmac/mac_demux.c | 7 ++++--- src/5gnrmac/mac_msg_hdl.c | 8 ++++---- src/5gnrmac/mac_mux.c | 6 +++--- src/5gnrmac/mac_slot_ind.c | 14 +++++++------- src/5gnrmac/mac_ue_mgr.c | 18 +++++++++--------- src/cm/common_def.h | 6 ++++++ 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c index a54228dd5..d244d5792 100644 --- a/src/5gnrmac/mac_demux.c +++ b/src/5gnrmac/mac_demux.c @@ -46,10 +46,11 @@ * ****************************************************************/ uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxDataIndPdu) { + uint8_t ueId = 0; /* UE Identity */ uint8_t ueIdx = 0; /* Iterator for UE list */ uint8_t lcId = 0; /* LC ID of a sub pdu */ uint8_t fBit = 0; /* Value of F Bit in MAC sub-header */ - uint8_t rxPduIdx = 0; /* Iterator for received PDU */ + uint8_t rxPduIdx = 0; /* Iterator for received PDU */ uint16_t length = 0; /* Length of payload in a sub-PDU */ uint8_t *pdu = NULLP; /* Payload in sub-PDU */ uint16_t pduLen = 0; /* Length of undecoded PDU */ @@ -72,8 +73,8 @@ uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxD } pduLen = rxDataIndPdu->pduLength; rxDataPdu = rxDataIndPdu->pduData; - GET_UE_IDX(rxDataIndPdu->rnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(rxDataIndPdu->rnti, ueId); + ueIdx = ueId -1; while(pduLen > 0) { diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index c1f8be211..66a55b077 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -234,7 +234,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) DU_LOG("\nDEBUG --> MAC: Received DL data for sfn=%d slot=%d numPdu= %d", \ dlData->slotInfo.sfn, dlData->slotInfo.slot, dlData->numPdu); - GET_UE_IDX(dlData->rnti, ueId); + GET_UE_ID(dlData->rnti, ueId); /* Copy the pdus to be muxed into mac Dl data */ macDlData.ueId = ueId; @@ -538,7 +538,7 @@ uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) * ****************************************************************/ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { - uint8_t ueIdx = 0; + uint8_t ueId = 0, ueIdx = 0; uint16_t cellIdx; uint16_t idx; DlRlcBoInfo dlBoInfo; @@ -558,8 +558,8 @@ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) dlBoInfo.dataVolume = (dlCcchIndInfo->dlCcchMsgLen + 3) + (MAX_CRI_SIZE + 1); /* storing Msg4 Pdu in raCb */ - GET_UE_IDX(dlBoInfo.crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(dlBoInfo.crnti, ueId); + ueIdx = ueId -1; if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == dlCcchIndInfo->crnti) { macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; diff --git a/src/5gnrmac/mac_mux.c b/src/5gnrmac/mac_mux.c index d0b434001..dc177dae8 100644 --- a/src/5gnrmac/mac_mux.c +++ b/src/5gnrmac/mac_mux.c @@ -226,7 +226,7 @@ void fillRarPdu(RarInfo *rarInfo) * ****************************************************************/ void createMacRaCb(RachIndInfo *rachIndInfo) { - uint8_t ueIdx = 0; + uint8_t ueId = 0, ueIdx = 0; uint16_t crnti = 0; uint16_t cellIdx = 0; @@ -236,8 +236,8 @@ void createMacRaCb(RachIndInfo *rachIndInfo) if(crnti == -1) return; - GET_UE_IDX(crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(crnti, ueId); + ueIdx = ueId -1; /* store in rach ind structure */ rachIndInfo->crnti = crnti; diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index 2968fa501..1aa842db8 100644 --- a/src/5gnrmac/mac_slot_ind.c +++ b/src/5gnrmac/mac_slot_ind.c @@ -55,8 +55,8 @@ MacSchSlotIndFunc macSchSlotIndOpts[] = uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo) { uint8_t schInfoIdx = 0; - uint8_t ueIdx; - uint16_t cellIdx; + uint8_t ueId = 0, ueIdx = 0; + uint16_t cellIdx = 0; MacDlSlot *currDlSlot = NULLP; #ifdef CALL_FLOW_DEBUG_LOG @@ -98,8 +98,8 @@ uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo) { if(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.isMsg4Pdu) { - GET_UE_IDX(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.crnti, ueId); + ueIdx = ueId -1; macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize = \ dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize; } @@ -138,7 +138,7 @@ uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo) **/ void fillMsg4Pdu(uint16_t cellId, DlMsgSchInfo *msg4SchInfo) { - uint8_t ueIdx; + uint8_t ueId = 0, ueIdx = 0; uint16_t cellIdx; uint16_t msg4TxPduLen; MacDlData msg4DlData; @@ -149,8 +149,8 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgSchInfo *msg4SchInfo) memset(&msg4DlData, 0, sizeof(MacDlData)); memset(&macCeData, 0, sizeof(MacCeInfo)); - GET_UE_IDX(msg4SchInfo->dlMsgInfo.crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(msg4SchInfo->dlMsgInfo.crnti, ueId); + ueIdx = ueId -1; if(macCb.macCell[cellIdx] == NULLP) { diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c index 77fc0f9c9..8b92f9552 100644 --- a/src/5gnrmac/mac_ue_mgr.c +++ b/src/5gnrmac/mac_ue_mgr.c @@ -2615,7 +2615,7 @@ uint8_t MacSendUeDeleteRsp(uint16_t cellId, uint16_t crnti, UeDeleteStatus resul /* Filling UE delete response */ deleteRsp->cellId = cellId; - GET_UE_IDX(crnti,deleteRsp->ueId); + GET_UE_ID(crnti, deleteRsp->ueId); deleteRsp->result = result; /* Fill Post structure and send UE delete response*/ @@ -2697,7 +2697,7 @@ void deletePucchResourcesCfg(PucchResrcCfg *resrcCfg) uint8_t MacProcSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *schUeDelRsp) { - uint8_t ueIdx =0, isCrntiValid = 0; + uint8_t ueId =0, isCrntiValid = 0; uint16_t cellIdx=0; uint8_t ret = RFAILED; UeDeleteStatus result; @@ -2723,23 +2723,23 @@ uint8_t MacProcSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *schUeDelRsp) } else { - GET_UE_IDX(schUeDelRsp->crnti, ueIdx); - if(macCb.macCell[cellIdx]->ueCb[ueIdx -1].crnti == schUeDelRsp->crnti) + GET_UE_ID(schUeDelRsp->crnti, ueId); + if(macCb.macCell[cellIdx]->ueCb[ueId -1].crnti == schUeDelRsp->crnti) { /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ #if 0 /*Looping around LCs to free S-NSSAI memory*/ - for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueIdx -1].ulInfo.numUlLc); lcIdx++) + for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.numUlLc); lcIdx++) { - MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueIdx -1].ulInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); + MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); } - for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueIdx -1].dlInfo.numDlLc); lcIdx++) + for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.numDlLc); lcIdx++) { - MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueIdx -1].dlInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); + MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); } #endif - memset(&macCb.macCell[cellIdx]->ueCb[ueIdx -1], 0, sizeof(MacUeCb)); + memset(&macCb.macCell[cellIdx]->ueCb[ueId -1], 0, sizeof(MacUeCb)); macCb.macCell[cellIdx]->numActvUe--; result = SUCCESS; ret = ROK; diff --git a/src/cm/common_def.h b/src/cm/common_def.h index 1220b2e42..550c72066 100644 --- a/src/cm/common_def.h +++ b/src/cm/common_def.h @@ -144,11 +144,17 @@ #define MAX_TDD_PERIODICITY_SLOTS 160 #endif +/* TODO : Delete GET_UE_IDX once replaced with GET_UE_ID at all places */ #define GET_UE_IDX( _crnti,_ueIdx) \ { \ _ueIdx = _crnti - ODU_START_CRNTI + 1; \ } +#define GET_UE_ID( _crnti,_ueId) \ +{ \ + _ueId = _crnti - ODU_START_CRNTI + 1; \ +} + #define GET_CRNTI( _crnti,_ueIdx) \ { \ _crnti = _ueIdx + ODU_START_CRNTI - 1; \ -- 2.16.6