X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=0de1281b04c124c1a5275453296a1489215d0caa;hb=f59409f0901831b9e116b7d37cd4dbf247cdde1f;hp=f015788baed429d15862ea8b1242fbaf04093f74;hpb=451e626d5ac7c7e7586bab23358161230449af46;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index f015788ba..0de1281b0 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -37,19 +37,7 @@ static int RLOG_FILE_ID=184; static int RLOG_MODULE_ID=4096; /* header include files (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ - -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ - -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_mblk.h" /* common memory link list library */ -#include "cm_lte.h" /* Common LTE */ - +#include "common_def.h" #include "rg_env.h" /* MAC Environment Defines */ #include "crg.h" /* CRG Interface defines */ #include "rgu.h" /* RGU Interface defines */ @@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096; #include "rg_err.h" /* MAC error defines */ /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ -#include "cm5.x" /* Timer */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_mblk.x" /* common memory link list library */ -#include "cm_lte.x" /* Common LTE */ #include "crg.x" /* CRG Interface includes */ #include "rgu.x" /* RGU Interface includes */ @@ -183,15 +162,15 @@ RgRguDedDatReq *datReq; for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++) { - timingInfo.subframe = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF); + timingInfo.slot = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF); timingInfo.sfn = (U16)((datReq->datReq[idx].transId >> 16) & 0xFFFF); - sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)]; + sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || (!RG_TIMEINFO_SAME(sf->schdTime,timingInfo))) { #if (ERRCLASS & ERRCLS_DEBUG) - /* Transmission is already done for this subframe. This is a delayed + /* Transmission is already done for this slot. This is a delayed * datReq. So discard */ rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT, @@ -400,7 +379,7 @@ RgRguCmnDatReq *datReq; /*Get the timing Info*/ /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ - timingInfo.subframe = (U8)((datReq->transId >> 8) & 0XFF); + timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF); timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF); #endif } @@ -411,7 +390,7 @@ RgRguCmnDatReq *datReq; /*Get the timing Info*/ /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ - timingInfo.subframe = (U8)(datReq->transId & 0XFF); + timingInfo.slot = (U8)(datReq->transId & 0XFF); timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF); #endif } @@ -429,8 +408,8 @@ RgRguCmnDatReq *datReq; /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ - RG_ARRAY_BOUND_CHECK(0, cell->subFrms, (timingInfo.subframe % RG_NUM_SUB_FRAMES)); - sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)]; + RG_ARRAY_BOUND_CHECK(0, cell->subFrms, (timingInfo.slot % RG_NUM_SUB_FRAMES)); + sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; ret = rgROMUpdDlSfRemDataCnt(cell, sf); /*Added check for RFAILED as above function can return RFAILED*/ @@ -500,15 +479,15 @@ RgErrInfo *err; } } - timingInfo.subframe = (U8)((datReq->transId >> 8) & 0XFF); + timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF); timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF); - sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)]; + sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || (!RG_TIMEINFO_SAME(sf->schdTime,timingInfo))) { #if (ERRCLASS & ERRCLS_DEBUG) - /* Transmission is already done for this subframe. This is a delayed + /* Transmission is already done for this slot. This is a delayed * datReq. So discard */ rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT, @@ -588,15 +567,15 @@ RgErrInfo *err; TRC2(rgROMHndlBcchPcchDatReq); - timingInfo.subframe = (U8)(datReq->transId & 0XFF); + timingInfo.slot = (U8)(datReq->transId & 0XFF); timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF); - sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)]; + sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || (!RG_TIMEINFO_SAME(sf->schdTime,timingInfo))) { #if (ERRCLASS & ERRCLS_DEBUG) - /* Transmission is already done for this subframe. This is a delayed + /* Transmission is already done for this slot. This is a delayed * datReq. So discard */ rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT, @@ -610,7 +589,7 @@ RgErrInfo *err; bcch = rgDBMGetBcchOnDlsch(cell,datReq->lcId); if (bcch ) { - /* Store BCCH-DLSCH data received in Scheduled subframe */ + /* Store BCCH-DLSCH data received in Scheduled slot */ sf->bcch.tb = datReq->pdu; SCpyMsgMsg(datReq->pdu, RG_GET_MEM_REGION(rgCb[inst]), @@ -622,7 +601,7 @@ RgErrInfo *err; bch = rgDBMGetBcchOnBch(cell); if ((bch) && (bch->lcId == datReq->lcId)) { - /* Store BCH data received in Scheduled subframe */ + /* Store BCH data received in Scheduled slot */ sf->bch.tb = datReq->pdu; RETVALUE(ROK); } @@ -631,7 +610,7 @@ RgErrInfo *err; pcch = rgDBMGetPcch(cell); if ((pcch) && (pcch->lcId == datReq->lcId)) { - /* Store PCCH-DLSCH data received in Scheduled subframe */ + /* Store PCCH-DLSCH data received in Scheduled slot */ sf->pcch.tb = datReq->pdu; RETVALUE(ROK); } @@ -686,17 +665,19 @@ RgRguDedStaRsp *staRsp; if(((cell = rgCb[inst].cell) != NULLP) && (cell->cellId == staRsp->cellId)) { - RgInfDedBoRpt boRpt; Pst schPst; - boRpt.cellSapId = cell->schInstMap.cellSapId; - boRpt.cellId = staRsp->cellId; - boRpt.rnti = staRsp->rnti; - boRpt.lcId = staRsp->lcId; - boRpt.bo = staRsp->boReport.bo; - boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime; - boRpt.staPduBo = staRsp->boReport.staPduBo; - boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime; - rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst); +#ifdef UNUSED_VAR + RgInfDedBoRpt boRpt + boRpt.cellSapId = cell->schInstMap.cellSapId; + boRpt.cellId = staRsp->cellId; + boRpt.rnti = staRsp->rnti; + boRpt.lcId = staRsp->lcId; + boRpt.bo = staRsp->boReport.bo; + boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime; + boRpt.staPduBo = staRsp->boReport.staPduBo; + boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime; +#endif + rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst); schPst.event = 0; //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt); RETVALUE(ROK); @@ -715,18 +696,21 @@ CmLteLcId lcId, S32 bo ) { - RgInfDedBoRpt boRpt; + RgCellCb *cell; //if ((cell = rgDBMGetCellCb(cellId)) != NULLP) if (((cell = rgCb[inst].cell) != NULLP) && (cell->cellId == cellId)) - { + { Pst schPst; - boRpt.cellSapId = cell->schInstMap.cellSapId; - boRpt.cellId = cellId; - boRpt.rnti = rnti; - boRpt.lcId = lcId; - boRpt.bo = bo; +#ifdef UNUSED_VAR + RgInfDedBoRpt boRpt; + boRpt.cellSapId = cell->schInstMap.cellSapId; + boRpt.cellId = cellId; + boRpt.rnti = rnti; + boRpt.lcId = lcId; + boRpt.bo = bo; +#endif rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst); schPst.event = 0; //TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt); @@ -895,17 +879,18 @@ RgErrInfo *err; { Pst schPst; Inst macInst = cell->macInst - RG_INST_START; - RgInfCmnBoRpt boRpt; + //RgInfCmnBoRpt boRpt; TRC2(rgROMHndlCcchStaRsp); - - +#ifdef UNUSED_VAR + RgInfCmnBoRpt boRpt; boRpt.cellSapId = cell->schInstMap.cellSapId; boRpt.cellId = staRsp->cellId; boRpt.u.rnti = staRsp->u.rnti; boRpt.lcId = staRsp->lcId; boRpt.lcType = staRsp->lcType; boRpt.bo = staRsp->bo; +#endif rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst); //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt); @@ -945,7 +930,7 @@ RgErrInfo *err; #endif { Pst schPst; - RgInfCmnBoRpt boRpt; + //RgInfCmnBoRpt boRpt; Inst macInst = cell->macInst - RG_INST_START; TRC2(rgROMHndlBcchPcchStaRsp); @@ -966,18 +951,18 @@ RgErrInfo *err; nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN; if ((staRsp->u.timeToTx.sfn != nextBchSfn) || - ((staRsp->u.timeToTx.sfn == cell->crntTime.sfn) && (cell->crntTime.subframe >= 7))) + ((staRsp->u.timeToTx.sfn == cell->crntTime.sfn) && (cell->crntTime.slot >= 7))) { RETVALUE(ROK); } } - +/* boRpt.cellSapId = cell->schInstMap.cellSapId; boRpt.cellId = staRsp->cellId; boRpt.u.timeToTx = staRsp->u.timeToTx; boRpt.lcId = staRsp->lcId; boRpt.lcType = staRsp->lcType; - boRpt.bo = staRsp->bo; + boRpt.bo = staRsp->bo;*/ #ifdef EMTC_ENABLE if(cell->emtcEnable) { @@ -1053,7 +1038,7 @@ RgDlSf *dlSf; if (ROK != rgTOMUtlProcDlSf (dlSf, cellCb, &err)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId, - "Unable to process downlink subframe for cell"); + "Unable to process downlink slot for cell"); err.errType = RGERR_ROM_DEDDATREQ; }