X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=cd202098a691bef1dd4e32812c590632c57d26ab;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=fbdb9c7a7cc566da0b03fa4dd4545b99ca4feac8;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index fbdb9c7a7..cd202098a 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -32,9 +32,6 @@ @brief APIs to handle all the primitives invoked on RGU interface. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=184; -static int RLOG_MODULE_ID=4096; /* header include files (.h) */ #include "common_def.h" @@ -66,18 +63,18 @@ static int RLOG_MODULE_ID=4096; /* local typedefs */ S16 RgMacSchBrdcmDedBoUpdtReq ARGS((Inst inst, CmLteCellId cellId, CmLteRnti rnti, CmLteLcId lcId, S32 bo )); -PRIVATE S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell, +static S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)); -PRIVATE S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell, +static S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)); -PRIVATE S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell, +static S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err)); -PRIVATE S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, +static S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err)); /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ -PRIVATE S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb, +static S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb, RgDlSf *dlSf)); S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, @@ -104,24 +101,14 @@ S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgROMDedDatReq -( -Inst inst, -RgRguDedDatReq *datReq -) -#else -S16 rgROMDedDatReq(inst,datReq) -Inst inst; -RgRguDedDatReq *datReq; -#endif +S16 rgROMDedDatReq(Inst inst,RgRguDedDatReq *datReq) { #if 0 RgCellCb *cell; RgUeCb *ue; - U8 idx1,idx2; + uint8_t idx1,idx2; RgDlHqProcCb *hqProc; - U8 hqPId; + uint8_t hqPId; RgErrInfo err; Pst schPst; RgInfDedBoRpt boRpt; @@ -134,10 +121,8 @@ RgRguDedDatReq *datReq; #ifdef LTEMAC_DLUE_TMGOPTMZ S16 ret; #endif - U32 idx; - //U8 datReqFailCnt = 0; - - TRC2(rgROMDedDatReq) + uint32_t idx; + //uint8_t datReqFailCnt = 0; if (((cell = rgCb[inst].cell) == NULLP) @@ -145,8 +130,7 @@ RgRguDedDatReq *datReq; { #if (ERRCLASS & ERRCLS_INT_PAR) /* Handle Cell fetch failure */ - RGLOGERROR(inst,ERRCLS_INT_PAR,ERG001,(ErrVal)datReq->cellId, - "rgROMDedDatReq(): Invalid cell Id"); + DU_LOG("\nERROR --> MAC : rgROMDedDatReq(): Invalid cell Id"); #endif err.errType = RGERR_ROM_DEDDATREQ; err.errCause = RGERR_ROM_INV_CELL_ID; @@ -162,8 +146,8 @@ RgRguDedDatReq *datReq; for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++) { - timingInfo.slot = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF); - timingInfo.sfn = (U16)((datReq->datReq[idx].transId >> 16) & 0xFFFF); + timingInfo.slot = (uint8_t)((datReq->datReq[idx].transId >> 8) & 0XFF); + timingInfo.sfn = (uint16_t)((datReq->datReq[idx].transId >> 16) & 0xFFFF); sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || @@ -182,7 +166,7 @@ RgRguDedDatReq *datReq; rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq); #ifdef CA_DBG { - EXTERN U32 dbgDelayedDatReqInMac; + uint32_t dbgDelayedDatReqInMac; dbgDelayedDatReqInMac++; } #endif /* CA_DBG */ @@ -197,8 +181,7 @@ RgRguDedDatReq *datReq; { #if (ERRCLASS & ERRCLS_INT_PAR) /* Handle Ue fetch failure */ - RGLOGERROR(inst,ERRCLS_INT_PAR,ERG002,(ErrVal)datReq->datReq[idx].rnti, - "rgROMDedDatReq(): Invalid ue Id"); + DU_LOG("\nERROR --> MAC : rgROMDedDatReq(): Invalid ue Id"); #endif err.errType = RGERR_ROM_DEDDATREQ; err.errCause = RGERR_ROM_INV_UE_ID; @@ -211,7 +194,7 @@ RgRguDedDatReq *datReq; ret = rgROMUpdDlSfRemDataCnt(cell, sf); if(ret == RFAILED) { - RLOG0(L_INFO, "Dropping due to no ue \n"); + DU_LOG("\nERROR --> MAC : Dropping due to no ue \n"); #ifndef L2_OPTMZ RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif @@ -223,15 +206,14 @@ RgRguDedDatReq *datReq; continue; } - hqPId = (U8)(datReq->datReq[idx].transId); + hqPId = (uint8_t)(datReq->datReq[idx].transId); hqPId = hqPId >> 2; /* get harq process and invoke DHM */ rgDHMGetHqProcFrmId(ue, hqPId, &hqProc); if (rgDHMHndlDedDatReq(inst,hqProc, &datReq->datReq[idx], sf, &err) == RFAILED) { - RLOG_ARG1(L_ERROR,DBG_CELLID,datReq->cellId, - "Handling of Data request in DHM failedi RNTI:%d", + DU_LOG("\nERROR --> MAC : Handling of Data request in DHM failedi RNTI:%d", datReq->datReq[idx].rnti); err.errType = RGERR_ROM_DEDDATREQ; /* errcause shall be filled in appropriately by DHM */ @@ -244,7 +226,7 @@ RgRguDedDatReq *datReq; ret = rgROMUpdDlSfRemDataCnt(cell, sf); if(ret == RFAILED) { - RLOG0(L_INFO, "Dropping due to no failure of remCnt update"); + DU_LOG("\nERROR --> MAC : Dropping due to no failure of remCnt update"); #ifndef L2_OPTMZ RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif @@ -297,7 +279,7 @@ RgRguDedDatReq *datReq; ret = rgROMUpdDlSfRemDataCnt(cell, sf); if(ret == RFAILED) { - RLOG0(L_INFO, "\n Dropping due to no failure of remCnt update(1) \n"); + DU_LOG("\nERROR --> MAC : Dropping due to no failure of remCnt update(1) \n"); #ifndef L2_OPTMZ RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif @@ -330,17 +312,7 @@ RgRguDedDatReq *datReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgROMCmnDatReq -( -Inst inst, -RgRguCmnDatReq *datReq -) -#else -S16 rgROMCmnDatReq(inst,datReq) -Inst inst; -RgRguCmnDatReq *datReq; -#endif +S16 rgROMCmnDatReq(Inst inst, RgRguCmnDatReq *datReq) { RgCellCb *cell; RgErrInfo err; @@ -351,8 +323,6 @@ RgRguCmnDatReq *datReq; RgDlSf *sf; #endif - TRC2(rgROMCmnDatReq) - ret = ROK; err.errType = RGERR_ROM_CMNDATREQ; if(((cell = rgCb[inst].cell) == NULLP) @@ -360,8 +330,7 @@ RgRguCmnDatReq *datReq; { #if (ERRCLASS & ERRCLS_INT_PAR) /* Handle Cell fetch failure */ - RGLOGERROR(inst,ERRCLS_INT_PAR,ERG003,(ErrVal)datReq->cellId, - "rgROMCmnDatReq(): Invalid cell Id"); + DU_LOG("\nERROR --> MAC : rgROMCmnDatReq(): Invalid cell Id"); #endif err.errCause = RGERR_ROM_INV_CELL_ID; /* Update stats */ @@ -379,8 +348,8 @@ RgRguCmnDatReq *datReq; /*Get the timing Info*/ /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ - timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF); - timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF); + timingInfo.slot = (uint8_t)((datReq->transId >> 8) & 0XFF); + timingInfo.sfn = (uint16_t)((datReq->transId >> 16) & 0xFFFF); #endif } else @@ -390,8 +359,8 @@ RgRguCmnDatReq *datReq; /*Get the timing Info*/ /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ - timingInfo.slot = (U8)(datReq->transId & 0XFF); - timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF); + timingInfo.slot = (uint8_t)(datReq->transId & 0XFF); + timingInfo.sfn = (uint16_t)((datReq->transId >> 8) & 0xFFFF); #endif } @@ -436,23 +405,11 @@ RgRguCmnDatReq *datReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgROMHndlCcchDatReq -( -RgCellCb *cell, -RgRguCmnDatReq *datReq, -RgErrInfo *err -) -#else -PRIVATE S16 rgROMHndlCcchDatReq(cell, datReq, err) -RgCellCb *cell; -RgRguCmnDatReq *datReq; -RgErrInfo *err; -#endif +static S16 rgROMHndlCcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err) { Inst inst = cell->macInst - RG_INST_START; RgUeCb *ue; - U8 hqPId; + uint8_t hqPId; RgDlHqProcCb *hqProc; CmLteTimingInfo timingInfo; RgDlSf *sf; @@ -460,9 +417,6 @@ RgErrInfo *err; RgUstaDgn dgn; /* Alarm diagnostics structure */ #endif - TRC2(rgROMHndlCcchDatReq); - - err->errType = RGERR_ROM_CMNDATREQ; if ((ue = rgDBMGetUeCb(cell, datReq->u.rnti)) == NULLP) @@ -471,16 +425,15 @@ RgErrInfo *err; { #if (ERRCLASS & ERRCLS_INT_PAR) /* Handle Ue fetch failure */ - RGLOGERROR(inst,ERRCLS_INT_PAR,ERG004,(ErrVal)datReq->u.rnti, - "rgROMHndlCcchDatReq(): Invalid ue Id"); + DU_LOG("\nERROR --> MAC : rgROMHndlCcchDatReq(): Invalid ue Id"); #endif err->errCause = RGERR_ROM_INV_UE_ID; return RFAILED; } } - timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF); - timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF); + timingInfo.slot = (uint8_t)((datReq->transId >> 8) & 0XFF); + timingInfo.sfn = (uint16_t)((datReq->transId >> 16) & 0xFFFF); sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || @@ -497,7 +450,7 @@ RgErrInfo *err; return RFAILED; } - hqPId = (U8)(datReq->transId); + hqPId = (uint8_t)(datReq->transId); hqPId = hqPId >> 2; /* get harq process and invoke DHM */ @@ -507,8 +460,7 @@ RgErrInfo *err; /* invoke DHM to process CCCH data */ if (rgDHMHndlCmnDatReq(inst,hqProc, datReq, err) == RFAILED) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "Handling of Data request in DHM failed RNTI:%d LCID:%d", + DU_LOG("\nERROR --> MAC : Handling of Data request in DHM failed RNTI:%d LCID:%d", datReq->u.rnti,datReq->lcId); /* Release First TB */ rgDHMRlsHqProcTB(cell, hqProc, 1); @@ -537,19 +489,7 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgROMHndlBcchPcchDatReq -( -RgCellCb *cell, -RgRguCmnDatReq *datReq, -RgErrInfo *err -) -#else -PRIVATE S16 rgROMHndlBcchPcchDatReq(cell, datReq, err) -RgCellCb *cell; -RgRguCmnDatReq *datReq; -RgErrInfo *err; -#endif +static S16 rgROMHndlBcchPcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err) { Inst inst = cell->macInst - RG_INST_START; RgPcchLcCb *pcch; @@ -564,11 +504,9 @@ RgErrInfo *err; RgUstaDgn dgn; /* Alarm diagnostics structure */ #endif - TRC2(rgROMHndlBcchPcchDatReq); - - timingInfo.slot = (U8)(datReq->transId & 0XFF); - timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF); + timingInfo.slot = (uint8_t)(datReq->transId & 0XFF); + timingInfo.sfn = (uint16_t)((datReq->transId >> 8) & 0xFFFF); sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; if( (sf->txDone == TRUE) || @@ -606,7 +544,7 @@ RgErrInfo *err; return ROK; } #endif/*RGR_SI_SCH*/ - + UNUSED(inst); pcch = rgDBMGetPcch(cell); if ((pcch) && (pcch->lcId == datReq->lcId)) { @@ -616,8 +554,7 @@ RgErrInfo *err; } /* Handle lcCb fetch failure */ - RGLOGERROR(inst,ERRCLS_INT_PAR,ERG005,(ErrVal)datReq->lcId, - "rgROMHndlBcchPcchDatReq(): Invalid Lc Id"); + DU_LOG("\nERROR --> MAC : rgROMHndlBcchPcchDatReq(): Invalid Lc Id"); err->errCause = RGERR_ROM_INV_LC_ID; return RFAILED; @@ -640,24 +577,12 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgROMDedStaRsp -( -Inst inst, -RgRguDedStaRsp *staRsp -) -#else -S16 rgROMDedStaRsp(inst,staRsp) -Inst inst; -RgRguDedStaRsp *staRsp; -#endif +S16 rgROMDedStaRsp(Inst inst, RgRguDedStaRsp *staRsp) { RgCellCb *cell; /* Moving the error variables and assignments to available scope */ - TRC2(rgROMDedStaRsp) - /* Avoiding memset, as the variables of this are getting initialized */ @@ -682,7 +607,7 @@ RgRguDedStaRsp *staRsp; //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt); return ROK; } - RLOG_ARG2(L_ERROR,DBG_CELLID,staRsp->cellId,"Invalid cell for CRNTI:%d LCID:%d ", + DU_LOG("\nERROR --> MAC : Invalid cell for CRNTI:%d LCID:%d ", staRsp->rnti,staRsp->lcId); return RFAILED; @@ -735,30 +660,16 @@ S32 bo * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgROMCmnStaRsp -( -Inst inst, -RgRguCmnStaRsp *staRsp -) -#else -S16 rgROMCmnStaRsp(inst,staRsp) -Inst inst; -RgRguCmnStaRsp *staRsp; -#endif +S16 rgROMCmnStaRsp(Inst inst, RgRguCmnStaRsp *staRsp) { RgCellCb *cell; RgErrInfo err; - TRC2(rgROMCmnStaRsp) - - if(((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != staRsp->cellId)) { /* Handle Cell fetch failure */ - RLOG_ARG2(L_ERROR,DBG_CELLID,staRsp->cellId, - "Invalid cell for CRNTI:%d LCID:%d",staRsp->u.rnti,staRsp->lcId); + DU_LOG("\nERROR --> MAC : Invalid cell for CRNTI:%d LCID:%d",staRsp->u.rnti,staRsp->lcId); err.errType = RGERR_ROM_CMNSTARSP; err.errCause = RGERR_ROM_INV_CELL_ID; return RFAILED; @@ -797,25 +708,12 @@ RgRguCmnStaRsp *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgROML2MUlThrpMeasReq -( -Inst inst, -RgRguL2MUlThrpMeasReq *measReq -) -#else -S16 rgROML2MUlThrpMeasReq(inst,measReq) -Inst inst; -RgRguL2MUlThrpMeasReq *measReq; -#endif +S16 rgROML2MUlThrpMeasReq(Inst inst, RgRguL2MUlThrpMeasReq *measReq) { RgCellCb *cell; RgUeCb *ue; - U8 lcgId; - U8 loop; - TRC2(rgROML2MUlThrpMeasReq) - - + uint8_t lcgId; + uint8_t loop; if(((cell = rgCb[inst].cell) != NULLP) &&(cell->cellId == measReq->cellId)) @@ -838,7 +736,7 @@ RgRguL2MUlThrpMeasReq *measReq; return ROK; } } - RLOG_ARG1(L_ERROR,DBG_CELLID,measReq->cellId,"Invalid cell CRNTI:%d", + DU_LOG("\nERROR --> MAC : Invalid cell CRNTI:%d", measReq->rnti); return RFAILED; } /* rgROML2MUlThrpMeasReq */ @@ -863,25 +761,12 @@ RgRguL2MUlThrpMeasReq *measReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgROMHndlCcchStaRsp -( -RgCellCb *cell, -RgRguCmnStaRsp *staRsp, -RgErrInfo *err -) -#else -PRIVATE S16 rgROMHndlCcchStaRsp(cell, staRsp, err) -RgCellCb *cell; -RgRguCmnStaRsp *staRsp; -RgErrInfo *err; -#endif +static S16 rgROMHndlCcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp, RgErrInfo *err) { Pst schPst; Inst macInst = cell->macInst - RG_INST_START; //RgInfCmnBoRpt boRpt; - TRC2(rgROMHndlCcchStaRsp); #ifdef UNUSED_VAR RgInfCmnBoRpt boRpt; boRpt.cellSapId = cell->schInstMap.cellSapId; @@ -915,31 +800,18 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgROMHndlBcchPcchStaRsp -( -RgCellCb *cell, -RgRguCmnStaRsp *staRsp, -RgErrInfo *err -) -#else -PRIVATE S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err) -RgCellCb *cell; -RgRguCmnStaRsp *staRsp; -RgErrInfo *err; -#endif +static S16 rgROMHndlBcchPcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp,RgErrInfo *err) { Pst schPst; //RgInfCmnBoRpt boRpt; Inst macInst = cell->macInst - RG_INST_START; - TRC2(rgROMHndlBcchPcchStaRsp); - cmMemset((U8*)&schPst, (U8)0, sizeof(Pst)); + memset(&schPst, 0, sizeof(Pst)); if (rgDBMChkCmnLcCb(cell, staRsp->lcId) != ROK) { /* Handle lcCb fetch failure */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid LCID:%d",staRsp->lcId); + DU_LOG("\nERROR --> MAC : Invalid LCID:%d",staRsp->lcId); err->errCause = RGERR_ROM_INV_LC_ID; return RFAILED; } @@ -947,7 +819,7 @@ RgErrInfo *err; This assumes that BO is not received more than 4 frames in advance from the enodeb application */ if (cell->bcchBchInfo.lcId == staRsp->lcId) { - U16 nextBchSfn; + uint16_t nextBchSfn; nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN; if ((staRsp->u.timeToTx.sfn != nextBchSfn) || @@ -996,30 +868,16 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgROMUpdDlSfRemDataCnt -( -RgCellCb *cellCb, -RgDlSf *dlSf -) -#else -PRIVATE S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf) -RgCellCb *cellCb; -RgDlSf *dlSf; -#endif +static S16 rgROMUpdDlSfRemDataCnt(RgCellCb *cellCb, RgDlSf *dlSf) { RgErrInfo err; //Inst inst = cellCb->macInst - RG_INST_START; - TRC2(rgROMUpdDlSfRemDataCnt); - - if(!dlSf->remDatReqCnt) { /*This is an error scenario of RLC generating more data * request than the allocation. Do nothing for this. */ - RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId, - "RX new data while remDatReqCnt is 0 for cell"); + DU_LOG("\nERROR --> MAC : RX new data while remDatReqCnt is 0 for cell"); return RFAILED; } @@ -1037,8 +895,7 @@ RgDlSf *dlSf; if (ROK != rgTOMUtlProcDlSf (dlSf, cellCb, &err)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId, - "Unable to process downlink slot for cell"); + DU_LOG("\nERROR --> MAC : Unable to process downlink slot for cell"); err.errType = RGERR_ROM_DEDDATREQ; }