X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dhm.c;h=e8cdacf294e7e350c935028e1eb52114d8b0b70f;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=211e7f84d6731c2a587902024a61fbda2e301cbf;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c index 211e7f84d..e8cdacf29 100755 --- a/src/5gnrmac/rg_dhm.c +++ b/src/5gnrmac/rg_dhm.c @@ -81,7 +81,7 @@ PRIVATE Void rgDHMBldTfuDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgDlHqProcC RgTfuDatReqPduInfo *datReq)); #ifdef L2_OPTMZ -PUBLIC S16 rgDHMFreeHqProcTB +S16 rgDHMFreeHqProcTB ( RgDlHqProcCb *hqP, U8 tbIndex @@ -112,14 +112,14 @@ U8 tbIndex * **/ #ifdef ANSI -PUBLIC S16 rgDHMHqEntInit +S16 rgDHMHqEntInit ( Inst inst, RgDlHqEnt *hqE, U8 maxHqProcs ) #else -PUBLIC S16 rgDHMHqEntInit(inst,hqE, maxHqProcs) +S16 rgDHMHqEntInit(inst,hqE, maxHqProcs) Inst inst, RgDlHqEnt *hqE; U8 maxHqProcs; @@ -131,8 +131,6 @@ U8 maxHqProcs; Buffer *ceDBuf = NULLP; #endif - TRC2(rgDHMHqEntInit) - hqE->numHqProcs = maxHqProcs; /* for each harq process */ for (idx1 = 0; idx1 < hqE->numHqProcs; idx1++) @@ -198,21 +196,19 @@ U8 maxHqProcs; * **/ #ifdef ANSI -PUBLIC Void rgDHMUeReset +Void rgDHMUeReset ( RgCellCb *cell, RgDlHqEnt *hqE ) #else -PUBLIC Void rgDHMUeReset(cell, hqE) +Void rgDHMUeReset(cell, hqE) RgCellCb *cell; RgDlHqEnt *hqE; #endif { U8 i = 0; - TRC2(rgDHMUeReset) - if(hqE->procs[0]) { /* Free all the TB memory associated with HARQ */ @@ -246,18 +242,17 @@ RgDlHqEnt *hqE; * **/ #ifdef ANSI -PUBLIC Void rgDHMHdlBufFree +Void rgDHMHdlBufFree ( Inst inst, Buffer **mBuf ) #else -PUBLIC Void rgDHMHdlBufFree(Inst inst, Buffer **mBuf) +Void rgDHMHdlBufFree(Inst inst, Buffer **mBuf) Inst inst; #endif { RgCb *rgCbP = &rgCb[inst]; - TRC2(rgDHMHdlBufFree) if (rgCbP->bufCnt < RG_MAX_DFRD_FREE_BUFS) { @@ -293,12 +288,12 @@ Inst inst; * **/ #ifdef ANSI -PUBLIC Void rgDHMFreeTbBufs +Void rgDHMFreeTbBufs ( Inst inst ) #else -PUBLIC Void rgDHMFreeTbBufs(inst) +Void rgDHMFreeTbBufs(inst) Inst inst; #endif { @@ -306,8 +301,6 @@ Inst inst; U8 start = rgCbP->bufCnt; U8 end = 0; - TRC2(rgDHMFreeTbBufs) - if (rgCbP->bufCnt < RG_MAX_FREE_BUFS_PERTTI) { end = 0; @@ -326,12 +319,12 @@ Inst inst; } /* rgDHMFreeTbBufs */ #ifdef ANSI -PUBLIC Void rgDHMFreeAllTbBufs +Void rgDHMFreeAllTbBufs ( Inst inst ) #else -PUBLIC Void rgDHMFreeAllTbBufs(inst) +Void rgDHMFreeAllTbBufs(inst) Inst inst; #endif { @@ -339,8 +332,6 @@ Inst inst; U8 start = rgCbP->bufCnt; U8 end = 0; - TRC2(rgDHMFreeAllTbBufs) - while (start != end) { start--; @@ -368,14 +359,14 @@ Inst inst; * **/ #ifdef ANSI -PUBLIC S16 rgDHMRlsHqProcTB +S16 rgDHMRlsHqProcTB ( RgCellCb *cell, RgDlHqProcCb *hqP, U8 tbIndex ) #else -PUBLIC S16 rgDHMRlsHqProcTB(cell, hqP, tbIndex) +S16 rgDHMRlsHqProcTB(cell, hqP, tbIndex) RgCellCb *cell; RgDlHqProcCb *hqP; U8 tbIndex; @@ -387,8 +378,6 @@ U8 tbIndex; // U32 lchIdx, pduIdx; #endif - TRC2(rgDHMRlsHqProcTB) - if((tbIndex > RG_MAX_TB_PER_UE) || (tbIndex == 0)) { @@ -459,21 +448,19 @@ U8 tbIndex; * **/ #ifdef ANSI -PUBLIC S16 rgDHMGetHqProcFrmId +S16 rgDHMGetHqProcFrmId ( RgUeCb *ue, U8 idx, RgDlHqProcCb **hqP ) #else -PUBLIC S16 rgDHMGetHqProcFrmId(ue, idx, hqP) +S16 rgDHMGetHqProcFrmId(ue, idx, hqP) RgUeCb *ue; U8 idx; RgDlHqProcCb **hqP; #endif { - TRC2(rgDHMGetHqProcFrmId) - /* Pick the proc based on the index provided */ *hqP = (ue->dl.hqEnt.procs[idx]); @@ -501,7 +488,7 @@ RgDlHqProcCb **hqP; * -#RFAILED **/ #ifdef ANSI -PUBLIC S16 rgDHMSndDatReq +S16 rgDHMSndDatReq ( RgCellCb *cellCb, RgDlSf *dlSf, @@ -510,7 +497,7 @@ RgDlHqProcCb *hqP, RgErrInfo *err ) #else -PUBLIC S16 rgDHMSndDatReq(cellCb, dlSf, datInfo, hqP, err) +S16 rgDHMSndDatReq(cellCb, dlSf, datInfo, hqP, err) RgCellCb *cellCb; RgDlSf *dlSf; RgTfuDatReqInfo *datInfo; @@ -526,8 +513,6 @@ RgErrInfo *err; has to be inclueded in the TFU Data request.*/ Bool dataAvlblUe; - TRC2(rgDHMSndDatReq) - dataAvlblUe = TRUE; for(i=0;i< RG_MAX_TB_PER_UE;i++) { @@ -686,7 +671,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgDHMHndlDedDatReq +S16 rgDHMHndlDedDatReq ( Inst inst, RgDlHqProcCb *hqProc, @@ -695,7 +680,7 @@ RgDlSf *dlSf, RgErrInfo *err ) #else -PUBLIC S16 rgDHMHndlDedDatReq(inst,hqProc, datReq, dlSf, err) +S16 rgDHMHndlDedDatReq(inst,hqProc, datReq, dlSf, err) Inst inst; RgDlHqProcCb *hqProc; RgRguDDatReqPerUe *datReq; @@ -712,8 +697,6 @@ RgErrInfo *err; RgTfuDatReqTbInfo *tb; #endif - TRC2(rgDHMHndlDedDatReq); - tbIndex = (U8)(datReq->transId & 0x03); /* Accept all the data requests even if delayed in case nothing * has been sent earlier on the harq proc. @@ -832,7 +815,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgDHMHndlCmnDatReq +S16 rgDHMHndlCmnDatReq ( Inst inst, RgDlHqProcCb *hqProc, @@ -840,7 +823,7 @@ RgRguCmnDatReq *datReq, RgErrInfo *err ) #else -PUBLIC S16 rgDHMHndlCmnDatReq(inst,hqProc, datReq, err) +S16 rgDHMHndlCmnDatReq(inst,hqProc, datReq, err) Inst inst; RgDlHqProcCb *hqProc; RgRguCmnDatReq *datReq; @@ -850,8 +833,6 @@ RgErrInfo *err; RgUstaDgn dgn; RgBldPduInfo bldPdu; - TRC2(rgDHMHndlCmnDatReq) - #ifndef L2_OPTMZ if (hqProc->tbInfo[0].tb != NULLP) #else @@ -915,7 +896,7 @@ RgErrInfo *err; **/ RgUeCb *gUe =NULLP; #ifdef ANSI -PUBLIC S16 rgDHMSndConsolidatedStaInd +S16 rgDHMSndConsolidatedStaInd ( RgCellCb *cell, RgInfUeInfo *ueInfo, @@ -923,7 +904,7 @@ CmLteTimingInfo timingInfo, RgErrInfo *err ) #else -PUBLIC S16 rgDHMSndConsolidatedStaInd(cell, ueInfo, timingInfo, err) +S16 rgDHMSndConsolidatedStaInd(cell, ueInfo, timingInfo, err) RgCellCb *cell; RgInfUeInfo *ueInfo; CmLteTimingInfo timingInfo; @@ -954,9 +935,8 @@ RgErrInfo *err; RgTfuDatReqTbInfo *tb; /* TB to be sent to CL/PHY*/ #endif - TRC2(rgDHMSndConsolidatedStaInd) - cmMemset ((U8 *)dStaInd, 0, (sizeof(RgRguDedStaInd *) * rgCb[inst].numRguSaps)); - cmMemset ((U8 *)rguDlSap, 0, (sizeof(RgUpSapCb *) * rgCb[inst].numRguSaps)); + memset (dStaInd, 0, (sizeof(RgRguDedStaInd *) * rgCb[inst].numRguSaps)); + memset (rguDlSap, 0, (sizeof(RgUpSapCb *) * rgCb[inst].numRguSaps)); /* Send StaInd for the scheduled UEs */ for(ueIdx = 0; ueIdx < ueInfo->numUes; ueIdx++) @@ -1311,7 +1291,6 @@ RgTfuDatReqPduInfo *datReq; #ifdef L2_OPTMZ U32 lchIdx, pduIdx; #endif - TRC2(rgDHMBldTfuDatReq) datReq->nmbOfTBs = 0; #ifndef L2_OPTMZ @@ -1452,13 +1431,13 @@ RgTfuDatReqPduInfo *datReq; * **/ #ifdef ANSI -PUBLIC S16 rgDHMFreeHqProcTB +S16 rgDHMFreeHqProcTB ( RgDlHqProcCb *hqP, U8 tbIndex ) #else -PUBLIC S16 rgDHMFreeHqProcTB(hqP, tbIndex) +S16 rgDHMFreeHqProcTB(hqP, tbIndex) RgDlHqProcCb *hqP; U8 tbIndex; #endif @@ -1466,8 +1445,6 @@ U8 tbIndex; RgTfuDatReqTbInfo *tb; /* TB to be sent to CL/PHY*/ U8 idx; - TRC2(rgDHMFreeHqProcTB) - if((tbIndex > RG_MAX_TB_PER_UE) || (tbIndex == 0)) { @@ -1511,19 +1488,18 @@ U8 tbIndex; * **/ #ifdef ANSI -PUBLIC Void rgDHMFreeUe +Void rgDHMFreeUe ( Inst inst, RgDlHqEnt *hqE ) #else -PUBLIC Void rgDHMFreeUe(inst,hqE) +Void rgDHMFreeUe(inst,hqE) Inst inst; RgDlHqEnt *hqE; #endif { U8 i; - TRC2(rgDHMFreeUe) if(hqE->procs) { @@ -1569,13 +1545,13 @@ RgDlHqEnt *hqE; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgSchMacRstHqEntReq +S16 RgSchMacRstHqEntReq ( Pst* pst, RgInfResetHqEnt* hqEntInfo ) #else -PUBLIC S16 RgSchMacRstHqEntReq(pst, hqEntInfo) +S16 RgSchMacRstHqEntReq(pst, hqEntInfo) Pst* pst; RgInfResetHqEnt* hqEntInfo; #endif @@ -1627,13 +1603,13 @@ U32 gSaveVal; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgSchMacRlsHqReq +S16 RgSchMacRlsHqReq ( Pst *pst, RgInfRlsHqInfo *rlshqUeInfo ) #else -PUBLIC S16 RgSchMacRlsHqReq(pst, rlshqUeInfo) +S16 RgSchMacRlsHqReq(pst, rlshqUeInfo) Pst *pst; RgInfRlsHqInfo *rlshqUeInfo; #endif @@ -1650,8 +1626,6 @@ RgInfRlsHqInfo *rlshqUeInfo; #endif U32 startTime=0; - TRC2(RgSchMacRlsHqReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell;