X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_dhm.c;h=8ee476e0859588350f72d903adf2d5df2969d99e;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=646e86b2af768e6de9a0d297b6b46efa5eeb04e3;hpb=e7b5eab0138956edeae768a021be476f4a7a807f;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index 646e86b2a..8ee476e08 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -215,7 +215,6 @@ Void rgSCHDhmHqEntReset(hqE) { RgSchDlHqProcCb *hqP; U8 i; - TRC2(rgSCHDhmHqEntReset) cmLListInit(&hqE->inUse); cmLListInit(&hqE->free); for (i=0; i < hqE->numHqPrcs; i++) @@ -287,7 +286,6 @@ RgSchUeCb *ue; RgSchRaCb *raCb; #endif { - TRC2(rgSCHDhmAssgnUeHqEntFrmRaCb) ue->cellInfo[0]->hqEnt = raCb->dlHqE; ue->cellInfo[0]->hqEnt->ue = ue; @@ -329,7 +327,6 @@ RgSchCellCb *cell; RgSchDlHqEnt **hqE; #endif { - TRC2(rgSCHDhmDelHqEnt) if (!(*hqE)) { @@ -357,8 +354,6 @@ RgSchCellCb *cell; RgSchDlHqEnt *hqE; Inst inst = cell->instIdx; - TRC2(rgSCHDhmHqEntInit) - /* Init the HARQ data structure */ if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE, sizeof(RgSchDlHqEnt)) != ROK) { @@ -441,7 +436,6 @@ RgSchDlHqProcCb **hqP; RgSchDlHqEnt *hqE = NULLP; RgSchDlHqProcCb *tmpHqProc; CmLList *tmp; - TRC2(rgSCHDhmGetAvlHqProc); hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); @@ -564,7 +558,6 @@ U8 tbIdx; #endif { U8 othrTbIdx = tbIdx ^ 1; - TRC2(rgSCHDhmHqTbRetx) hqP->tbInfo[tbIdx].timingInfo = timingInfo; @@ -625,7 +618,6 @@ RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE) RgSchDlHqEnt *hqE; #endif { - TRC2(rgSCHDhmLastSchedHqProc); /* GRPPWR_CNTRL Fix: UE context will not hold a valid hqE, * until RACH procedure is completed */ if ((hqE == NULLP) || (hqE->inUse.last == NULLP)) @@ -679,8 +671,6 @@ RgSchDlHqProcCb **hqP; CmLList *tmp; RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetCcchSduHqProc) - hqE = ueCb->cellInfo[0]->hqEnt; CM_LLIST_FIRST_NODE(&(hqE->free), tmp); if (NULLP == tmp) @@ -751,8 +741,6 @@ CmLteTimingInfo timingInfo; CmLList *tmp; RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetMsg4HqProc) - hqE = raCb->dlHqE; CM_LLIST_FIRST_NODE(&(hqE->free), tmp); if (NULLP == tmp) @@ -816,8 +804,6 @@ Bool togNdi; U8 numLch = 0; #endif - TRC2(rgSCHDhmRlsHqpTb) - /* Reset all tbInfo values */ hqE = hqP->hqE; @@ -1043,8 +1029,6 @@ RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmRlsHqProc) - #ifdef MAC_SCH_STATS /* THIS FUNCTION IS NOT CALLED */ @@ -1131,7 +1115,6 @@ RgSchDlHqProcCb **hqP; #endif { RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetHqProcFrmId) hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); /* Pick the proc based on the index provided */ @@ -1172,8 +1155,6 @@ CmLteTimingInfo timingInfo; RgSchDlHqProcCb *hqProc = NULLP; CmLList *tmp = NULLP; - TRC2(rgSCHDhmSpsDlGetHqProc); - hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); CM_LLIST_FIRST_NODE(&(hqE->free), tmp); @@ -1261,8 +1242,6 @@ Bool maxHqRetxReached; RgSchUeCb *ueCb; RgSchCellCb *cell; - TRC2(rgSCHDhmFdbkIndHndlTa) - ueCb = hqP->hqE->ue; cell = ueCb->cell; switch(fdbk) @@ -1348,8 +1327,6 @@ RgSchDlHqTbCb *tbInfo; #endif { - TRC2(rgSCHDhmSchdTa) - ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED; ueCb->dl.taCb.numRemSf = 2; tbInfo->schdTa.pres = PRSNT_NODEF; @@ -1587,8 +1564,6 @@ Bool *isMaxRetx; RgSchDlHqEnt *hqE; U8 maxHqTx; - TRC2(rgSCHDhmHqTbTrnsFail) - hqE = hqP->hqE; /* Fetch the maximum number of harq transmissions */ @@ -2129,7 +2104,6 @@ RgSchErrInfo *err; #endif /* LTEMAC_SPS_AN_MUX*/ RgrSchFrmt1b3TypEnum uciFrmtTyp = RG_SCH_UCI_FORMAT1A_1B; - TRC2(rgSCHDhmHqFdbkInd) if (cbType == RGSCH_HQ_FDB_IND_CB_TYPE_RA_CB) { @@ -2804,7 +2778,6 @@ RgSchErrInfo *err; CmLteTimingInfo frm = timingInfo; #endif - TRC2(rgSCHDhmPrcFdbkForTb) if (ue) { ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -3288,8 +3261,6 @@ RgSchErrInfo *err; U8 hqPCount = 0; RgInfRlsHqInfo *rlsHqBufs = NULLP; - TRC2(rgSCHDhm5gtfHqFdbkInd) - RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); sf = rgSCHUtlSubFrmGet(cell, timingInfo); @@ -3400,8 +3371,6 @@ RgSchErrInfo *err; #endif RgrSchFrmt1b3TypEnum uciFrmtTyp = RG_SCH_UCI_FORMAT1A_1B; - TRC2(rgSCHDhmHqFdbkInd) - /* Get the subframe associated with the feedback */ /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper output * if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() as it is @@ -3651,7 +3620,6 @@ RgrUeCfg *ueCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHDhmRgrUeCfg) UNUSED(err); @@ -3723,8 +3691,6 @@ RgSchErrInfo *err; S16 ret; U8 idx; - TRC2(rgSCHDhmRgrCellCfg) - UNUSED(err); pUeCb = NULLP; @@ -3809,8 +3775,6 @@ RgSchErrInfo *err; PTR nUeCb;/* next UE control block */ S16 ret; - TRC2(rgSCHDhmRgrCellRecfg) - UNUSED(err); pUeCb = NULLP; @@ -3864,8 +3828,6 @@ RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDhmFreeUe) - /* If TA Timer is running. Stop it */ if (ueCb->taTmr.tmrEvnt != TMR_NONE) { @@ -3937,7 +3899,6 @@ RgSchUeCb *ueCb; U8 ta; #endif { - TRC2(rgSCHDhmUpdTa) if (ueCb->dl.taCb.state == RGSCH_TA_IDLE) { @@ -3996,8 +3957,6 @@ Void rgSCHDhmProcTAExp (ueCb) RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDhmProcTAExp); - /* Ask scheduler to schedule this UE */ ueCb->dl.taCb.state = RGSCH_TA_TOBE_SCHEDULED; rgSCHUtlDlTARpt(ueCb->cell, ueCb); @@ -4037,8 +3996,6 @@ RgSchDlHqTbCb *tbInfo; #endif { - TRC2(rgSCHDhmAddLcData) - if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC) { return RFAILED; @@ -4086,8 +4043,6 @@ CmLteTimingInfo uciTimingInfo; U8 noFdbks; U8 i; - TRC2(rgSCHDhmTddRlsSubFrm) - ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot]; noFdbks = ascIdx.numFdbkSubfrms; @@ -4154,7 +4109,6 @@ CmLteTimingInfo uciTimingInfo; RgSchTddANInfo *anInfo = NULLP; RgSchDlHqTbCb *tbCb; RgSchUeCb *ue = NULLP; - TRC2(rgSCHDhmRlsDlsfHqProc) ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot]; @@ -4435,8 +4389,6 @@ CmLteTimingInfo timingInfo; RgSchDlHqTbCb *tbCb; RgSchUeCb *ue; - TRC2(rgSCHDhmRlsDlsfHqProc) - /* Fetch the current timing info. Modify it to Last sf to be rlsd.*/ /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper * output if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() @@ -4592,7 +4544,6 @@ U8 idx; #endif { RgSchDlHqProcCb *hqP; - TRC2(rgSCHDhmMarkSpsHqProc) /* Pick the proc based on the index provided */ rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP); @@ -4637,7 +4588,6 @@ U8 tbCnt; U8 *isAck; #endif { - TRC2(rgSCHDhmProcHqFdbkAckNackRep) /* Check if this is repeating UE */ rgSCHUtlDlHqPTbRmvFrmTx(sf, hqP, tbCnt, TRUE); /* Check if last repetition */ @@ -4709,8 +4659,6 @@ RgSchDlHqProcCb *hqP; Bool maxRetx = FALSE; RgSchCmnCell *cellSch; - TRC2(rgSCHDhmDlRetxAllocFail); - cell = hqP->hqE->cell; cellSch = RG_SCH_CMN_GET_CELL(cell); rlsHqInfo = &(cell->rlsHqArr[cell->crntHqIdx]); @@ -4957,8 +4905,6 @@ U8 hqCnt; { U8 numOfAcks; - TRC2(rgSCHDhmPrcSplBundlFdbk); - /* Num of ACKs reported by UE */ numOfAcks = fdbk->isAck[0]; @@ -5015,7 +4961,6 @@ Void rgSCHDhmHqPAdd2FreeLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPAdd2FreeLst) #ifdef LAA_DBG if (hqP->hqPLst) @@ -5072,7 +5017,6 @@ Void rgSCHDhmHqPAdd2InUseLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPAdd2InUseLst) #ifdef LAA_DBG if (hqP->hqPLst) @@ -5124,7 +5068,6 @@ Void rgSCHDhmHqPDelFrmFreeLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPDelFrmFreeLst) #ifdef LAA_DBG if (!hqP->hqPLst) @@ -5187,7 +5130,6 @@ Void rgSCHDhmHqPDelFrmInUseLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPDelFrmInUseLst) #ifdef LAA_DBG if (!hqP->hqPLst)