X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=06760d2064ce97b59e0358cd8d64ff71ccba0d21;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;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..06760d206 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -79,7 +79,7 @@ PRIVATE S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, #ifdef LTEMAC_DLUE_TMGOPTMZ PRIVATE S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb, RgDlSf *dlSf)); -PUBLIC S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, +S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #endif @@ -105,13 +105,13 @@ PUBLIC S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgROMDedDatReq +S16 rgROMDedDatReq ( Inst inst, RgRguDedDatReq *datReq ) #else -PUBLIC S16 rgROMDedDatReq(inst,datReq) +S16 rgROMDedDatReq(inst,datReq) Inst inst; RgRguDedDatReq *datReq; #endif @@ -137,8 +137,6 @@ RgRguDedDatReq *datReq; U32 idx; //U8 datReqFailCnt = 0; - TRC2(rgROMDedDatReq) - if (((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != datReq->cellId)) @@ -331,13 +329,13 @@ RgRguDedDatReq *datReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgROMCmnDatReq +S16 rgROMCmnDatReq ( Inst inst, RgRguCmnDatReq *datReq ) #else -PUBLIC S16 rgROMCmnDatReq(inst,datReq) +S16 rgROMCmnDatReq(inst,datReq) Inst inst; RgRguCmnDatReq *datReq; #endif @@ -351,8 +349,6 @@ RgRguCmnDatReq *datReq; RgDlSf *sf; #endif - TRC2(rgROMCmnDatReq) - ret = ROK; err.errType = RGERR_ROM_CMNDATREQ; if(((cell = rgCb[inst].cell) == NULLP) @@ -460,9 +456,6 @@ RgErrInfo *err; RgUstaDgn dgn; /* Alarm diagnostics structure */ #endif - TRC2(rgROMHndlCcchDatReq); - - err->errType = RGERR_ROM_CMNDATREQ; if ((ue = rgDBMGetUeCb(cell, datReq->u.rnti)) == NULLP) @@ -564,9 +557,6 @@ RgErrInfo *err; RgUstaDgn dgn; /* Alarm diagnostics structure */ #endif - TRC2(rgROMHndlBcchPcchDatReq); - - timingInfo.slot = (U8)(datReq->transId & 0XFF); timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF); sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; @@ -641,13 +631,13 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgROMDedStaRsp +S16 rgROMDedStaRsp ( Inst inst, RgRguDedStaRsp *staRsp ) #else -PUBLIC S16 rgROMDedStaRsp(inst,staRsp) +S16 rgROMDedStaRsp(inst,staRsp) Inst inst; RgRguDedStaRsp *staRsp; #endif @@ -656,8 +646,6 @@ RgRguDedStaRsp *staRsp; /* Moving the error variables and assignments to available scope */ - TRC2(rgROMDedStaRsp) - /* Avoiding memset, as the variables of this are getting initialized */ @@ -736,13 +724,13 @@ S32 bo * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgROMCmnStaRsp +S16 rgROMCmnStaRsp ( Inst inst, RgRguCmnStaRsp *staRsp ) #else -PUBLIC S16 rgROMCmnStaRsp(inst,staRsp) +S16 rgROMCmnStaRsp(inst,staRsp) Inst inst; RgRguCmnStaRsp *staRsp; #endif @@ -750,9 +738,6 @@ RgRguCmnStaRsp *staRsp; RgCellCb *cell; RgErrInfo err; - TRC2(rgROMCmnStaRsp) - - if(((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != staRsp->cellId)) { @@ -798,13 +783,13 @@ RgRguCmnStaRsp *staRsp; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgROML2MUlThrpMeasReq +S16 rgROML2MUlThrpMeasReq ( Inst inst, RgRguL2MUlThrpMeasReq *measReq ) #else -PUBLIC S16 rgROML2MUlThrpMeasReq(inst,measReq) +S16 rgROML2MUlThrpMeasReq(inst,measReq) Inst inst; RgRguL2MUlThrpMeasReq *measReq; #endif @@ -813,9 +798,6 @@ RgRguL2MUlThrpMeasReq *measReq; RgUeCb *ue; U8 lcgId; U8 loop; - TRC2(rgROML2MUlThrpMeasReq) - - if(((cell = rgCb[inst].cell) != NULLP) &&(cell->cellId == measReq->cellId)) @@ -881,7 +863,6 @@ RgErrInfo *err; Inst macInst = cell->macInst - RG_INST_START; //RgInfCmnBoRpt boRpt; - TRC2(rgROMHndlCcchStaRsp); #ifdef UNUSED_VAR RgInfCmnBoRpt boRpt; boRpt.cellSapId = cell->schInstMap.cellSapId; @@ -933,8 +914,7 @@ RgErrInfo *err; //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) { @@ -1011,9 +991,6 @@ 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