X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_tenb_stats.c;h=dba907f2ed5031c54214c4083155be4eee6d3d7a;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=906d233392be60733080f77457af7f6b99352a26;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 906d23339..dba907f2e 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -181,7 +181,7 @@ PRIVATE Buffer* TSInfUtlAllocMsg(pst) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { printf("\n MBuf Allocation failed\n"); } - RETVALUE(mBuf); + return (mBuf); } #ifdef ANSI @@ -201,68 +201,68 @@ PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) TRC2(TSInfUtlPackUeInfo) - CMCHKPK(SPkU32, stats->persistent.numDeactivation, mBuf); - CMCHKPK(SPkU32, stats->persistent.numActivation, mBuf); - CMCHKPK(SPkU32, stats->persistent.activatedSCells, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.numDeactivation, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.numActivation, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.activatedSCells, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); for (k = 0; k < L2_STATS_MAX_CELLS; k++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulTpt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNumCqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulSumCqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNackCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulTxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlTpt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlBo, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTpt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNackCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTpt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlBo, mBuf); for (i=0; i<4; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].riCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].riCnt[i], mBuf); } for (i=0; i<5; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf); } - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf); for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf); } for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf); } for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf); } - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlTxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTxOccns, mBuf); } - CMCHKPK(SPkU32, stats->rnti, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rnti, mBuf); RETVOID; } @@ -282,103 +282,103 @@ PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) TRC2(TSInfUtlPackCellInfo) - CMCHKPK(SPkU32, stats->rlc.reOdrTmrExp, mBuf); - CMCHKPK(SPkU32, stats->rlc.maxRlcDrbRetxFail, mBuf); - CMCHKPK(SPkU32, stats->rlc.maxRlcSrbRetxFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.reOdrTmrExp, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcDrbRetxFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcSrbRetxFail, mBuf); - CMCHKPK(SPkU32, stats->sch.ulNumiTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.ulSumiTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.ulNumCqi, mBuf); - CMCHKPK(SPkU32, stats->sch.ulSumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulSumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulSumCqi, mBuf); #ifdef RG_5GTF - CMCHKPK(SPkU32, stats->sch.ul5gtfRbAllocFail, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfPdcchSend, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeFnlzReAdd, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeRbAllocDone, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfAllocAllocated, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfPdcchSchd, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeSchPick, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfBsrRecv, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfSrRecv, mBuf); - - CMCHKPK(SPkU32, stats->sch.dl5gtfPdschCons, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfPdcchSend, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfBoUpd, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfFnlzFail, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfFnlzPass, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfRbAllocFail, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfRbAllocPass, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfUePick, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfRbAllocFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSend, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeFnlzReAdd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRbAllocDone, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfAllocAllocated, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSchd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeSchPick, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfBsrRecv, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfSrRecv, mBuf); + + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdschCons, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdcchSend, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfBoUpd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzPass, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocPass, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfUePick, mBuf); #endif - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime500, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime600, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime700, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime800, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime900, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime1000, mBuf); - CMCHKPK(SPkU32, stats->sch.avgTtiProcTime, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime500, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime600, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime700, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime800, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime900, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime1000, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.avgTtiProcTime, mBuf); for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.dlPdbRatio[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlPdbRatio[i], mBuf); } for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulPrbUsage[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulPrbUsage[i], mBuf); } for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.dlPrbUsage[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlPrbUsage[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulDtx[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulDtx[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulAckNack[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulAckNack[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulNack[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNack[i], mBuf); } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlDtx[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlDtx[i][j], mBuf); } } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlAckNack[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlAckNack[i][j], mBuf); } } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlNack[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNack[i][j], mBuf); } } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.riCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.riCnt[i], mBuf); } - CMCHKPK(SPkU32, stats->sch.dlNumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.msg3Fail, mBuf); - CMCHKPK(SPkU32, stats->sch.msg4Fail, mBuf); - - CMCHKPK(SPkU32, stats->cellId, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.msg3Fail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.msg4Fail, mBuf); + + CMCHKPK(oduUnpackUInt32, stats->cellId, mBuf); RETVOID; } @@ -400,68 +400,68 @@ PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) TRC2(TSInfUtlUnpkUeInfo) - CMCHKUNPK(SUnpkU32, &stats->rnti, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rnti, mBuf); for (k = L2_STATS_MAX_CELLS; k > 0; k--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf); for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf); } for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf); } for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf); for (i=4; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlBo, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlBo, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.activatedSCells, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.numActivation, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.numDeactivation, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.activatedSCells, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.numActivation, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.numDeactivation, mBuf); RETVOID; } @@ -482,103 +482,103 @@ PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) TRC2(TSInfUtlUnpkCellInfo) - CMCHKUNPK(SUnpkU32, &stats->cellId, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->sch.msg4Fail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.msg3Fail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->cellId, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->sch.msg4Fail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.msg3Fail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1iTbs, mBuf); for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.riCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.riCnt[i], mBuf); } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlNack[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNack[i][j], mBuf); } } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlAckNack[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlAckNack[i][j], mBuf); } } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlDtx[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlDtx[i][j], mBuf); } } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulNack[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNack[i], mBuf); } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulAckNack[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulAckNack[i], mBuf); } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulDtx[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulDtx[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlPrbUsage[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlPrbUsage[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulPrbUsage[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulPrbUsage[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlPdbRatio[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlPdbRatio[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->sch.avgTtiProcTime, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime1000, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime900, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime800, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime700, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime600, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime500, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.avgTtiProcTime, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime1000, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime900, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime800, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime700, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime600, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime500, mBuf); #ifdef RG_5GTF - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfUePick, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfRbAllocPass, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfRbAllocFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfFnlzPass, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfFnlzFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfBoUpd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfPdcchSend, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfPdschCons, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfSrRecv, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfBsrRecv, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeSchPick, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfPdcchSchd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfAllocAllocated, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeRbAllocDone, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfPdcchSend, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfRbAllocFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfUePick, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocPass, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzPass, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfBoUpd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdcchSend, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdschCons, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfSrRecv, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfBsrRecv, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeSchPick, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSchd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfAllocAllocated, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRbAllocDone, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSend, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfRbAllocFail, mBuf); #endif - CMCHKUNPK(SUnpkU32, &stats->sch.ulSumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulNumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulSumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulNumiTbs, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->rlc.maxRlcSrbRetxFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->rlc.maxRlcDrbRetxFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->rlc.reOdrTmrExp, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumiTbs, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcSrbRetxFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcDrbRetxFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rlc.reOdrTmrExp, mBuf); RETVOID; }