X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=363209dab13716384a629171bc5501c1f64e89a8;hb=e8126b742c458158da117396d52ace22d59e9d47;hp=48e31f281c6b8b7c7084c5230d07c0c2784d97bc;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index 48e31f281..363209dab 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -66,20 +66,20 @@ 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)); -PUBLIC S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, +S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #endif @@ -104,24 +104,14 @@ PUBLIC S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgROMDedDatReq -( -Inst inst, -RgRguDedDatReq *datReq -) -#else -PUBLIC 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 +124,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) @@ -162,8 +150,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 +170,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 */ @@ -223,7 +211,7 @@ 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); @@ -330,17 +318,7 @@ RgRguDedDatReq *datReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgROMCmnDatReq -( -Inst inst, -RgRguCmnDatReq *datReq -) -#else -PUBLIC S16 rgROMCmnDatReq(inst,datReq) -Inst inst; -RgRguCmnDatReq *datReq; -#endif +S16 rgROMCmnDatReq(Inst inst, RgRguCmnDatReq *datReq) { RgCellCb *cell; RgErrInfo err; @@ -351,8 +329,6 @@ RgRguCmnDatReq *datReq; RgDlSf *sf; #endif - TRC2(rgROMCmnDatReq) - ret = ROK; err.errType = RGERR_ROM_CMNDATREQ; if(((cell = rgCb[inst].cell) == NULLP) @@ -379,8 +355,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 +366,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 +412,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 +424,6 @@ RgErrInfo *err; RgUstaDgn dgn; /* Alarm diagnostics structure */ #endif - TRC2(rgROMHndlCcchDatReq); - - err->errType = RGERR_ROM_CMNDATREQ; if ((ue = rgDBMGetUeCb(cell, datReq->u.rnti)) == NULLP) @@ -479,8 +440,8 @@ RgErrInfo *err; } } - 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 +458,7 @@ RgErrInfo *err; return RFAILED; } - hqPId = (U8)(datReq->transId); + hqPId = (uint8_t)(datReq->transId); hqPId = hqPId >> 2; /* get harq process and invoke DHM */ @@ -537,19 +498,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 +513,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) || @@ -640,24 +587,12 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgROMDedStaRsp -( -Inst inst, -RgRguDedStaRsp *staRsp -) -#else -PUBLIC 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 */ @@ -735,24 +670,11 @@ S32 bo * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgROMCmnStaRsp -( -Inst inst, -RgRguCmnStaRsp *staRsp -) -#else -PUBLIC 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)) { @@ -797,25 +719,12 @@ RgRguCmnStaRsp *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgROML2MUlThrpMeasReq -( -Inst inst, -RgRguL2MUlThrpMeasReq *measReq -) -#else -PUBLIC 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)) @@ -863,25 +772,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,26 +811,13 @@ 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) { @@ -947,7 +830,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,24 +879,11 @@ 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