X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_dbm.c;h=212a49dd36d6c43abd27cae4b223b11ca3d76600;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=a6330300f2de2d0272fab7d9854465554b430c28;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c index a6330300f..212a49dd3 100755 --- a/src/5gnrsch/rg_sch_dbm.c +++ b/src/5gnrsch/rg_sch_dbm.c @@ -58,15 +58,15 @@ static int RLOG_MODULE_ID=4096; /* local defines */ -PRIVATE S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, U16 numBins)); +PRIVATE S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); #ifdef LTE_TDD -PRIVATE S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, U16 numBins)); +PRIVATE S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); #endif PRIVATE Void rgSCHDbmInitDedLcLst ARGS((RgSchUeCb *ueCb)); PRIVATE Void rgSCHDbmInitCmnLcLst ARGS((RgSchCellCb *cellCb)); #ifdef LTEMAC_SPS PRIVATE S16 rgSCHDbmInitSpsUeCbLst ARGS((RgSchCellCb *cellCb, - U16 numBins)); + uint16_t numBins)); #endif PRIVATE Void rgSCHDbmInitRaCbLst ARGS(( RgSchCellCb *cellCb)); #ifndef LTE_TDD @@ -112,8 +112,6 @@ RgSchCellCb *cellCb; { S16 ret; - TRC2(rgSCHDbmInitCell); - /* Initialize ue list */ if ((ret = rgSCHDbmInitUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK) return (ret); @@ -171,20 +169,19 @@ RgSchCellCb *cellCb; PRIVATE S16 rgSCHDbmInitUeCbLst ( RgSchCellCb *cellCb, -U16 numBins +uint16_t numBins ) #else PRIVATE S16 rgSCHDbmInitUeCbLst(cellCb, numBins) RgSchCellCb *cellCb; -U16 numBins; +uint16_t numBins; #endif { RgSchUeCellInfo ueCellInfo; - TRC2(rgSCHDbmInitUeCbLst) /* Fix: syed It is better to compute offset dynamically * rather than hardcoding it as 0 */ - return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, + return (cmHashListInit(&cellCb->ueLst, numBins, (uint16_t)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, CM_HASH_KEYTYPE_CONID, rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool)); @@ -214,7 +211,6 @@ S16 rgSCHDbmDeInitUeCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitUeCbLst) return (cmHashListDeinit(&cellCb->ueLst)); @@ -239,18 +235,17 @@ RgSchCellCb *cellCb; PRIVATE S16 rgSCHDbmInitSpsUeCbLst ( RgSchCellCb *cellCb, -U16 numBins +uint16_t numBins ) #else PRIVATE S16 rgSCHDbmInitSpsUeCbLst(cellCb, numBins) RgSchCellCb *cellCb; -U16 numBins; +uint16_t numBins; #endif { RgSchUeCb ue; - TRC2(rgSCHDbmInitSpsUeCbLst) - return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, + return (cmHashListInit(&cellCb->spsUeLst, numBins, (uint16_t) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool)); @@ -280,7 +275,6 @@ S16 rgSCHDbmDeInitSpsUeCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitSpsUeCbLst) return (cmHashListDeinit(&cellCb->spsUeLst)); @@ -315,12 +309,11 @@ RgSchUeCb *ueCb; #endif { RgSchUeCellInfo *ueCellInfo = NULLP; - TRC2(rgSCHDbmInsUeCb) ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]]; return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, - (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId))); + (uint8_t *)&ueCb->ueId, (uint16_t)sizeof(ueCb->ueId))); } /* rgSCHDbmInsUeCb */ @@ -351,10 +344,8 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDbmInsSpsUeCb) - return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, - (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); + (uint8_t *)&ueCb->spsRnti, (uint16_t)sizeof(ueCb->spsRnti))); } /* end of rgSCHDbmInsSpsUeCb */ @@ -387,9 +378,7 @@ CmLteRnti ueId; { RgSchUeCellInfo *ueCellInfo = NULLP; - TRC2(rgSCHDbmGetUeCb) - - cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, + cmHashListFind(&cellCb->ueLst, (uint8_t *)&ueId, sizeof(ueId), 0, (PTR *)&ueCellInfo); return (!ueCellInfo?NULLP:ueCellInfo->ue); @@ -423,9 +412,7 @@ CmLteRnti spsRnti; { RgSchUeCb *ueCb = NULLP; - TRC2(rgSCHDbmGetSpsUeCb) - - cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, + cmHashListFind(&cellCb->spsUeLst, (uint8_t *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); return (ueCb); } /* rgSCHDbmGetSpsUeCb */ @@ -459,8 +446,6 @@ RgSchUeCb *ueCb; RgSchUeCellInfo *ueCellInfo = NULLP; RgSchUeCellInfo *nextUeCellInfo = NULLP; - TRC2(rgSCHDbmGetNextUeCb) - if (ueCb) { ueCellInfo = ueCb->cellInfo[ @@ -499,8 +484,6 @@ RgSchUeCb *ueCb; { RgSchUeCb *nextUeCb = NULLP; - TRC2(rgSCHDbmGetNextSpsUeCb) - cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb); return (nextUeCb); } /* end of rgSCHDbmGetNextSpsUeCb */ @@ -535,11 +518,9 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - U8 lcCnt = 0; + uint8_t lcCnt = 0; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb); - TRC2(rgSCHDbmDelL2MUe) - ueUl->hqEnt.numBusyHqProcs = 0; /* Clean cell level UE Active Count */ for (lcCnt =0; lcCnt < RGSCH_MAX_LC_PER_UE; lcCnt++) @@ -599,7 +580,6 @@ RgSchUeCb *ueCb; #endif { RgSchUeCellInfo *ueCellInfo = NULLP; - TRC2(rgSCHDbmDelUeCb) ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]]; @@ -634,7 +614,6 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDbmDelSpsUeCb) return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); } /* end of rgSCHDbmDelSpsUeCb */ @@ -668,8 +647,6 @@ RgSchUeCb *ueCb; { S16 ret = ROK; - TRC2(rgSCHDbmInitUe); - /* Initialize Dedicated logical channels */ rgSCHDbmInitDedLcLst(ueCb); @@ -698,10 +675,8 @@ PRIVATE Void rgSCHDbmInitDedLcLst(ueCb) RgSchUeCb *ueCb; #endif { - U8 idx; + uint8_t idx; - TRC2(rgSCHDbmInitDedLcLst); - for (idx = 0; idx < RGSCH_MAX_LC_PER_UE; ++idx) { /* Set Dedicated LCs as not configured */ @@ -710,7 +685,7 @@ RgSchUeCb *ueCb; } /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmInitDedLcLst */ @@ -740,17 +715,15 @@ PRIVATE Void rgSCHDbmInitCmnLcLst(cellCb) RgSchCellCb *cellCb; #endif { - U8 idx; + uint8_t idx; - TRC2(rgSCHDbmInitCmnLcLst); - for (idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++) { cellCb->cmnLcCb[idx].lcId = RGSCH_INVALID_LC_ID; } /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmInitCmnLcLst */ @@ -777,7 +750,6 @@ RgSchUeCb *ueCb; RgSchDlLcCb *dlLcCb; #endif { - TRC2(rgSCHDbmInsDlDedLcCb); ueCb->dl.lcCb[dlLcCb->lcId - 1] = dlLcCb; @@ -806,7 +778,6 @@ RgSchUeCb *ueCb; RgSchDlLcCb *dlLcCb; #endif { - TRC2(rgSCHDbmDelDlDedLcCb); #ifdef LTE_L2_MEAS /* Clean cell level UE Active Count */ @@ -828,7 +799,7 @@ RgSchDlLcCb *dlLcCb; ueCb->dl.lcCb[dlLcCb->lcId - 1] = NULLP; /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmDelDlDedLcCb */ @@ -856,8 +827,6 @@ RgSchUeCb *ueCb; CmLteLcId idx; #endif { - TRC2(rgSCHDbmGetDlDedLcCb); - if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID) { return (NULLP); @@ -888,8 +857,7 @@ RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(ueCb) RgSchUeCb *ueCb; #endif { - U8 idx; - TRC2(rgSCHDbmGetFirstDlDedLcCb) + uint8_t idx; for(idx = 0; idx < RGSCH_DEDLC_MAX_LCID; idx++) { @@ -925,8 +893,7 @@ RgSchUeCb *ueCb; RgSchDlLcCb *lcCb; #endif { - U8 idx; - TRC2(rgSCHDbmGetNextDlDedLcCb); + uint8_t idx; if (!lcCb) { @@ -968,9 +935,7 @@ RgSchCellCb *cellCb; CmLteLcId lcId; #endif { - U8 idx; - - TRC2(rgSCHDbmGetCmnLcCb) + uint8_t idx; for(idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++) { @@ -1004,7 +969,6 @@ RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmGetBcchOnBch) if(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId != RGSCH_INVALID_LC_ID) { @@ -1035,7 +999,6 @@ RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmGetFirstBcchOnDlsch) if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId != RGSCH_INVALID_LC_ID) { @@ -1066,7 +1029,6 @@ RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmGetSecondBcchOnDlsch) if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2].lcId != RGSCH_INVALID_LC_ID) { @@ -1096,7 +1058,6 @@ RgSchClcDlLcCb* rgSCHDbmGetPcch(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmGetPcch) if(cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId != RGSCH_INVALID_LC_ID) { @@ -1129,13 +1090,12 @@ RgSchCellCb *cellCb; RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInsBcchOnBch) cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId = cmnDlLcCb->lcId; cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].boLst = cmnDlLcCb->boLst; /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmInsBcchOnBch */ @@ -1163,8 +1123,6 @@ RgSchCellCb *cellCb; RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInsBcchOnDlsch) - if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId == RGSCH_INVALID_LC_ID) { cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId = cmnDlLcCb->lcId; @@ -1179,7 +1137,7 @@ RgSchClcDlLcCb *cmnDlLcCb; } /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmInsBcchOnDlsch */ @@ -1207,13 +1165,12 @@ RgSchCellCb *cellCb; RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInsPcch) cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId = cmnDlLcCb->lcId; cellCb->cmnLcCb[RGSCH_PCCH_IDX].boLst = cmnDlLcCb->boLst; /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmInsPcch */ @@ -1238,10 +1195,9 @@ Void rgSCHDbmInitCmnLcBoLst(cmnDlLcCb) RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInitCmnLcBoLst) cmLListInit(&cmnDlLcCb->boLst); - RETVOID; + return; } /* rgSCHDbmInitCmnLcBoLst */ /** @@ -1268,13 +1224,11 @@ RgSchClcDlLcCb *cmnDlLcCb; RgSchClcBoRpt *cmnBoRpt; #endif { - TRC2(rgSCHDbmInsCmnLcBoRpt) - cmnBoRpt->boLstEnt.next = NULLP; cmnBoRpt->boLstEnt.prev = NULLP; cmnBoRpt->boLstEnt.node = (PTR)cmnBoRpt; cmLListAdd2Tail(&cmnDlLcCb->boLst, &cmnBoRpt->boLstEnt); - RETVOID; + return; } /* rgSCHDbmInsCmnLcBoRpt */ @@ -1299,10 +1253,9 @@ PRIVATE Void rgSCHDbmInitRaCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitRaCbLst) cmLListInit(&cellCb->raInfo.raCbLst); - RETVOID; + return; } /* rgSCHDbmInitRaCbLst */ @@ -1332,8 +1285,6 @@ CmLteRnti key; { CmLList *tmpNode; - TRC2(rgSCHDbmGetRaCb) - CM_LLIST_FIRST_NODE(&cellCb->raInfo.raCbLst,tmpNode); while(tmpNode) { @@ -1368,9 +1319,7 @@ PRIVATE Void rgSCHDbmInitRaReqLst(cellCb) RgSchCellCb *cellCb; #endif { - U8 idx; - - TRC2(rgSCHDbmInitRaReqLst) + uint8_t idx; /* ccpu00133557- Memory Leak Fix- initializing for the all nodes * in RAREQ list*/ @@ -1378,7 +1327,7 @@ RgSchCellCb *cellCb; { cmLListInit(&cellCb->raInfo.raReqLst[idx]); } - RETVOID; + return; } /* rgSCHDbmInitRaReqLst */ #endif @@ -1403,10 +1352,9 @@ PRIVATE Void rgSCHDbmInitCrntRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitCrntRgrCfgLst) cmLListInit(&cellCb->rgCfgInfo.crntRgrCfgLst); - RETVOID; + return; } /* rgSCHDbmInitCrntRgrCfgLst */ /** @@ -1430,10 +1378,9 @@ PRIVATE Void rgSCHDbmInitPndngRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitPndngRgrCfgLst) cmLListInit(&cellCb->rgCfgInfo.pndngRgrCfgLst); - RETVOID; + return; } /* rgSCHDbmInitPndngRgrCfgLst */ /** @@ -1460,12 +1407,10 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmInsCrntRgrCfgElem) - cfgElem->cfgReqLstEnt.next = NULLP; cfgElem->cfgReqLstEnt.prev = NULLP; cmLListAdd2Tail(&cellCb->rgCfgInfo.crntRgrCfgLst, &cfgElem->cfgReqLstEnt); - RETVOID; + return; } /* rgSCHDbmInsCrntRgrCfgElem */ /** @@ -1492,13 +1437,12 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmInsPndngRgrCfgElem) cfgElem->cfgReqLstEnt.next = NULLP; cfgElem->cfgReqLstEnt.prev = NULLP; cfgElem->cfgReqLstEnt.node = (PTR)cfgElem; cmLListAdd2Tail(&cellCb->rgCfgInfo.pndngRgrCfgLst, &cfgElem->cfgReqLstEnt); - RETVOID; + return; } /* rgSCHDbmInsPndngRgrCfgElem */ /** @@ -1525,7 +1469,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmGetNextCrntRgrCfgElem) if(!cfgElem) { @@ -1560,7 +1503,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmGetNextPndngRgrCfgElem) if(!cfgElem) { @@ -1597,8 +1539,6 @@ CmLteTimingInfo key; { CmLList *tmpNode; - TRC2(rgSCHDbmGetPndngRgrCfgElemByKey) - CM_LLIST_FIRST_NODE(&cellCb->rgCfgInfo.pndngRgrCfgLst,tmpNode); while(tmpNode) { @@ -1636,7 +1576,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmDelCrntRgrCfgElem) if(cmLListDelFrm(&cellCb->rgCfgInfo.crntRgrCfgLst,&cfgElem->cfgReqLstEnt)) { @@ -1669,8 +1608,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmDelPndngRgrCfgElem) - if(cmLListDelFrm(&cellCb->rgCfgInfo.pndngRgrCfgLst,&cfgElem->cfgReqLstEnt)) { return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node)); @@ -1697,22 +1634,20 @@ RgSchCfgElem *cfgElem; S16 rgSCHDbmRntiDbInit ( RgSchCellCb *cellCb, -U16 rntiStart, -U16 maxRntis +uint16_t rntiStart, +uint16_t maxRntis ) #else S16 rgSCHDbmRntiDbInit(cellCb, rntiStart, maxRntis) RgSchCellCb *cellCb; -U16 rntiStart; -U16 maxRntis; +uint16_t rntiStart; +uint16_t maxRntis; #endif { - U16 rnti; + uint16_t rnti; RgSchRntiLnk *rntiPool; - TRC2(rgSCHDbmRntiDbInit) - - /* Fix for Change Request ccpu00099150 */ + /* Fix for Change Request ccpu00099150 */ if(rgSCHUtlAllocSBuf(cellCb->instIdx, (Data **)&cellCb->rntiDb.rntiPool,maxRntis*sizeof(RgSchRntiLnk)) != ROK) { @@ -1734,7 +1669,7 @@ U16 maxRntis; } else { - U16 idx; + uint16_t idx; rntiPool[0].rnti = rnti++; rntiPool[0].prv = NULLP; rntiPool[0].nxt = &rntiPool[1]; @@ -1774,8 +1709,6 @@ Void rgSCHDbmRntiDbDeInit(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmRntiDbDeInit) - /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cellCb->instIdx, (Data **)(&(cellCb->rntiDb.rntiPool)), @@ -1786,7 +1719,7 @@ RgSchCellCb *cellCb; cmLListInit(&cellCb->rntiDb.rntiGuardPool); /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmRntiDbDeInit */ @@ -1813,8 +1746,6 @@ RgSchCellCb *cellCb; { RgSchRntiLnk *rntiLnk; - TRC2(rgSCHDbmGetRnti) - if (!(cellCb->rntiDb.freeRnti)) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI exhausted count:%d", @@ -1868,11 +1799,10 @@ RgSchCellCb *cellCb; RgSchRntiLnk *rntiLnk; #endif { - TRC2(rgSCHDbmRlsRnti) #ifdef EMTC_ENABLE if(ROK==rgSCHDbmPutEmtcRnti(cellCb,rntiLnk)) { -RETVOID; +return; } #endif rntiLnk->nxt = NULLP; @@ -1891,7 +1821,7 @@ RETVOID; cellCb->rntiDb.count++; /* Stack Crash problems for TRACE5 Changes. Added the return below */ - RETVOID; + return; } /* rgSCHDbmRlsRnti */ @@ -1914,20 +1844,19 @@ RETVOID; PRIVATE S16 rgSCHDbmInitUeTfuPendLst ( RgSchCellCb *cellCb, -U16 numBins +uint16_t numBins ) #else PRIVATE S16 rgSCHDbmInitUeTfuPendLst(cellCb, numBins) RgSchCellCb *cellCb; -U16 numBins; +uint16_t numBins; #endif { RgSchUePucchRecpInfo pucchInfo; - TRC2(rgSCHDbmInitUeTfuPendLst) /* Fix: syed It is better to compute offset dynamically * rather than hardcoding it as 0 */ - if(cmHashListInit(&cellCb->ueTfuPendLst, numBins, (U16)((PTR)&(pucchInfo.hashLstEnt) - (PTR)&pucchInfo), FALSE, + if(cmHashListInit(&cellCb->ueTfuPendLst, numBins, (uint16_t)((PTR)&(pucchInfo.hashLstEnt) - (PTR)&pucchInfo), FALSE, CM_HASH_KEYTYPE_CONID, rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool) != ROK) @@ -1962,7 +1891,6 @@ S16 rgSCHDbmDeInitUeTfuPendLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitUeTfuPendLst) cmHashListDeinit(&cellCb->ueTfuPendLst);