From 5d74fef7c9fe6b65a965ceac6bfe812872dab323 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Wed, 21 Oct 2020 20:18:16 +0530 Subject: [PATCH] replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces from functions Change-Id: I00bb5b0289418335f400ce9489fa2addfafdbf03 Signed-off-by: sphoorthi --- src/5gnrmac/lwr_mac_phy.h | 4 +- src/5gnrmac/mac_cfg_hdl.c | 6 +- src/5gnrmac/mac_utils.h | 4 +- src/5gnrmac/rg_cfg.c | 68 +------- src/5gnrmac/rg_com.c | 17 +- src/5gnrmac/rg_dbm.c | 53 ------ src/5gnrmac/rg_dhm.c | 30 +--- src/5gnrmac/rg_dux.c | 5 - src/5gnrmac/rg_ex_ms.c | 12 -- src/5gnrmac/rg_id.c | 4 +- src/5gnrmac/rg_l2m.c | 43 ++--- src/5gnrmac/rg_lim.c | 14 +- src/5gnrmac/rg_lmm.c | 103 +++++------ src/5gnrmac/rg_mux.c | 19 --- src/5gnrmac/rg_pom_scell.c | 20 --- src/5gnrmac/rg_prg.c | 24 --- src/5gnrmac/rg_prg_pt.c | 12 -- src/5gnrmac/rg_ptli.c | 31 ---- src/5gnrmac/rg_ptmi.c | 33 ---- src/5gnrmac/rg_ptui.c | 79 +-------- src/5gnrmac/rg_ram.c | 8 - src/5gnrmac/rg_rom.c | 25 +-- src/5gnrmac/rg_tom.c | 36 +--- src/5gnrmac/rg_uhm.c | 3 - src/5gnrmac/rg_uim.c | 50 +----- src/5gnrmac/rg_utl.c | 54 +----- src/5gnrrlc/kw.h | 14 +- src/5gnrrlc/kw_amm_dl.c | 33 ---- src/5gnrrlc/kw_amm_ul.c | 15 -- src/5gnrrlc/kw_cfg_dl.c | 25 +-- src/5gnrrlc/kw_cfg_ul.c | 15 +- src/5gnrrlc/kw_dbm_dl.c | 19 --- src/5gnrrlc/kw_dbm_ul.c | 33 ---- src/5gnrrlc/kw_dl.h | 2 +- src/5gnrrlc/kw_dl_ex_ms.c | 4 - src/5gnrrlc/kw_id.c | 1 - src/5gnrrlc/kw_lim.c | 4 - src/5gnrrlc/kw_lmm.c | 54 +----- src/5gnrrlc/kw_ptli.c | 6 +- src/5gnrrlc/kw_ptmi.c | 13 -- src/5gnrrlc/kw_ptui.c | 11 -- src/5gnrrlc/kw_tenb_stats.c | 21 +-- src/5gnrrlc/kw_tmm_dl.c | 5 - src/5gnrrlc/kw_tmm_ul.c | 2 - src/5gnrrlc/kw_tmr.c | 3 - src/5gnrrlc/kw_udx.c | 54 +----- src/5gnrrlc/kw_udx_dl.c | 14 +- src/5gnrrlc/kw_udx_ptdl.c | 8 - src/5gnrrlc/kw_udx_ptul.c | 26 --- src/5gnrrlc/kw_udx_ul.c | 6 - src/5gnrrlc/kw_uim.c | 15 -- src/5gnrrlc/kw_ul_ex_ms.c | 3 - src/5gnrrlc/kw_umm_dl.c | 10 +- src/5gnrrlc/kw_umm_ul.c | 10 -- src/5gnrrlc/kw_utl_dl.c | 34 +--- src/5gnrrlc/kw_utl_ul.c | 18 +- src/5gnrrlc/mac_stub.c | 6 +- src/5gnrsch/rg_sch.c | 87 ++-------- src/5gnrsch/rg_sch_cfg.c | 189 ++------------------- src/5gnrsch/rg_sch_cmn.c | 368 +++------------------------------------- src/5gnrsch/rg_sch_dbm.c | 74 +------- src/5gnrsch/rg_sch_dhm.c | 58 ------- src/5gnrsch/rg_sch_drx.c | 54 +----- src/5gnrsch/rg_sch_empty.c | 30 ---- src/5gnrsch/rg_sch_ex_ms.c | 2 - src/5gnrsch/rg_sch_gom.c | 33 +--- src/5gnrsch/rg_sch_hdfdd.c | 15 -- src/5gnrsch/rg_sch_inf.c | 66 +------ src/5gnrsch/rg_sch_l2m.c | 32 +--- src/5gnrsch/rg_sch_lmm.c | 50 ++---- src/5gnrsch/rg_sch_mga.c | 35 ---- src/5gnrsch/rg_sch_pt.c | 38 ----- src/5gnrsch/rg_sch_pwr.c | 88 +--------- src/5gnrsch/rg_sch_ram.c | 23 --- src/5gnrsch/rg_sch_sc1.c | 96 +---------- src/5gnrsch/rg_sch_scell.c | 27 +-- src/5gnrsch/rg_sch_tmr.c | 8 - src/5gnrsch/rg_sch_tom.c | 111 +----------- src/5gnrsch/rg_sch_uhm.c | 20 --- src/5gnrsch/rg_sch_utl.c | 288 +++---------------------------- src/5gnrsch/rg_sch_utl_clist.c | 5 - src/5gnrsch/sch.c | 10 +- src/5gnrsch/sch_utils.h | 2 +- src/cm/ckw.c | 40 +---- src/cm/cm_bdy5.c | 10 -- src/cm/cm_gen.c | 78 --------- src/cm/cm_hash.c | 20 --- src/cm/cm_inet.c | 206 +++++++++------------- src/cm/cm_inet.h | 4 +- src/cm/cm_lib.c | 11 +- src/cm/cm_llist.c | 7 - src/cm/cm_lte.c | 6 - src/cm/cm_mblk.c | 26 +-- src/cm/cm_mem.c | 69 ++------ src/cm/cm_mem_wl.c | 74 ++------ src/cm/cm_tenb_stats.c | 11 -- src/cm/cm_tkns.c | 21 --- src/cm/cm_tpt.c | 41 ----- src/cm/crg.c | 44 ----- src/cm/ctf.c | 142 ---------------- src/cm/envdep.h | 106 ------------ src/cm/gen.h | 4 +- src/cm/kwu.c | 56 ++---- src/cm/legtp.c | 10 +- src/cm/lkw.c | 69 +------- src/cm/lrg.c | 105 +----------- src/cm/lsctp.c | 2 +- src/cm/rgm.c | 27 --- src/cm/rgr.c | 263 +--------------------------- src/cm/rgu.c | 45 +---- src/cm/tfu.c | 281 ------------------------------ src/cu_stub/cu_f1ap_msg_hdl.c | 16 +- src/cu_stub/cu_stub.h | 2 +- src/cu_stub/cu_stub_egtp.c | 14 +- src/du_app/du_cfg.c | 4 +- src/du_app/du_e2ap_msg_hdl.c | 6 +- src/du_app/du_egtp.c | 10 +- src/du_app/du_f1ap_msg_hdl.c | 18 +- src/du_app/du_mgr.h | 2 +- src/du_app/du_msg_hdl.c | 13 +- src/du_app/du_sctp.c | 10 +- src/du_app/du_sys_info_hdl.c | 6 +- src/du_app/du_utils.h | 4 +- src/mt/mt_ss.c | 97 ----------- src/mt/ss_drvr.c | 2 - src/mt/ss_gen.c | 33 +--- src/mt/ss_mem.c | 15 -- src/mt/ss_msg.c | 104 ------------ src/mt/ss_pack.c | 20 --- src/mt/ss_queue.c | 17 -- src/mt/ss_strm.c | 55 ------ src/mt/ss_task.c | 34 +--- src/mt/ss_timer.c | 17 -- src/ric_stub/ric_e2ap_msg_hdl.c | 4 +- src/ric_stub/ric_e2ap_msg_hdl.h | 2 +- src/ric_stub/ric_stub.h | 2 +- src/rlog/rl_postproc.cpp | 4 +- src/rlog/rl_rlog.c | 2 +- 138 files changed, 450 insertions(+), 4891 deletions(-) diff --git a/src/5gnrmac/lwr_mac_phy.h b/src/5gnrmac/lwr_mac_phy.h index 0b837fcff..0f0be9f71 100644 --- a/src/5gnrmac/lwr_mac_phy.h +++ b/src/5gnrmac/lwr_mac_phy.h @@ -39,10 +39,10 @@ typedef enum /* allocate static buffer from WLS memory */ #define WLS_MEM_ALLOC(_datPtr, _size) \ { \ - int16_t _ret; \ + uint8_t _ret; \ _ret = SGetSBufWls(0, 0, (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - memset((U8*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } diff --git a/src/5gnrmac/mac_cfg_hdl.c b/src/5gnrmac/mac_cfg_hdl.c index f75f84740..2293082cb 100644 --- a/src/5gnrmac/mac_cfg_hdl.c +++ b/src/5gnrmac/mac_cfg_hdl.c @@ -121,7 +121,7 @@ uint8_t MacProcCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) uint8_t ret = ROK; MacCellCb *macCellCb; - memset((uint8_t *)&cfmPst, 0, sizeof(Pst)); + memset(&cfmPst, 0, sizeof(Pst)); MAC_ALLOC(macCellCb, sizeof(MacCellCb)); if(macCellCb == NULLP) @@ -195,7 +195,7 @@ uint8_t MacSchCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) Pst cfgPst; uint8_t ret; - memset((uint8_t *)&cfgPst, 0, sizeof(Pst)); + memset(&cfgPst, 0, sizeof(Pst)); schCellCfg.cellId = macCellCfg->cellId; schCellCfg.phyCellId = macCellCfg->phyCellId; schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw; @@ -311,7 +311,7 @@ void MacSendCellCfgCfm(uint16_t cellId, uint8_t response) uint16_t cellIdx; MacCellCfgCfm macCellCfgCfm; - memset((uint8_t *)&pst, 0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); GET_CELL_IDX(cellId, cellIdx); macCellCfgCfm.cellId = macCb.macCell[cellIdx]->macCellCfg.cellId; diff --git a/src/5gnrmac/mac_utils.h b/src/5gnrmac/mac_utils.h index c35bbeb43..68df2c44e 100644 --- a/src/5gnrmac/mac_utils.h +++ b/src/5gnrmac/mac_utils.h @@ -30,7 +30,7 @@ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ { \ - cmMemset((uint8_t *)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ } \ else \ { \ @@ -55,7 +55,7 @@ if(SGetStaticBuffer(MAC_MEM_REGION, MAC_POOL, \ (Data **)&_buf, (Size) _size, 0) == ROK) \ { \ - cmMemset((uint8_t *)(_buf), 0, _size); \ + memset((_buf), 0, _size); \ } \ else \ { \ diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c index 7181b0f18..048e84843 100755 --- a/src/5gnrmac/rg_cfg.c +++ b/src/5gnrmac/rg_cfg.c @@ -126,8 +126,6 @@ CrgCellCfg *cellCfg; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgCellCfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG; if ((rgCb[inst].cell != NULLP) || rgCb[inst].inactiveCell != NULLP) @@ -206,8 +204,6 @@ RgCellCb **cell; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgUeCfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG; if ((ueCfg->txMode.pres == PRSNT_NODEF) && (ueCfg->txMode.tm == CRG_UE_TM_5)) @@ -299,8 +295,6 @@ RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgLcCfg); - if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH) { /* Dedicated logical channels */ @@ -384,8 +378,6 @@ RgCellCb **cell; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgCellRecfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG; if (((*cell = rgCb[inst].cell) == NULLP) @@ -456,8 +448,6 @@ RgUeCb **ue; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgUeRecfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG; if ((ueRecfg->txMode.pres == PRSNT_NODEF) && @@ -544,8 +534,6 @@ RgUlLcCb **ulLc; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgLcRecfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG; /* Fetch the cell */ @@ -622,8 +610,6 @@ RgUeCb **ue; RgErrInfo *errInfo; #endif { - TRC2(rgCFGVldtCrgUeReset); - errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET; /* Fetch the Active cell */ @@ -693,8 +679,6 @@ RgErrInfo *errInfo; /* RLC SAP to allocate flowCntrlInd buffer*/ Pst *pst ; - TRC2(rgCFGCrgCellCfg); - errInfo->errCause = RGERR_CFG_CRG_CELL_CFG; /* Allocate the cell control block */ @@ -767,7 +751,7 @@ RgErrInfo *errInfo; cmLListInit(&cell->l2mList); for(idx = 0; idx < RG_NUM_UL_SUB_FRAMES; idx++) { - cmMemset((U8 *)&cell->ulSf[idx], 0, sizeof(RgUlSf)); + memset(&cell->ulSf[idx], 0, sizeof(RgUlSf)); } cell->ttiCycle = (U32)RG_TTI_CYCLE_INVLD; @@ -826,8 +810,6 @@ RgCellCb *cell; U8 idx; RgErrInfo errInfo; - TRC2(rgCfgAddUeSCellCfg); - #ifdef LTE_ADV rguDlSapId = ueSCellCb->rguDlSapId; rguUlSapId = ueSCellCb->rguUlSapId; @@ -944,8 +926,6 @@ Bool *isCfmRqrd; RgPrgUeSCellCfgInfo ueSCellCb; Pst dstInstPst; - TRC2(rgFillAndAddSCellCfg); - /* Fetch the Active cell */ if(((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != ueRecfg->cellId)) @@ -973,13 +953,13 @@ Bool *isCfmRqrd; ue->cfgCfmInfo.cfgCfgCount = 0; ue->cfgCfmInfo.mask = 0x0; - cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId, + memcpy(&(ue->cfgCfmInfo.transId), &transId, sizeof(CrgCfgTransId)); ueSCellCb.ueId = ueRecfg->oldCrnti; ueSCellCb.txMode = ue->txMode; ueSCellCb.maxUlHqRetx = ue->ul.hqEnt.maxHqRetx; - cmMemcpy((U8 *)ueSCellCb.ulLcInfo, (U8 *)ue->ul.lcCb, sizeof(ue->ul.lcCb)); - cmMemcpy((U8 *)ueSCellCb.dlLcInfo, (U8 *)ue->dl.lcCb, sizeof(ue->dl.lcCb)); + memcpy(ueSCellCb.ulLcInfo, ue->ul.lcCb, sizeof(ue->ul.lcCb)); + memcpy(ueSCellCb.dlLcInfo, ue->dl.lcCb, sizeof(ue->dl.lcCb)); for (idx =0; idx < RG_MAX_LCG_PER_UE; idx++) { ueSCellCb.lcgInfo[idx].lcgId = ue->ul.lcgArr[idx].lcgId; @@ -1054,8 +1034,6 @@ RgErrInfo *errInfo; SuId rguUlSapId = 0; SuId rguDlSapId = 0; - TRC2(rgCFGCrgUeCfg); - errInfo->errCause = RGERR_CFG_CRG_UE_CFG; /* Start: LTEMAC_2.1_DEV_CFG */ @@ -1161,8 +1139,6 @@ CrgCfgTransId transId; #endif { - TRC2(rgCFGCrgLcCfg); - /* Handle Config for dedicated/common logical channels */ if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH) { @@ -1175,7 +1151,7 @@ CrgCfgTransId transId; } #ifdef LTE_ADV /*ERAB Multl Cell fix*/ - cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId, + memcpy(&(ue->cfgCfmInfo.transId), &transId, sizeof(CrgCfgTransId)); rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lcCfg,isCfmRqrd); #endif @@ -1233,8 +1209,6 @@ CrgCellRecfg *cellRecfg; RgErrInfo *errInfo; #endif { - TRC2(rgCFGCrgCellRecfg); - /* Store the given rachCfg */ cell->rachCfg = cellRecfg->rachRecfg; @@ -1288,8 +1262,6 @@ CrgUeRecfg *ueRecfg; RgErrInfo *errInfo; #endif { - TRC2(rgCFGCrgUeRecfg); - errInfo->errCause = RGERR_CFG_CRG_UE_RECFG; /* Fix : syed UE ID change at MAC will now be controlled @@ -1350,7 +1322,6 @@ RgErrInfo *errInfo; Bool *isCfmRqrd; #endif { - TRC2(rgCFGCrgLcRecfg); if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId) { @@ -1399,7 +1370,6 @@ CrgRst *reset; RgErrInfo *errInfo; #endif { - TRC2(rgCFGCrgUeReset); RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId); rgDHMUeReset(cell, &ue->dl.hqEnt); @@ -1447,7 +1417,6 @@ RgErrInfo *errInfo; RgCellCb *cell; U8 idx; - TRC2(rgCFGCrgCellDel); errInfo->errCause = RGERR_CFG_CRG_CELL_DEL; if (((cell = rgCb[inst].cell) == NULLP) @@ -1524,7 +1493,6 @@ CrgDel *ueDelInfo; RgErrInfo *errInfo; #endif { - TRC2(rgCFGCrgUeDel); errInfo->errCause = RGERR_CFG_CRG_UE_DEL; @@ -1587,8 +1555,6 @@ CrgCfgTransId transId; RgUlLcCb *ulLc; RgDlLcCb *dlLc; - TRC2(rgCFGCrgLcDel); - errInfo->errCause = RGERR_CFG_CRG_LC_DEL; /* Fetch the Active cell */ @@ -1644,7 +1610,7 @@ CrgCfgTransId transId; } #ifdef LTE_ADV /*ERAB - multicell fix*/ - cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId, + memcpy( &(ue->cfgCfmInfo.transId), &transId, sizeof(CrgCfgTransId)); rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd); #endif @@ -1687,7 +1653,6 @@ RgErrInfo *errInfo; #endif { U8 dirVld = FALSE; - TRC2(rgCFGVldtCrgDedLcCfg); errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG; @@ -1792,8 +1757,6 @@ RgErrInfo *errInfo; { U8 dirVld = FALSE; - TRC2(rgCFGVldtCrgCmnLcCfg); - errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG; /* Ensure cell is not in the active list */ @@ -1918,8 +1881,6 @@ RgErrInfo *errInfo; #endif { //Inst inst = cell->macInst - RG_INST_START; - TRC2(rgCFGCrgDedLcCfg); - errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG; /* Uplink/Bi-directional logical channel */ @@ -1979,8 +1940,6 @@ CrgLchCfg *lcCfg; RgErrInfo *errInfo; #endif { - TRC2(rgCFGCrgCmnLcCfg); - errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG; /* Handle configuration for CCCH/BCCH/PCCH */ @@ -2071,8 +2030,6 @@ RgCellCb *cell; U8 sfIdx; Inst inst = cell->macInst - RG_INST_START; - TRC2(rgCFGFreeUeUlAlloc); - for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++) { if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP) @@ -2112,7 +2069,6 @@ RgCellCb *cell; #endif { Inst inst = cell->macInst - RG_INST_START; - TRC2(rgCFGFreeCellCb); #ifdef LTE_ADV RgLaaCellCbDeInit(cell); @@ -2173,8 +2129,6 @@ RgCellCb *cell; #endif { Inst inst = cell->macInst - RG_INST_START; - TRC2(rgCFGFreeInactvCellCb); - /* De-initialize the Ue list */ rgDBMDeInitUeCbLst(cell); #ifdef LTEMAC_SPS @@ -2228,8 +2182,6 @@ RgUeCb *ue; { Inst inst = cell->macInst - RG_INST_START; - TRC2(rgCFGFreeUeCb); - rgDHMFreeUe(inst,&ue->dl.hqEnt); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP @@ -2271,8 +2223,6 @@ PRIVATE Void rgCFGFreeCmnLcLst(cell) RgCellCb *cell; #endif { - TRC2(rgCFGFreeCmnLcLst); - rgDBMFreeCmnLcLst(cell); @@ -2309,8 +2259,6 @@ RgCellCb *cell; { RgUeCb *ue; - TRC2(rgCFGFreeUeLst); - /* Free Ues in the list */ while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP) { @@ -2358,8 +2306,6 @@ RgCellCb *cell; { RgUeCb *ue; - TRC2(rgCFGFreeSpsUeLst); - /* Free Ues in the list */ while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP))) { @@ -2409,8 +2355,6 @@ RgInfCellReg* regReq; Inst inst; RgCellCb *cell = NULLP; - TRC3(RgSchMacCellRegReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c index 6b55a6ad0..1d31c55e9 100755 --- a/src/5gnrmac/rg_com.c +++ b/src/5gnrmac/rg_com.c @@ -116,8 +116,6 @@ CrgCfgReqInfo *crgCfgReq; RgErrInfo errInfo; Bool isCfmRqrd = TRUE; - TRC2(rgCOMCfgReq); - /* Process Config/Reconfig/Delete request from RRC */ switch (crgCfgReq->action) { @@ -219,8 +217,6 @@ CrgCfgTransId transId; RgCellCb *cell = NULLP; RgUeCb *ue = NULLP; - TRC2(rgCOMHndlCfgReq); - errInfo->errType = RGERR_COM_CFG_REQ; /* Validate and process the configuration request */ @@ -323,8 +319,6 @@ Bool *isCfmRqrd; RgUeCb *ue = NULLP; RgUlLcCb *ulLc = NULLP; - TRC2(rgCOMHndlRecfgReq); - errInfo->errType = RGERR_COM_RECFG_REQ; /* Validate and process the re-configuration request */ @@ -398,7 +392,7 @@ Bool *isCfmRqrd; #ifdef LTE_ADV /*ERAB- multicell fix*/ - cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId, + memcpy( &(ue->cfgCfmInfo.transId), &transId, sizeof(CrgCfgTransId)); #endif ret = rgCFGCrgLcRecfg(inst,cell, ue, ulLc, @@ -453,8 +447,6 @@ CrgRst *reset; RgErrInfo *errInfo; #endif { - TRC2(rgCOMHndlResetReq); - /* Fix : ccpu00126865: ignore CRG reset. Let SCH trigger it. */ errInfo->errCause = RGERR_NONE; @@ -507,8 +499,6 @@ CrgCfgTransId transId; S16 ret; VOLATILE U32 startTime=0; - TRC2(rgCOMHndlDelReq); - errInfo->errType = RGERR_COM_DEL_REQ; /* Process the delete request */ @@ -588,7 +578,6 @@ RgPrgUeSCellCfgInfo *ueSCellCb; S16 ret; Pst cfmPst; - TRC2(RgPrgPMacSMacUeSCellCfgReq); RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d\n", @@ -667,8 +656,6 @@ RgPrgCfgCfmInfo *cfgCfm; Inst inst = pst->dstInst; RgCellCb *cell; RgUeCb *ue; - TRC2(RgPrgSMacPMacCfgCfm); - RG_IS_INST_VALID(inst); @@ -768,8 +755,6 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; RgCellCb *sCell = rgCb[inst].cell; RgUeCb *sCellUe = NULLP; - TRC2(RgPrgPMacSMacUeSCellDelReq) - /* Checking for cell Cb because in case of shutdownReq it is possible that * cell is already deleted for this cell*/ if(sCell == NULLP) diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c index 9464325df..78d1c219f 100755 --- a/src/5gnrmac/rg_dbm.c +++ b/src/5gnrmac/rg_dbm.c @@ -97,8 +97,6 @@ RgCellCb *cellCb; { S16 ret; - TRC2(rgDBMInitCell); - /* Initialize ue list */ if ((ret = rgDBMInitUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK) return (ret); @@ -148,7 +146,6 @@ U16 numBins; { Inst inst = cellCb->macInst - RG_INST_START; RgUeCb ue; - TRC2(rgDBMInitUeCbLst) return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); @@ -178,7 +175,6 @@ S16 rgDBMDeInitUeCbLst(cellCb) RgCellCb *cellCb; #endif { - TRC2(rgDBMDeInitUeCbLst) return (cmHashListDeinit(&cellCb->ueLst)); @@ -213,7 +209,6 @@ U16 numBins; { Inst inst = cellCb->macInst - RG_INST_START; RgUeCb ue; - TRC2(rgDBMInitSpsUeCbLst) return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); @@ -243,7 +238,6 @@ S16 rgDBMDeInitSpsUeCbLst(cellCb) RgCellCb *cellCb; #endif { - TRC2(rgDBMDeInitSpsUeCbLst) return (cmHashListDeinit(&cellCb->spsUeLst)); @@ -277,8 +271,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMInsUeCb) - return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId))); @@ -311,7 +303,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMInsSpsUeCb) return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); @@ -347,8 +338,6 @@ CmLteRnti ueId; { RgUeCb *ueCb = NULLP; - TRC2(rgDBMGetUeCb) - cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, sizeof(ueId), 0, (PTR *)&ueCb); return (ueCb); @@ -382,8 +371,6 @@ CmLteRnti spsRnti; { RgUeCb *ueCb = NULLP; - TRC2(rgDBMGetSpsUeCb) - cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); return (ueCb); @@ -418,8 +405,6 @@ RgUeCb *ueCb; { RgUeCb *nextUeCb = NULLP; - TRC2(rgDBMGetNextUeCb) - cmHashListGetNext(&cellCb->ueLst, (PTR) ueCb, (PTR *)&nextUeCb); return (nextUeCb); } /* rgDBMGetNextUeCb */ @@ -452,8 +437,6 @@ RgUeCb *ueCb; { RgUeCb *nextUeCb = NULLP; - TRC2(rgDBMGetNextSpsUeCb) - cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb); return (nextUeCb); } /* end of rgDBMGetNextSpsUeCb */ @@ -488,8 +471,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMDelUeCb) - return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb)); } /* rgDBMDelUeCb */ @@ -521,7 +502,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMDelSpsUeCb) return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); } /* end of rgDBMDelSpsUeCb */ @@ -557,8 +537,6 @@ RgUeCb *ueCb; U8 idx; #endif - TRC2(rgDBMInitUe); - /* Initialize Dedicated logical channels */ rgDBMInitDedLcLst(ueCb); @@ -598,8 +576,6 @@ RgUeCb *ueCb; { U8 idx; - TRC2(rgDBMInitDedLcLst); - for (idx = 0; idx < RG_MAX_LC_PER_UE; ++idx) { /* Set Dedicated LCs as not configured */ @@ -646,8 +622,6 @@ RgCellCb *cellCb; { U8 idx; - TRC2(rgDBMInitCmnLcLst); - cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID; cellCb->pcchInfo.lcId = RG_INVALID_LC_ID; @@ -689,8 +663,6 @@ RgCellCb *cellCb; { U8 idx; - TRC2(rgDBMFreeCmnLcLst); - cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID; cellCb->pcchInfo.lcId = RG_INVALID_LC_ID; @@ -728,7 +700,6 @@ RgUeCb *ueCb; CmLteLcId idx; #endif { - TRC2(rgDBMInsDlDedLcCb); if( idx >= RG_DEDLC_MIN_LCID ) { ueCb->dl.lcCb[idx-1].lcId = idx; @@ -760,8 +731,6 @@ RgUeCb *ueCb; RgDlLcCb *dlLcCb; #endif { - TRC2(rgDBMDelDlDedLcCb); - ueCb->dl.lcCb[dlLcCb->lcId - 1].lcId = RG_INVALID_LC_ID; /* Stack Crash problem for TRACE5 Changes. Added the return below */ @@ -793,8 +762,6 @@ RgUeCb *ueCb; CmLteLcId idx; #endif { - TRC2(rgDBMGetDlDedLcCb); - if (idx > RG_DEDLC_MAX_LCID || idx <= 0) { return (NULLP); @@ -853,7 +820,6 @@ LteLcgId gId; #endif #endif { - TRC2(rgDBMInsUlDedLcCb); if ( idx >= RG_DEDLC_MIN_LCID) { ueCb->ul.lcCb[idx - 1].lcId = idx; @@ -901,8 +867,6 @@ RgUlLcCb *ulLcCb; LteLcgId gId; #endif { - TRC2(rgDBMUpdUlDedLcCb); - ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount - 1; if(ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount == 0) @@ -945,7 +909,6 @@ RgUeCb *ueCb; RgUlLcCb *ulLcCb; #endif { - TRC2(rgDBMDelUlDedLcCb); ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount - 1; @@ -985,7 +948,6 @@ RgUeCb *ueCb; CmLteLcId idx; #endif { - TRC2(rgDBMGetUlDedLcCb) if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID) { @@ -1028,8 +990,6 @@ CmLteLcId lcId; { U8 idx; - TRC2(rgDBMChkCmnLcCb) - if(cellCb->bcchBchInfo.lcId == lcId) { return ROK; @@ -1071,7 +1031,6 @@ RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb) RgCellCb *cellCb; #endif { - TRC2(rgDBMGetBcchOnBch) if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID) { @@ -1107,8 +1066,6 @@ CmLteLcId lcId; { U8 idx; - TRC2(rgDBMGetBcchOnDlsch) - for (idx = 0; idx < RG_MAX_BCCH_DLSCH; idx++) { if(cellCb->bcchDlschInfo[idx].lcId == lcId) @@ -1140,7 +1097,6 @@ RgPcchLcCb* rgDBMGetPcch(cellCb) RgCellCb *cellCb; #endif { - TRC2(rgDBMGetPcch) if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID) { @@ -1173,7 +1129,6 @@ RgCellCb *cellCb; CmLteLcId idx; #endif { - TRC2(rgDBMInsBcchOnBch) cellCb->bcchBchInfo.lcId = idx; @@ -1205,7 +1160,6 @@ RgCellCb *cellCb; CmLteLcId idx; #endif { - TRC2(rgDBMInsBcchOnDlsch) cellCb->bcchDlschInfo[cellCb->numBcchDlschInfo].lcId = idx; cellCb->numBcchDlschInfo++; @@ -1238,7 +1192,6 @@ RgCellCb *cellCb; CmLteLcId idx; #endif { - TRC2(rgDBMInsPcch) cellCb->pcchInfo.lcId = idx; @@ -1267,7 +1220,6 @@ PRIVATE Void rgDBMInitRachLst(cellCb) RgCellCb *cellCb; #endif { - TRC2(rgDBMInitRachLst) cmLListInit(&cellCb->raInfo.ueRachLst); RETVOID; @@ -1297,7 +1249,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMInsUeCbInRachLst) cmLListAdd2Tail(&cellCb->raInfo.ueRachLst,&ueCb->rachLstEnt); @@ -1330,8 +1281,6 @@ CmLteRnti key; { CmLList *tmpNode; - TRC2(rgDBMGetUeCbFromRachLst) - CM_LLIST_FIRST_NODE(&cellCb->raInfo.ueRachLst,tmpNode); while(tmpNode) { @@ -1368,7 +1317,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMGetNextUeCbFromRachLst) if(!ueCb) { @@ -1403,7 +1351,6 @@ RgCellCb *cellCb; RgUeCb *ueCb; #endif { - TRC2(rgDBMDelUeCbFromRachLst) cmLListDelFrm(&cellCb->raInfo.ueRachLst, &ueCb->rachLstEnt); RETVOID; diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c index cb6267df1..e8cdacf29 100755 --- a/src/5gnrmac/rg_dhm.c +++ b/src/5gnrmac/rg_dhm.c @@ -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++) @@ -211,8 +209,6 @@ RgDlHqEnt *hqE; { U8 i = 0; - TRC2(rgDHMUeReset) - if(hqE->procs[0]) { /* Free all the TB memory associated with HARQ */ @@ -257,7 +253,6 @@ Inst inst; #endif { RgCb *rgCbP = &rgCb[inst]; - TRC2(rgDHMHdlBufFree) if (rgCbP->bufCnt < RG_MAX_DFRD_FREE_BUFS) { @@ -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; @@ -339,8 +332,6 @@ Inst inst; U8 start = rgCbP->bufCnt; U8 end = 0; - TRC2(rgDHMFreeAllTbBufs) - while (start != end) { start--; @@ -387,8 +378,6 @@ U8 tbIndex; // U32 lchIdx, pduIdx; #endif - TRC2(rgDHMRlsHqProcTB) - if((tbIndex > RG_MAX_TB_PER_UE) || (tbIndex == 0)) { @@ -472,8 +461,6 @@ U8 idx; RgDlHqProcCb **hqP; #endif { - TRC2(rgDHMGetHqProcFrmId) - /* Pick the proc based on the index provided */ *hqP = (ue->dl.hqEnt.procs[idx]); @@ -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++) { @@ -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. @@ -850,8 +833,6 @@ RgErrInfo *err; RgUstaDgn dgn; RgBldPduInfo bldPdu; - TRC2(rgDHMHndlCmnDatReq) - #ifndef L2_OPTMZ if (hqProc->tbInfo[0].tb != NULLP) #else @@ -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 @@ -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)) { @@ -1523,7 +1500,6 @@ RgDlHqEnt *hqE; #endif { U8 i; - TRC2(rgDHMFreeUe) if(hqE->procs) { @@ -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; diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c index 8466d3a12..b39913292 100755 --- a/src/5gnrmac/rg_dux.c +++ b/src/5gnrmac/rg_dux.c @@ -171,7 +171,6 @@ RgErrInfo *err; S16 ret; RgMacSdu *sduAloc = NULLP; - TRC2(rgDUXInsSdu) RG_DUX_ALLOC(pdu, sizeof(RgMacSdu), sduAloc, ret); if(ret != ROK) @@ -232,7 +231,6 @@ RgErrInfo *err; U8 byte; U8 fmt=0; - TRC2(rgDUXExtSubHdr) *len = 0; if(oduPackUInt8(&byte,mBuf) != ROK) @@ -316,7 +314,6 @@ RgErrInfo *err; { S16 ret; - TRC2(rgDUXExtCe); switch(lcId) { @@ -516,7 +513,6 @@ RgErrInfo *err; Buffer *tmpBuf2 = NULLP; RgMacSdu *sdu; - TRC2(rgDUXExtSdu) if(lcId == RG_CCCH_LCID) { @@ -588,7 +584,6 @@ RgErrInfo *err; U8 lcId; U16 subPduLen; MsgLen len; - TRC2(rgDUXDemuxData) ceInfo->bitMask = 0x0000; diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index a1da9971b..31e0fdaa4 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -84,8 +84,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlSMEvents) - switch(pst->event) { #ifdef LCRGMILRG @@ -163,8 +161,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlNHEvents) - switch(pst->event) { #ifdef LCRGUICRG @@ -210,8 +206,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlKWEvents) - switch(pst->event) { #ifdef LCRGUIRGU @@ -267,8 +261,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlTFEvents) - switch(pst->event) { #if (defined(LCRGLITFU) || defined(LWLCRGLITFU)) @@ -317,8 +309,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlRGEvents) - switch(pst->event) { #ifdef LCRG @@ -443,8 +433,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgActvTsk) - switch(pst->srcEnt) { /* The originator of this message is the stack manager, diff --git a/src/5gnrmac/rg_id.c b/src/5gnrmac/rg_id.c index 1932d8a21..38ef7f519 100755 --- a/src/5gnrmac/rg_id.c +++ b/src/5gnrmac/rg_id.c @@ -107,13 +107,11 @@ Void rgGetSId(s) SystemId *s; /* system id */ #endif { - TRC2(rgGetSId); - s->mVer = sId.mVer; s->mRev = sId.mRev; s->bVer = sId.bVer; s->bRev = sId.bRev; - cmMemcpy((U8 *)s->ptNmb, (U8 *)sId.ptNmb, LRG_MAX_PT_NUM_SIZE); + memcpy(s->ptNmb, sId.ptNmb, LRG_MAX_PT_NUM_SIZE); /* Stack Crash Problem for TRACE5 Changes. Added the return below */ RETVOID; diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c index d335f8266..c464569f8 100755 --- a/src/5gnrmac/rg_l2m.c +++ b/src/5gnrmac/rg_l2m.c @@ -117,15 +117,13 @@ RgErrInfo *err; UNUSED(measType); UNUSED(err); - TRC3(rgL2mCreateMeasCb) - - if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP) - { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed"); - return RFAILED; - } + if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP) + { + RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed"); + return RFAILED; + } //Memcpy is already done in rgL2mAllocMeasCb - /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\ + /*memcpy(&measCb->measReq, (CONSTANT U8 *)measInfo,\ sizeof(RgInfL2MeasReq));*/ rgL2mInsertMeasCb(cell, measCb, measInfo); measCb->measReq.timePrd = measInfo->timePrd; @@ -182,7 +180,6 @@ RgErrInfo *err; { S16 ret=RFAILED; - TRC3(rgL2mMeasReq) /* Creaet MeasCb Insert in cell->l2mList and return*/ if ( (ret = rgL2mCreateMeasCb(cell, measInfo, LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK) @@ -216,9 +213,8 @@ RgInfL2MeasCfm *measCfm; { Pst pst; Inst macInst = cell->macInst - RG_INST_START; - TRC3(rgSndL2MeasCfm) - cmMemset((U8 *)&pst, 0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst); RgMacSchL2Meas(&pst, measCfm); @@ -250,8 +246,7 @@ RgInfL2MeasCfm *measCfm; Pst pst; Inst macInst = cell->macInst - RG_INST_START; - TRC3(rgSndL2MeasStopCfm) - cmMemset((U8 *)&pst, 0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst); RgMacSchL2MeasStop(&pst, measCfm); @@ -290,9 +285,6 @@ RgInfL2MeasReq *measInfo; /* Meas Req Info */ S16 ret = ROK; RgInfL2MeasCfm measCfm; - TRC3(RgSchMacL2MeasReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cellCb = rgCb[inst].cell; @@ -307,7 +299,7 @@ RgInfL2MeasReq *measInfo; /* Meas Req Info */ ret = rgL2mMeasReq(cellCb, measInfo, &err); if (ret != ROK) { - cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm)); + memset(&measCfm, 0, sizeof(RgInfL2MeasCfm)); measCfm.transId = measInfo->transId; measCfm.cellId = measInfo->cellId; measCfm.measType = measInfo->measType; @@ -358,9 +350,6 @@ RgInfL2MeasStopReq *measInfo; /* Meas Req Info */ RgInfL2MeasCfm measCfm; - TRC3(RgSchMacL2MeasStopReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cellCb = rgCb[inst].cell; @@ -387,7 +376,7 @@ RgInfL2MeasStopReq *measInfo; /* Meas Req Info */ cmLListDelFrm(&cellCb->l2mList, &measCb->measLnk); rgFreeSBuf(inst,(Data**)&measCb, sizeof(RgL2MeasCb)); } - cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm)); + memset(&measCfm, 0, sizeof(RgInfL2MeasCfm)); measCfm.transId = measInfo->transId; measCfm.cellId = measInfo->cellId; measCfm.measType = measInfo->measType; @@ -426,9 +415,6 @@ RgInfL2MeasSndReq *measInfo; /* Meas Req Info */ RgCellCb *cellCb = NULLP; S16 ret = ROK; - TRC3(RgSchMacL2MeasSendReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cellCb = rgCb[inst].cell; @@ -478,8 +464,6 @@ RgInfL2MeasReq *measInfo; RgL2MeasCb *oldMeasCb; U16 diffTime; - TRC3(rgL2mInsertMeasCb) - /* * 1. Check if l2mList has any entries. * 2. If yes @@ -544,7 +528,6 @@ RgErrInfo *err; RgL2MeasCb *measCb = NULLP; Inst inst = cell->macInst - RG_INST_START; - TRC3(rgL2mAllocMeasCb) if((rgAllocSBuf(inst,(Data **)&(measCb), sizeof(RgL2MeasCb))) == RFAILED) @@ -555,7 +538,7 @@ RgErrInfo *err; err->errCause = RGERR_RAM_MEM_EXHAUST; return (NULLP); } - cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq)); + memcpy(&measCb->measReq, measInfo, sizeof(RgInfL2MeasReq)); RGCPYTIMEINFO(cell->crntTime, measCb->startTime); return (measCb); @@ -595,8 +578,6 @@ RgCellCb *cell; CmLteTimingInfo crntTime; Inst inst = cell->macInst - RG_INST_START; - TRC3(rgL2Meas) - node = cell->l2mList.first; while(node != NULLP) @@ -616,7 +597,7 @@ RgCellCb *cell; /*LTE_L2_MEAS_PHASE2*/ if (cell->sndL2Meas || measPrd == measCb->measReq.timePrd) { - cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm)); + memset(&measCfm, 0, sizeof(RgInfL2MeasCfm)); for(idx = 0; idx < measCb->measReq.t.prbReq.numQci; idx++) { qciVal = measCb->measReq.t.prbReq.qci[idx]; diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c index 9eccb0859..df56929e1 100755 --- a/src/5gnrmac/rg_lim.c +++ b/src/5gnrmac/rg_lim.c @@ -102,11 +102,10 @@ SpId spId; RgLowSapCb *tfuSap; Pst pst; - TRC2(rgLIMTfuBndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); - (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuBndReq (&pst, suId, spId)) != ROK) { RLOG0(L_ERROR,"Call to RgLiTfuBndReq() failed"); @@ -151,11 +150,10 @@ Reason reason; RgLowSapCb *tfuSap; Pst pst; - TRC2(rgLIMTfuUbndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); - cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuUbndReq (&pst, tfuSap->sapCfg.spId, reason)) != ROK) { RLOG0(L_ERROR,"Call to RgLiTfuUbndReq() failed"); @@ -200,7 +198,6 @@ U8 status; S16 ret; RgLowSapCb *tfuSap; - TRC3(RgLiTfuBndCfm); RG_IS_INST_VALID(pst->dstInst); @@ -244,7 +241,6 @@ PRIVATE S16 rgLIMValidateSap(inst,suId) { RgLowSapCb *tfuSap; - TRC2(rgLIMValidateSap) tfuSap = &(rgCb[inst].tfuSap); @@ -293,7 +289,6 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error) TfuDatInfo *datInfo; CmLList *node; - TRC2(rgLIMUtlFreeDatIndEvnt); /* Steps of freeing up the TfuDatInd. * 1. loop through the datIndLst and free up all the buffers. * 2. free up the whole event @@ -347,7 +342,6 @@ TfuDatIndInfo *datInd; S16 ret; VOLATILE U32 startTime=0; - TRC3(RgLiTfuDatInd); // printf("5GTF:: DatindRcvd\n"); @@ -416,7 +410,6 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error) CmLList *node; U8 i; - TRC2(rgLIMUtlFreeDatReqEvnt); /* Steps of freeing up the TfuDatReq. * 1. Free the bch buffer. * 2. loop through the pdus list and free up all the buffers. @@ -481,7 +474,6 @@ TfuDatReqInfo *datReq; S16 ret; RgLowSapCb *tfuSap; - TRC2(rgLIMTfuDatReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); @@ -543,7 +535,6 @@ TfuDelDatReqInfo *delDatReq; S16 ret; RgLowSapCb *tfuSap; - TRC2(rgLIMTfuDelDatReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); @@ -594,7 +585,6 @@ Pst *pst; SuId suId; #endif { - TRC3(RgLiTfuNonRtInd); #ifdef NO_ERRCLS if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK) diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 0b3357b01..d6fcdefeb 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -154,13 +154,12 @@ Reason reason; /* reason */ #endif { Inst macInst ; - TRC2(rgActvInit); RG_IS_INST_VALID(inst); macInst = inst - RG_INST_START; /* Initialize the MAC TskInit structure to zero */ - cmMemset ((U8 *)&rgCb[macInst], 0, sizeof(RgCb)); + memset (&rgCb[macInst], 0, sizeof(RgCb)); /* Initialize the MAC TskInit with received values */ rgCb[macInst].rgInit.ent = entity; @@ -252,8 +251,6 @@ RgMngmt *cfg; /* config structure */ Pst cfmPst; Inst inst; - TRC2(RgMiLrgCfgReq) - RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG, "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", @@ -265,7 +262,7 @@ RgMngmt *cfg; /* config structure */ /* Fill the post structure for sending the confirmation */ rgLMMFillCfmPst(pst, &cfmPst, cfg); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = cfg->hdr.transId; @@ -340,15 +337,13 @@ RgMngmt *sts; /* statistics structure */ RgMngmt cfm; Inst inst; - TRC2(RgMiLrgStsReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; /* Fill the post structure for sending the confirmation */ rgLMMFillCfmPst(pst, &cfmPst, sts); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = sts->hdr.transId; @@ -373,7 +368,7 @@ RgMngmt *sts; /* statistics structure */ { case STGEN: { - cmMemcpy((U8 *)&(cfm.t.sts.s.genSts), (U8 *)&rgCb[inst].genSts, + memcpy(&(cfm.t.sts.s.genSts), &rgCb[inst].genSts, sizeof(RgGenSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) @@ -434,9 +429,9 @@ RgMngmt *sts; /* statistics structure */ /* Reset statistics */ if(sts->t.sts.action == ZEROSTS) { - cmMemset((U8 *)&hqRetxStats, 0, \ + memset(&hqRetxStats, 0, \ sizeof(RgSchHqRetxStats)); - cmMemset((U8 *)&hqFailStats, 0, \ + memset(&hqFailStats, 0, \ sizeof(RgSchNackAckStats)); } } @@ -444,30 +439,30 @@ RgMngmt *sts; /* statistics structure */ } break; case STRGUSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.rguSts), (U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, + memcpy(&(cfm.t.sts.s.rguSts), &rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts)); break; case STCRGSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.crgSts), (U8 *)&rgCb[inst].crgSap.sapSts, + memcpy(&(cfm.t.sts.s.crgSts), &rgCb[inst].crgSap.sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts)); break; case STTFUSAP: - cmMemcpy((U8 *)&(cfm.t.sts.s.tfuSts), (U8 *)&rgCb[inst].tfuSap.sapSts, + memcpy(&(cfm.t.sts.s.tfuSts), &rgCb[inst].tfuSap.sapSts, sizeof(RgSapSts)); /* check if action is read and reset */ if(sts->t.sts.action == ARST) - cmMemset((U8 *)&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts)); + memset(&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts)); break; default: @@ -515,8 +510,6 @@ RgMngmt *sta; /* status structure */ RgMngmt cfm; Inst inst ; - TRC2(RgMiLrgStaReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -530,7 +523,7 @@ RgMngmt *sta; /* status structure */ SPutSBuf(pst->region, pst->pool, (Data *)sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE); } - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt; #ifdef LMINT3 @@ -547,7 +540,7 @@ RgMngmt *sta; /* status structure */ RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); return ROK; } - cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); + memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; @@ -568,7 +561,7 @@ RgMngmt *sta; /* status structure */ RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); return ROK; } - cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); + memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; @@ -578,8 +571,8 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.rguSapSta), - (U8 *)&rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta, + memcpy(&(cfm.t.ssta.s.rguSapSta), + &rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; @@ -587,7 +580,7 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.crgSapSta), (U8 *)&rgCb[inst].crgSap.sapSta, + memcpy(&(cfm.t.ssta.s.crgSapSta), &rgCb[inst].crgSap.sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; @@ -595,7 +588,7 @@ RgMngmt *sta; /* status structure */ cfm.cfm.status = LCM_PRIM_OK; cfm.cfm.reason = LCM_REASON_NOT_APPL; SGetDateTime(&cfm.t.ssta.dt); - cmMemcpy((U8 *)&(cfm.t.ssta.s.tfuSapSta), (U8 *)&rgCb[inst].tfuSap.sapSta, + memcpy(&(cfm.t.ssta.s.tfuSapSta), &rgCb[inst].tfuSap.sapSta, sizeof(RgSapSta)); RgMiLrgStaCfm(&cfmPst, &cfm); break; @@ -647,7 +640,6 @@ RgMngmt *cntrl; /* control structure */ RgMngmt cfm; Inst inst; - TRC2(RgMiLrgCntrlReq) /* Fill the post structure for sending the confirmation */ @@ -656,7 +648,7 @@ RgMngmt *cntrl; /* control structure */ rgLMMFillCfmPst(pst, &cfmPst, cntrl); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = cntrl->hdr.transId; #endif @@ -735,7 +727,6 @@ Elmnt sapType; /* Sap Type */ RgUpSapCfgInfo *upSapCfg = NULLP; RgUpSapCb *upSapCb = NULLP; - TRC2(rgLMMSapCfg) /* Check if Gen Config has been done */ if(rgCb[inst].rgInit.cfgDone != TRUE) @@ -834,7 +825,7 @@ Elmnt sapType; /* Sap Type */ lowSapCfg->sapPst.prior = cfg->s.tfuSap.prior; lowSapCfg->suId = cfg->s.tfuSap.suId; lowSapCfg->spId = cfg->s.tfuSap.spId; - cmMemcpy((U8 *)&lowSapCfg->bndTmr, (U8 *)&cfg->s.tfuSap.bndTmr, + memcpy(&lowSapCfg->bndTmr, &cfg->s.tfuSap.bndTmr, sizeof(TmrCfg)); break; default: @@ -878,7 +869,6 @@ RgCfg *cfg; /* Configuaration information */ { U16 ret = LCM_REASON_NOT_APPL; - TRC2(rgLMMGenCfg) /* Check if General Configuration is done already */ if (rgCb[inst].rgInit.cfgDone == TRUE) @@ -892,7 +882,7 @@ RgCfg *cfg; /* Configuaration information */ return (LCM_REASON_INVALID_PAR_VAL); } /* Update the Pst structure for LM interface */ - cmMemcpy((U8 *)&rgCb[inst].rgInit.lmPst, (U8 *)&cfg->s.genCfg.lmPst, + memcpy(&rgCb[inst].rgInit.lmPst, &cfg->s.genCfg.lmPst, sizeof(Pst)); rgCb[inst].rgInit.lmPst.srcProcId = rgCb[inst].rgInit.procId; @@ -930,15 +920,15 @@ RgCfg *cfg; /* Configuaration information */ for (int idx = 0; idx < rgCb[inst].numRguSaps; idx++) { rgCb[inst].rguSap[idx].sapSta.sapState = LRG_NOT_CFG; - cmMemset((U8 *)&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb)); } rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG; /* Initialize the timer blocks */ cmInitTimers(rgCb[inst].tmrBlk, RG_MAX_TIMER); /* Initialzie the timer queue */ - cmMemset((U8 *)&rgCb[inst].tmrTq, 0, sizeof(CmTqType)*RG_TQ_SIZE); + memset(&rgCb[inst].tmrTq, 0, sizeof(CmTqType)*RG_TQ_SIZE); /* Initialize the timer control point */ - cmMemset((U8 *)&rgCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); + memset(&rgCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); rgCb[inst].tmrTqCp.tmrLen = RG_TQ_SIZE; #if 0 /* Timer Registration request to SSI */ @@ -992,7 +982,6 @@ Inst inst; RgCellCb *cell = rgCb[inst].cell; U8 idx; - TRC2(rgLMMShutdown) /* Unbind the TFU Sap */ if(rgCb[inst].tfuSap.sapSta.sapState == LRG_WAIT_BNDCFM) @@ -1074,7 +1063,6 @@ Pst *cfmPst; #endif { Inst inst = (cfmPst->srcInst - RG_INST_START); - TRC2(rgLMMGenCntrl) cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1091,8 +1079,8 @@ Pst *cfmPst; rgCb[inst].rgInit.trc = TRUE; rgCb[inst].trcLen = cntrl->t.cntrl.s.trcLen; /*Store the response and TransId for sending the Traces */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.trcResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.trcResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.trcResp.transId = cntrl->hdr.transId; break; @@ -1100,8 +1088,8 @@ Pst *cfmPst; /* Enable Unsolicited Status (alarms) */ rgCb[inst].rgInit.usta = TRUE; /*Store the response and TransId for sending the Alarms */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.ustaResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.ustaResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId; break; case SADBG: @@ -1199,7 +1187,6 @@ Pst *cfmPst; #endif { Inst inst = cfmPst->srcInst - RG_INST_START; - TRC2(rgLMMSapCntrl) /* Only TFU Sap can be controlled by LM */ switch(cntrl->hdr.elmId.elmnt) @@ -1227,8 +1214,8 @@ Pst *cfmPst; rgCb[inst].tfuSap.numBndRetries++; /* Store the response and TransId for sending * the Control confirm */ - cmMemcpy((U8 *)&rgCb[inst].genCfg.bndCfmResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgCb[inst].genCfg.bndCfmResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgCb[inst].genCfg.bndCfmResp.transId = cntrl->hdr.transId; /* Sending Status Indication to Layer Manager */ @@ -1275,7 +1262,7 @@ Pst *cfmPst; rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); } } - cmMemset((U8 *)&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb)); + memset(&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb)); rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1292,7 +1279,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb)); rgCb[inst].rguSap[cntrl->t.cntrl.instId].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1309,7 +1296,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb)); + memset(&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb)); rgCb[inst].crgSap.sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -1362,7 +1349,6 @@ RgMngmt *cfm; #endif { Inst inst; - TRC2(rgLMMFillCfmPst) inst = (reqPst->dstInst - RG_INST_START); cfmPst->srcEnt = rgCb[inst].rgInit.ent; @@ -1418,12 +1404,11 @@ PTR cb; /* Entry for which Timer Expired */ { CmTmrArg arg; - TRC2(rgLMMStartTmr) UNUSED(tmrEvnt); /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgCb[inst].tmrTqCp; arg.tq = rgCb[inst].tmrTq; @@ -1477,7 +1462,6 @@ PTR cb; /* Entry for which Timer Expired */ U8 i; S16 ret; - TRC2(rgLMMStopTmr) ret = RFAILED; @@ -1487,7 +1471,7 @@ PTR cb; /* Entry for which Timer Expired */ if(rgCb[inst].tmrBlk[i].tmrEvnt == tmrEvnt) { /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgCb[inst].tmrTqCp; arg.tq = rgCb[inst].tmrTq; @@ -1542,9 +1526,6 @@ S16 tmrEvnt; /* Timer Event */ RgLowSapCb *tfuSap = (RgLowSapCb *)cb; Inst inst = tfuSap->sapCfg.sapPst.srcInst - RG_INST_START; - TRC2(rgLMMTmrExpiry) - - switch(tmrEvnt) { case RG_BNDREQ_TMR: @@ -1616,14 +1597,13 @@ RgUstaDgn *dgn; { RgMngmt usta; - TRC2(rgLMMStaInd) if(rgCb[inst].rgInit.usta == FALSE) { return ROK; } - cmMemset((U8 *)&usta, 0, sizeof(RgMngmt)); + memset(&usta, 0, sizeof(RgMngmt)); SGetDateTime(&usta.t.usta.cmAlarm.dt); usta.t.usta.cmAlarm.category = category; @@ -1631,7 +1611,7 @@ RgUstaDgn *dgn; usta.t.usta.cmAlarm.cause = cause; if (dgn != NULLP) { - cmMemcpy((U8 *)&usta.t.usta.dgn, (U8 *)dgn, sizeof(RgUstaDgn)); + memcpy(&usta.t.usta.dgn, dgn, sizeof(RgUstaDgn)); } rgCb[inst].rgInit.lmPst.selector = rgCb[inst].genCfg.ustaResp.response.selector; @@ -1681,7 +1661,6 @@ U8 event; /* event */ RgMngmt trc; Pst pst; - TRC2(rgLMMTrcInd) if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP)) @@ -1690,7 +1669,7 @@ U8 event; /* event */ RETVOID; } - cmMemset((U8 *)&trc, 0, sizeof(RgMngmt)); + memset(&trc, 0, sizeof(RgMngmt)); pst = rgCb[inst].rgInit.lmPst; pst.selector = rgCb[inst].genCfg.trcResp.response.selector; @@ -1832,7 +1811,6 @@ U8 status; /* Status */ RgMngmt cntrlCfm; Pst cfmPst; - TRC3(rgLMMBndCfm) UNUSED(pst); @@ -1862,7 +1840,7 @@ U8 status; /* Status */ cfmPst.region = rgCb[inst].genCfg.bndCfmResp.response.mem.region; cfmPst.pool = rgCb[inst].genCfg.bndCfmResp.response.mem.pool; - cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt)); + memset(&cntrlCfm, 0, sizeof(RgMngmt)); switch(status) { @@ -1926,7 +1904,6 @@ Inst inst; #endif { Inst macInst = (inst - RG_INST_START); - TRC3(rgActvTmr) /* Check if any MAC timer has expired */ cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry); diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index 461a30d78..d7da7b31c 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -174,8 +174,6 @@ RgErrInfo *err; S16 ret; RgMUXSubHdr subHdr; - TRC2(rgMUXAddCes) - if (NULLP != pdu->contResId) { if(pdu->schdTbSz >= RG_CRES_ELM_LEN) @@ -305,7 +303,6 @@ RgErrInfo *err; U8 lenBytes; MsgLen elmTotLen; - TRC2(rgMUXInsSdu) SFndLenMsg(sdu, &msgLen); RG_MUX_CALC_LEN(msgLen,lenBytes,elmTotLen); @@ -393,7 +390,6 @@ RgErrInfo *err; S16 ret = ROK; Buffer *padBuf = NULLP; RgMUXSubHdr subHdr; - TRC2(rgMUXAddPadd) #ifdef L2_OPTMZ padSize = 0; @@ -532,8 +528,6 @@ RgErrInfo *err; RgRguDDatReqPerUe *dDatReq; RgRguCmnDatReq *cDatReq; - TRC2(rgMUXAddSdus) - switch(pdu->reqType) { case EVTRGUCDATREQ: @@ -667,9 +661,6 @@ RgErrInfo *err; { Buffer *mBuf = NULLP; - TRC2(rgMUXBldPdu) - - if (rgGetMsg(inst, &mBuf) != ROK) { /* Buffer couldnt get allocated. Return a failure */ @@ -739,8 +730,6 @@ RgErrInfo *err; RgRguCmnDatReq *cDatReq; U32 lchIdx, pduIdx; - TRC2(rgMUXAddSdus) - switch(pdu->reqType) { case EVTRGUCDATREQ: @@ -976,8 +965,6 @@ RgErrInfo *err; Buffer *mBuf2; /* MAC CEs */ //U32 lchIdx, pduIdx; - TRC2(rgMUXBldPdu) - /* Reseting macHdr and macCes pointers */ if(tb->macHdr) SResetMBuf(tb->macHdr); @@ -1060,8 +1047,6 @@ RgErrInfo *err; U8 idx; Inst inst = cell->macInst - RG_INST_START; - TRC2(rgMUXBldRarPdu) - schdTbSz = alloc->schdTbSz; /* RAR PDU Requirements */ /* @@ -1194,8 +1179,6 @@ U8 *grnt; { U16 riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb); - TRC2(rgMUXGet20bitRarGrnt); - grnt[2] = msg3Grnt->cqiBit; /* cqi bit is 0, output from sched */ grnt[2] |= (msg3Grnt->delayBit << 1); grnt[2] |= (msg3Grnt->tpc << 2); @@ -1242,8 +1225,6 @@ U8 numRb; U8 numRbMinus1 = numRb - 1; U16 riv; - TRC2(rgMUXCalcRiv); - if (numRbMinus1 <= bw/2) { riv = bw * numRbMinus1 + rbStart; diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c index 8e3e4d85f..f21f8851c 100755 --- a/src/5gnrmac/rg_pom_scell.c +++ b/src/5gnrmac/rg_pom_scell.c @@ -104,8 +104,6 @@ RgPrgUeSCellLchModInfo *lchCfgCb; RgUeCb *ue; RgUlLcCb *ulLc; - TRC2(RgPrgPMacSMacUeSCellLchModReq); - RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d lcId %d lcgId %d\n", lchCfgCb->cellId, lchCfgCb->crnti,lchCfgCb->lcId,lchCfgCb->ulLchRecfg.lcgId)); @@ -192,8 +190,6 @@ Bool *isCfmRqrd; RgCellCb *cell; RgUeCb *ue; - TRC2(rgPomSndUeSCellLchDelToSmac); - /* Fetch the Active cell */ if(((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != lcDel->u.lchDel.cellId)) @@ -286,8 +282,6 @@ Bool *isCfmRqrd; RgPrgUeSCellLchModInfo lchCfgCb; Pst dstInstPst; - TRC2(rgPomSndUeSCellLchModToSmac); - for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) { if(TRUE == ue->sCelInfo[idx].isSCellAdded) @@ -355,8 +349,6 @@ Bool *isCfmRqrd; RgPrgUeSCellLchAddInfo lchCfgCb; Pst dstInstPst; - TRC2(rgPomSndUeSCellLchAddToSmac); - for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) { if(TRUE == ue->sCelInfo[idx].isSCellAdded) @@ -423,8 +415,6 @@ RgPrgUeSCellLchDelInfo *delLcCb; RgUlLcCb *ulLc; RgDlLcCb *dlLc; - TRC2(RgPrgPMacSMacUeSCellLchDelReq); - RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d\n", lchCfgCb->cellId, lchCfgCb->crnti)); @@ -502,8 +492,6 @@ RgPrgUeSCellLchAddInfo *lchCfgCb; Pst cfmPst; RgUeCb *ue; - TRC2(RgPrgPMacSMacUeSCellLchAddReq); - RGDBGPRM(inst,(rgPBuf(inst), "APPLYING UE SCELL CONFIG AT SMAC : cellId %d ueId %d\n", lchCfgCb->cellId, lchCfgCb->crnti)); @@ -581,7 +569,6 @@ RgUeCb **ue; #endif { - TRC2(rgPomVldtAddLch); RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC CONFIG: cellId %d ueId %d lcId %d\ cell %p ue %p\n", lcCfg->cellId, lcCfg->crnti, lcCfg->lcId, (void*)*cell, (void*)*ue)); @@ -656,7 +643,6 @@ RgPrgUeSCellLchAddInfo *lcCfg; #endif { - TRC2(rgPomUeSCellLcAdd); RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC CONFIG: cellId %d ueId %d\ lcId %d dir %d cell %p ue %p\n", lcCfg->cellId, lcCfg->crnti, lcCfg->lcId, lcCfg->dir, (void*)cell, (void*)ue)); @@ -710,7 +696,6 @@ RgCellCb **cell; RgUeCb **ue; #endif { - TRC2(rgPomVldtSCellDedLchCfg); RGDBGPRM(inst,(rgPBuf(inst), "VALIDATING CRG DEDICATED LC CONFIG \n")); @@ -815,7 +800,6 @@ RgPrgUeSCellLchAddInfo *lcCfg; #endif { //Inst inst = cell->macInst - RG_INST_START; - TRC2(rgPomUeSCellDedLcCfg); //RGDBGPRM(inst,(rgPBuf(inst), "APPLYING DEDICATED LC CONFIG\n")); /* Uplink/Bi-directional logical channel */ @@ -877,7 +861,6 @@ S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc) RgUlLcCb **ulLc; #endif { - TRC2(rgPomVltdModLch); RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \ lcId %d cell %p ue %p ulLc %p\n",lchCfgCb->cellId, lchCfgCb->crnti,lchCfgCb->lcId, (void*)*cell, (void*)*ue, @@ -947,7 +930,6 @@ RgUlLcCb *ulLc; RgPrgUeSCellLchModInfo *lchCfgCb; #endif { - TRC2(rgPomUeSCellLcMod); RGDBGPRM(inst,(rgPBuf(inst), "APPLYING SMAC LC RECONFIG: cellId %d ueId %d\ lcId %d \n", lchCfgCb->cellId, lchCfgCb->crnti, lchCfgCb->lcId)); @@ -998,7 +980,6 @@ S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc) RgDlLcCb **dlLc; #endif { - TRC2(rgPomVltdDelLch); RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \ lcId %d cell %p ue %p ulLc %p\n",delLcCb->cellId, delLcCb->crnti,delLcCb->lcId, (void*)*cell, (void*)*ue, @@ -1071,7 +1052,6 @@ RgDlLcCb *dlLc; #endif { - TRC2(rgPomUeSCellLcDel); RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC DELETE: cellId %d ueId %d\ lcId %d dir %d\n", delLcCb->cellId, delLcCb->crnti, delLcCb->lcId, diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c index f07644363..a8dbcb763 100755 --- a/src/5gnrmac/rg_prg.c +++ b/src/5gnrmac/rg_prg.c @@ -79,8 +79,6 @@ RgPrgUeSCellCfgInfo *ueSCellCfgInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgPMacSMacUeSCellCfgReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -126,8 +124,6 @@ Buffer *mBuf; { RgPrgUeSCellCfgInfo ueSCellCfgInfo; - TRC2(cmUnpkPrgPMacSMacUeSCellCfgReq) - if(SRemPreMsgMult((Data *)&ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); @@ -165,8 +161,6 @@ RgPrgCfgCfmInfo *cfgCfm; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgSMacPMacCfgCfm) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -233,8 +227,6 @@ Buffer *mBuf; { RgPrgCfgCfmInfo cfgCfm; - TRC2(cmUnpkPrgSMacPMacCfgCfm) - if(SRemPreMsgMult((Data *)&cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); @@ -272,8 +264,6 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgPMacSMacUeSCellDelReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -320,8 +310,6 @@ Buffer *mBuf; { RgPrgUeSCellDelInfo ueSCellDelInfo; - TRC2(cmUnpkPrgPMacSMacUeSCellDelReq) - if(SRemPreMsgMult((Data *)&ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo),\ mBuf) != ROK) { @@ -360,8 +348,6 @@ RgPrgUeSCellLchAddInfo *lchCfgInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgPMacSMacUeSCellLchAddReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -408,8 +394,6 @@ Buffer *mBuf; { RgPrgLchRecfgInfo lchCfgInfo; - TRC2(cmUnpkPrgPMacSMacUeSCellLchAddReq) - if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); @@ -447,8 +431,6 @@ RgPrgUeSCellLchDelInfo *delLcCb; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgPMacSMacUeSCellLchDelReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -493,8 +475,6 @@ RgPrgUeSCellLchModInfo *lchCfgInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkPrgPMacSMacUeSCellLchModReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -542,8 +522,6 @@ Buffer *mBuf; { RgPrgUeSCellLchModInfo lchCfgInfo; - TRC2(cmUnpkPrgPMacSMacAddLchCfgReq) - if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); @@ -585,8 +563,6 @@ Buffer *mBuf; { RgPrgUeSCellLchDelInfo lchCfgInfo; - TRC2(cmUnpkPrgPMacSMacUeSCellLchDelReq) - if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchDelInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c index 96ac97a29..9e01cf896 100755 --- a/src/5gnrmac/rg_prg_pt.c +++ b/src/5gnrmac/rg_prg_pt.c @@ -88,8 +88,6 @@ S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo) #endif { - TRC3(RgPrgPMacSMacUeSCellCfg); - return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo)); } @@ -128,8 +126,6 @@ S16 RgPrgSMacPMacCfg(pst, cfgCfm) #endif { - TRC3(RgPrgSMacPMacCfg); - return ((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm)); } @@ -168,8 +164,6 @@ S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo) #endif { - TRC3(RgPrgPMacSMacUeSCellDel); - return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo)); } @@ -211,8 +205,6 @@ S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo) #endif { - TRC3(RgPrgPMacSMacUeScellLchMod); - return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo)); } @@ -253,8 +245,6 @@ S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb) #endif { - TRC3(RgPrgPMacSMacUeScellLchDel); - return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb)); } @@ -295,8 +285,6 @@ S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo) #endif { - TRC3(RgPrgPMacSMacUeScellLchAdd); - return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo)); } diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c index 4fa8c40b3..7d49cf70e 100755 --- a/src/5gnrmac/rg_ptli.c +++ b/src/5gnrmac/rg_ptli.c @@ -416,8 +416,6 @@ SpId spId; #endif { - TRC3(RgLiTfuBndReq) - return ((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId)); } @@ -458,8 +456,6 @@ SpId spId; #endif { - TRC3(RgLiTfuSchBndReq) - return ((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId)); } @@ -500,8 +496,6 @@ Reason reason; #endif { - TRC3(RgLiTfuUbndReq) - return ((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason)); } @@ -542,8 +536,6 @@ Reason reason; #endif { - TRC3(RgLiTfuSchUbndReq) - return ((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason)); } @@ -598,8 +590,6 @@ TfuRecpReqInfo * recpReq; #endif { - TRC3(RgLiTfuRecpReq) - return ((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq)); } @@ -647,8 +637,6 @@ TfuCntrlReqInfo * cntrlReq; #endif { - TRC3(RgLiTfuCntrlReq) - return ((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq)); } @@ -695,8 +683,6 @@ TfuDatReqInfo * datReq; #endif { - TRC3(RgLiTfuDatReq) - return ((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq)); } @@ -741,8 +727,6 @@ TfuDelDatReqInfo * delDatReq; #endif { - TRC3(RgLiTfuDelDatReq) - return ((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq)); } @@ -788,7 +772,6 @@ SpId spId; #endif { - TRC3(PtLiTfuBndReq) UNUSED(pst); UNUSED(suId); @@ -834,8 +817,6 @@ SpId spId; #endif { - TRC3(PtLiTfuSchBndReq) - UNUSED(pst); UNUSED(suId); UNUSED(spId); @@ -880,8 +861,6 @@ Reason reason; #endif { - TRC3(PtLiTfuUbndReq) - UNUSED(pst); UNUSED(spId); UNUSED(reason); @@ -926,8 +905,6 @@ Reason reason; #endif { - TRC3(PtLiTfuSchUbndReq) - UNUSED(pst); UNUSED(spId); UNUSED(reason); @@ -986,8 +963,6 @@ TfuRecpReqInfo * recpReq; #endif { - TRC3(PtLiTfuRecpReq) - UNUSED(pst); UNUSED(spId); UNUSED(recpReq); @@ -1039,8 +1014,6 @@ TfuCntrlReqInfo * cntrlReq; #endif { - TRC3(PtLiTfuCntrlReq) - UNUSED(pst); UNUSED(spId); UNUSED(cntrlReq); @@ -1091,8 +1064,6 @@ TfuDatReqInfo * datReq; #endif { - TRC3(PtLiTfuDatReq) - UNUSED(pst); UNUSED(spId); UNUSED(datReq); @@ -1142,8 +1113,6 @@ TfuDelDatReqInfo * DelDatReq; #endif { - TRC3(PtLiTfuDelDatReq) - UNUSED(pst); UNUSED(spId); UNUSED(delDatReq); diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c index 87419c341..a7fa99a70 100755 --- a/src/5gnrmac/rg_ptmi.c +++ b/src/5gnrmac/rg_ptmi.c @@ -292,8 +292,6 @@ RgMngmt *cfm; /* config confirm structure */ #endif { - TRC3(RgMiLrgCfgCfm); - (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm); return ROK; @@ -330,8 +328,6 @@ RgMngmt *cfm; /* config confirm structure */ #endif { - TRC3(RgMiLrgSchCfgCfm); - (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm); return ROK; @@ -370,8 +366,6 @@ RgMngmt *cfm; /* statistics confirm structure */ #endif { - TRC3(RgMiLrgStsCfm); - (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm); return ROK; @@ -409,8 +403,6 @@ RgMngmt *cfm; /* status confirm structure */ #endif { - TRC3(RgMiLrgStaCfm); - (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm); return ROK; @@ -448,8 +440,6 @@ RgMngmt *cfm; /* control confirm structure */ #endif { - TRC3(RgMiLrgCntrlCfm); - (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm); return ROK; @@ -486,8 +476,6 @@ RgMngmt *cfm; /* control confirm structure */ #endif { - TRC3(RgMiLrgSchCntrlCfm); - (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm); return ROK; @@ -525,8 +513,6 @@ RgMngmt *usta; /* status indication structure */ #endif { - TRC3(RgMiLrgStaInd); - (*RgMiLrgStaIndMt[pst->selector])(pst,usta); return ROK; @@ -563,8 +549,6 @@ RgMngmt *usta; /* status indication structure */ #endif { - TRC3(RgMiLrgSchStaInd); - (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta); return ROK; @@ -605,8 +589,6 @@ Buffer *mBuf; /* Trace message */ #endif { - TRC3(RgMiLrgTrcInd); - (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf); return ROK; @@ -628,7 +610,6 @@ Pst *pst; /* post structure */ LrgSchMeasCfmInfo *cfm; /* Meas Cfm Info */ #endif { - TRC3(RgMiLrgSchL2MeasCfm) (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm); @@ -665,8 +646,6 @@ Pst *pst; /* post structure */ LrgSchMeasCfmInfo *cfm; /* Meas Cfm Info */ #endif { - TRC3(RgMiLrgSchL2MeasStopCfm) - (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm); return ROK; @@ -710,8 +689,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Config Confirm */ #endif { - TRC3(PtMiLrgCfgCfm) - return ROK; }/* end of PtMiLrgCfgCfm */ @@ -746,7 +723,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Config Confirm */ #endif { - TRC3(PtMiLrgSchCfgCfm) return ROK; }/* end of PtMiLrgSchCfgCfm */ @@ -784,7 +760,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Statistics Confirm */ #endif { - TRC3(PtMiLrgStsCfm) return ROK; }/* end of PtMiLrgStsCfm */ @@ -822,7 +797,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Status Confirm */ #endif { - TRC3(PtMiLrgStaCfm) return ROK; }/* end of PtMiLrgStaCfm */ @@ -859,7 +833,6 @@ Pst *pst; /* post structure */ RgMngmt *usta; /* Status indication */ #endif { - TRC3(PtMiLrgStaInd) return ROK; }/* end of PtMiLrgStaInd */ @@ -894,7 +867,6 @@ Pst *pst; /* post structure */ RgMngmt *usta; /* Status indication */ #endif { - TRC3(PtMiLrgSchStaInd) return ROK; }/* end of PtMiLrgSchStaInd */ @@ -930,7 +902,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Control Confirm */ #endif { - TRC3(PtMiLrgCntrlCfm) return ROK; }/* end of PtMiLrgCntrlCfm */ @@ -965,7 +936,6 @@ Pst *pst; /* post structure */ RgMngmt *cfm; /* Control Confirm */ #endif { - TRC3(PtMiLrgSchCntrlCfm) return ROK; }/* end of PtMiLrgSchCntrlCfm */ @@ -1003,7 +973,6 @@ RgMngmt *trc; /* Trace Event */ Buffer *mBuf; /* Trace message */ #endif { - TRC3(PtMiLrgTrcInd) return ROK; }/* end of PtMiLrgTrcInd */ #ifdef LTE_L2_MEAS @@ -1033,7 +1002,6 @@ Pst *pst; /* post structure */ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */ #endif { - TRC3(PtMiLrgSchL2MeasCfm) return ROK; }/* end of PtMiLrgSchL2MeasCfm */ @@ -1064,7 +1032,6 @@ Pst *pst; /* post structure */ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */ #endif { - TRC3(PtMiLrgSchL2MeasStopCfm) return ROK; }/* end of PtMiLrgSchL2MeasStopCfm */ diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index aad470958..ff502749f 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -563,8 +563,6 @@ U8 status; #endif { - TRC3(RgUiRgrBndCfm); - return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); } @@ -597,8 +595,6 @@ U8 status; #endif { - TRC3(RgUiRgmBndCfm); - return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); } @@ -635,8 +631,6 @@ RgrTtiIndInfo *ttiInd; #endif { - TRC3(RgUiRgrTtiInd); - return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd)); } @@ -672,8 +666,6 @@ U8 status; #endif { - TRC3(RgUiRgrCfgCfm); - return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); } @@ -708,8 +700,6 @@ U8 status; #endif { - TRC3(RgUiCrgBndCfm); - return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); } @@ -747,8 +737,6 @@ U8 status; #endif { - TRC3(RgUiCrgCfgCfm); - return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -783,8 +771,6 @@ U8 status; #endif { - TRC3(RgUiRguBndCfm); - return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status)); } @@ -823,8 +809,6 @@ RguCDatIndInfo * datInd; { macCDatIndSnt++; - TRC3(RgUiRguCDatInd); - return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); } @@ -860,8 +844,6 @@ RguDDatIndInfo * datInd; { macDDatIndSnt++; - TRC3(RgUiRguDDatInd); - #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) return (RgUiRguDDatIndRbuf(datInd)); #else @@ -902,8 +884,6 @@ RguCStaIndInfo * staInd; #endif { - TRC3(RgUiRguCStaInd); - return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd)); } @@ -941,8 +921,6 @@ RguDStaIndInfo * staInd; #endif { - TRC3(RgUiRguDStaInd); - return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd)); } @@ -963,7 +941,6 @@ RguHarqStatusInd *harqStatusInd; #endif { - TRC3(RgUiRguHqStaInd); #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF) S16 ret=ROK; ret = RgUiRguHqStaIndRbuf(pst,suId,harqStatusInd); @@ -1024,8 +1001,6 @@ U8 status; #endif { - TRC3(RgUiRgrSiCfgCfm); - return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -1063,8 +1038,6 @@ U8 siId; U8 status; #endif { - TRC3(RgUiRgrWarningSiCfgCfm); - return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) (pst, suId, transId, siId, status)); } @@ -1103,8 +1076,6 @@ RgrStaIndInfo *staInd; #endif { - TRC3(RgUiRgrStaInd); - return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd)); } @@ -1139,8 +1110,6 @@ S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd) #endif { - TRC3(RgUiRgrLoadInfInd); - return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd)); } @@ -1174,8 +1143,6 @@ RgrUeStaIndInfo *ueStaInd; #endif { - TRC3(RgUiRgrUeStaInd); - return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd)); } @@ -1212,8 +1179,6 @@ U8 status; #endif { - TRC3(PtUiCrgBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); @@ -1255,8 +1220,6 @@ U8 status; #endif { - TRC3(PtUiCrgCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); @@ -1298,8 +1261,6 @@ U8 status; #endif { - TRC3(PtUiRguBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); @@ -1339,8 +1300,6 @@ RguCDatIndInfo * datInd; #endif { - TRC3(PtUiRguCDatInd); - UNUSED(pst); UNUSED(suId); UNUSED(datInd); @@ -1380,8 +1339,6 @@ RguDDatIndInfo * datInd; #endif { - TRC3(PtUiRguDDatInd); - UNUSED(pst); UNUSED(suId); UNUSED(datInd); @@ -1423,8 +1380,6 @@ RguCStaIndInfo * staInd; #endif { - TRC3(PtUiRguCStaInd); - UNUSED(pst); UNUSED(suId); UNUSED(staInd); @@ -1466,8 +1421,6 @@ RguDStaIndInfo * staInd; #endif { - TRC3(PtUiRguDStaInd); - UNUSED(pst); UNUSED(suId); UNUSED(staInd); @@ -1492,8 +1445,6 @@ RguHarqStatusInd *harqStatusInd; #endif { - TRC3(PtUiRguHqStaInd); - UNUSED(pst); UNUSED(suId); UNUSED(harqStatusInd); @@ -1518,8 +1469,6 @@ RguHarqStatusInd *flowCntrlInd; #endif { - TRC3(PtUiRguFlowCntrlInd); - UNUSED(pst); UNUSED(suId); UNUSED(flowCntrlInd); @@ -1561,8 +1510,6 @@ U8 status; #endif { - TRC3(PtUiRgrBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); @@ -1601,8 +1548,6 @@ RgrTtiIndInfo *ttiInd; #endif { - TRC3(PtUiRgrTtiInd); - UNUSED(pst); UNUSED(suId); UNUSED(ttiInd); @@ -1644,8 +1589,6 @@ U8 status; #endif { - TRC3(PtUiRgrCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); @@ -1688,8 +1631,6 @@ U8 status; #endif { - TRC3(PtUiRgrSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); @@ -1732,8 +1673,6 @@ U8 siId; U8 status; #endif { - TRC3(PtUiRgrWarningSiCfgCfm); - UNUSED(pst); UNUSED(suId); UNUSED(transId); @@ -1776,8 +1715,6 @@ RgrStaIndInfo *staInd; #endif { - TRC3(PtUiRgrStaInd); - UNUSED(pst); UNUSED(suId); UNUSED(staInd); @@ -1815,8 +1752,6 @@ S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd) #endif { - TRC3(PtUiRgrLoadInfInd); - UNUSED(pst); UNUSED(suId); UNUSED(loadInfInd); @@ -1854,8 +1789,6 @@ RgrUeStaIndInfo *ueStaInd; #endif { - TRC3(PtUiRgrUeStaInd); - UNUSED(pst); UNUSED(suId); UNUSED(ueStaInd); @@ -1896,8 +1829,6 @@ U8 status; #endif { - TRC3(PtUiRgmBndCfm); - UNUSED(pst); UNUSED(suId); UNUSED(status); @@ -1934,8 +1865,6 @@ RgmPrbRprtInd *prbRprtInd; #endif { - TRC3(PtUiRgmPrbRprtInd); - UNUSED(pst); UNUSED(suId); UNUSED(prbRprtInd); @@ -1972,8 +1901,6 @@ RgmTransModeInd *transModeInd; #endif { - TRC3(PtUiRgmTransModeInd); - UNUSED(pst); UNUSED(suId); UNUSED(transModeInd); @@ -2011,7 +1938,6 @@ RgmPrbRprtInd *prbRprtInd; #endif { - TRC2(RgUiRgmSendPrbRprtInd); return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd)); } @@ -2043,7 +1969,6 @@ RgmTransModeInd *transModeInd; #endif { - TRC2(RgUiRgmChangeTransModeInd); return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd)); } @@ -2250,8 +2175,8 @@ RguHarqStatusInd *harqStatusInd; } else { - cmMemcpy((U8 *)&(harqStaInd->hqStatusInd), (U8 *)harqStatusInd, sizeof(RguHarqStatusInd)); - cmMemcpy((U8 *)&(harqStaInd->pst), (U8 *)pst, sizeof(Pst)); + memcpy(&(harqStaInd->hqStatusInd), harqStatusInd, sizeof(RguHarqStatusInd)); + memcpy(&(harqStaInd->pst), pst, sizeof(Pst)); SRngIncrWIndx(SS_RNG_BUF_MAC_HARQ); SsRngInfoTbl[SS_RNG_BUF_MAC_HARQ].pktRate++; } diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c index bfaefcba7..da2b5787a 100755 --- a/src/5gnrmac/rg_ram.c +++ b/src/5gnrmac/rg_ram.c @@ -94,8 +94,6 @@ Inst inst; RgUeCb *ue; #endif { - TRC2(rgRAMFreeUeCb); - rgDHMFreeUe(inst,&ue->dl.hqEnt); /*ccpu00117052 - MOD - Passing double pointer for proper NULLP @@ -141,8 +139,6 @@ RgErrInfo *err; Inst inst = cell->macInst - RG_INST_START; RgUeCb *ueCb = NULLP; - TRC2(rgRAMCreateUeCb) - RLOG_ARG1(L_INFO,DBG_CELLID,cell->cellId,"CREATE UECB FOR CRNTI:%d", tmpCrnti); /* Allocate the Ue control block */ @@ -209,8 +205,6 @@ RgCellCb *cell; Inst inst = cell->macInst - RG_INST_START; RgUeCb *ueCb; - TRC2(rgRAMFreeCell); - /* Free CURRENT CRG cfg list */ while ((ueCb = rgDBMGetNextUeCbFromRachLst(cell, NULLP)) != NULLP) { @@ -264,8 +258,6 @@ RgErrInfo *err; RgDlSf *dlSf; U8 idx; - TRC2(rgHndlRaResp) - if(NULLP == rarInfo->raRntiInfo) { return RFAILED; diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index fbdb9c7a7..06760d206 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -137,8 +137,6 @@ RgRguDedDatReq *datReq; U32 idx; //U8 datReqFailCnt = 0; - TRC2(rgROMDedDatReq) - if (((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != datReq->cellId)) @@ -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)]; @@ -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 */ @@ -750,9 +738,6 @@ RgRguCmnStaRsp *staRsp; RgCellCb *cell; RgErrInfo err; - TRC2(rgROMCmnStaRsp) - - if(((cell = rgCb[inst].cell) == NULLP) || (cell->cellId != staRsp->cellId)) { @@ -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 diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index bb4e23455..82cca8095 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -204,7 +204,6 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) U8 idx; Inst inst = cellCb->macInst - RG_INST_START; - TRC2(rgTOMUtlFillDatReqPdus) /* first lets send the BCCH data down to PHY */ if (dlSf->bcch.tb != NULLP) @@ -405,7 +404,6 @@ S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) TfuDatReqInfo *datInfo; Inst inst = cellCb->macInst - RG_INST_START; - TRC2(rgTOMUtlProcDlSf); /* Fill Data Request Info from scheduler to PHY */ if ((ret = rgAllocEventMem(inst,(Ptr *)&datInfo, @@ -504,7 +502,6 @@ Inst inst; RgUstaDgn dgn; /* Alarm diagnostics structure */ VOLATILE U32 startTime=0; - TRC2(rgTOMUtlAllocPduEvnt); evntMem.region = rgCb[inst].rgInit.region; evntMem.pool = rgCb[inst].rgInit.pool; @@ -562,7 +559,6 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) RgMacSdu *sdu; CmLList *node; - TRC2(rgTOMUtlFreePduEvnt); /* Steps of freeing up the PDU. * 1. loop through the subHdrLst and free up all the buffers. * 2. free up the whole event @@ -613,7 +609,6 @@ RgInfSfDatInd **sfInfo; RgUstaDgn dgn; /* Alarm diagnostics structure */ VOLATILE U32 startTime=0; - TRC2(rgTOMInfAllocPduEvnt); evntMem.region = rgCb[inst].rgInit.region; evntMem.pool = rgCb[inst].rgInit.pool; @@ -663,7 +658,6 @@ PRIVATE Void rgTOMInfFreePduEvnt (sfInfo) RgInfSfDatInd *sfInfo; #endif { - TRC2(rgTOMInfFreePduEvnt); RG_FREE_MEM(sfInfo); RETVOID; @@ -704,7 +698,6 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) U8 lcId; U8 lcgId; U8 loop; - TRC2(rgTomUtlPrepareL2MUlThrpInfo); dDatInd->burstInd = RGU_L2M_UL_BURST_END; for(loop=0;loopnumLch;loop++) @@ -845,7 +838,6 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) ulLcCb = NULLP; - TRC2(rgTOMUtlProcMsg) #ifndef LTE_L2_MEAS UNUSED(slot); @@ -897,7 +889,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) return RFAILED; } dDatInd = (RgRguDedDatInd *)elem; - cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd)); + memset(dDatInd, 0x00, sizeof(RgRguDedDatInd)); #endif dDatInd->cellId = cellCb->cellId; dDatInd->rnti = ueCb->ueId; @@ -974,7 +966,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) return RFAILED; } dDatInd = (RgRguDedDatInd *)elem; - cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd)); + memset(dDatInd, 0x00, sizeof(RgRguDedDatInd)); #endif dDatInd->cellId = cellCb->cellId; dDatInd->rnti = ueCb->ueId; @@ -1067,7 +1059,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) { ueCb->ul.explRelCntr = 0; /* Indicate scheduler for explicit release */ - cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst)); + memset(&schPst1, 0, sizeof(Pst)); rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst); //TODO: commented for compilation without SCH #if 0 @@ -1181,7 +1173,6 @@ U32 *lcgBytes; U32 lcgId = 0; U32 idx = 0; - TRC2(rgTOMUtlInsSchInfo); RG_TOM_INF_ALLOC(sfInfo, sizeof(RgInfUeDatInd), ueInfo, ret); @@ -1282,7 +1273,6 @@ Inst inst; U32 lcgBytes[RGINF_MAX_LCG_PER_UE]; - TRC2(rgTOMDatInd); #ifdef STUB_TTI_HANDLING_5GTF node = datInd->datIndLst.first; for (;node; node=node->next) @@ -1302,7 +1292,7 @@ Inst inst; return(RFAILED); #endif - cmMemset((U8 *)&lcgBytes, 0, sizeof(lcgBytes)); + memset(&lcgBytes, 0, sizeof(lcgBytes)); tfuSap = &(rgCb[inst].tfuSap); ueCb = NULLP; @@ -1423,7 +1413,7 @@ Inst inst; if (ueCb->ul.implRelCntr == ueCb->ul.implRelCnt) { /* Indicate scheduler for implicit release */ - cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst)); + memset(&schPst1, 0, sizeof(Pst)); rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst); ueCb->ul.implRelCntr = 0; @@ -1500,11 +1490,11 @@ Inst inst; #endif /* RRM_RBC_X */ /* Update PRB used for all GBR QCIs to scheduler */ - cmMemcpy((U8*) &sfInfo->qcisUlPrbCnt[0], - (U8*) &cellCb->qcisUlPrbCnt[0], + memcpy( &sfInfo->qcisUlPrbCnt[0], + &cellCb->qcisUlPrbCnt[0], (RGM_MAX_QCI_REPORTS * sizeof(U32))); /* clear the cellCb ul prb value */ - cmMemset((U8*)&cellCb->qcisUlPrbCnt[0], 0, + memset(&cellCb->qcisUlPrbCnt[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(U32))); /* RRM_RBC_Y */ @@ -1571,7 +1561,6 @@ RgErrInfo *err; RgDlSf *dlSf; Inst inst = cell->macInst - RG_INST_START; - TRC2(rgHndlCmnChnl) dlSf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)]; @@ -1751,7 +1740,6 @@ RgErrInfo *err; #endif { - TRC2(rgHndlSchdUe); if(NULLP == ueInfo->allocInfo) { @@ -1798,7 +1786,6 @@ RgInfUlUeInfo *ueInfo; RgUlSf *ulSf; S16 ret; - TRC2(rgHndlUlUeInfo) ulSf = &cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)]; @@ -1875,7 +1862,6 @@ RgDlSf *dlSf; { U8 idx; - TRC2(rgTOMRlsSf) if(dlSf->txDone == FALSE) { @@ -1975,7 +1961,6 @@ RgInfSfAlloc *sfInfo; Pst *pst; U32 ueIdx; U32 lcIdx; - TRC3(rgHndlFlowCntrl); pst = &cell->rguDlSap->sapCfg.sapPst; /* flowCntrlInd is alloced in cell init time and will be re-used throughout */ @@ -2046,7 +2031,6 @@ RgInfSfAlloc *sfInfo; VOLATILE U32 startTime=0; Inst inst; - TRC2(RgSchMacSfAllocReq) RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -2204,7 +2188,6 @@ U16 slot; U16 sduSize; #endif - TRC2(rgTOMProcCrntiCEInDatInd) #ifndef LTE_L2_MEAS UNUSED(slot); @@ -2306,7 +2289,6 @@ U16 slot; #endif - TRC2(rgTOMProcCCCHSduInDatInd) #ifndef LTE_L2_MEAS UNUSED(slot); @@ -2390,7 +2372,6 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) { U8 lcgId; U8 bsr; - TRC2(rgTOMUtlL2MStoreBufSz); if(ceInfo->bitMask & RG_TRUNC_BSR_CE_PRSNT) { @@ -2448,7 +2429,6 @@ PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) RgMacSdu *sdu; RgUlLcCb *ulLcCb; - TRC2(rgTOML2MCompileActiveLCs) node = pdu->sduLst.first; while (node) diff --git a/src/5gnrmac/rg_uhm.c b/src/5gnrmac/rg_uhm.c index 840f37687..36440d9f1 100755 --- a/src/5gnrmac/rg_uhm.c +++ b/src/5gnrmac/rg_uhm.c @@ -96,8 +96,6 @@ RgUeCb *ueCb; CrgUeCfg *ueCfg; #endif { - TRC2(rgUHMCrgUeCfg); - ueCb->ul.hqEnt.maxHqRetx = (ueCfg->ueUlHqCfg.maxUlHqTx - 1); RETVOID; } /* rgUHMCrgUeCfg */ @@ -134,7 +132,6 @@ RgUeCb *ueCb; CrgUeRecfg *ueRecfg; #endif { - TRC2(rgUHMCrgUeRecfg); ueCb->ul.hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1); RETVOID; diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index 7ab5a96a3..8f177a663 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -114,9 +114,6 @@ SpId spId; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRguBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -218,8 +215,6 @@ Reason reason; #endif { Inst inst; - TRC3(RgUiRguUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -286,9 +281,6 @@ U8 status; { S16 ret = ROK; - TRC2(rgUIMRguBndCfm) - - ret = RgUiRguBndCfm(&rgCb[inst].rguSap[spId].sapCfg.sapPst, rgCb[inst].rguSap[spId].sapCfg.suId, status); if (ret != ROK) @@ -340,9 +332,6 @@ RguDDatReqInfo *datReq; U32 id3; #endif - TRC3(RgUiRguDDatReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -456,9 +445,6 @@ RguCDatReqInfo *datReq; Inst inst; S16 ret = ROK; - TRC3(RgUiRguCDatReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -549,8 +535,6 @@ RguDStaRspInfo *staRsp; S16 ret = ROK; VOLATILE U32 startTime = 0; - TRC3(RgUiRguDStaRsp) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; /*starting Task*/ @@ -605,9 +589,6 @@ RguCStaRspInfo *staRsp; Inst inst; S16 ret = ROK; - TRC3(RgUiRguCStaRsp) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -689,9 +670,6 @@ RguL2MUlThrpMeasReqInfo *measReq; S16 ret = ROK; - TRC3(RgUiRguL2MUlThrpMeasReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS @@ -771,8 +749,6 @@ RgRguDedStaInd *staInd; { S16 ret = ROK; - TRC2(rgUIMSndDedStaInd) - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd)); ret = RgUiRguDStaInd(&(rguSap->sapCfg.sapPst), rguSap->sapCfg.suId, @@ -820,10 +796,6 @@ RgRguCmnStaInd *staInd; { S16 ret = ROK; - - TRC2(rgUIMSndCmnStaInd) - - ret = RgUiRguCStaInd(&(rguDlSap->sapCfg.sapPst), rguDlSap->sapCfg.suId, staInd); if (ret != ROK) @@ -869,10 +841,6 @@ RgRguDedDatInd *datInd; { S16 ret = ROK; - - TRC2(rgUIMSndDedDatInd) - - rguUlSap->sapSts.numPduTxmit += datInd->numLch; #ifndef SS_RBUF ret = RgUiRguDDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, @@ -924,9 +892,6 @@ RgRguCmnDatInd *datInd; { S16 ret = ROK; - TRC2(rgUIMSndCmnDatInd) - - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd)); rguUlSap->sapSts.numPduTxmit++; @@ -981,9 +946,6 @@ SpId spId; RgUstaDgn dgn; /* Alarm diagnostics structure */ Inst inst; - TRC3(RgUiCrgBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1085,8 +1047,6 @@ Reason reason; #endif { Inst inst; - TRC3(RgUiCrgUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1152,8 +1112,6 @@ SuId suId; U8 status; #endif { - TRC2(rgUIMCrgBndCfm) - if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { @@ -1205,12 +1163,10 @@ CrgCfgReqInfo *cfgReqInfo; U8 cfmStatus = 0x00ff; U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; - TRC3(RgUiCrgCfgReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; /* Ensuring transId is always Null terminated. */ - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE); prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; @@ -1303,9 +1259,7 @@ U8 status; S16 ret = ROK; U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; - TRC2(rgUIMCrgCfgCfm) - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE); prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index f6b7b50e8..87fe3e59d 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -128,8 +128,6 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocShrablSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -160,7 +158,7 @@ Size size; /* size */ #endif /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -200,8 +198,6 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -227,7 +223,7 @@ Size size; /* size */ } /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -266,8 +262,6 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSharableBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -322,8 +316,6 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -379,8 +371,6 @@ Buffer **mBuf; /* Message Buffer pointer be returned */ { S16 ret; - TRC2(rgGetMsg) - #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ MS_BUF_ADD_ALLOC_CALLER(); #endif /* */ @@ -433,8 +423,6 @@ U8 dgnType; #endif { - TRC2(rgFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: @@ -486,10 +474,6 @@ RgRguDedDatReq *datReq; /* DatReq pointer */ U8 idx1,idx2; U32 idx; - - TRC2(rgUpdtRguDedSts) - - switch(stsType) { case RG_RGU_SDU_RCVD: @@ -560,9 +544,6 @@ RgUpSapCb *rguDlSap; U8 stsType; /* Statistics type to update */ #endif { - TRC2(rgUpdtRguCmnSts) - - switch(stsType) { @@ -608,7 +589,6 @@ Inst inst; U8 updtType; #endif { - TRC2(rgUpdtCellCnt); switch (updtType) { @@ -655,8 +635,6 @@ Inst inst; U8 updtType; #endif { - TRC2(rgUpdtUeCnt); - switch (updtType) { case RG_CFG_ADD: @@ -702,8 +680,6 @@ Size memSize; Mem sMem; VOLATILE U32 startTime=0; - TRC2(rgAllocEventMem) - sMem.region = rgCb[inst].rgInit.region; sMem.pool = rgCb[inst].rgInit.pool; @@ -771,7 +747,6 @@ Ptr memCp; { S16 ret; - TRC2(rgGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else @@ -811,7 +786,6 @@ Inst srcInst; Inst dstInst; #endif { - TRC2(rgGetPstToInst); pst->srcEnt = rgCb[srcInst].rgInit.ent; pst->srcInst = rgCb[srcInst].rgInit.inst; @@ -867,8 +841,6 @@ RgInfLcgRegReq *lcgRegReq; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacLcgRegReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -926,8 +898,6 @@ RgInfUlSpsReset *ulSpsResetInfo; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacUlSpsResetReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -997,8 +967,6 @@ RgInfSpsLcInfo *lcInfo; RgUeCb *ue; U8 idx; - TRC2(RgSchMacSpsLcRegReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -1081,8 +1049,6 @@ CmLteRnti crnti; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacSpsLcDeregReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -1150,8 +1116,6 @@ CmLteRnti newRnti; RgUeCb *ue = NULLP; RgUeCb *newUe = NULLP; - TRC3(rgUtlHndlCrntiChng) - ue = rgDBMGetUeCb(cell, rnti); newUe = rgDBMGetUeCbFromRachLst(cell, newRnti); if ((ue == NULLP) || (newUe == NULLP)) @@ -1168,7 +1132,7 @@ CmLteRnti newRnti; ue->ueId = newRnti; - cmMemcpy((U8*)&(ue->contResId), (U8*)&(newUe->contResId), + memcpy(&(ue->contResId), &(newUe->contResId), sizeof(newUe->contResId)); /* Fix : syed MSG4 might be RETXing need to store the * HARQ context. */ @@ -1217,8 +1181,6 @@ RgUeCb *ue; Pst dstInstPst; RgPrgUeSCellDelInfo ueSCellDelInfo; - TRC2(rgDelUeFrmAllSCell) - /* To Delete the SCells if exisits for that UE */ for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) { @@ -1272,9 +1234,7 @@ S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) { S16 ret = ROK; - TRC3(rgUtlVltdAddSCellCfg) - - /* To Validate the CellID presence */ + /* To Validate the CellID presence */ if((cell == NULLP) || (cell->cellId != ueSCellCb->cellId)) { @@ -1339,8 +1299,6 @@ CmLteRnti newRnti; TfuDelDatReqInfo delDatReq; #endif - TRC2(rgUtlSndCrntiChngReq2AllSMacs) - /* use newRnti to get UeCb in PMac because rnti is already changed in PMac*/ ue = rgDBMGetUeCb(cell, newRnti); if (ue == NULLP) @@ -1417,8 +1375,6 @@ CmLteRnti *rlsRnti; RgUeCb *spsUeCb = NULLP; #endif - TRC3(rgUtlHndlCrntiRls) - if ((ue = rgDBMGetUeCb(cell, rlsRnti->rnti)) == NULLP) { /* Check in RachLst */ @@ -1509,8 +1465,6 @@ RgInfRlsRnti *rlsRnti; TfuDelDatReqInfo delDatReq; #endif - TRC3(RgSchMacRlsRntiReq) - RG_IS_INST_VALID(pst->dstInst); macInst = pst->dstInst - RG_INST_START; cell = rgCb[macInst].cell; diff --git a/src/5gnrrlc/kw.h b/src/5gnrrlc/kw.h index acf5147ab..74a1a0f4f 100755 --- a/src/5gnrrlc/kw.h +++ b/src/5gnrrlc/kw.h @@ -106,7 +106,7 @@ { \ SGetSBuf(_cb->init.region, _cb->init.pool, (Data **)&_buf, \ (Size) _size); \ - cmMemset((U8 *)(_buf), 0, _size); \ + memset((_buf), 0, _size); \ } #define RLC_RMV_SDU(_cb,_sduQ,_sdu) \ @@ -159,7 +159,7 @@ if (SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ (Size) _size, 0) == ROK) \ { \ - cmMemset((U8 *)(_buf), 0, _size); \ + memset((_buf), 0, _size); \ } \ else \ { \ @@ -172,7 +172,7 @@ if (SGetSBuf(_cb->init.region, _cb->init.pool, (Data **)&_buf, \ (Size) _size) == ROK) \ { \ - cmMemset((U8 *)(_buf), 0, _size); \ + memset((_buf), 0, _size); \ } \ else \ { \ @@ -292,9 +292,9 @@ #define RLC_FREE_BUF_WC(_buf) SPutMsg((_buf)); -#define RLC_MEM_CPY(_dst, _src, _size) cmMemcpy((U8*)_dst, (U8 *)_src, _size); +#define RLC_MEM_CPY(_dst, _src, _size) memcpy(_dst, _src, _size); -#define RLC_MEM_ZERO(_buf, _size) cmMemset((U8 *)(_buf), 0, _size); +#define RLC_MEM_ZERO(_buf, _size) memset((_buf), 0, _size); #define RLC_GET_MEM_REGION(_cb) (_cb->init.region) @@ -303,7 +303,7 @@ #define RLC_GET_MEM_POOL_ADDRESS(_cb) (&_cb->init.pool) /* Memset to value */ -#define RLC_MEM_SET(_arg, _val, _size) cmMemset((U8 *)_arg, (U8)_val, _size); +#define RLC_MEM_SET(_arg, _val, _size) memset(_arg, _val, _size); /* Alarms */ /* Send an alarm for sapId events */ @@ -959,7 +959,7 @@ do \ { \ S8 _buf[60]; \ DateTime dt; \ - cmMemset((U8 *)(&dt), 0, sizeof(DateTime)); \ + memset((&dt), 0, sizeof(DateTime)); \ SGetDateTime(&dt); \ sprintf(_buf, "date: %02d/%02d/%04d time: %02d:%02d:%02d", \ (int)dt.month,(int)dt.day,(int)dt.year + 1900, \ diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index 29d612dd5..d46abe924 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -396,8 +396,6 @@ RlcRetx **retx; RlcDlPduInfo *pduInfo; #endif { - TRC2(rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer); - RLC_ALLOC_WC(gCb,*retx, sizeof(RlcRetx)); @@ -480,8 +478,6 @@ KwuDatCfmInfo **datCfm; CmLList *lnk; CmLList *nextLnk; - TRC2(rlcAmmDlHndlStatus4SduByteSegInTxBuf) - txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, nackSnInfo->sn); if (txBuf == NULLP) { @@ -570,8 +566,6 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode RlcTx *txBuf; RlcRetx *retx; - TRC2(rlcAmmDlUpdateTxAndReTxBufForNackSn) - /* Now process the NACK_SN received. Now the NACK_SN is */ /* either the first element of RETX or is in TX array */ /* To remove the remaining acks from the pdu byte segments */ @@ -693,8 +687,6 @@ U8 idx; RlcRetx *retx; CmLList *node; - TRC2(RlcDlAmmGetNackSnInfoFrmNackRangeIdx) - nackSnInfo->isSegment = FALSE; if((!nackInfo->isSegment) || (!idx && nackSnInfo->nackRange && (!nackInfo->soStart))) @@ -803,7 +795,6 @@ RlcUdxStaPdu *pStaPdu; RlcKwuSapCb *rlckwuSap; RlcSn mTxNext; - TRC2(rlcAmmDlHndlStatusPdu) rlcStatusPduCnt++; rlckwuSap = gCb->u.dlCb->rlcKwuDlSap + RLC_UI_PDCP; @@ -2313,8 +2304,6 @@ RlcDlRbCb *rbCb; RlcRetx *retx; #endif { - TRC2(rlcRemRetxPdu) - cmLListDelFrm(&AMDL.retxLst, &retx->lstEnt); if( AMDL.retxLst.count == 0) @@ -2364,7 +2353,6 @@ RlcDlRbCb *rbCb; RlcRetx *retx; #endif { - TRC2(rlcAmmDlMarkPduForReTx) if (AMDL.maxReTxReached == TRUE) { RETVOID; @@ -2448,8 +2436,6 @@ KwuDatCfmInfo **datCfm; { RlcSdu *sdu; - TRC2(rlcAmmDlCheckIsSDUDelivered) - sdu = sduMap->sdu; sdu->mode.am.rcvdSz += sduMap->sduSz; @@ -2533,7 +2519,6 @@ RlcSn sn; KwuDatCfmInfo **datCfm; #endif { - TRC2(rlcAmmDlProcessSuccessfulTxPdu) CmLList *pduNode; RlcTx *txBuf = rlcUtlGetTxBuf(AMDL.txBufLst, sn); @@ -2592,9 +2577,6 @@ RlcRetx *retx; KwuStaIndInfo *staInd; RlcKwuSapCb *rlckwuSap; - TRC2(rlcAmmSndStaInd); - - /* Sap control block */ rlckwuSap = gCb->u.dlCb->rlcKwuDlSap + RLC_UI_PDCP; @@ -2812,7 +2794,6 @@ RlcDlRbCb *rbCb; U32 sduId; #endif { - TRC2(rlcAmmDiscSdu); return (RFAILED); } @@ -2844,9 +2825,7 @@ RlcDlRbCb *rbCb; RlcAmDl *amDl = &(rbCb->m.amDl); RlcSn sn; RlcTx *txBuf; - TRC2(rlcAmmPollRetxTmrExp); - /* kw003.201 - Correcting the logic for determmining whether to do */ /* any transmission of PDU. As per the spec section */ /* 5.2.2.3, if there is any to transmit or retransmit, */ @@ -2936,8 +2915,6 @@ KwuDatCfmInfo **datCfm; RlcRetx *retx; RlcTx *txBuf; - TRC2(rlcAmmDlUpdateTxAndReTxBufForAckSn); - /* Remove pdus/segs from retxLst */ while (retxNode) { @@ -3019,8 +2996,6 @@ KwuDatCfmInfo **datCfm; RlcRetx *retx; RlcTx *txBuf=NULLP; - TRC2(rlcAmmDlUpdTxAndReTxBufForLessThanNackSn); - while (*retxNode) { retx = (RlcRetx *)((*retxNode)->node); @@ -3143,8 +3118,6 @@ RlcRetx *retx; RlcSn tMSn; RlcSn retxMSn; - TRC2(rlcAmmAddPduToRetxLst); - node = amDl->retxLst.last; MODAMT(retx->amHdr.sn, retxMSn, amDl->txNextAck,amDl->snModMask); while(node != NULLP) @@ -3214,7 +3187,6 @@ RlcSn sn; #endif { RlcTx* txBuf = rlcUtlGetTxBuf(amDl->txBufLst, sn); - TRC2(rlcAmmDlMoveFrmTxtoRetxBuffer); if (txBuf == NULLP) { @@ -3625,8 +3597,6 @@ RlcExtHdr *hdrInfo; /* U8 rLen1 = 0; */ U16 tVal; - TRC2(rlcAmmExtractElmnt); - hdr = hdrInfo->hdr; if (pLen == 0) @@ -3712,9 +3682,6 @@ U8 *fByte; U32 resrvdBitsAckSn; U32 resrvdBitsNackSn; - - TRC2(rgAmmUlHndlStatusPdu) - RLCDBGP_BRIEF(gCb, "rgAmmUlHndlStatusPdu(rbCb, cntrlPdu, fByte) \n"); RLC_MEM_ZERO(&hdrInfo, sizeof(RlcExtHdr)); diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c index 570f70a0c..a0c15ea3d 100755 --- a/src/5gnrrlc/kw_amm_ul.c +++ b/src/5gnrrlc/kw_amm_ul.c @@ -864,9 +864,6 @@ U8 *fByte; MsgLen totalSz = 0; RlcExtHdr hdrInfo; - TRC2(rlcAmmExtractHdrOld) - - RLC_MEM_ZERO(&hdrInfo, sizeof(RlcExtHdr)); /* Extract fixed part of the header */ @@ -1575,9 +1572,6 @@ RlcUlRbCb *rbCb; #endif RlcAmRecBuf *recBuf = NULLP; - TRC2(rlcAmmUlReEstablish); - - sn = AMUL.rxNext; MODAMR(AMUL.vrMr, mVrMr, AMUL.rxNext, AMUL.snModMask); @@ -1678,9 +1672,6 @@ RlcUlRbCb *rbCb; Bool tmrRunning = FALSE; RlcAmRecBuf *recBuf = NULLP; - TRC2(rlcAmmReOrdTmrExp); - - /* Update rxHighestStatus */ sn = amUl->rxNextStatusTrig; @@ -1753,9 +1744,6 @@ RlcUlRbCb *rbCb; { RlcAmUl *amUl = &(rbCb->m.amUl); - TRC2(rlcAmmStaProTmrExp); - - amUl->gatherStaPduInfo = FALSE; if (amUl->staTrg == TRUE) @@ -1945,9 +1933,6 @@ RlcUlRbCb *rbCb; RlcSn windSz; /* PDU window size */ RlcAmRecBuf *recBuf = NULLP; - TRC2(rlcAmmFreeUlRbCb) - - windSz = (RLC_AM_GET_WIN_SZ(rbCb->m.amUl.snLen)) << 1; if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMUL_REORD_TMR)) diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c index 1d636d431..a6150fe1d 100755 --- a/src/5gnrrlc/kw_cfg_dl.c +++ b/src/5gnrrlc/kw_cfg_dl.c @@ -262,7 +262,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId) ueIdx = freeIdx; } measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE; - cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI)); + memset(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI)); measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0; } measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId; @@ -331,7 +331,6 @@ RlcDlUeCb *ueCb; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgFillDlRbCb) RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, "rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))", @@ -448,7 +447,6 @@ void *ptr; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgUpdateDlRb) if (rbCb->mode != entCfg->entMode) { @@ -571,8 +569,6 @@ RlcEntCfgCfmInfo *entCfm; RlcDlRbCb *rlcRbCb; /* KW RB Control Block */ U8 reason; /* Rb Identifier */ - TRC3(rlcCfgAddDlRb) - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, "rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))", cellId, @@ -899,8 +895,6 @@ RlcEntCfgCfmInfo *entCfm; RlcDlUeCb *ueCb; /* Ue Control Block */ U8 ret; - TRC3(rlcCfgReCfgDlRb) - RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, "rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d", cellId, entCfg->cfgType,entCfg->rbId); @@ -954,7 +948,7 @@ RlcEntCfgCfmInfo *entCfm; /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); + memcpy(&tRbCb, rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg); @@ -971,7 +965,7 @@ RlcEntCfgCfmInfo *entCfm; "CELLID:%u RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); + memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb)); return (ret); } @@ -1022,7 +1016,7 @@ RlcEntCfgCfmInfo *entCfm; /* Take backup of rbCb before updating. * Because in failure case restore original rbCb */ - cmMemcpy((U8 *)&tRbCb, (U8 *)rbCb, sizeof(RlcDlRbCb)); + memcpy(&tRbCb, rbCb, sizeof(RlcDlRbCb)); /* Update rbCb */ ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg); @@ -1035,7 +1029,7 @@ RlcEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d updation failed", cellId, entCfg->rbId); - cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); + memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb)); return (ret); } @@ -1101,8 +1095,6 @@ RlcEntCfgCfmInfo *entCfm; RlcDlCellCb *cellCb; /* UE Control Block */ RlcDlRbCb *rlcRbCb; /* KW RB Control Block */ - TRC3(rlcCfgDelDlRb) - RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, "rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))", entCfg->rbId, @@ -1297,8 +1289,6 @@ RlcEntCfgCfmInfo *entCfm; RlcDlRbCb *rbCb; /* RB Control Block */ CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgReEstDlRb) - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, "rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))", ueId, @@ -1398,8 +1388,6 @@ RlcEntCfgCfmInfo *entCfm; S16 ret; /* Return Value */ RlcDlUeCb *ueCb; /* UE Control Block */ - TRC3(rlcCfgDelUe) - RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, "rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))", ueId, @@ -1489,8 +1477,6 @@ RlcEntCfgCfmInfo *entCfm; RlcDlCellCb *cellCb; /* UE Control Block */ U8 rbId; /* RB Identifier */ - TRC3(rlcCfgDelCell) - RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId, "rlcCfgDelCell( cellId(%d), cfgType(%d)", cellId, @@ -1574,7 +1560,6 @@ CmStatus *status; { RlcDlUeCb *ueCb; /*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/ - TRC3(rlcCfgUeIdChng) if ( (ueInfo->ueId == newUeInfo->ueId) && (ueInfo->cellId == newUeInfo->cellId)) diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c index cee5f4249..aaec229f3 100755 --- a/src/5gnrrlc/kw_cfg_ul.c +++ b/src/5gnrrlc/kw_cfg_ul.c @@ -263,7 +263,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,U8 cellId,U8 ueId) ueIdx = freeIdx; } measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE; - cmMemset((U8 *)&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI)); + memset(&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI)); measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0; } measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId; @@ -322,7 +322,6 @@ RlcUlUeCb *ueCb; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgFillUlRbCb) RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId, "rlcCfgFillRbCb(cellId(%d), rbId(%d), rbType(%d))", @@ -432,7 +431,6 @@ void *ptr; RlcEntCfgInfo *entCfg; #endif { - TRC3(rlcCfgUpdateUlRb) switch (rbCb->mode) { @@ -632,7 +630,6 @@ RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateUlRb) RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, "cellId(%d), cfgType(%d)", @@ -856,7 +853,6 @@ RlcUlEntTmpData *cfgEntData; ) #endif { - TRC3(rlcCfgRollBackUlRb) if(CKW_CFG_ADD == cfg->cfgType) { @@ -910,7 +906,6 @@ RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyUlRb) switch(cfgToAply->cfgType) { @@ -1052,7 +1047,6 @@ RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateDelUlUe) RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, "cellId(%d), cfgType(%d)", @@ -1105,7 +1099,6 @@ RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyDelUlUe) #ifdef LTE_L2_MEAS rlcDelFrmUlL2Meas(gCb,cfgTmpData->cellId,cfgTmpData->ueId); @@ -1148,7 +1141,6 @@ RlcUlEntTmpData *cfgEntData; RlcUlCfgTmpData *cfgTmpData; #endif { - TRC3(rlcCfgValidateDelUlCell) RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)", cfgToValidate->cfgType); @@ -1199,7 +1191,6 @@ RlcUlCfgTmpData *cfgInfo; ) #endif { - TRC3(rlcCfgApplyDelUlCell) rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb); RETVOID; @@ -1238,7 +1229,6 @@ RlcUlEntTmpData *cfgEntData; #endif { CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgValidateReEstRb) RLOG_ARG2(L_DEBUG, DBG_UEID,ueId, "cellId(%d) RBID:%d", @@ -1301,7 +1291,6 @@ RlcUlEntTmpData *cfgEntData; #endif { CmLteRlcId rlcId; /* RLC Identifier */ - TRC3(rlcCfgApplyReEstUlRb) rlcId.ueId = ueId; rlcId.cellId = cellId; @@ -1361,7 +1350,6 @@ RlcUlCfgTmpData *cfgTmpData; #endif { RlcUlUeCb *ueCb; - TRC3(rlcCfgValidateUeIdChng) #define CFM_STATUS cfgTmpData->cfgEntData[0].entUlCfgCfm.status if ( (ueInfo->ueId == newUeInfo->ueId) && @@ -1428,7 +1416,6 @@ RlcUlCfgTmpData *cfgTmpData; ) #endif { - TRC3(rlcCfgApplyUlUeIdChng) #ifdef LTE_L2_MEAS rlcHdlMeasUlUeIdChg(gCb, ueInfo->cellId, ueInfo->ueId, newUeInfo->ueId); diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index f051b7c44..4ce1a8854 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -104,7 +104,6 @@ S16 rlcDbmDlInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlInit) /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), @@ -188,7 +187,6 @@ Void rlcDbmDlDeInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlDeInit); /* De Initialize ueCb Hash List */ @@ -353,8 +351,6 @@ U8 numRbCb; { U32 idx; - TRC3(rlcDbmDelAllDlRb) - for (idx = 0; idx < numRbCb; idx++) { @@ -423,9 +419,6 @@ RlcDlUeCb **ueCb; { RlcDlUeCb *tUeCb; - TRC3(rlcDbmCreateDlUeCb) - - RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -515,8 +508,6 @@ RlcDlUeCb *ueCb; Bool abortFlag; #endif { - TRC3(rlcDbmDelDlUeCb) - #if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC))) UNUSED(abortFlag); @@ -572,9 +563,6 @@ RlcCb *gCb; { RlcDlUeCb *ueCb = NULLP; - TRC3(rlcDbmDelAllDlUe) - - /* Until no more ueCb is ueLstCp hash list get and delete ueCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb, @@ -649,7 +637,6 @@ RlcDlCellCb **cellCb; { RlcDlCellCb *tCellCb; - TRC3(rlcDbmCreateDlCellCb) RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -734,8 +721,6 @@ RlcCb *gCb; RlcDlCellCb *cellCb; #endif { - TRC3(rlcDbmDelDlCellCb) - /* Delete all rbCbs in cellCb */ rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL); @@ -775,9 +760,6 @@ RlcCb *gCb; { RlcDlCellCb *cellCb = NULLP; - TRC3(rlcDbmDelAllDlCell) - - /* Until no more cellCb is ueLstCp hash list get and delete cellCb */ while (ROK == cmHashListGetNext(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb, @@ -813,7 +795,6 @@ S16 rlcDbmDlShutdown(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmDlShutdown) rlcDbmDelAllDlCell(gCb); diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c index 6c0b1be8b..07e958868 100755 --- a/src/5gnrrlc/kw_dbm_ul.c +++ b/src/5gnrrlc/kw_dbm_ul.c @@ -83,8 +83,6 @@ S16 rlcDbmUlInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcUlDbmInit) - /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp), (U16) RLC_UE_LIST_BUCKET_SIZE, @@ -152,8 +150,6 @@ Void rlcDbmUlDeInit(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmUlDeInit); - /* De Initialize ueCb Hash List */ cmHashListDeinit(&(gCb->u.ulCb->ueLstCp)); @@ -200,8 +196,6 @@ CmLteRlcId *rlcId; RlcUlRbCb **rbCb; #endif { - TRC3(rlcDbmFetchUlRbCbByRbId) - *rbCb= NULLP; /* Check for UE CB or CELL CB */ @@ -341,9 +335,6 @@ U8 numRbCb; { U32 idx; /* Index */ - TRC3(rlcDbmDelAllUlRb) - - for (idx = 0; idx < numRbCb; idx++) { if (rbCbLst[idx] != NULLP) @@ -399,8 +390,6 @@ CmLteCellId cellId; RlcUlUeCb *ueCb; #endif { - TRC3(rlcDbmAddUlUeCb) - ueCb->ueId = ueId; ueCb->cellId = cellId; @@ -449,8 +438,6 @@ RlcCb *gCb; RlcUlCfgTmpData *cfg; #endif { - TRC3(rlcDbmAddUlTransaction) - #ifndef ALIGN_64BIT RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId); #else @@ -494,7 +481,6 @@ U32 transId; RlcUlCfgTmpData **cfg; #endif { - TRC3(rlcDbmFindUlTransaction) if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp), (U8 *) &transId, @@ -536,8 +522,6 @@ RlcCb *gCb; RlcUlCfgTmpData *cfg; #endif { - TRC3(rlcDbmDelUlTransaction) - if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) { @@ -574,8 +558,6 @@ RlcCb *gCb; { RlcUlCfgTmpData *cfg = NULL; - TRC3(kwDbmDelAllUlTransctions) - /* Until no more ueCb is ueLstCp hash list get and delete ueCb */ while (ROK == cmHashListGetNext(&(gCb->u.ulCb->transIdLstCp), (PTR) cfg, @@ -647,8 +629,6 @@ RlcUlUeCb *ueCb; Bool abortFlag; #endif { - TRC3(rlcDbmDelUlUeCb) - #if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC))) UNUSED(abortFlag); @@ -701,9 +681,6 @@ RlcCb *gCb; { RlcUlUeCb *ueCb = NULLP; /* UE Control Block */ - TRC3(rlcDbmDelAllUlUe) - - /* Until no more ueCb is ueLstCp hash list get and delete ueCb */ while (ROK == cmHashListGetNext(&(gCb->u.ulCb->ueLstCp), (PTR) ueCb, @@ -749,10 +726,6 @@ RlcUlCellCb *cellCb; { RlcUlCellCb *tCellCb; - TRC3(rlcDbmAddUlCellCb) - - - tCellCb = cellCb; tCellCb->cellId = cellId; @@ -824,8 +797,6 @@ RlcCb *gCb; RlcUlCellCb *cellCb; #endif { - TRC3(rlcDbmDelUlCellCb) - /* Delete all rbCbs in cellCb */ rlcDbmDelAllUlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL); @@ -865,9 +836,6 @@ RlcCb *gCb; { RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */ - TRC3(rlcDbmDelAllUlCell) - - /* Until no more cellCb is ueLstCp hash list get and delete cellCb */ while (ROK == cmHashListGetNext(&(gCb->u.ulCb->cellLstCp), (PTR) cellCb, @@ -902,7 +870,6 @@ Void rlcDbmUlShutdown(gCb) RlcCb *gCb; #endif { - TRC3(rlcDbmUlShutdown) rlcDbmDelAllUlCell(gCb); diff --git a/src/5gnrrlc/kw_dl.h b/src/5gnrrlc/kw_dl.h index 4cd48d7ca..d34bb2db0 100755 --- a/src/5gnrrlc/kw_dl.h +++ b/src/5gnrrlc/kw_dl.h @@ -150,7 +150,7 @@ if (_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci].totDrbsPerQci == 0) \ { \ _rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.qci[(_rlcRbCb)->qci] = 0; \ - cmMemset((U8 *)&_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci], 0, \ + memset(&_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci], 0, \ sizeof(_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci])); \ } \ } \ diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c index 26b019026..adcf51f5d 100755 --- a/src/5gnrrlc/kw_dl_ex_ms.c +++ b/src/5gnrrlc/kw_dl_ex_ms.c @@ -101,8 +101,6 @@ S16 rlcDlInitExt S16 rlcDlInitExt() #endif { - TRC2(rlcDlInitExt); - return ROK; } /* kwInitExt */ @@ -152,7 +150,6 @@ Reason reason; /* reason */ #endif { RlcCb *tRlcCb; - TRC3(rlcDlActvInit) if (inst >= MAX_RLC_INSTANCES) { @@ -244,7 +241,6 @@ Buffer *mBuf; /* message buffer */ { S16 ret = ROK; - TRC3(rlcDlActvTsk); #ifdef RLC_FREE_RING_BUF gRlcTId = pthread_self(); #endif diff --git a/src/5gnrrlc/kw_id.c b/src/5gnrrlc/kw_id.c index 45f5f83a7..cdc5c3a67 100755 --- a/src/5gnrrlc/kw_id.c +++ b/src/5gnrrlc/kw_id.c @@ -117,7 +117,6 @@ S16 rlcGetSId(s) SystemId *s; /* system id */ #endif { - TRC2(rlcGetSId); s->mVer = sId.mVer; s->mRev = sId.mRev; diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c index 12fb70f63..ba46450bb 100755 --- a/src/5gnrrlc/kw_lim.c +++ b/src/5gnrrlc/kw_lim.c @@ -118,8 +118,6 @@ U8 status; RlcRguSapCb *rguSap; /* RGU SAP Control Block */ RlcCb *tRlcCb; - TRC3(RlcLiRguBndCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -574,8 +572,6 @@ RguHarqStatusInd *staInd; U8 tbIdx; RlcCb *tRlcCb; - TRC3(RlcLiRguHqStaInd) - tRlcCb = RLC_GET_RLCCB(pst->dstInst); ueKey.cellId = staInd->cellId; ueKey.ueId = staInd->ueId; diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c index 2772e4107..615d6c605 100755 --- a/src/5gnrrlc/kw_lmm.c +++ b/src/5gnrrlc/kw_lmm.c @@ -140,8 +140,6 @@ RlcGenCfg *cfg; CmTqCp *rlcTqCp; Size rguSapSize; - TRC2(rlcLmmGenCfg) - if(cfg->maxUe > RLC_MAX_UE) { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -390,7 +388,7 @@ RlcGenCfg *cfg; /* Timer Initialization */ gCb->rlcTqCp.tmrLen = RLC_TMR_LEN; - cmMemset((U8*)gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN); + memset(gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN); RLC_MEM_CPY(&(gCb->init.lmPst), &cfg->lmPst, sizeof(Pst)); @@ -444,8 +442,6 @@ Header *hdr; { Pst rPst; /* Reply post structure */ - TRC2(rlcLmmSendCfm); - RLC_MEM_SET(&rPst, 0, sizeof(Pst)); /* reply post structure for confirmation */ @@ -580,8 +576,6 @@ RlcMngmt *cfg; Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiRlcConfigReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -736,8 +730,6 @@ RlcMngmt *cntrl; Reason reason; /* failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwCntrlReq) - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -845,8 +837,6 @@ RlcMngmt *sta; Reason reason; /* Failure reason */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwStaReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -981,8 +971,6 @@ RlcMngmt *sts; Reason reason; /* Reason for failure */ RlcCb *tRlcCb=NULLP; - TRC3(RlcMiLkwStsReq); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Check if the instance is configured */ if (pst->dstInst >= MAX_RLC_INSTANCES) @@ -1100,8 +1088,6 @@ RlcL2MeasReqEvt *measReqEvt; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasReq); - tRlcCb = RLC_GET_RLCCB(pst->dstInst); /* Initialize measCfmEvt */ @@ -1175,7 +1161,7 @@ RlcL2MeasReqEvt *measReqEvt; return RFAILED; } #endif - cmMemcpy((Void*)measEvt, (Void*)measReqEvt, sizeof(RlcL2MeasReqEvt)); + memcpy(measEvt, measReqEvt, sizeof(RlcL2MeasReqEvt)); /*Redirect the request to DL task */ /* NOTE:As of today, there are no cases where the Req will fail at DL as long as it reached the DL, so we don't wait for a confirmation from @@ -1229,8 +1215,6 @@ U8 measType; U8 status = ROK; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasStopReq); - tRlcCb = RLC_GET_RLCCB(pst->dstInst); /* reset the counter values for the measurement that is stopped */ @@ -1260,7 +1244,7 @@ U8 measType; rlcUlUdxL2MeasStopReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst),measType); /*return ROK;*/ } - /*cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ + /*memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ status = LCM_PRIM_OK; RlcMiLkwL2MeasStopCfm(&tRlcCb->genCfg.lmPst, measType,status); @@ -1294,7 +1278,6 @@ U8 measType; RlcL2MeasEvtCb *measEvtCb = NULLP; U16 cntr; RlcCb *tRlcCb; - TRC3(RlcMiLkwL2MeasSendReq); tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -1350,7 +1333,6 @@ RlcSapCfg *cfg; #endif { RlcKwuSapCb *rlcKwuSapCb; - TRC2(rlcLmmCfgKwuSap) #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ @@ -1408,8 +1390,6 @@ RlcSapCfg *cfg; { RlcCkwSapCb *ckwSap; - TRC2(rlcLmmCfgCkwSap) - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate config parameters */ if ((cfg->sapId >= RLC_MAX_CKWSAPS) || (cfg->sapId < 0) ) @@ -1469,8 +1449,6 @@ RlcSapCfg *cfg; RlcUdxDlSapCb *udxDlSap; RlcUdxUlSapCb *udxUlSap; - TRC2(rlcLmmCfgUdxSap); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if((cfg->sapId >= RLC_MAX_UDXSAPS) || (cfg->sapId < 0)) @@ -1544,8 +1522,6 @@ RlcSapCfg *cfg; { RlcRguSapCb *rguSap; - TRC2(rlcLmmCfgRguSap); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if((cfg->sapId >= gCb->genCfg.maxRguSaps) || \ @@ -1606,8 +1582,6 @@ RlcMngmt *cntrl; S16 reason; /* reason for failure */ U8 sAction; /* subaction field */ - TRC2(rlcLmmValidateGenCntrl); - reason = LCM_REASON_NOT_APPL; sAction = cntrl->t.cntrl.subAction; @@ -1653,8 +1627,6 @@ RlcCb *gCb; Size rlcSapSize; Size rlcUdxSapSize; - TRC2(rlcLmmCleanGblRsrcs) - if (gCb->init.cfgDone) { /* Deregister the timers */ @@ -1762,8 +1734,6 @@ RlcCb *gCb; RlcRguSapCb *rguSap; U32 idx; - TRC2(rlcLmmShutdown) - if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { for (idx = 0; idx < gCb->genCfg.maxRguSaps; idx++) @@ -1833,8 +1803,6 @@ RlcMngmt *cntrl; #endif /* DEBUGP */ S16 reason; /* reason for failure */ - TRC2(rlcLmmGenCntrl); - /* Validate control parameters */ reason = rlcLmmValidateGenCntrl (cntrl); @@ -1934,7 +1902,6 @@ RlcCb *gCb; RlcMngmt *cntrl; #endif { - TRC2(rlcLmmUdxSapCntrl) #if (ERRCLASS & ERRCLS_INT_PAR) if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) @@ -2018,8 +1985,6 @@ RlcMngmt *cntrl; { RlcRguSapCb *rguSap; /* rgu sap pointer */ - TRC2(rlcLmmLSapCntrl) - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate SuId */ if((cntrl->t.cntrl.s.sapCntrl.suId < 0) || @@ -2103,8 +2068,6 @@ RlcKwuSapSta *sta; { RlcKwuSapCb *rlcKwSapCb; - TRC2(rlcLmmGetKwuSapSta); - #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ if ((sta->spId >= (S16)gCb->genCfg.maxKwuSaps)|| @@ -2146,7 +2109,6 @@ RlcCb *gCb; RlcRguSapSta *sta; #endif { - TRC2(rlcLmmGetRguSapSta); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate the protocol parameters */ @@ -2185,7 +2147,6 @@ rlcCb *gCb, RlcCkwCntSapSta *sta; #endif { - TRC2(rlcLmmGetCkwCntSapSta); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate config parameters */ @@ -2227,7 +2188,6 @@ RlcGenSts *sts; Action action; #endif { - TRC2(rlcLmmGetGenSts); #if (ERRCLASS & ERRCLS_INT_PAR) /* Validate protocol parameters */ @@ -2276,7 +2236,6 @@ Elmnt elmnt; Action action; #endif { - TRC2(rlcLmmGetSapSts); /* Validate protocol parameters */ if (action != LKW_ZEROSTS && action != LKW_NOZEROSTS) @@ -2393,8 +2352,6 @@ U32 ueId; { RlcMngmt usta; /* Rlc Management Structure */ - TRC2(rlcLmmSendAlarm); - if(gCb->init.usta == FALSE) { RETVOID; @@ -2461,13 +2418,11 @@ Buffer *mBuf; MsgLen tempCnt; Pst pst; - TRC2(rlcLmmSendTrc) - RLOG2(L_DEBUG, "rlcLmmSendTrc(): Trace for event=%d, gCb->trcLen=%d", event, gCb->trcLen); - cmMemset((U8 *)&trc, 0, sizeof(RlcMngmt)); + memset(&trc, 0, sizeof(RlcMngmt)); pst = gCb->init.lmPst; @@ -2595,7 +2550,6 @@ Inst inst; #endif { RlcCb *gCb; - TRC2(rlcActvTmr) if (inst >= MAX_RLC_INSTANCES) { diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c index 558bc7788..811bc25a2 100755 --- a/src/5gnrrlc/kw_ptli.c +++ b/src/5gnrrlc/kw_ptli.c @@ -177,7 +177,6 @@ SuId suId; /* Service User Id */ SpId spId; /* Service Provider Id */ #endif { - TRC3(RlcLiRguBndReq) /* jump to specific primitive depending on configured selector */ (*kwLiRguBndReqMt[post->selector])(post, suId, spId); @@ -220,7 +219,6 @@ SpId spId; Reason reason; #endif { - TRC3(RlcLiRguUbndReq) /* jump to specific primitive depending on configured selector */ (*kwLiRguUbndReqMt[post->selector])(post, spId, reason); @@ -268,7 +266,6 @@ SpId spId; RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq; #endif { - TRC3(RlcLiRguL2MUlThrpMeasReq) /* jump to specific primitive depending on configured selector */ (*kwLiRguL2MUlThrpMeasReqMt[post->selector])(post, spId, l2mUlThrpMeasReq); @@ -375,7 +372,6 @@ Void rlcUtlFreeUlRBuf() U8 numLch; U8 numPdu; - TRC2(rlcUtlFreeUlRBuf) /* Free SS_RNG_BUF_ULMAC_TO_ULRLC */ while((SDeqSRngBuf (SS_RNG_BUF_ULMAC_TO_ULRLC, &elem) == ROK)) { @@ -418,7 +414,7 @@ Void *staRsp; if (NULLP != elem) { staRspInfo = (RguDStaRspInfo *)elem; - cmMemcpy((U8 *)staRspInfo, (U8 *)staRsp, sizeof(RguDStaRspInfo)); + memcpy(staRspInfo, staRsp, sizeof(RguDStaRspInfo)); staRspInfo->post = *post; SRngIncrWIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktRate++; diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c index 5f32542f9..e97151b12 100755 --- a/src/5gnrrlc/kw_ptmi.c +++ b/src/5gnrrlc/kw_ptmi.c @@ -186,7 +186,6 @@ Pst *pst; /* post structure */ RlcMngmt *cfm; /* Layer Management structure */ #endif { - TRC3(RlcMiRlcConfigCfm); /* jump to specific primitive depending on configured selector */ (*rlcMiRlcConfigCfmMt[pst->selector])(pst, cfm); @@ -220,7 +219,6 @@ Pst *pst; /* post structure */ RlcMngmt *cfm; /* confirm */ #endif { - TRC3(RlcMiLkwCntrlCfm) /* jump to specific primitive depending on configured selector */ (*kwMiLkwCntrlCfmMt[pst->selector])(pst, cfm); @@ -259,8 +257,6 @@ Pst *pst; /* post structure */ RlcMngmt *usta; /* unsolicited status */ #endif { - TRC3(RlcMiLkwStaInd); - /* jump to specific primitive depending on configured selector */ (*kwMiLkwStaIndMt[pst->selector])(pst, usta); @@ -297,7 +293,6 @@ Pst *pst; /* post structure */ RlcMngmt *cfm; /* solicited status confirmation */ #endif { - TRC3(RlcMiLkwStaCfm); /* jump to specific primitive depending on configured selector */ (*kwMiLkwStaCfmMt[pst->selector])(pst, cfm); @@ -338,8 +333,6 @@ Action action; /* action */ RlcMngmt *cfm; /* statistics confirmation */ #endif { - TRC3(RlcMiLkwStsCfm); - /* jump to specific primitive depending on configured selector */ (*kwMiLkwStsCfmMt[pst->selector])(pst, action, cfm); @@ -378,8 +371,6 @@ RlcMngmt *trc; /* trace indication */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(RlcMiLkwTrcInd); - /* jump to specific primitive depending on configured selector */ (*kwMiLkwTrcIndMt[pst->selector])(pst, trc, mBuf); @@ -403,8 +394,6 @@ RlcL2MeasCfmEvt *measEvt; #endif { - TRC3(RlcMiLkwL2MeasCfm) - (*rlcMiLkwL2MeasCfmMt[pst->selector])(pst, measEvt); return ROK; @@ -425,8 +414,6 @@ U8 status; #endif { - TRC3(RlcMiLkwL2MeasStopCfm) - (*RlcMiLkwL2MeasStopCfmMt[pst->selector])(pst, measType,status); return ROK; diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c index e9f8756d0..44f6807b7 100755 --- a/src/5gnrrlc/kw_ptui.c +++ b/src/5gnrrlc/kw_ptui.c @@ -267,7 +267,6 @@ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(RlcUiKwuBndCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status); @@ -311,7 +310,6 @@ KwuDatIndInfo *datInd; Buffer *mBuf; #endif { - TRC3(rlcSendUlDataToDu) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf); @@ -357,7 +355,6 @@ KwuDatCfmInfo *datCfm; #endif { rlcDatCfmsSent++; - TRC3(RlcUiKwuDatCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm); @@ -401,7 +398,6 @@ SuId suId; KwuStaIndInfo *staInd; #endif { - TRC3(RlcUiKwuStaInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd); @@ -445,7 +441,6 @@ SuId suId; CmLteRlcId rlcId; #endif { - TRC3(RlcUiKwuReEstCmpInd) RLOG0(L_DEBUG, "In RlcUiKwuReEstCmpInd"); /* jump to specific primitive depending on configured selector */ @@ -488,7 +483,6 @@ SuId suId; KwuDiscSduInfo *discCfm; #endif { - TRC3(RlcUiKwuDiscSduCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm); @@ -530,7 +524,6 @@ SuId suId; KwuFlowCntrlIndInfo *flowCntrlIndInfo; #endif { - TRC3(RlcUiKwuFlowCntrlInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlIndInfo); @@ -572,7 +565,6 @@ SuId suId; KwuDatAckInfo *datAckInd; #endif { - TRC3(RlcUiKwuDatAckInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatAckIndMt[pst->selector])(pst, suId, datAckInd); @@ -661,7 +653,6 @@ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(RlcUiCkwBndCfm) /* jump to specific primitive depending on configured selector */ (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status); @@ -705,7 +696,6 @@ SuId suId; /* Service User Id */ RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ #endif { - TRC3(RlcUiRlcCfgCfm) /* jump to specific primitive depending on configured selector */ (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo); @@ -753,7 +743,6 @@ CkwUeInfo *ueInfo; CmStatus status; #endif { - TRC3(RlcUiCkwUeIdChgCfm) /* jump to specific primitive depending on configured selector */ (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status); diff --git a/src/5gnrrlc/kw_tenb_stats.c b/src/5gnrrlc/kw_tenb_stats.c index a95e5fb5e..393f1d4fc 100755 --- a/src/5gnrrlc/kw_tenb_stats.c +++ b/src/5gnrrlc/kw_tenb_stats.c @@ -83,8 +83,6 @@ Void TSL2AllocStatsMem(region, pool) { U32 cnt=0; - TRC2(TSL2AllocStatsMem) - cmLListInit(&inUseL2UeStatsLst); cmLListInit(&freeL2UeStatsLst); for (cnt=0; cnt < L2_STATS_MAX_CELLS; cnt++) @@ -97,7 +95,7 @@ Void TSL2AllocStatsMem(region, pool) printf("\n STATS Unexpected MEM Alloc Failure\n"); } } - cmMemset((U8 *)l2CellStats[cnt], 0x00, (Size)sizeof(TSL2CellStatsCb)); + memset(l2CellStats[cnt], 0x00, sizeof(TSL2CellStatsCb)); } for (cnt=0; cnt < L2_STATS_MAX_UES; cnt++) @@ -111,7 +109,7 @@ Void TSL2AllocStatsMem(region, pool) printf("\n STATS Unexpected MEM Alloc Failure at %d\n", (int)cnt); } } - cmMemset((U8 *)statsCb, 0x00, (Size)sizeof(TSL2UeStatsCb)); + memset(statsCb, 0x00, sizeof(TSL2UeStatsCb)); statsCb->lnk.node = (PTR)statsCb; cmLListAdd2Tail(&freeL2UeStatsLst, &statsCb->lnk); l2UeStats[cnt] = statsCb; @@ -145,8 +143,6 @@ TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti) CmLList *tmp = NULLP; TSL2UeStatsCb *statsCb = NULLP; - TRC2(TSL2AllocUeStatsBlk) - tmp = freeL2UeStatsLst.first; if (tmp == NULLP) { @@ -186,8 +182,6 @@ Void TSL2DeallocUeStatsBlk(rnti, statsCb) TSL2UeStatsCb *statsCb; #endif { - TRC2(TSL2DeallocUeStatsBlk) - statsCb->inUse = FALSE; cmLListDelFrm(&inUseL2UeStatsLst, &statsCb->lnk); freeL2UeStatsLst.crnt = freeL2UeStatsLst.first; @@ -218,8 +212,6 @@ TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId) U32 cellId; #endif { - TRC2(TSL2AllocCellStatsBlk) - if (cellId != 1) { printf("\n STATS Unexpected CellID = %d\n", (int)cellId); @@ -250,7 +242,6 @@ Void TSL2DeallocCellStatsBlk(cellId) U32 cellId; #endif { - TRC2(TSL2DeallocCellStatsBlk) RETVOID; } @@ -284,8 +275,6 @@ Void TSL2SendStatsToApp(pst, suId) { U32 idx; - TRC2(TSL2SendStatsToApp) - for (idx = 0; idx < L2_STATS_MAX_UES; idx++) { TSL2UeStatsCb *statsCb = l2UeStats[idx]; @@ -307,8 +296,8 @@ Void TSL2SendStatsToApp(pst, suId) #endif } rnti = statsCb->stats.rnti; - cmMemset((U8 *)&statsCb->stats.nonPersistent, 0x00, (Size)sizeof(statsCb->stats.nonPersistent)); - /* cmMemset((U8 *)&statsCb->stats, 0x00, (Size)sizeof(TSInfL2UeStats)); */ + memset(&statsCb->stats.nonPersistent, 0x00, sizeof(statsCb->stats.nonPersistent)); + /* memset(&statsCb->stats, 0x00, sizeof(TSInfL2UeStats)); */ statsCb->stats.rnti = rnti; } @@ -330,7 +319,7 @@ Void TSL2SendStatsToApp(pst, suId) #endif } cellId = statsCellCb->cellId; - cmMemset((U8 *)l2CellStats[idx], 0x00, (Size)sizeof(TSInfL2CellStats)); + memset(l2CellStats[idx], 0x00, sizeof(TSInfL2CellStats)); statsCellCb->cellId = cellId; } RETVOID; diff --git a/src/5gnrrlc/kw_tmm_dl.c b/src/5gnrrlc/kw_tmm_dl.c index d3d938c45..0a6266caf 100755 --- a/src/5gnrrlc/kw_tmm_dl.c +++ b/src/5gnrrlc/kw_tmm_dl.c @@ -108,9 +108,6 @@ Buffer *mBuf; { RlcSdu *sdu; - TRC2(rlcTmmQSdu) - - RLC_ALLOC(gCb,sdu,sizeof(RlcSdu)); #if (ERRCLASS & ERRCLS_ADD_RES) if ( sdu == NULLP ) @@ -392,8 +389,6 @@ RlcCb *gCb; RlcDlRbCb *rbCb; #endif { - TRC2(rlcDlTmmReEstablish) - #ifdef LTE_L2_MEAS_RLC rlcUtlEmptySduQ(gCb, rbCb, &rbCb->m.tm.sduQ); diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c index 55337b357..d9d735b44 100755 --- a/src/5gnrrlc/kw_tmm_ul.c +++ b/src/5gnrrlc/kw_tmm_ul.c @@ -109,7 +109,6 @@ U8 rrcUeCapabilityInfo[] = #ifdef PJ Pst ulPst2 ={100,100,217,0,216,0,PRIOR0,0,68,0,1,0,0}; #endif - TRC2(rlcTmmRcvFrmMac) if(1 == rrcMsgType) { @@ -317,7 +316,6 @@ RlcCb *gCb; RlcUlRbCb *rbCb; #endif { - TRC2(rlcUlTmmReEstablish) RLOG_ARG0(L_DEBUG,DBG_RBID,rbCb->rlcId.rbId,"do nothing for TMM for ReEstablish"); RETVOID; diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c index e13332551..19465d259 100755 --- a/src/5gnrrlc/kw_tmr.c +++ b/src/5gnrrlc/kw_tmr.c @@ -307,7 +307,6 @@ S16 tmrEvnt; #endif { /* kw005.201 added support for L2 Measurement */ - TRC2(rlcTmrExpiry) switch (tmrEvnt) { @@ -429,8 +428,6 @@ PTR cb; { RlcRguSapCb *rguSapCb; - TRC2(rlcBndTmrExpiry) - rguSapCb = (RlcRguSapCb *) cb; if (rguSapCb->state == RLC_SAP_BINDING) diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c index 7c18958bb..73bdee10c 100755 --- a/src/5gnrrlc/kw_udx.c +++ b/src/5gnrrlc/kw_udx.c @@ -71,7 +71,6 @@ MsgLen size; { MsgLen tmpLen; - TRC3(cmUnpkUdxStruct) return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen)); } /*end of function cmPkUdxBndReq*/ @@ -104,7 +103,6 @@ Buffer *dstMBuf; #endif { - TRC3(cmPkUdxStruct) return (SAddPstMsgMult(srcBuf,size,dstMBuf)); } /*end of function cmPkUdxBndReq*/ @@ -138,7 +136,6 @@ SpId spId; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxBndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -189,7 +186,6 @@ Reason reason; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxUbndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -240,7 +236,6 @@ U8 status; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxBndCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -293,7 +288,6 @@ RlcCfgInfo *cfgInfo; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxCfgReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -363,7 +357,6 @@ RlcCfgCfmInfo *cfgCfmInfo; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkUdxCfgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -439,7 +432,6 @@ CkwUeInfo *newUeInfo; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxUeIdChgReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -517,7 +509,6 @@ CmStatus status; { S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxUeIdChgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -574,8 +565,6 @@ RlcUdxBufLst *pStaPdu; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdCfm) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -642,8 +631,6 @@ CmLteRlcId *rlcId; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaProhTmrStart) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -710,8 +697,6 @@ RlcUdxStaPdu *pStaPdu; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -783,8 +768,6 @@ RlcUdxDlStaPdu *pStaPdu; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxStaUpdReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -850,8 +833,6 @@ RlcL2MeasReqEvt *measReqEvt; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -910,8 +891,6 @@ U8 measType S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasSendReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -966,8 +945,6 @@ U8 measType S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkUdxL2MeasStopReq) - if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1031,8 +1008,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkUdxBndReq) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1070,8 +1045,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkUdxUbndReq) - CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1108,8 +1081,6 @@ Buffer *mBuf; SuId suId = 0; U8 status = 0; - TRC3(cmUnpkUdxBndCfm) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst); SPutMsg(mBuf); @@ -1152,8 +1123,6 @@ Buffer *mBuf; RlcCfgInfo tmpCfgInfo; RlcCfgInfo *cfgInfo; /*stack Variable because it is not freed */ - TRC3(cmUnpkUdxCfgReq) - CMCHKUNPK(SUnpkS16, &(spId), mBuf); switch(pst->selector) { @@ -1220,8 +1189,6 @@ Buffer *mBuf; SuId suId = 0; RlcCfgCfmInfo *cfgCfmInfo = NULLP; - TRC3(cmUnpkUdxCfgCfm) - CMCHKUNPK(SUnpkS16, &suId, mBuf); switch(pst->selector) @@ -1302,9 +1269,6 @@ Buffer *mBuf; CkwUeInfo *ueInfo; CkwUeInfo *newUeInfo; - TRC3(cmUnpkUdxUeIdChgReq) - - CMCHKUNPK(SUnpkS16, &(spId), mBuf); CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); @@ -1371,9 +1335,7 @@ Buffer *mBuf; U32 transId = 0; CmStatus status; - TRC3(cmUnpkUdxUeIdChgCfm) - - cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus)); + memset(&status, 0, sizeof(CmStatus)); CMCHKUNPK(SUnpkS16, &suId, mBuf); CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); @@ -1417,8 +1379,6 @@ Buffer *mBuf; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ RlcUdxBufLst *pBufLst = NULLP; /* KW_FIX*/ - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &suId, mBuf); switch (pst->selector) { @@ -1473,8 +1433,6 @@ Buffer *mBuf; S16 ret1; CmLteRlcId tmpRlcId; - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { @@ -1545,8 +1503,6 @@ Buffer *mBuf; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ RlcUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */ - TRC3(cmUnpkUdxStaUpdCfm) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { @@ -1614,8 +1570,6 @@ Buffer *mBuf; CmLteRlcId tmpRlcId; CmLteRlcId *rlcId = NULLP; /* KW_FIX */ - TRC3(cmUnpkUdxStaProhTmrStart) - CMCHKUNPK(SUnpkS16, &spId, mBuf); switch (pst->selector) { @@ -1667,8 +1621,6 @@ Buffer *mBuf; RlcL2MeasReqEvt tmpMeasReqEvt; RlcL2MeasReqEvt *measReqEvt = NULLP; /* KW_FIX */ - TRC3(cmUnpkUdxL2MeasReq) - switch (pst->selector) { case UDX_SEL_LC: @@ -1715,8 +1667,6 @@ Buffer *mBuf; { U8 measType = 0; /* KW_FIX */ - TRC3(cmUnpkUdxL2MeasSendReq) - switch (pst->selector) { case UDX_SEL_LC: @@ -1758,8 +1708,6 @@ Buffer *mBuf; { U8 measType = 0; /* KW_FIX */ - TRC3(cmUnpkUdxL2MeasStopReq) - switch (pst->selector) { case UDX_SEL_LC: diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c index 6e3ee49ab..96338e512 100755 --- a/src/5gnrrlc/kw_udx_dl.c +++ b/src/5gnrrlc/kw_udx_dl.c @@ -99,8 +99,6 @@ SpId spId; RlcUdxDlSapCb *udxSap; /* pointer to session SAP */ RlcCb *tRlcCb; - TRC3(rlcDlUdxBndReq); - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -198,8 +196,6 @@ Reason reason; RlcUdxDlSapCb *udxSap; RlcCb *tRlcCb; - TRC3(rlcDlUdxUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -263,8 +259,6 @@ RlcCfgInfo *cfg; RlcCb *tRlcCb; Pst *pstUdxCfm; - TRC3(rlcDlUdxCfgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -454,8 +448,6 @@ CkwUeInfo *newUeInfo; CmStatus status; RlcCb *tRlcCb; - TRC3(rlcDlUdxUeIdChgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -623,8 +615,6 @@ RlcL2MeasReqEvt *measReqEvt; VOLATILE U32 startTime = 0; RlcCb *tRlcCb; - TRC3(rlcDlUdxL2MeasReq); - /*starting Task*/ SStartTask(&startTime, PID_RLC_MEAS_START); @@ -700,13 +690,12 @@ U8 measType; /* RlcL2MeasCfmEvt measCfmEvt; */ VOLATILE U32 startTime = 0; RlcCb *tRlcCb=NULLP; - TRC3(rlcDlUdxMeasStopReq); /*starting Task*/ SStartTask(&startTime, PID_RLC_MEAS_STOP); tRlcCb = RLC_GET_RLCCB(pst->dstInst); -/* cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ +/* memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */ /* reset the counters for the measurement type passed */ for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { @@ -760,7 +749,6 @@ U8 measType; VOLATILE U32 startTime = 0; RlcCb *tRlcCb; - TRC3(rlcDlUdxMeasSendReq); tRlcCb = RLC_GET_RLCCB(pst->dstInst); for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) diff --git a/src/5gnrrlc/kw_udx_ptdl.c b/src/5gnrrlc/kw_udx_ptdl.c index baafe66fa..6b7cf5e87 100755 --- a/src/5gnrrlc/kw_udx_ptdl.c +++ b/src/5gnrrlc/kw_udx_ptdl.c @@ -101,7 +101,6 @@ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(PtDlUdxBndCfm) return ROK; @@ -143,7 +142,6 @@ SuId suId; /* Service User Id */ RlcCfgCfmInfo *cfmInfo; /* Status */ #endif { - TRC3(PtDlUdxCfgCfm) return ROK; @@ -185,7 +183,6 @@ U32 transId; CmStatus status; #endif { - TRC3(PtDlUdxUeIdChgCfm) return ROK; @@ -201,7 +198,6 @@ CmLteRlcId *rlcId, RlcUdxBufLst *pBufLst ) { - TRC3(PtDlUdxStaUpdCfm); return ROK; } @@ -212,7 +208,6 @@ SuId suId, CmLteRlcId *rlcId ) { - TRC3(PtDlUdxStaProhTmrStart); return ROK; } #endif @@ -328,7 +323,6 @@ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(rlcDlUdxBndCfm) /* jump to specific primitive depending on configured selector */ (*rlcDlUdxBndCfmMt[pst->selector])(pst, suId, status); @@ -373,7 +367,6 @@ SuId suId; /* Service User Id */ RlcCfgCfmInfo *cfmInfo; /* Status */ #endif { - TRC3(rlcDlUdxCfgCfm) /* jump to specific primitive depending on configured selector */ (*rlcDlUdxCfgCfmMt[pst->selector])(pst, suId, cfmInfo); @@ -418,7 +411,6 @@ U32 transId; CmStatus status; #endif { - TRC3(rlcDlUdxUeIdChgCfm) /* jump to specific primitive depending on configured selector */ (*rlcDlUdxUeIdChgCfmMt[pst->selector])(pst, suId,transId,status); diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c index a6c3fa8de..1e072a74d 100755 --- a/src/5gnrrlc/kw_udx_ptul.c +++ b/src/5gnrrlc/kw_udx_ptul.c @@ -79,7 +79,6 @@ SuId suId; /* Service User Id */ SpId spId; /* Status */ #endif { - TRC3(PtUlUdxBndReq) return ROK; @@ -119,7 +118,6 @@ SpId spId; /* Service User Id */ Reason Reason; /* Status */ #endif { - TRC3(PtUlUdxUbndReq) return ROK; @@ -139,7 +137,6 @@ SpId spId; /* Service User Id */ RlcCfgInfo *cfmInfo; /* Config Info */ #endif { - TRC3(PtUlUdxCfgReq) return ROK; @@ -163,8 +160,6 @@ CkwUeInfo *ueInfo; /* Config Info */ CkwUeInfo *newUeInfo; /* Config Info */ #endif { - TRC3(PtUlUdxUeIdChgReq) - return ROK; @@ -179,7 +174,6 @@ CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu ) { - TRC3(PtUlUdxStaPduReq); return ROK; } @@ -213,8 +207,6 @@ RlcUdxDlStaPdu *pStaPdu; #endif { - TRC3(PtUlUdxStaUpdReq); - return ROK; } /* end of RlcUlmDlmStaUpd*/ @@ -244,8 +236,6 @@ RlcL2MeasReqEvt *measReqEvt; #endif { - TRC3(PtUlUdxL2MeasReq); - return ROK; } @@ -274,8 +264,6 @@ U8 status #endif { - TRC3(PtUlUdxL2MeasSendReq); - return ROK; } @@ -304,8 +292,6 @@ U8 status #endif { - TRC3(PtUlUdxL2MeasStopReq); - return ROK; } #endif @@ -518,8 +504,6 @@ SuId suId; /* Service User Id */ SpId spId; /* Status */ #endif { - TRC3(rlcUlUdxBndReq) - /* jump to specific primitive depending on configured selector */ (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId); @@ -561,8 +545,6 @@ SpId spId; /* Service User Id */ Reason Reason; /* Status */ #endif { - TRC3(rlcUlUdxUbndReq) - /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason ); @@ -584,7 +566,6 @@ SuId spId; /* Service User Id */ RlcCfgInfo *cfmInfo; /* Config Info */ #endif { - TRC3(rlcUlUdxCfgReq) /* jump to specific primitive depending on configured selector */ (*rlcUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo); @@ -611,7 +592,6 @@ CkwUeInfo *ueInfo; /* Config Info */ CkwUeInfo *newUeInfo; /* Config Info */ #endif { - TRC3(rlcUlUdxUeIdChgReq) /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo); @@ -670,8 +650,6 @@ RlcL2MeasReqEvt *measReqEvt; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt)); } /* end of rlcUlUdxL2MeasReq*/ @@ -700,8 +678,6 @@ U8 measType; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ @@ -730,8 +706,6 @@ U8 measType; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ #endif diff --git a/src/5gnrrlc/kw_udx_ul.c b/src/5gnrrlc/kw_udx_ul.c index ca9c89d76..710e9fdfa 100755 --- a/src/5gnrrlc/kw_udx_ul.c +++ b/src/5gnrrlc/kw_udx_ul.c @@ -115,8 +115,6 @@ U8 status; RlcUdxUlSapCb *udxSap; /* RGU SAP Control Block */ RlcCb *tRlcCb; - TRC3(rlcUlUdxBndCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -225,8 +223,6 @@ RlcCfgCfmInfo *cfmInfo; Pst rspPst; memset(&rspPst, 0, sizeof(Pst)); - TRC3(rlcUlUdxCfgCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -337,8 +333,6 @@ CmStatus status; RlcCb *tRlcCb; RlcUlCfgTmpData *cfgTmpData; - TRC3(rlcUlUdxUeIdChgCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c index daf15f8d7..e3478c9ce 100755 --- a/src/5gnrrlc/kw_uim.c +++ b/src/5gnrrlc/kw_uim.c @@ -114,8 +114,6 @@ SpId spId; RlcCkwSapCb *ckwSap; RlcCb *tRlcCb; - TRC3(RlcUiCkwBndReq); - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -220,8 +218,6 @@ Reason reason; { RlcCb *tRlcCb; - TRC3(RlcUiCkwUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -281,9 +277,6 @@ RlcCfgInfo *cfg; static U32 transCount; - - TRC3(RlcProcCfgReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -362,8 +355,6 @@ CkwUeInfo *newUeInfo; RlcCb *tRlcCb; RlcUlCfgTmpData *cfgTmpData = NULLP; - TRC3(RlcUiCkwUeIdChgReq) - do { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -466,8 +457,6 @@ RlcCfgInfo *cfg; { U8 idx; - TRC3(rlcUlHdlCfgReq) - cfgTmpData->ueId = cfg->ueId; cfgTmpData->cellId = cfg->cellId; for (idx = 0; idx < cfg->numEnt; idx++) @@ -623,8 +612,6 @@ SpId spId; RlcKwuSapCb *rlckwuSap; /* SAP Config Block */ RlcCb *tRlcCb; - TRC3(RlcUiKwuBndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -742,8 +729,6 @@ Reason reason; RlcKwuSapCb *rlckwuSap; /* KWU SAP control block */ RlcCb *tRlcCb; - TRC3(RlcUiKwuUbndReq) - #if (ERRCLASS & ERRCLS_INT_PAR) if ((pst->dstInst >= MAX_RLC_INSTANCES) || (spId >= (S16) rlcCb[pst->dstInst]->genCfg.maxKwuSaps) || diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index 21574c363..01fcde09a 100755 --- a/src/5gnrrlc/kw_ul_ex_ms.c +++ b/src/5gnrrlc/kw_ul_ex_ms.c @@ -89,7 +89,6 @@ S16 rlcUlInitExt S16 rlcUlInitExt() #endif { - TRC2(rlcUlInitExt); return ROK; } /* kwInitExt */ @@ -140,7 +139,6 @@ Reason reason; /* reason */ #endif { RlcCb *tRlcCb; - TRC3(rlcUlActvInit) if (inst >= MAX_RLC_INSTANCES) { @@ -219,7 +217,6 @@ Buffer *mBuf; /* message buffer */ { S16 ret = ROK; - TRC3(kwActvTsk); switch(pst->srcEnt) { diff --git a/src/5gnrrlc/kw_umm_dl.c b/src/5gnrrlc/kw_umm_dl.c index 10dfd86ad..c00b0e463 100755 --- a/src/5gnrrlc/kw_umm_dl.c +++ b/src/5gnrrlc/kw_umm_dl.c @@ -515,7 +515,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq) if ((lchInfo.numSdus != 0) && (l2MeasTb != NULLP) && (l2MeasTb->numLchInfo < RLC_MAX_ACTV_DRB)) { - cmMemcpy((U8 *) &l2MeasTb->lchInfo[l2MeasTb->numLchInfo], (U8 *) &lchInfo, sizeof(RlclchInfo)); + memcpy( &l2MeasTb->lchInfo[l2MeasTb->numLchInfo], &lchInfo, sizeof(RlclchInfo)); l2MeasTb->numLchInfo++; } l2MeasTb->txSegSduCnt += segSduCnt; @@ -588,8 +588,6 @@ RlcDlRbCb *rbCb; #endif { /* The re-establishment indication is sent from the UL only */ - TRC2(rlcDlUmmReEstablish) - rlcUmmFreeDlRbCb(gCb, rbCb); @@ -778,10 +776,6 @@ U32 sduId; #endif { CmLList *tmpNode; /* Temporary Node in SDU queue */ - - TRC2(rlcUmmDiscSdu) - - CM_LLIST_FIRST_NODE(&rbCb->m.umDl.sduQ,tmpNode); if (tmpNode) @@ -824,8 +818,6 @@ RlcCb *gCb; RlcDlRbCb *rbCb; #endif { - TRC2(rlcUmmFreeDlRbCb) - /* cat the SDU queue to the to be freed list */ cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCb->m.umDl.sduQ)); diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c index 555165406..d316ff957 100755 --- a/src/5gnrrlc/kw_umm_ul.c +++ b/src/5gnrrlc/kw_umm_ul.c @@ -540,9 +540,6 @@ RlcUlRbCb *rbCb; RlcUmRecBuf **recBuf; /* UM Reception Buffer */ RlcKwuSapCb *rlcKwSap; /* KWU SAP Information */ - TRC2(rlcUmmUlReEstablish) - - curSn = rbCb->m.umUl.vrUr; vrUh = RLC_UM_GET_VALUE(rbCb->m.umUl.vrUh,rbCb->m.umUl); recBuf = rbCb->m.umUl.recBuf; @@ -756,10 +753,6 @@ RlcUlRbCb *rbCb; #endif { RlcSn prevVrUr; /* prevVrUr */ - - TRC3(rlcUmmReOrdTmrExp) - - prevVrUr = RLC_UMUL.vrUr; /* set VR(UR) to SN >= VR(UX) that has not been received */ @@ -820,9 +813,6 @@ RlcUlRbCb *rbCb; RlcSn windSz; /* PDU window size */ RlcUmRecBuf **umRecBuf; /* UM module receive buffer */ - TRC2(rlcUmmFreeUlRbCb) - - windSz = rbCb->m.umUl.umWinSz << 1; umRecBuf = rbCb->m.umUl.recBuf; diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index 46bfc35bb..258a49687 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -91,9 +91,9 @@ Void ResetRLCStats(Void) { RlcCb* dlInst = rlcCb[1]; RlcCb* ulInst = rlcCb[0]; - cmMemset((U8*)&gRlcStats, 0, sizeof(RLCStats)); - cmMemset((U8*)&dlInst->genSts,0,sizeof(RlcGenSts)); - cmMemset((U8*)&ulInst->genSts,0,sizeof(RlcGenSts)); + memset(&gRlcStats, 0, sizeof(RLCStats)); + memset(&dlInst->genSts,0,sizeof(RlcGenSts)); + memset(&ulInst->genSts,0,sizeof(RlcGenSts)); } #ifndef ALIGN_64BIT @@ -251,7 +251,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) { datPerUe = datReqInfo->datReq[ueIdx]; - memset((uint8_t *)dlData, 0, sizeof(RlcData)); + memset(dlData, 0, sizeof(RlcData)); dlData->cellId = datReqInfo->cellId; dlData->rnti = datPerUe.rnti; @@ -397,7 +397,7 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) } /* kw002.201 Removed the allocation of RlcDatReq */ /* kw004.201 Used SSI function to initialize the variable */ - cmMemset( (U8 *)&datReq, 0, sizeof(RlcDatReq) ); + memset(&datReq, 0, sizeof(RlcDatReq) ); totNumPdu = 0; for (numTb = 0; numTb < staInd->nmbOfTbs; numTb++) { @@ -669,7 +669,6 @@ CmLListCp *sduQ; CmLList *firstSduSnMap; /* First Node in SDU SnMap Queue */ RlcSduSnMap *sduSnMap; /* SDU Sn Map */ - TRC2(rlcUtlEmptySduQ) sduSnMapQ = NULLP; firstSduSnMap = NULLP; sduSnMap = NULLP; @@ -760,7 +759,6 @@ RlcCb *gCb; RlcDlRbCb *rbCb; #endif { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = TRUE; @@ -818,7 +816,6 @@ Void rlcDlUtlResetReestInProgress(rbCb) RlcDlRbCb *rbCb; #endif { - TRC2(rlcDlUtlSetReestInProgressForRB) rbCb->reestInProgress = FALSE; } @@ -850,8 +847,6 @@ RlcDlUeCb *ueCb; { U32 rbIdx; - TRC2(rlcDlUtlSetReestInProgressForAllRBs) - for(rbIdx = 0;rbIdx < RLC_MAX_SRB_PER_UE;rbIdx++) { if(ueCb->srbCb[rbIdx] != NULLP) @@ -1097,9 +1092,6 @@ U32 *toBeFreed RlcSn mTxNext; /* send state variable */ RlcTx *txBuf; - TRC2(rlcUtlFreeDlAmRbMemory) - - MODAMT(AMDL.txNext, mTxNext, AMDL.txNextAck,AMDL.snModMask); /* TODO : to be checked changed from <= to < */ @@ -1330,7 +1322,7 @@ S16 rlcUtlL2MeasDlInit(RlcCb *gCb) gCb->u.dlCb->rlcL2Cb.rlcNumMeas=0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - cmMemset((U8 *)&(gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); + memset(&(gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); } gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_DL_DISC].measCb.measType = LKW_L2MEAS_DL_DISC; gCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_DL_IP].measCb.measType = LKW_L2MEAS_DL_IP; @@ -1379,7 +1371,6 @@ U32 schPduSz; U8 currTbIdx; VOLATILE U32 startTime = 0; RlcContSduLst *dstContSduLst; - TRC2(rlcUtlUpdateBurstSdus) /*starting Task*/ @@ -1536,8 +1527,6 @@ RlcDlRbCb *rbCb; RlcL2MeasTb *curL2MeasTb; U16 idx; - TRC3(rlcUtlGetCurMeasTb) - if((curL2MeasTb = rbCb->ueCb->l2MeasTbCb[rbCb->ueCb->tbIdx]) == NULLP) { /* Intentionally avoiding the RLC_ALLOC macro to avoid memset */ @@ -1617,8 +1606,6 @@ U8 tbIdx; VOLATILE U32 startTime = 0; /*kw005.201 Code added for DL IP thruput measurement*/ - TRC3(rlcUtlProcHarqInd) - /*starting Task*/ SStartTask(&startTime, PID_RLC_DLIP_TPT_PRCHARQIND); @@ -1821,8 +1808,6 @@ RlcL2MeasEvtCb *measEvtCb; U32 cfmIdx =0; /* Discard new changes ends */ - TRC3(rlcUtlSndL2MeasCfm) - /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT RLOG1(L_DEBUG,"rlcUtlSndL2MeasCfm(transId(%ld))", measEvtCb->transId); @@ -1833,7 +1818,7 @@ RlcL2MeasEvtCb *measEvtCb; /* Clean up the RB data structures */ measCb = &measEvtCb->measCb; - cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); + memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); measCfmEvt.transId = measEvtCb->transId; measCfmEvt.measType = measCb->measType; @@ -1969,7 +1954,6 @@ RlcL2MeasReqEvt *measReqEvt; RlcL2MeasCfmEvt *measCfmEvt; #endif { - TRC3(rlcUtlSndDlL2MeasNCfm) RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); return ROK; @@ -2357,8 +2341,6 @@ RlcCb *gCb; U32 hashKey; CmLListCp *txBufLstCp; - TRC3(rlcUtlDelTxBuf) - hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; @@ -2399,8 +2381,6 @@ RlcCb *gCb; U32 hashKey; CmLListCp *txBufLstCp; - TRC3(rlcUtlRemovTxBuf) - hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c index f5b17d6f1..6472e15a5 100755 --- a/src/5gnrrlc/kw_utl_ul.c +++ b/src/5gnrrlc/kw_utl_ul.c @@ -380,7 +380,7 @@ S16 rlcUtlL2MeasUlInit(RlcCb *gCb) gCb->u.ulCb->rlcL2Cb.rlcNumMeas=0; for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) { - cmMemset((U8 *)&(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); + memset(&(gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[cntr]), 0, sizeof(RlcL2MeasEvtCb)); } gCb->u.ulCb->rlcL2Cb.rlcL2EvtCb[RLC_L2MEAS_UL_IP].measCb.measType = LKW_L2MEAS_UL_IP; return ROK; @@ -415,7 +415,6 @@ U32 ttiCnt; #endif { VOLATILE U32 startTime = 0; - TRC2(rlcUtlCalUlIpThrPutIncTTI) /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCTTI); @@ -497,8 +496,6 @@ Void rlcUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt) { MsgLen rlcSduSz = 0; /*Holds length of Rlc Sdu*/ VOLATILE U32 startTime = 0; - TRC2(rlcUtlCalUlIpThrPut) - /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCVOL); @@ -548,7 +545,6 @@ RlcCb *gCb; RlcL2MeasEvtCb *measEvtCb; #endif { - TRC3(rlcUtlHdlL2TmrExp) #ifdef LTE_L2_MEAS_RLC U16 qciIdx; @@ -616,8 +612,6 @@ RlcL2MeasEvtCb *measEvtCb; U32 cfmIdx =0; /* Discard new changes ends */ - TRC3(rlcUtlSndUlL2MeasCfm) - /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT RLOG1(L_DEBUG,"rlcUtlSndUlL2MeasCfm(transId(%ld))", measEvtCb->transId); @@ -628,7 +622,7 @@ RlcL2MeasEvtCb *measEvtCb; /* Clean up the RB data structures */ measCb = &measEvtCb->measCb; - cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); + memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); measCfmEvt.transId = measEvtCb->transId; measCfmEvt.measType = measCb->measType; @@ -714,7 +708,6 @@ RlcL2MeasReqEvt *measReqEvt; RlcL2MeasCfmEvt *measCfmEvt; #endif { - TRC3(rlcUtlSndUlL2MeasNCfm) RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); return ROK; @@ -767,9 +760,6 @@ U8 *numLCh; U8 msbNibble = 0; U8 numFaild = 0; - - TRC3(rlcUtlValidateL2Meas) - idx = 0; rbCb = NULLP; ret = ROK; @@ -896,8 +886,6 @@ RlcL2MeasCfmEvt *measCfmEvt; U8 lsbNibble = 0; U8 msbNibble = 0; - TRC3(rlcUtlValidateIpThL2Meas) - measType = measReqEvt->measReq.measType; /* Check for the range of measType */ /* LKW_L2MEAS_DL_IP+ LKW_L2MEAS_UL_IP = 0x0030*/ @@ -1025,8 +1013,6 @@ RlcL2MeasRbCb *rbL2Cb; U8 measType; #endif { - TRC3(rlcUtlPlcMeasDatInL2Sts) - /* We should check the number of measType in the request. This can be done * by looking at each bit in the measType. Also store the measData in the * correct index of l2Sts in RbCb. diff --git a/src/5gnrrlc/mac_stub.c b/src/5gnrrlc/mac_stub.c index 3a9e48193..816ed6d11 100644 --- a/src/5gnrrlc/mac_stub.c +++ b/src/5gnrrlc/mac_stub.c @@ -42,7 +42,7 @@ void macStubBuildUlData(Buffer *mBuf) mLen = 0; SFndLenMsg(mBuf, &mLen); - cmMemset((U8 *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); + memset(&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); ipv4Hdr.length = CM_IPV4_HDRLEN + mLen; ipv4Hdr.hdrVer = 0x45; ipv4Hdr.proto = 1; @@ -56,8 +56,8 @@ void macStubBuildUlData(Buffer *mBuf) /* initialize locals */ cnt = 0; - cmMemset(revPkArray, 0, CM_IPV4_HDRLEN); - cmMemset(pkArray, 0, CM_IPV4_HDRLEN); + memset(revPkArray, 0, CM_IPV4_HDRLEN); + memset(pkArray, 0, CM_IPV4_HDRLEN); /* Pack Header Version */ pkArray[cnt++] = ipv4Hdr.hdrVer; diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index d90d3274d..b002d90e0 100755 --- a/src/5gnrsch/rg_sch.c +++ b/src/5gnrsch/rg_sch.c @@ -117,8 +117,6 @@ RgMngmt *cntrl; /* control structure */ RgMngmt cfm; Inst inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */ - TRC3(RgMiLrgSchCntrlReq) - /* Fill the post structure for sending the confirmation */ SchFillCfmPst(pst, &cfmPst, cntrl); @@ -131,7 +129,7 @@ RgMngmt *cntrl; /* control structure */ SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); return ROK; } */ - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = @@ -221,8 +219,6 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) err.errType = 0; err.errCause = 0; - TRC3(RgMiLrgSchL2MeasReq) - /* Find the cellCb using cellId in measInfo. Iterate through all cells * in rgrsapCb in RgschCb */ @@ -328,10 +324,6 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) LrgSchMeasCfmInfo measCfm; U8 idx; - - TRC3(RgMiLrgSchL2MeasStopReq) - - for (idx = 0; idx < instCb->numSaps; idx++) { if ( instCb->rgrSap[idx].cell->cellId == measInfo->cellId) @@ -347,7 +339,7 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) "Stop req Failed.Invalid Cell Id "); return RFAILED; } - cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); node = cell->l2mList.first; while(node != NULLP) { @@ -363,7 +355,7 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) { RgInfL2MeasStopReq measStopReq; Pst pstMac; - cmMemset((U8 *)&measStopReq, 0, sizeof(RgInfL2MeasStopReq)); + memset(&measStopReq, 0, sizeof(RgInfL2MeasStopReq)); measStopReq.transId = measInfo->hdr.transId; measStopReq.measType = measInfo->measType; /* measReq.timePrd = measInfo->timePrd; */ @@ -410,10 +402,6 @@ S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) RgSchCb *instCb = &rgSchCb[(pst->dstInst - SCH_INST_START)]; U8 idx; - TRC3(RgMiLrgSchL2MeasSendReq) - - - cell = NULLP; for (idx = 0; idx < instCb->numSaps; idx++) { @@ -435,7 +423,7 @@ S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) { RgInfL2MeasSndReq measSndReq; Pst pstMac; - cmMemset((U8 *)&measSndReq, 0, sizeof(RgInfL2MeasSndReq)); + memset(&measSndReq, 0, sizeof(RgInfL2MeasSndReq)); measSndReq.transId = measInfo->hdr.transId; measSndReq.measType = measInfo->measType; measSndReq.timePrd = measInfo->timePrd; @@ -494,9 +482,6 @@ S16 RgUiRgrBndReq(pst, suId, spId) Inst instId = pst->dstInst-SCH_INST_START; RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRgrBndReq) - - tmpPst.prior = pst->prior; tmpPst.route = pst->route; tmpPst.selector = pst->selector; @@ -589,8 +574,6 @@ S16 RgUiRgrUbndReq(pst, spId, reason) #endif { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgrUbndReq) - /* SAP Id validation */ if (spId < rgSchCb[instId].numSaps) @@ -666,9 +649,7 @@ RgrSiCfgReqInfo *cfgReqInfo; U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; - TRC2(RgUiRgrSiCfgReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -780,9 +761,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; U8 cfmStatus = RGR_CFG_CFM_NOK; U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(RgUiRgrWarningSiCfgReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -894,10 +873,6 @@ U8 siId; { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgrWarningSiStopReq) - - - if (spId < rgSchCb[instId].numSaps) { if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) @@ -970,9 +945,7 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; - TRC2(RgUiRgrLoadInfReq); - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -1063,7 +1036,6 @@ RgInfDedBoRpt *boRpt; Inst inst = (pst->dstInst - SCH_INST_START); S16 cellSapId = boRpt->cellSapId; - TRC3(RgMacSchDedBoUpdtReq) /* RLOG_ARG2(L_DEBUG,DBG_CELLID,boRpt->cellId,"rgMacSchDedBoUpdtReq():" " boRpt->rnti = %u boRpt->lcId = %u",boRpt->rnti, boRpt->lcId); @@ -1196,7 +1168,6 @@ RgInfCmnBoRpt *boRpt; Inst inst = (pst->dstInst - SCH_INST_START); S16 cellSapId = boRpt->cellSapId; - TRC3(RgMacSchCmnBoUpdtReq) /* No need to chk for cell being NULL as MAC would not have found instance if * it doesnt exist */ @@ -1256,8 +1227,6 @@ RgInfUeDelInd *ueDelInd; CmLList *tmp; RgSchRntiLnk *rntiLnk=NULL; - TRC3(RgMacSchUeDelInd) - if (rgSchCb[inst].rgrSap == NULLP || rgSchCb[inst].rgrSap[cellSapId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,ueDelInd->cellId,"rgrSap or cell is not configured"); @@ -1365,7 +1334,6 @@ RgInfSfDatInd *subfrmInfo; U16 diffBits = 0; U8 lcCount; #endif - TRC3(RgMacSchSfRecpInd) /* No need to chk for cell being NULL as MAC wouldn't have found instance if * it doesnt exist */ @@ -1618,7 +1586,6 @@ RgInfSpsRelInfo *relInfo; RgSchCellCb *cell; Inst inst = (pst->dstInst - SCH_INST_START); - TRC2(RgMacSchSpsRelInd); /* No need to chk for cell being NULL as MAC wouldn't have found instance if * it doesnt exist */ @@ -1685,7 +1652,6 @@ RgInfL2MeasCfm *measCfm; U8 qciVal; U8 idx1; /*LTE_L2_MEAS_PHASE2*/ U8 qciVal1; - TRC2(RgMacSchL2MeasCfm); /* Find the cellCb using cellId in measInfo. Iterate through all cells * in rgrsapCb in RgschCb */ @@ -1738,7 +1704,7 @@ RgInfL2MeasCfm *measCfm; /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)&measCb, sizeof(RgSchL2MeasCb)); - cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); schMeasCfm.measType = measCfm->measType; schMeasCfm.cfm = measCfm->cfm; schMeasCfm.hdr.transId = measCfm->transId; @@ -1806,9 +1772,7 @@ RgInfL2MeasCfm *measCfm; Inst inst = (pst->dstInst - SCH_INST_START); RgSchCb *instCb = &rgSchCb[inst]; - TRC2(RgMacSchL2MeasStopCfm); - - cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo)); schMeasCfm.measType = measCfm->measType; schMeasCfm.cfm = measCfm->cfm; schMeasCfm.hdr.transId = measCfm->transId; @@ -1855,9 +1819,6 @@ U8 status; RgSchLowSapCb *tfuSap; Inst instId = pst->dstInst - SCH_INST_START; - TRC3(RgLiTfuSchBndCfm); - - if(suId >= rgSchCb[instId].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Incorrect SuId"); @@ -1911,8 +1872,6 @@ TfuRaReqIndInfo *raReqInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuRaReqInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"SAP Validation failed SuId(%d)", suId); @@ -1975,8 +1934,6 @@ TfuUlCqiIndInfo *ulCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuUlCqiInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); @@ -2032,8 +1989,6 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuPucchDeltaPwrInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); @@ -2090,7 +2045,6 @@ TfuHqIndInfo *harqAckInd; S16 ret; Inst inst = (pst->dstInst - SCH_INST_START); - TRC3(RgLiTfuHqInd); #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) @@ -2150,8 +2104,6 @@ TfuSrIndInfo *srInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuSrInd); - #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { @@ -2209,8 +2161,6 @@ TfuDlCqiIndInfo *dlCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuDlCqiInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); @@ -2266,8 +2216,6 @@ TfuRawCqiIndInfo *rawCqiInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuRawCqiInd); - #ifdef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { @@ -2324,8 +2272,6 @@ TfuSrsIndInfo *srsInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuSrsInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); @@ -2382,8 +2328,6 @@ TfuDoaIndInfo *doaInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC2(RgLiTfuDoaInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); @@ -2436,7 +2380,6 @@ TfuCrcIndInfo *crcInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuCrcInd); #ifdef XEON_SPECIFIC_CHANGES struct timeval start6, end6; gettimeofday(&start6, NULL); @@ -2500,8 +2443,6 @@ TfuTimingAdvIndInfo *timingAdvInd; S16 ret; Inst inst = pst->dstInst-SCH_INST_START; - TRC3(RgLiTfuTimingAdvInd); - if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); @@ -2560,9 +2501,6 @@ SpId spId; Pst tmpPst; /* Temporary Post Structure */ Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgmBndReq) - - tmpPst.prior = pst->prior; tmpPst.route = pst->route; tmpPst.selector = pst->selector; @@ -2658,8 +2596,6 @@ Reason reason; #endif { Inst instId = pst->dstInst-SCH_INST_START; - TRC3(RgUiRgmUbndReq) - /* SAP Id validation */ if (spId < rgSchCb[instId].numSaps) @@ -2731,7 +2667,6 @@ RgmPrbRprtCfg *prbRprtCfg; RgSchPrbUsage *prbUsage; Inst inst = (pst->dstInst - SCH_INST_START); - TRC2(RgUiRgmCfgPrbRprt); cell = rgSchCb[inst].rgmSap[spId].cell; prbUsage = &cell->prbUsage; prbUsage->prbRprtEnabld = prbRprtCfg->bConfigType; @@ -2739,7 +2674,7 @@ RgmPrbRprtCfg *prbRprtCfg; RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, prbUsage->startTime, 1); /* clear the qciPrbRpts for all GBR QCIs */ - cmMemset((U8*)&prbUsage->qciPrbRpts[0], 0, + memset(&prbUsage->qciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgSchQciPrbUsage))); RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, @@ -2790,8 +2725,6 @@ TfuErrIndInfo *errInd; Inst inst = (pst->dstInst - SCH_INST_START); #endif - TRC3(RgLiTfuErrInd); - #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index 1b2bf24e3..db04bfd91 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -491,7 +491,6 @@ RgrSchedEnbCfg *schedEnbCfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrSchedEnbCfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR SCH ENB CONFIG: \n")); errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG; @@ -569,8 +568,6 @@ RgSchCellCb *cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrCellCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_CFG; /* check if cell exists already */ @@ -851,8 +848,6 @@ Inst inst; RgrSchedCfg *rgSchedCfg; #endif { - TRC2(rgSCHCfgVldtRgrSchCfg); - RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Validating \ scheduler related Configuration")); if (rgSchedCfg->ulSchdType > (RGSCH_NUM_SCHEDULERS - 1)) @@ -902,7 +897,6 @@ Inst inst; RgrCellCfg *cellCfg; #endif { - TRC2(rgSCHCfgVldtRgrCellSchCfg); #if RGSCH_NUM_DLFS_SCHEDULERS if (cellCfg->dlfsSchdType > RGSCH_NUM_DLFS_SCHEDULERS - 1) @@ -947,8 +941,6 @@ Inst inst; RgrCellCfg *cellCfg; #endif { - TRC2(rgSCHCfgVldtRgrCellRACfg); - #ifdef LTE_TDD if ((cellCfg->rachCfg.preambleFormat > RGSCH_MAX_TDD_RA_PREAMBLE_FMT) || @@ -1073,8 +1065,6 @@ RgSchCellCb **cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_CFG; if (((*cell) == NULLP) || @@ -1279,8 +1269,6 @@ RgSchCellCb **cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrCellRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_RECFG; @@ -1485,8 +1473,6 @@ RgSchErrInfo *err; RgrUePrdDlCqiCfg *pCqiCfg; #endif - TRC2(rgSCHSCellCfgUeCfg); - RLOG0(L_INFO, "SCELL recfg received from APP \n"); RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), @@ -1741,7 +1727,6 @@ RgSchErrInfo *err; RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP; U8 idx; - TRC2(rgSCHSCellCfgUePucchReCfg); RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" "UE SCell PUCCH ReConfiguration at SCH: rnti (%u) cell(%u)\n" @@ -1845,7 +1830,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *sCell = NULLP; Inst inst = cell->instIdx; - TRC2(rgSCHCfgVldtRgrUeSCellRecfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR UE SCELL RECONFIG: cellId %d " "oldUeId %d cell %p \n", ueRecfg->cellId, ueRecfg->oldCrnti)); @@ -1979,8 +1963,6 @@ RgrUeRecfg *ueRecfg; RgSchUeCellInfo *sCellInfo = NULLP; RgSchCmnCell *cellSch = NULLP; - TRC2(rgSCHSCellCfgUeCfgRollBack); - RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" "UE SCell config roll back at SCH: rnti (%u) cell(%u)\n" @@ -2070,8 +2052,6 @@ RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RECFG; if (((*cell) == NULLP) || @@ -2300,8 +2280,6 @@ RgSchDlLcCb **dlLc; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLchRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LC_RECFG; if (((*cell) == NULLP) || @@ -2372,8 +2350,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeReset); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RESET; @@ -2442,8 +2418,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcgRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LCG_RECFG; if (((cell) == NULLP) || @@ -2512,8 +2486,6 @@ RgrCellCfg *cellCfg; U16 numDlSf; #endif - TRC2(rgSCHDynCfiCfg); - cell->dynCfiCb.isDynCfiEnb = cellCfg->isDynCfiEnb; /* Initializing Failure Sample Period */ @@ -2639,7 +2611,6 @@ RgrSchedEnbCfg *schedEnbCfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrSchedEnbCfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "APPLYING RGR SCH ENB CONFIG: \n")); errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG; @@ -2693,8 +2664,6 @@ RgrCellCfg *cellCfg; { U8 idx; - TRC2(rgSCHCfgRgrCellCfg); - for(idx = 0; idx < MAX_5GTF_GROUP; idx++) { cell->cell5gtfCb.ueGrp5gConf[idx].beamBitMask = 0; @@ -2767,11 +2736,9 @@ RgSchErrInfo *errInfo; Inst inst = instCb->rgSchInit.inst; U32 Idx1 = (U8)((cellCfg->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); - TRC2(rgSCHCfgRgrCellCfg); - errInfo->errCause = RGSCHERR_CFG_RGR_CELL_CFG; - cmMemset((U8*)&pst, (U8)0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); /* Allocate the scheduler's cell control block */ if((ret = rgSCHUtlAllocSBuf(inst, (Data**)&cell, sizeof(RgSchCellCb))) @@ -2809,7 +2776,7 @@ RgSchErrInfo *errInfo; { cell->lteAdvCb.absCfg = cellCfg->rgrLteAdvCfg.absCfg; - cmMemset((U8*)cell->lteAdvCb.absLoadInfo, 0, sizeof(U32)*RGR_ABS_PATTERN_LEN); + memset(cell->lteAdvCb.absLoadInfo, 0, sizeof(U32)*RGR_ABS_PATTERN_LEN); cell->lteAdvCb.absLoadTtiCnt = 0; } @@ -2857,7 +2824,7 @@ RgSchErrInfo *errInfo; cell->t300TmrVal = cellCfg->t300TmrVal; #ifdef RGR_SI_SCH /*Initialize the SI CB in Cell CB */ - cmMemset((U8 *)&cell->siCb, 0, sizeof(RgSchSiCb)); + memset(&cell->siCb, 0, sizeof(RgSchSiCb)); #endif /*Fix: Added Guard Pool for RNTI which will contain RNTIs *for UEs deleted from Scheduler but not yet from MAC*/ @@ -3156,7 +3123,6 @@ RgSchErrInfo *errInfo; #ifdef TFU_UPGRADE RgSchUePCqiCb *cqiCb = NULLP; #endif - TRC2(rgSCHCfgRgrUeCfg); do { errInfo->errCause = RGSCHERR_CFG_RGR_UE_CFG; @@ -3541,8 +3507,6 @@ RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrUePhrMsg3); - /* Record msg3 allocation in the UE */ rgSCHUtlRecMsg3Alloc(cell, ue, raCb); @@ -3583,8 +3547,6 @@ Bool isDynCfiEnb; U8 idx; RgSchCmnDlCell *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHDynCfiReCfg); - if(isDynCfiEnb) { cell->dynCfiCb.ttiCnt = 0; @@ -3649,9 +3611,6 @@ RgSchErrInfo *errInfo; U16 len; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ /* LTE_ADV_FLAG_REMOVED_END */ - TRC2(rgSCHCfgRgrCellRecfg); - - errInfo->errCause = RGSCHERR_CFG_RGR_CELL_RECFG; /* Invoke scheduler to update scheduler specific information */ @@ -3748,7 +3707,7 @@ RgSchErrInfo *errInfo; } if(cellRecfg->rgrLteAdvCfg.pres & RGR_SFR) { - cmMemcpy((U8 *)&cell->lteAdvCb.sfrCfg, (U8 *)&cellRecfg->rgrLteAdvCfg.sfrCfg, + memcpy(&cell->lteAdvCb.sfrCfg, &cellRecfg->rgrLteAdvCfg.sfrCfg, sizeof(RgrSfrConfig)); /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ if (cellRecfg->rgrLteAdvCfg.sfrCfg.status == RGR_ENABLE) @@ -3926,8 +3885,6 @@ RgSchErrInfo *errInfo; RgSchDlHqEnt **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell)); U8 idx; - TRC2(rgSCHCfgRgrUeRecfgRntiChg); - /* Handle CRNTI change in reconfiguration */ if (ueRecfg->oldCrnti != ueRecfg->newCrnti) { @@ -4138,8 +4095,6 @@ RgSchErrInfo *errInfo; Bool dciChange = TRUE; #endif - TRC2(rgSCHCfgRgrUeRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_UE_RECFG; #ifdef LTE_ADV @@ -4404,8 +4359,6 @@ RgSchErrInfo *errInfo; { S16 ret = ROK; - TRC2(rgSCHCfgRgrLchRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_LC_RECFG; /* Invoke Scheduler to update the new configuration */ ret = rgSCHUtlRgrLcRecfg(cell, ue, dlLc, lcRecfg, errInfo); @@ -4459,8 +4412,6 @@ RgSchErrInfo *errInfo; { S16 ret = ROK; - TRC2(rgSCHCfgRgrLcgRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_LCG_RECFG; /*Added for handling LCG ReConfig if the LCG was deleted */ @@ -4518,9 +4469,6 @@ RgSchErrInfo *errInfo; U32 idx; RgSchRaCb *raCb; - TRC2(rgSCHCfgRgrUeReset); - - errInfo->errCause = RGSCHERR_CFG_RGR_UE_RESET; /* Setting BO of Each Logical Channel of the UE to 0 */ @@ -4625,8 +4573,6 @@ RgrDel *cellDelInfo; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrCellDel); - errInfo->errCause = RGSCHERR_CFG_RGR_CELL_DEL; @@ -4686,7 +4632,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *secCellCb = NULLP; #endif - TRC2(rgSCHCfgRgrUeDel); errInfo->errCause = RGSCHERR_CFG_RGR_UE_DEL; if (cell->cellId != ueDelInfo->u.ueDel.cellId) @@ -4830,8 +4775,6 @@ RgSchErrInfo *errInfo; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLcDel); - errInfo->errCause = RGSCHERR_CFG_RGR_LC_DEL; /* Fetch the Active cell */ @@ -4956,9 +4899,6 @@ RgSchErrInfo *errInfo; #endif U8 lcgId = 0; - TRC2(rgSCHCfgRgrLcgDel); - - lcgId = lcDelInfo->u.lcgDel.lcgId; errInfo->errCause = RGSCHERR_CFG_RGR_LCG_DEL; @@ -5050,8 +4990,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LC_CFG; @@ -5124,8 +5062,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcgCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LCG_CFG; @@ -5187,8 +5123,6 @@ RgSchErrInfo *errInfo; UNUSED(cellCfg); UNUSED(errInfo); - TRC2(rgSCHCfgVldtRgrCellPwrCfg); - /* This function does nothing now, placeholder for * subsequent power config validations that may be needed */ @@ -5236,8 +5170,6 @@ RgSchErrInfo *errInfo; U8 bitMask = 0x00; U8 cnt=0; - TRC2(rgSCHCfgVldtRgrCmnLcCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CMN_LC_CFG; for (idx = 0; idx < cellCfg->numCmnLcs; idx++) @@ -5366,8 +5298,6 @@ RgrUeDlCqiCfg *ueDlCqiCfg; #endif { - TRC2(rgSCHCfgVldtUeCqiModeCfg) - #ifndef TFU_UPGRADE if((ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx < 1) || (ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx > 1024)) @@ -5450,8 +5380,6 @@ RgrUeCfg *ueCfg; #endif { - TRC2(rgSCHCfgVldtUeMeasGapAckNakRepCfg) - #ifdef LTE_TDD if ((ueCfg->ackNackModeEnum == RGR_TDD_ACKNACK_MODE_MULT) && (ueCfg->ueAckNackCfg.isAckNackEnabled == TRUE)) @@ -5541,7 +5469,6 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtUeMeasGapAckNakRepRecfg) if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) && (!ueRecfg->ueMeasGapRecfg.isMesGapEnabled)) { @@ -5623,8 +5550,6 @@ RgrUeSpsDlCfg *dlSpsCfg; U8 idx = 0; - TRC2(rgSCHCfgVldtUeDlSpsCfg); - /* peridicity validation done in SPS module */ if ((dlSpsCfg->numPucchVal > RG_SCH_MAX_NUM_N1PUCCH_PER_UE) || (dlSpsCfg->numPucchVal == 0)) @@ -5690,8 +5615,6 @@ RgrUeUlPwrCfg *pwrCfg; #endif { - TRC2(rgSCHCfgVldtUePwrCfg); - /* Group power control works only in accumulated mode */ if (!pwrCfg->isAccumulated) { @@ -5749,8 +5672,6 @@ RgrUeGrpPwrCfg *grpPwrCfg; #endif { - TRC2(rgSCHCfgVldtUeGrpPwrCfg); - if ((grpPwrCfg->pres) && (((grpPwrCfg->tpcRnti > cell->rntiDb.rntiStart) && ((grpPwrCfg->tpcRnti < @@ -5797,7 +5718,6 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtSpsReCfg); if ((ueRecfg->ueRecfgTypes & RGR_UE_DLSPS_RECFG) && (ueRecfg->ueSpsRecfg.dlSpsCfg.isDlSpsEnabled)) { @@ -5895,7 +5815,6 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtCqiReptReCfg); /* Validate DL Power Control Config parameters */ if (ueRecfg->ueCqiReptCfg.numColltdCqiRept > RGR_CQIRPTS_MAXN) { @@ -5949,8 +5868,6 @@ RgSchErrInfo *errInfo; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLchCfg); - errInfo->errCause = RGSCHERR_CFG_RGR_DED_LC_CFG; /* Allocate the downlink logical channel control block */ @@ -6074,7 +5991,6 @@ RgSchErrInfo *errInfo; U32 idx; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLcgCfg); errInfo->errCause = RGSCHERR_CFG_RGR_DED_LCG_CFG; @@ -6160,11 +6076,10 @@ RgSchErrInfo *errInfo; #endif { RgSchClcDlLcCb cmnLcCb; - TRC2(rgSCHCfgRgrCmnLcCfg); errInfo->errCause = RGSCHERR_CFG_RGR_CMN_LC_CFG; - cmMemset((U8 *)&cmnLcCb, 0, sizeof(cmnLcCb)); + memset(&cmnLcCb, 0, sizeof(cmnLcCb)); /* Handle configuration for CCCH/BCCH/PCCH */ if (lcCfg->lcType == CM_LTE_LCH_CCCH) @@ -6238,7 +6153,6 @@ RgSchDlLcCb *dlLc; #endif { Inst inst = cell->instIdx; - TRC2(rgSCHCfgFreeDlDedLcCb); rgSCHUtlFreeDlLc(cell, ue, dlLc); @@ -6280,9 +6194,8 @@ PRIVATE Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc) RgSchClcDlLcCb *cmnDlLc; #endif { - TRC2(rgSCHCfgFreeDlCmnLcCb); - cmMemset((U8*)cmnDlLc, 0, sizeof(*cmnDlLc)); + memset(cmnDlLc, 0, sizeof(*cmnDlLc)); cmnDlLc->lcId = RGSCH_INVALID_LC_ID; RETVOID; } /* rgSCHCfgFreeDlCmnLcCb */ @@ -6321,7 +6234,6 @@ RgSchCellCb *cell; RgSchWarningSiPdu *warningSiPdu; U8 idx; - TRC2(rgSCHCfgFreeCellCb); /* ccpu00132385- SI Warning PDUs which are not processed need to be deleted */ /* Search for used index in WarningSi */ for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++) @@ -6443,7 +6355,6 @@ RgSchUeCb *ue; Inst inst = cell->instIdx; U8 lcCnt; U8 lcgId; - TRC2(rgSCHCfgFreeUeCb); /* Free all logical channel info per UE */ while((dlLc = rgSCHDbmGetNextDlDedLcCb(ue, NULLP)) != NULLP) @@ -6566,8 +6477,6 @@ RgSchCellCb *cell; RgSchCfgElem *rgCfgElem; Inst inst = cell->instIdx; - TRC2(rgSCHCfgFreeRgrCfgLst); - /* Free CURRENT RGR cfg list */ while ((rgCfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP) { @@ -6621,7 +6530,6 @@ RgSchCellCb *cell; { RgSchClcDlLcCb *dlCmnLc; - TRC2(rgSCHCfgFreeCmnLcLst); if ((dlCmnLc = rgSCHDbmGetBcchOnBch(cell)) != NULLP) { @@ -6678,7 +6586,6 @@ RgSchCellCb *cell; RgSchUeCellInfo *sCellInfo; CmLList *node; #endif - TRC2(rgSCHCfgFreeUeLst); /* Free Ues in the list */ while ((ue = rgSCHDbmGetNextUeCb(cell, NULLP)) != NULLP) @@ -6746,8 +6653,6 @@ RgSchCellCb *cell; { RgSchUeCb *ue; - TRC2(rgSCHCfgFreeSpsUeLst); - /* Free Ues in the list */ while ((ue = rgSCHDbmGetNextSpsUeCb(cell, NULLP))) { @@ -6793,9 +6698,6 @@ RgrSiCfg *siCfg; UNUSED(inst); - TRC2(rgSCHCfgVldtRgrCellSiCfg); - - #ifndef LTE_TDD /* Check that retxCnt value should be <= value of siWinSize. This validation is only applicable for FDD mode. */ @@ -6877,9 +6779,6 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) U32 idx; UNUSED(inst); - TRC2(rgSCHCfgVldtRgrCellLteAdvCfg); - - if((lteAdvCfg->pres & RGR_SFR) && (RGR_ENABLE == lteAdvCfg->sfrCfg.status)) { if(lteAdvCfg->sfrCfg.cellEdgeRbRange.startRb > lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb) @@ -6912,7 +6811,7 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) return RFAILED; } - cmMemcpy(temp, (U8 *) lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN); + memcpy(temp, lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN); /* Added validation for ABS pattern len */ for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++) @@ -6958,8 +6857,6 @@ RgrCellCsgParamCfg *csgParam; #endif { - TRC2(rgSCHCfgVldtRgrCellCsgParamCfg); - RGSCHDBGPRM(inst, (rgSchPBuf(inst), "Validating CSG Parameters \n")); if(csgParam->minDlResNonCsg > 100) @@ -7019,9 +6916,6 @@ RgSchErrInfo *errInfo; MsgLen msgLen = 0; U8 numSi; - TRC2(rgSCHCfgVldtRgrSiCfg); - - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_SI_CFG; /*Validate the cfgType parameter */ @@ -7152,9 +7046,6 @@ S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) #endif { - TRC2(rgSCHCfgVldtRgrLoadInf); - - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LOAD_INF; /* Validate if the CC startRb which we have received from DSFR lies in CE sub-band of the receiving eNB */ @@ -7226,8 +7117,6 @@ S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrTxmodePuschMode); - if (txMde == RGR_UE_TM_1 || txMde == RGR_UE_TM_2 || txMde == RGR_UE_TM_3 || txMde == RGR_UE_TM_7) @@ -7316,8 +7205,6 @@ S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) { RgrTxMode txMde; RgrAprdCqiMode puschMode; - TRC2(rgSCHCfgVldtRgrUeACqiCfg); - if(acqiCfg->pres) { @@ -7376,8 +7263,6 @@ S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrTxmodePucchMode); - if (pucchMode == RGR_PRD_CQI_MOD10 || pucchMode == RGR_PRD_CQI_MOD20 ) { @@ -7466,8 +7351,6 @@ S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RgrTxMode txMde; RgrPrdCqiMode pucchMode; - TRC2(rgSCHCfgVldtRgrUePCqiCfg); - txMde = RGR_UE_TM_1; pucchMode = RGR_PRD_CQI_MOD20; if ( RGR_SCH_PCQI_SETUP == cqiCfg->type ) @@ -7687,9 +7570,6 @@ S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) U16 srsOffset=0; U8 srsSubframe=0; - TRC2(rgSCHCfgVldtRgrUeUlSrsCfg); - - if ( RGR_SCH_SRS_SETUP == srsCfg->type ) { @@ -7849,10 +7729,6 @@ S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) #endif { - TRC2(rgSCHCfgVldtRgrUeSrCfg); - - - if ( RGR_SCH_SR_SETUP == srCfg->type ) { /* 1. Validate SR Configuration related parameter values */ @@ -7939,9 +7815,6 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) #endif { - TRC2(rgSCHCfgVldtCqiSrSrsUeCfg); - - /* 1. Validate UE Aperiodic CQI related parameters */ if ( ROK != rgSCHCfgVldtRgrUeACqiCfg (cellCb, ueCfg->crnti, &ueCfg->ueDlCqiCfg.aprdCqiCfg, ueCfg->txMode, errInfo )) @@ -8045,7 +7918,6 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) #endif { RgrUeTxModeCfg txMode; - TRC3(rgSCHCfgVldtCqiSrSrsUeReCfg); txMode.pres = TRUE; txMode.tmTrnstnState = RGR_TXMODE_RECFG_CMPLT; @@ -8182,8 +8054,6 @@ CmLteUeCategory ueCat; U8 cqiPmiSzR1; /*CQIPMI Size for Rank =1*/ U8 cqiPmiSzRn1; /*CQIPMI Size for Rank > 1*/ - TRC3(rgSCHCfgACqiUeCfg); - cqiPmiSzR1 = 0; cqiPmiSzRn1 = 0; @@ -8318,7 +8188,6 @@ S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) U8 temp; U8 loop; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgPCqiUeCfg); crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)+ (cellCb->crntTime.slot); @@ -8332,7 +8201,7 @@ S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) ueCb->rawCqiBitW[loop].type = TFU_RECP_REQ_INVLD; /* setting invalid type*/ } /* 1. Copy the Received CQI Cfg parameters to ueCb */ - cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, + memcpy(&cqiCb->cqiCfg, cqiCfg, sizeof(RgrUePrdDlCqiCfg)); /* 2. Compute Periodic CQI Periodicity and subframe offset */ @@ -8492,10 +8361,6 @@ S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) U16 tempIdx; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgRiUeCfg); - - - crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cellCb->crntTime.slot); cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); @@ -8673,16 +8538,13 @@ S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) U16 crntTime; U16 tempIdx; - TRC3(rgSCHCfgSrsUeCfg); - - crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cellCb->crntTime.slot); if(RGR_SCH_SRS_SETUP == srsCfg->type) { /* 1. Copy the Received Cfg parameters to local cb */ - cmMemcpy((U8 *)&ueCb->srsCb.srsCfg, (U8 *)srsCfg, sizeof(RgrUeUlSrsCfg)); + memcpy(&ueCb->srsCb.srsCfg, srsCfg, sizeof(RgrUeUlSrsCfg)); #ifndef LTE_TDD /* 2. Compute SRS Offset and Periodicity */ @@ -8822,15 +8684,13 @@ S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) U16 srTrInsTime; U16 crntTime; - TRC3(rgSCHCfgSrUeCfg); - crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cellCb->crntTime.slot); if(srCfg->type == RGR_SCH_SR_SETUP) { /* 1. Copy the Received Cfg parameters to local cb */ - cmMemcpy((U8 *)&ueCb->srCb.srCfg, (U8 *)srCfg, sizeof(RgrUeSrCfg)); + memcpy(&ueCb->srCb.srCfg, srCfg, sizeof(RgrUeSrCfg)); /* 2. Compute SR periodicity and offset */ @@ -8965,7 +8825,6 @@ S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) { RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgPCqiUeReCfg); cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); /* Fix: ccpu00124008 Fix for incorrect check causing missed CQI reception instance */ @@ -9077,9 +8936,6 @@ S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) #endif { - TRC3(rgSCHCfgSrsUeReCfg); - - if(( RGR_SCH_SRS_SETUP == srsCfg->type) || ( RGR_SCH_SRS_SETUP != ueCb->srsCb.srsCfg.type )) @@ -9175,8 +9031,6 @@ S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) RgrUeSrCfg *srCfg; #endif { - TRC3(rgSCHCfgSrUeReCfg); - /* Fix : syed Incorrect check for SR RECFG */ if((srCfg->type == RGR_SCH_SR_SETUP) && @@ -9260,7 +9114,6 @@ S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) CmLteUeCategory ueCat; #endif { - TRC3(rgSCHCfgAcqiUeReCfg); return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) ,ueCb->mimoInfo.txMode, acqiCfg, ueCat)); @@ -9322,7 +9175,6 @@ S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) U32 sCellCnt = 0; #endif RgSchUePCqiCb *cqiRiCb = NULLP; - TRC3(rgSCHCfgPCqiSrsSrUeDel); cqiRiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); @@ -9446,7 +9298,6 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) U8 min = 0; U8 max = 0; CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* table; - TRC3(rgSCHUtlGetCfgPerOff); /* Added the function instead of the MACRO to get the * periodicity table */ @@ -9511,9 +9362,6 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn U32 confRepMode; - - TRC3(rgSCHCfgUtlFetchAcqiBitSz); - confRepMode = acqiCb->aCqiCfg.aprdModeEnum; switch(confRepMode) { @@ -9613,7 +9461,6 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy #endif { CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * table; - TRC3(rgSCHCfgUtlGetPcqiCrsSrRiTbl); switch (tblType) { @@ -9702,8 +9549,6 @@ RgSchCellCb *cell; RgrUeDrxCfg *ueDrxCfg; #endif { - TRC2(rgSCHCfgVldtDrxUeCfg) - if (ueDrxCfg->isDrxEnabled == FALSE) { @@ -9901,7 +9746,6 @@ PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) U8 onDurTmr; #endif { - TRC2(rgSCHCfgVldtDrxOnDurCfg) switch ( onDurTmr ) { @@ -9959,8 +9803,6 @@ PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) U16 inActvTmr; #endif { - TRC2(rgSCHCfgVldtDrxInActvCfg) - switch ( inActvTmr ) { case RGR_DRX_PRD_1PSF: @@ -10023,8 +9865,6 @@ PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) U8 reTxTmr; #endif { - TRC2(rgSCHCfgVldtDrxReTxCfg) - switch ( reTxTmr ) { case RGR_DRX_PRD_1PSF: @@ -10074,8 +9914,6 @@ PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst) RgrDrxLongCycleOffst lngCycleOffst; #endif { - TRC2(rgSCHCfgVldtDrxLngCycCfg) - if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK ) { return RFAILED; @@ -10117,7 +9955,6 @@ PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val) U16 val; #endif { - TRC2(rgSCHCfgVldtDrxLngCyclTmrs) switch ( val ) { @@ -10176,8 +10013,6 @@ PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg) RgrDrxShortDrx shrtCycCfg; #endif { - TRC2(rgSCHCfgVldtDrxShrtCycCfg) - switch(shrtCycCfg.shortDrxCycle) { case RGR_DRX_PRD_2SF: @@ -10249,8 +10084,6 @@ RgrUeRecfg *ueCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHCfgUeTaRecfg) - UNUSED(err); /* Update the TA related information */ @@ -10312,7 +10145,6 @@ RgrUeRecfg *ueRecfg; #endif { S16 retVal; - TRC3(rgSCHCfgUeCqiReptReCfg) /* Check has it been disabled */ if(ueRecfg->ueCqiReptCfg.numColltdCqiRept) @@ -10418,7 +10250,6 @@ U8 idx; RgSchUeCellInfo *sCellInfo = NULLP; RgrUeSecCellCfg *sCellInfoRecfg = NULLP; - TRC2(rgSCHSCellFreeBuf); for(U8 i = 0; i <= idx; i++) { diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index e264b9368..b217d3c09 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -1883,7 +1883,6 @@ RgSchCmnTbSzEff *effTbl; U8 resOfCrs; /* Effective REs occupied by CRS */ U8 i, j; - TRC2(rgSCHCmnCompEff); switch (cpType) { @@ -1965,7 +1964,6 @@ RgSchCmnTbSzEff *effTbl; U8 noSymPerRb; U8 i, j; - TRC2(rgSCHCmnCompUlEff); switch (cpType) { @@ -2034,7 +2032,6 @@ RgSchCmnTbSzEff *effTbl2Lyr; U8 resOfCrs; /* Effective REs occupied by CRS */ U8 i, j; - TRC2(rgSCHCmn2LyrCompEff); switch (cpType) { @@ -2108,7 +2105,6 @@ RgSchCellCb *cell; #endif { - TRC2(rgSCHCmnGetDciFrmtSizes); /* DCI Format 0 size determination */ rgSchCmnDciFrmtSizes[0] = 1 + @@ -2257,7 +2253,6 @@ RgSchCellCb *cell; U8 i; U8 j; - TRC2(rgSCHCmnGetCqiDciFrmt2AggrLvl); for (i = 0; i < RG_SCH_CMN_MAX_CQI; i++) { @@ -2319,7 +2314,6 @@ PRIVATE Void rgSCHCmnDlInit() RgSchCmnTbSzEff *effTbl; RgSchCmnCqiToTbs *tbsTbl; - TRC2(rgSCHCmnDlInit); /* 0 corresponds to Single layer case, 1 corresponds to 2 layers case*/ /* Init Efficiency table for normal cyclic prefix */ @@ -2559,7 +2553,6 @@ PRIVATE Void rgSCHCmnUlInit() CONSTANT RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; S16 i; S16 j; - TRC2(rgSCHCmnUlInit); /* Initaializing new variable added for UL eff */ rgSchCmnUlEffTbl[RG_SCH_CMN_NOR_CP] = &rgSchCmnNorUlEff[0]; @@ -2631,7 +2624,6 @@ Void rgSCHCmnInit() #endif { U8 idx; - TRC2(rgSCHCmnInit); rgSCHCmnDlInit(); rgSCHCmnUlInit(); @@ -2758,7 +2750,6 @@ CmLteTimingInfo frm; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchDlSf *sf; - TRC2(rgSCHCmnDlRlsSubFrm); /* Get the pointer to the subframe */ sf = rgSCHUtlSubFrmGet(cell, frm); @@ -2802,7 +2793,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlCcchRarAlloc); rgSCHCmnDlCcchRetx(cell, &cellSch->allocInfo); /* LTE_ADV_FLAG_REMOVED_START */ @@ -2923,7 +2913,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); - TRC2(rgSCHCmnCcchSduAlloc); /* Return if subframe BW exhausted */ if (allocInfo->ccchSduAlloc.ccchSduDlSf->bw <= @@ -2992,7 +2981,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; - TRC2(rgSCHCmnDlCcchSduTx); node = cell->ccchSduUeLst.first; while(node) @@ -3064,7 +3052,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; - TRC2(rgSCHCmnDlCcchTx); node = cell->raInfo.toBeSchdLst.first; while(node) @@ -3127,7 +3114,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnDlUe *ueDl; RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; - TRC2(rgSCHCmnDlCcchSduRetx); node = cellSch->dl.ccchSduRetxLst.first; while(node) @@ -3223,7 +3209,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 retxBw = 0; RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; - TRC2(rgSCHCmnDlCcchRetx); node = cellSch->dl.msg4RetxLst.first; while(node) @@ -3321,7 +3306,6 @@ RgInfSfAlloc *subfrmAlloc; #endif/*RGR_SI_SCH*/ - TRC2(rgSCHCmnDlBcchPcch); frm = cell->crntTime; #ifdef LTEMAC_HDFDD @@ -3482,7 +3466,6 @@ CmLteTimingInfo end; { Bool inWin = FALSE; - TRC2(rgSCHCmnChkInWin); if (end.sfn > start.sfn) { @@ -3559,7 +3542,6 @@ CmLteTimingInfo end; CmLteTimingInfo refFrm = end; Bool pastWin; - TRC2(rgSCHCmnChkPastWin); RGSCH_INCR_FRAME(refFrm.sfn); RGSCH_INCR_SUB_FRAME(end, 1); @@ -3617,7 +3599,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnClcAlloc); bo = (RgSchClcBoRpt *)(lch->boLst.first->node); @@ -3726,7 +3707,6 @@ RgSchDlSf *subFrm; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 numCce; /*store num CCEs based on aggregation level */ - TRC2(rgSCHCmnCmnPdcchAlloc); aggrLvl = cellSch->dl.cmnChAggrLvl; @@ -3861,7 +3841,6 @@ RgSchDlSf *sf; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 cfi = cellSch->dl.currCfi; U32 tmpRb=0; - TRC2(rgSCHCmnClcRbAlloc); /* first get the CQI to MCS table and determine the number of RBs */ effTbl = (RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[0][cfi]); @@ -3930,7 +3909,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnMsg4Alloc); /* SR_RACH_STATS : MSG4 TO BE TXED */ rgNumMsg4ToBeTx++; @@ -4014,7 +3992,6 @@ Bool isDtx; RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; - TRC2(rgSCHCmnPdcchAlloc); /* 3.1 consider the selected DCI format size in determining the * aggregation level */ @@ -4171,7 +4148,6 @@ RgSchUeCb *ueCb; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnCcchSduDedAlloc); rbAllocinfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell); @@ -4271,7 +4247,6 @@ RgSchRaCb *raCb; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnMsg4DedAlloc); effBo = raCb->dlCcchInfo.bo + RGSCH_MSG4_HDRSIZE + RGSCH_CONT_RESID_SIZE; @@ -4371,7 +4346,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 sfnIdx; U8 subfrmIdx; U16 rntiIdx=0; - TRC2(rgSCHCmnDlRaRsp); frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4464,7 +4438,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 raIdx; RgSchCmnCell *sched; U8 i,noRaRnti=0; - TRC2(rgSCHCmnDlRaRsp); frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4577,7 +4550,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnRaRspAlloc); #ifndef RGR_V1 UNUSED(cellUl); #endif @@ -4724,7 +4696,6 @@ RgSchUlAlloc *alloc; U8 cfi = cellDl->currCfi; - TRC2(rgSCHCmnUlAllocFillRbInfo); alloc->grnt.rbStart = (alloc->sbStart * cellUl->sbSize) + cell->dynCfiCb.bwInfo[cfi].startRb; @@ -4786,7 +4757,6 @@ U8 *hqProcIdRef; U8 iMcs; U8 numSb; - TRC2(rgSCHCmnMsg3GrntReq); *ulAllocRef = NULLP; @@ -4909,7 +4879,6 @@ Bool isEmtcUe; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 cfi = cellSch->dl.currCfi; - TRC2(rgSCHCmnDlSetUeAllocLmt); #ifdef EMTC_ENABLE if(TRUE == isEmtcUe) @@ -5074,7 +5043,6 @@ RgSchUeCb *ue; U8 cqiBasediTbs; U8 actualiTbs; - TRC2(rgSCHCheckAndSetTxScheme); maxiTbs = (*(RgSchCmnCqiToTbs*)(cellSch->dl.cqiToTbsTbl[0][cfi]))\ [RG_SCH_CMN_MAX_CQI - 1]; @@ -5137,7 +5105,6 @@ RgSchUeCb *ue; U8 maxiTbs; U8 cwIdx = 0; - TRC2(rgSCHCmnDlSetUeAllocLmtLa); maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1]; if(ueDl->cqiFlag == TRUE) @@ -5242,7 +5209,6 @@ RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHCmnDlHqPResetTemp); /* Fix: syed having a hqP added to Lists for RB assignment rather than * a UE, as adding UE was limiting handling some scenarios */ @@ -5284,7 +5250,6 @@ RgSchDlHqProcCb *hqP; Void *tmpCb; #endif - TRC2(rgSCHCmnDlUeResetTemp); /* Fix : syed check for UE's existence was useless. * Instead we need to check that reset is done only for the @@ -5297,7 +5262,7 @@ RgSchDlHqProcCb *hqP; #ifdef LTE_ADV tmpCb = allocInfo->laaCb; #endif - cmMemset((U8 *)allocInfo, (U8)0, sizeof(RgSchDlRbAlloc)); + memset(allocInfo, 0, sizeof(RgSchDlRbAlloc)); allocInfo->rnti = ue->ueId; #ifdef LTE_ADV allocInfo->laaCb = tmpCb; @@ -5339,9 +5304,8 @@ RgSchUeCb *ue; { RgSchCmnUlUe *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnUlUeResetTemp); - cmMemset((U8 *)&cmnUlUe->alloc, (U8)0, sizeof(cmnUlUe->alloc)); + memset(&cmnUlUe->alloc, 0, sizeof(cmnUlUe->alloc)); RETVOID; } /* rgSCHCmnUlUeResetTemp */ @@ -5380,7 +5344,6 @@ RgSchDlRbAlloc *rbAllocInfo; #endif { - TRC2(rgSCHCmnFillPdcch); /* common channel pdcch filling, * only 1A and Local is supported */ @@ -5541,7 +5504,6 @@ RgSchTddSubfrmInfo *subfrmInfo; U8 dlSfCnt = 0; U8 splfrmIdx = 0; - TRC2(rgSCHCmnIsSplSubfrm); if(splfrmCnt > 0) { @@ -5616,7 +5578,6 @@ U8 tbAllocIdx; { RgSchUeCb *ue = hqP->hqE->ue; - TRC2(rgSCHCmnUpdHqAndDai); if(subFrm != NULLP) { @@ -5705,7 +5666,6 @@ U8 *ulDai; U8 ackNackFdbkArrSize; - TRC2(rgSCHCmnUpdDai); if(hqP != NULLP) {/* Non SPS */ @@ -5834,7 +5794,6 @@ RgSchPdcch *pdcch; RgSchDlHqTbCb *tbInfo = tbAllocInfo->tbCb; RgSchDlHqProcCb *hqP = tbInfo->hqP; - TRC2(rgSCHCmnFillHqPTb); /*ccpu00120365-ADD-if tb is disabled, set mcs=0,rv=1. * Relevant for DCI format 2 & 2A as per 36.213-7.1.7.2 @@ -5940,7 +5899,6 @@ U8 tpc; #endif { - TRC2(rgSCHCmnFillHqPPdcchDciFrmtB1B2) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); //Currently hardcoding values here. @@ -6054,7 +6012,6 @@ RgSchDlHqProcCb *hqP; RgSchPdcch *pdcch = rbAllocInfo->pdcch; U8 tpc = 1; - TRC2(rgSCHCmnFillHqPPdcch); if (hqP->hqE->ue) { @@ -6227,7 +6184,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1Info.tpcCmd = tpc; @@ -6363,7 +6319,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1A) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1aInfo.isPdcchOrder = FALSE; @@ -6496,7 +6451,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1B) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1bInfo.tpcCmd = tpc; @@ -6620,7 +6574,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt2) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); /*ccpu00120365:-ADD-call also if tb is disabled */ @@ -6774,7 +6727,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt2A) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); /*ccpu00120365:-ADD-call also if tb is disabled */ @@ -6909,7 +6861,6 @@ RgSchCellCb *cell; { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnInitVars); cellUl->idx = RGSCH_INVALID_INFO; cellUl->schdIdx = RGSCH_INVALID_INFO; @@ -6956,7 +6907,6 @@ RgSchCellCb *cell; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); U16 idx; - TRC2(rgSCHCmnUpdVars); idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot); cellUl->idx = ((idx) % (RG_SCH_CMN_UL_NUM_SF)); @@ -7050,7 +7000,6 @@ RgSchCellCb *cell; U16 sfn; U8 subframe; - TRC2(rgSCHCmnGetPhichUlSfIdx); dlsf = rgSCHUtlSubFrmGet(cell, *timeInfo); @@ -7103,7 +7052,6 @@ RgSchCellCb *cell; U8 idx = 0; U16 numUlSf; - TRC2(rgSCHCmnGetUlSfIdx); /* ccpu00130980: numUlSf(U16) parameter added to avoid integer * wrap case such that idx will be proper*/ @@ -7157,7 +7105,6 @@ RgSchCellCb *cell; U8 numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx] /* TRACE 5 Changes */ - TRC2(rgSCHCmnGetUlHqProcIdx); /* Calculate the number of UL SF in one SFN */ numUlSfInSfn = RGSCH_NUM_SUB_FRAMES - @@ -7213,7 +7160,6 @@ RgSchUlAlloc *alloc; #endif { RgSchUlHqProcCb *hqProc; - TRC2(rgSCHCmnUlFreeAllocation); if (alloc->forMsg3) { @@ -7267,7 +7213,6 @@ RgSchUlAlloc *alloc; { RgSchUlHqProcCb *hqProc; - TRC2(rgSCHCmnUlFreeAllocation); if (alloc->forMsg3) { @@ -7333,7 +7278,6 @@ RgSchUeCb *ue; RgSchDlSf *sf; RgSchPdcch *pdcch = NULLP; - TRC2(rgSCHCmnPdcchAllocCrntSf); RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -7383,7 +7327,6 @@ RgSchCmnUlCell *cellUl; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHCmnUlAllocFillNdmrs); alloc->grnt.nDmrs = cellUl->dmrsArr[alloc->sbStart]; RETVOID; } @@ -7418,7 +7361,6 @@ RgSchUlHqProcCb *proc; Bool isRetx; #endif { - TRC2(rgSCHCmnUlAllocLnkHqProc); if(TRUE == isRetx) { @@ -7470,7 +7412,6 @@ RgSchPdcch *pdcch; CmLteTimingInfo frm = cell->crntTime; RgSchDlSf *sf; - TRC2(rgSCHCmnPdcchRlsCrntSf); RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -7505,7 +7446,6 @@ RgSchUeCb *ue; #endif { - TRC2(rgSCHCmnUlFillPdcchWithAlloc); pdcch->ue = ue; pdcch->rnti = alloc->rnti; @@ -7603,7 +7543,6 @@ RgSchUeCb *ue; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHCmnUlAllocFillTpc); alloc->grnt.tpc = rgSCHPwrPuschTpcForUe(cell, ue); RETVOID; } @@ -7642,10 +7581,9 @@ U32 wait; CmTmrArg arg; RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnAddUeToRefreshQ); UNUSED(cell); - cmMemset((U8 *)&arg, 0, sizeof(arg)); + memset(&arg, 0, sizeof(arg)); arg.tqCp = &sched->tmrTqCp; arg.tq = sched->tmrTq; arg.timers = &ueSchd->tmr; @@ -7691,7 +7629,6 @@ RgSchUeCb *ue; RgSchCmnLcg *lcgCmn; CmLList *node; RgSchCmnAllocRecord *allRcd; - TRC2(rgSCHCmnUlUeReset); ue->ul.minReqBytes = 0; ue->ul.totalBsr = 0; @@ -7757,7 +7694,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnResetRiCqi); rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, cell->isCpUlExtend); @@ -7823,7 +7759,6 @@ RgSchUeCb *ue; RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlUeReset); if (ueDl->rachInfo.poLnk.node != NULLP) { @@ -7883,7 +7818,6 @@ RgSchUeCb *ue; Pst pst; RgInfResetHqEnt hqEntRstInfo; - TRC2(rgSCHCmnUeReset); /* RACHO: remove UE from pdcch, handover and rapId assoc Qs */ rgSCHCmnDelRachInfo(cell, ue); @@ -7955,7 +7889,6 @@ RgSchUeCb *ue; #endif { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnActvtUlUe); /* : take care of this in UL retransmission */ cellSchd->apisUl->rgSCHUlActvtUe(cell, ue); @@ -7991,7 +7924,6 @@ RgSchUeCb *ue; #endif { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnActvtDlUe); cellSchd->apisDl->rgSCHDlActvtUe(cell, ue); RETVOID; @@ -8025,7 +7957,6 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHCmnHdlUlTransInd); /* Update the latest UL dat/sig transmission time */ RGSCHCPYTIMEINFO(timingInfo, ue->ul.ulTransTime); @@ -8067,7 +7998,6 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) #endif { U32 bitMap0, bitMap1; - TRC2(rgSCHCmnComp4TxMode4); bitMap0 = pmiBitMap[0]; bitMap1 = pmiBitMap[1]; if((bitMap1) & 0xFFFF) @@ -8119,7 +8049,6 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp2TxMode4); bitMap0 = pmiBitMap[0]; if((bitMap0>>26)& 0x0F) { @@ -8161,7 +8090,6 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp4TxMode3); bitMap0 = pmiBitMap[0]; if((bitMap0>>28)& 1) { @@ -8211,7 +8139,6 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp2TxMode3); bitMap0 = pmiBitMap[0]; if((bitMap0>>30)& 1) { @@ -8258,7 +8185,6 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) U8 numTxPorts; #endif { - TRC2(rgSCHCmnComputeRank); if (numTxPorts ==2 && txMode == RGR_UE_TM_3) { @@ -8315,7 +8241,6 @@ RgSchDlHqEnt *hqE; U8 cnt; S16 ret; - TRC2(rgSCHCmnDlDeInitHqEnt); ret = cellSchd->apisDl->rgSCHDlUeHqEntDeInit(cell, hqE); /* Free only If the Harq proc are created*/ @@ -8371,7 +8296,6 @@ RgSchDlHqEnt *hqEnt; U8 cnt; RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlInitHqEnt); for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++) { @@ -8436,7 +8360,6 @@ RgSchUeCb *ue; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHCmnGetRefreshDist); for(refOffst = 0; refOffst < RGSCH_MAX_REFRESH_OFFSET; refOffst++) { @@ -8491,7 +8414,6 @@ U32 *waitPer; U32 refreshPer; U32 crntSubFrm; - TRC2(rgSCHCmnGetRefreshPer); refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES; crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot; @@ -8559,7 +8481,6 @@ RgSchErrInfo *err; Inst inst = ue->cell->instIdx; #endif U32 idx = (U8)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); - TRC2(rgSCHCmnRgrSCellUeCfg); pCellUeSchCmn = RG_SCH_CMN_GET_UE(ue,ue->cell); pCellUeDl = &pCellUeSchCmn->dl; @@ -8768,7 +8689,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell); Inst inst = ue->cell->instIdx; - TRC2(rgSCHCmnRgrSCellUeDel); cellSchd->apisDl->rgSCHRgrSCellDlUeDel(sCellInfo, ue); @@ -8838,7 +8758,6 @@ RgSchUeCb *ue; RgrUeCfg *cfg; #endif { - TRC2(rgSCHCmnRgrUeCfg); RgSchUeGrp *ue5gtfGrp; ue->ue5gtfCb.grpId = cfg->ue5gtfCfg.grpId; @@ -8922,7 +8841,6 @@ RgSchErrInfo *err; U32 waitPer; U32 idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue); - TRC2(rgSCHCmnRgrUeCfg); /* 1. Allocate Common sched control block */ @@ -9195,7 +9113,6 @@ RgrUeRecfg *ueRecfg; #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlHdlTxModeRecfg); if (ueRecfg->txMode.pres != PRSNT_NODEF) { @@ -9299,7 +9216,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSchd; #endif { - TRC2(rgSCHCmnUpdUeMimoInfo) #ifdef TFU_UPGRADE if(ueCfg->txMode.pres) { @@ -9369,7 +9285,6 @@ Bool isEcp; #endif { - TRC2(rgSCHCmnUpdUeUlCqiInfo) #ifdef TFU_UPGRADE if(ue->srsCb.srsCfg.type == RGR_SCH_SRS_SETUP) @@ -9443,7 +9358,6 @@ RgSchCellCb *cell; RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell); RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUpdUeCatCfg) ueDl->maxTbBits = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxDlTbBits; @@ -9514,7 +9428,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); U32 waitPer; - TRC2(rgSCHCmnRgrUeRecfg); /* Basic validations */ if (ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG) { @@ -9676,7 +9589,6 @@ RgSchUeCb *ue; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUlUeDelAllocs); for (i = 0; i < ueUl->hqEnt.numHqPrcs; ++i) { @@ -9756,7 +9668,6 @@ RgSchUeCb *ue; CmTmrArg arg; RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnDelUeFrmRefreshQ); #ifdef RGL_SPECIFIC_CHANGES if(ue->refreshOffset < RGSCH_MAX_REFRESH_GRPSZ) @@ -9769,7 +9680,7 @@ RgSchUeCb *ue; #endif - cmMemset((U8 *)&arg, 0, sizeof(arg)); + memset(&arg, 0, sizeof(arg)); arg.tqCp = &sched->tmrTqCp; arg.tq = sched->tmrTq; arg.timers = &ueSchd->tmr; @@ -9811,7 +9722,6 @@ RgSchUeCb *ueCb; RgSchDlHqProcCb *ccchSduHqP = NULLP; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUeCcchSduDel); hqE = RG_SCH_CMN_GET_UE_HQE(ueCb, cell); if (hqE == NULLP) @@ -9890,7 +9800,6 @@ RgSchUeCb *ue; U8 cnt; RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); U32 idx = 0; - TRC2(rgSCHCmnUeDel); if (RG_SCH_CMN_GET_UE(ue,cell) == NULLP) { @@ -10031,7 +9940,6 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; U8 i, rbNum; U32 pdcchBits; - TRC2(rgSCHCmnDlCnsdrCmnRt); /* code rate is bits per 1024 phy bits, since modl'n scheme is 2. it is * bits per 1024/2 REs */ @@ -10169,7 +10077,6 @@ RgSchErrInfo *err; U8 splSfCfi; U8 mPhich; - TRC2(rgSCHCmnDlRgrCellCfg); cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -10567,7 +10474,6 @@ RgSchErrInfo *err; U8 cfi; U8 cfiIdx; - TRC2(rgSCHCmnDlRgrCellCfg); cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -10780,7 +10686,6 @@ RgSchCmnUlCell *cellUl; #endif { U32 numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff); - TRC2(rgSCHCmnUlCalcReqRbCeil); return ((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); } @@ -10825,7 +10730,6 @@ Bool isEcp; U8 iTbs = 0; U16 msg3GrntSz = 0; - TRC2(rgSCHCmnPrecompMsg3Vars); if (ccchCqi > cellUl->max16qamCqi) { @@ -10957,7 +10861,6 @@ U8 *bwAvailRef; /* Maximum value of M as per Table 10.1-1 */ U8 M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1}; - TRC2(rgSCHCmnUlCalcAvailBw); if (cell->isCpUlExtend) { @@ -11071,7 +10974,6 @@ U8 *bwAvailRef; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #endif - TRC2(rgSCHCmnUlCalcAvailBw); if (cell->isCpUlExtend) { @@ -11203,7 +11105,6 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) #endif /* #if (defined(LTE_L2_MEAS) || defined(DEBUGP) */ RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - TRC2(rgSCHCmnUlCellInit); cellUl->maxUeNewTxPerTti = cellCfg->maxUlUeNewTxPerTti; if (maxUePerUlSf == 0) @@ -11506,7 +11407,6 @@ RgSchErrInfo *err; { S16 ret; RgSchCmnCell *cellSch; - TRC2(rgSCHCmnRgrCellCfg); /* As part of RGR cell configuration, validate the CRGCellCfg * There is no trigger for crgCellCfg from SC1 */ @@ -11645,7 +11545,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnRgrCellRecfg); if (recfg->recfgTypes & RGR_CELL_UL_CMNRATE_RECFG) { @@ -11767,7 +11666,6 @@ RgSchCellCb *cell; CmLList *lnk = NULLP; RgSchL2MeasCb *measCb; #endif - TRC2(rgSCHCmnUlCellDeinit); #ifdef LTE_L2_MEAS #ifdef LTE_TDD for(ulSfIdx = 0; ulSfIdx < RGSCH_SF_ALLOC_SIZE; ulSfIdx++) @@ -11854,7 +11752,6 @@ RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnCellDel); #ifdef LTE_L2_MEAS glblTtiCnt = 0; @@ -11941,7 +11838,6 @@ RgrLchQosCfg *dlQos; { U8 qci = dlQos->qci; - TRC2(rgSCHCmnValidateDlQos); if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI ) { @@ -12001,7 +11897,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchCfg); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&((dlLc)->sch), (sizeof(RgSchCmnDlSvc))); @@ -12145,7 +12040,6 @@ RgSchErrInfo *err; S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchRecfg) if(dlLc->lcType != CM_LTE_LCH_DCCH) { @@ -12267,7 +12161,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].sch)); - TRC2(rgSCHCmnRgrLcgCfg); ulLcg->cfgdGbr = (lcgCfg->ulInfo.gbr * RG_SCH_CMN_REFRESH_TIME)/100; ulLcg->effGbr = ulLcg->cfgdGbr; @@ -12342,7 +12235,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[reCfg->ulRecfg.lcgId].sch)); - TRC2(rgSCHCmnRgrLcgRecfg); ulLcg->cfgdGbr = (reCfg->ulRecfg.gbr * RG_SCH_CMN_REFRESH_TIME)/100; ulLcg->effGbr = ulLcg->cfgdGbr; @@ -12410,7 +12302,6 @@ U8 lcgId; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchDel); #ifdef EMTC_ENABLE if(TRUE == ue->isEmtcUe) { @@ -12454,7 +12345,6 @@ RgSchLcgCb *lcg; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *lcgCmn = RG_SCH_CMN_GET_UL_LCG(lcg); - TRC2(rgSCHCmnLcgDel); if (lcgCmn == NULLP) { @@ -12526,7 +12416,6 @@ RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnFreeDlLc); if (svc->sch == NULLP) { RETVOID; @@ -12611,7 +12500,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchUeCb *ue; - TRC2(rgSCHCmnDlCcchSduRetxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->ccchSduAlloc.schdCcchSduRetxLst.first; @@ -12685,7 +12573,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchRaCb *raCb; - TRC2(rgSCHCmnDlCcchRetxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->msg4Alloc.schdMsg4RetxLst.first; @@ -12702,7 +12589,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; hqP->tbInfo[0].ccchSchdInfo.retxLnk.node = (PTR)NULLP; /* Fix: syed dlAllocCb reset should be performed. * zombie info in dlAllocCb leading to crash rbNum wraparound */ - cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo)); + memset(rbAllocInfo, 0, sizeof(*rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } /* Fix: syed dlAllocCb reset should be performed. @@ -12713,7 +12600,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; hqP = (RgSchDlHqProcCb *)(node->node); raCb = hqP->hqE->raCb; node = node->next; - cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo)); + memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } RETVOID; @@ -12760,7 +12647,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchLchAllocInfo lchSchdData; - TRC2(rgSCHCmnDlCcchSduTxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->ccchSduAlloc.schdCcchSduTxLst.first; @@ -12852,7 +12738,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchLchAllocInfo lchSchdData; - TRC2(rgSCHCmnDlCcchTxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->msg4Alloc.schdMsg4TxLst.first; @@ -12889,7 +12774,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } /* Fix: syed dlAllocCb reset should be performed. * zombie info in dlAllocCb leading to crash rbNum wraparound */ - cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo)); + memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } node = allocInfo->msg4Alloc.nonSchdMsg4TxLst.first; @@ -12904,7 +12789,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /*Fix: Removing releasing of TB1 as it will not exist for MSG4 and hence caused a crash*/ /* rgSCHDhmRlsHqpTb(hqP, 1, FALSE);*/ /* reset the UE allocation Information */ - cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo)); + memset(rbAllocInfo, 0, sizeof(*rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } @@ -12946,7 +12831,6 @@ U32 ueCount; U8 idx = 0; U16 timeDiff = 0; - TRC2(rgSCHCmnGetBiIndex) if (cell->biInfo.prevBiTime != 0) { @@ -13046,7 +12930,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 msg3Subfrm; #endif - TRC2(rgSCHCmnDlRaRspFnlz); for (rarCnt=0; rarCntcrntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -13318,7 +13200,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnDlBcchPcchFnlz); /* handle PCCH */ rbAllocInfo = &allocInfo->pcchAlloc; @@ -13506,7 +13387,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; { CmLList *node; - TRC2(rgSCHCmnUlSetAllUnSched); node = allocInfo->contResLst.first; while (node) @@ -13561,7 +13441,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,ue->cell))->alloc); - TRC2(rgSCHCmnUlAdd2CntResLst); cmLListAdd2Tail(&allocInfo->contResLst, &ulAllocInfo->reqLnk); ulAllocInfo->reqLnk.node = (PTR)ue; RETVOID; @@ -13597,7 +13476,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,cell))->alloc); - TRC2(rgSCHCmnUlAdd2UeLst); if (ulAllocInfo->reqLnk.node == NULLP) { cmLListAdd2Tail(&allocInfo->ueLst, &ulAllocInfo->reqLnk); @@ -13633,7 +13511,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; #endif { RgSchUlSf *sf = allocInfo->sf; - TRC2(rgSCHCmnAllocUlRb); /* Schedule for new transmissions */ rgSCHCmnUlRbAllocForLst(cell, sf, allocInfo->ueLst.count, @@ -13687,7 +13564,6 @@ Bool isNewTx; CmLteTimingInfo timeInfo; #endif #endif - TRC2(rgSCHCmnUlRbAllocForLst); if(schdLst->count == 0) { @@ -13829,7 +13705,6 @@ U32 effTgt; Bool mdfyiTbsFlg = FALSE; U8 resiTbs = *iTbs; - TRC2(rgSCHCmnUlMdfyGrntForCqi) do @@ -13952,7 +13827,6 @@ RgSchUlHole *hole; U8 numLyr; #endif - TRC2(rgSCHCmnUlRbAllocForUe); #ifdef RG_5GTF rgSCHUhmGetAvlHqProc(cell, ue, &proc); if (proc == NULLP) @@ -14107,7 +13981,6 @@ CmLListCp *lst; #endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnUlRbAllocAddUeToLst); UNUSED(cell); gUl5gtfUeRbAllocDone++; @@ -14149,7 +14022,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUlAllocFnlz); /* call scheduler specific Finalization */ cellSch->apisUl->rgSCHUlAllocFnlz(cell, allocInfo); @@ -14186,7 +14058,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlRbAllocInfo *allocInfo = &cellSch->allocInfo; - TRC2(rgSCHCmnDlAllocFnlz); rgSCHCmnDlCcchRetxFnlz(cell, allocInfo); rgSCHCmnDlCcchTxFnlz(cell, allocInfo); @@ -14238,7 +14109,6 @@ RgSchUlSf *sf; #endif { CmLList *lnk; - TRC2(rgSCHCmnUlUpdSf); while ((lnk = sf->allocs.first)) { @@ -14313,7 +14183,6 @@ RgSchUlAlloc *alloc; { U32 bytes; RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlHndlAllocRetx); bytes = \ rgTbSzTbl[0][rgSCHCmnUlGetITbsFrmIMcs(alloc->grnt.iMcs)]\ [alloc->grnt.numRb-1]/8; @@ -14387,7 +14256,6 @@ RgSchCellCb *cell; #endif - TRC2(rgSCHCmnUlAlloc); /* Initializing RgSchCmnUlRbAllocInfo structure */ rgSCHCmnInitUlRbAllocInfo(allocInfoRef); @@ -14507,7 +14375,6 @@ RgSchCellCb *cell; Pst pst; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnSndCnsldtInfo); subfrmAlloc = &(cell->sfAllocArr[cell->crntSfIdx]); @@ -14580,7 +14447,6 @@ RgSchCellCb *cell; CmLListCp ulInActvLst; RgSchCmnCell *cellSch = NULLP; - TRC2(rgSCHCmnCnsldtSfAlloc); cmLListInit(&dlDrxInactvTmrLst); cmLListInit(&dlInActvLst); @@ -14639,10 +14505,9 @@ PRIVATE Void rgSCHCmnInitDlRbAllocInfo(allocInfo) RgSchCmnDlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHCmnInitDlRbAllocInfo); - cmMemset((U8 *)&allocInfo->pcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc)); - cmMemset((U8 *)&allocInfo->bcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc)); - cmMemset((U8 *)allocInfo->raRspAlloc, (U8)0, + memset(&allocInfo->pcchAlloc, 0, sizeof(RgSchDlRbAlloc)); + memset(&allocInfo->bcchAlloc, 0, sizeof(RgSchDlRbAlloc)); + memset(allocInfo->raRspAlloc, 0, RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc)); allocInfo->msg4Alloc.msg4DlSf = NULLP; @@ -14715,7 +14580,6 @@ Void rgSCHCmnInitUlRbAllocInfo(allocInfo) RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHCmnInitUlRbAllocInfo); allocInfo->sf = NULLP; cmLListInit(&allocInfo->contResLst); cmLListInit(&allocInfo->schdContResLst); @@ -14754,7 +14618,6 @@ RgSchCellCb *cell; RgSchDlSf *dlSf; #endif { - TRC2(rgSCHCmnGrpPwrCntrlPucch); rgSCHPwrGrpCntrlPucch(cell, dlSf); @@ -14792,7 +14655,6 @@ RgSchUlSf *ulSf; CmLteTimingInfo frm; RgSchDlSf *dlSf; - TRC2(rgSCHCmnGrpPwrCntrlPusch); /* Got to pass DL SF corresponding to UL SF, so get that first. * There is no easy way of getting dlSf by having the RgSchUlSf*, @@ -14850,7 +14712,6 @@ RgSchUeCb *ue; U32 effNonGbrBsr = 0; U32 lcgId; - TRC2(rgSCHCmnApplyUeRefresh); /* Reset the refresh cycle variableCAP */ ue->ul.effAmbr = ue->ul.cfgdAmbr; @@ -14924,7 +14785,6 @@ S16 tmrEvnt; /* Timer Event */ #if (ERRCLASS & ERRCLS_DEBUG) #endif - TRC2(rgSCHCmnTmrExpiry); #if (ERRCLASS & ERRCLS_DEBUG) if (tmrEvnt != RG_SCH_CMN_EVNT_UE_REFRESH) @@ -14973,7 +14833,6 @@ RgSchCellCb *cell; RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); /* Moving the assignment of scheduler pointer to available scope for optimization */ - TRC2(rgSCHCmnTmrProc); if ((cell->crntTime.slot % RGSCH_NUM_SUB_FRAMES_5G) == 0) { @@ -15041,7 +14900,6 @@ U8 delta; U8 splSfCfi = 0; #endif - TRC2(rgSchCmnUpdCfiVal); pdsch = cell->crntTime; RGSCH_INCR_SUB_FRAME(pdsch, delta); @@ -15149,7 +15007,6 @@ U8 dlIdx; { U8 idx; - TRC2(rgSchCmnUpdtPdcchSfIdx); /* Resetting the parameters on CFI switching */ cell->dynCfiCb.cceUsed = 0; @@ -15220,7 +15077,6 @@ U8 delta; U8 dlIdx; U16 ttiMod; - TRC2(rgSchCmnUpdCfiDb); /* Get Downlink Subframe */ frm = cell->crntTime; @@ -15403,7 +15259,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlCommonChSch); cellSch->apisDl->rgSCHDlTickForPdbTrkng(cell); rgSchCmnUpdCfiVal(cell, RG_SCH_CMN_DL_DELTA); @@ -15460,7 +15315,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUlSch); #ifdef LTE_ADV /* LAA_SCELL: */ @@ -15545,7 +15399,6 @@ RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlDedBoUpd); /* RACHO : if UEs idle time exceeded and a BO update * is received, then add UE to the pdcch Order Q */ @@ -15619,7 +15472,6 @@ RgSchUeCb *ue; #endif { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnRmvFrmTaLst); #ifdef EMTC_ENABLE if(cell->emtcEnable && ue->isEmtcUe) @@ -15668,7 +15520,6 @@ RgSchDlHqProcCb *hqP; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlMsg4ProcRmvFrmRetx); if (hqP->tbInfo[0].ccchSchdInfo.retxLnk.node) { @@ -15721,7 +15572,6 @@ RgSchDlHqProcCb *hqP; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlProcAddToRetx); if (hqP->hqE->msg4Proc == hqP) /* indicating msg4 transmission */ { @@ -15801,7 +15651,6 @@ Bool isPer; { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); RgSchCmnUeInfo *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnDlSetUeRi); #ifdef TFU_UPGRADE RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ue,cell); @@ -15915,7 +15764,6 @@ U8 pmi; #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlSetUePmi); if (ue->txModeTransCmplt == FALSE) { @@ -16009,7 +15857,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode10); if (pucchCqi->u.mode10Info.type == TFU_RPT_CQI) { @@ -16103,7 +15950,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode11); if (pucchCqi->u.mode11Info.type == TFU_RPT_CQI) { @@ -16207,7 +16053,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode20); if (pucchCqi->u.mode20Info.type == TFU_RPT_CQI) { @@ -16306,7 +16151,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode21); if (pucchCqi->u.mode21Info.type == TFU_RPT_CQI) { @@ -16421,7 +16265,6 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlCqiOnPucchInd); /* ccpu00117452 - MOD - Changed RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ @@ -16543,7 +16386,6 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U32 prevRiVal = 0; - TRC2(rgSCHCmnDlCqiOnPuschInd); if (puschCqi->ri.pres == PRSNT_NODEF) { if (RG_SCH_CMN_IS_RI_VALID(puschCqi->ri.val)) @@ -16805,7 +16647,6 @@ CmLteTimingInfo timingInfo; Bool is2ndCwCqiAvail = FALSE; #endif - TRC2(rgSCHCmnDlCqiInd); #ifdef RGR_CQI_REPT if (isPucchInfo) @@ -16975,7 +16816,6 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) #endif { U8 wideCqi=1; /*Calculated value from SNR*/ - TRC2(rgSCHCmnCalcWcqiFrmSnr); /*Need to map a certain SNR with a WideCQI value. * The CQI calculation is still primitive. Further, need to * use a improvized method for calculating WideCQI from SNR*/ @@ -17041,7 +16881,6 @@ Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) { U8 wideCqi; /*Calculated value from SNR*/ U32 recReqTime; /*Received Time in TTI*/ - TRC2(rgSCHCmnSrsInd); recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.slot; ue->srsCb.selectedAnt = (recReqTime/ue->srsCb.peri)%2; @@ -17094,7 +16933,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); CmLListCp poInactvLst; - TRC2(rgSCHCmnDlTARpt); /* RACHO: If UE idle time is more than threshold, then * set its poInactv pdcch order inactivity */ @@ -17224,7 +17062,6 @@ TfuUlCqiRpt *ulCqiInfo; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); #endif - TRC2(rgSCHCmnUlCqiInd); /* consider inputs from SRS handlers about SRS occassions * in determining the UL TX Antenna selection */ ueUl->crntUlCqi[0] = ulCqiInfo->wideCqi; @@ -17334,7 +17171,6 @@ RgSchUlHqProcCb **procRef; #ifndef RG_5GTF U8 procId = rgSCHCmnGetUlHqProcIdx(&frm, cell); #endif - TRC2(rgSCHCmnUlHqProcForUe); #ifndef RG_5GTF *procRef = rgSCHUhmGetUlHqProc(cell, ue, procId); #else @@ -17376,7 +17212,6 @@ RgSchUlHqProcCb *curProc; RgSchUlHqProcCb *oldProc; #endif { - TRC2(rgSCHCmnUpdUlHqProc); UNUSED(cell); UNUSED(oldProc); @@ -17418,7 +17253,6 @@ RgSchUeCb *ueCb; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ueCb->cell); - TRC2(rgSCHCmnBsrTmrExpry) ueCb->isSrGrant = TRUE; @@ -17490,7 +17324,6 @@ RgSchErrInfo *err; #ifdef LTE_L2_MEAS U8 idx; #endif - TRC2(rgSCHCmnUpdBsrShort); if (!RGSCH_LCG_ISCFGD(ulLcg)) { @@ -17671,7 +17504,6 @@ RgSchErrInfo *err; U8 idx; #endif - TRC2(rgSCHCmnUpdBsrTrunc); if (!RGSCH_LCG_ISCFGD(ulLcg)) { @@ -17849,7 +17681,6 @@ RgSchErrInfo *err; #endif U32 lcgId; - TRC2(rgSCHCmnUpdBsrLong); #ifdef LTE_L2_MEAS for(idx1 = 1; idx1 < RGSCH_MAX_LCG_PER_UE; idx1++) @@ -18014,7 +17845,6 @@ RgSchErrInfo *err; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUpdExtPhr); UNUSED(err); @@ -18081,7 +17911,6 @@ RgSchErrInfo *err; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUpdPhr); UNUSED(err); @@ -18137,7 +17966,6 @@ RgSchErrInfo *err; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnContResUlGrant); #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -18194,7 +18022,6 @@ RgSchErrInfo *err; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); CmLList *node = ueUl->ulAllocLst.last; - TRC2(rgSCHCmnSrRcvd); #ifdef EMTC_ENABLE emtcStatsUlTomSrInd++; @@ -18260,7 +18087,6 @@ RgSchCellCb *cell; /* ACC_TDD */ RgSchUlAlloc* alloc = NULLP; - TRC2(rgSCHCmnFirstRcptnReq); if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO) { @@ -18309,7 +18135,6 @@ RgSchUlAlloc *alloc; /* ACC-TDD */ //RgSchUlSf *sf = &cellUl->ulSfArr[cellUl->rcpReqIdx]; - TRC2(rgSCHCmnNextRcptnReq); /* ACC-TDD */ if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO) { @@ -18362,8 +18187,6 @@ RgSchCellCb *cell; RgSchUeCb *ueCb; - TRC2(rgSCHCmnDrxStrtInActvTmrInUl); - cmLListInit(&ulUeLst); while(alloc) @@ -18428,7 +18251,6 @@ U8 idx; /* ACC-TDD */ RgSchUlAlloc *alloc = NULLP; - TRC2(rgSCHCmnFirstHqFdbkAlloc); if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { @@ -18474,7 +18296,6 @@ U8 idx; #endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnNextHqFdbkAlloc); if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { @@ -18517,7 +18338,6 @@ U8 rgSCHCmnUlGetITbsFrmIMcs(iMcs) U8 iMcs; #endif { - TRC2(rgSCHCmnUlGetITbsFrmIMcs); return (rgUlIMcsTbl[iMcs].iTbs); } @@ -18551,7 +18371,6 @@ CmLteUeCategory ueCtg; #endif { U8 iMcs; - TRC2(rgSCHCmnUlGetIMcsFrmITbs); if (iTbs <= 10) { @@ -18613,7 +18432,6 @@ RgSchCmnUlCell *cellUl; U8 iTbs; #endif { - TRC2(rgSCHCmnUlMinTbBitsForITbs); RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); @@ -18652,7 +18470,6 @@ RgSchUlHole *hole; { U8 holeSz; /* valid hole size */ RgSchUlAlloc *alloc; - TRC2(rgSCHCmnUlSbAlloc); if ((holeSz = rgSchCmnMult235Tbl[hole->num].prvMatch) == hole->num) { @@ -18717,7 +18534,6 @@ RgSchUeCb *ue; RgSchCmnUeUlAlloc *ulAllocInfo; RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlUeFillAllocInfo); ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); ulAllocInfo = &ueUl->alloc; @@ -18775,7 +18591,6 @@ RgSchUeCb *ue; U32 nonLcg0Bsr=0; U8 lcgId; RgSchCmnLcg *cmnLcg = NULLP; - TRC2(rgSCHCmnUpdUlCompEffBsr); while (node) { @@ -18874,7 +18689,6 @@ RgSchUeCb *ue; RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node); RgSchCmnUeUlAlloc *ulAllocInfo = &ueUl->alloc; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); - TRC2(rgSCHCmnUlRecordUeAlloc); cmLListDelFrm(lst, &allRcd->lnk); #ifndef LTE_TDD @@ -18951,7 +18765,6 @@ RgSchRaCb *raCb; RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node); /* Stack Crash problem for TRACE5 changes */ - TRC2(rgSCHCmnUlRecMsg3Alloc); cmLListDelFrm(lst, node); allRcd->allocTime = raCb->msg3AllocTime; @@ -19001,7 +18814,6 @@ U32 alloc; #endif { U32 nonLcg0Alloc=0; - TRC2(rgSCHCmnUlUpdOutStndAlloc); /* Update UEs LCG0's bs according to the total outstanding BSR allocation.*/ if (((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs > alloc) @@ -19090,7 +18902,6 @@ Bool isEcp; U8 maxiTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ueUl->maxUlCqi]; #endif - TRC2(rgSCHCmnUlGetITbs); /* #ifdef RG_SCH_CMN_EXT_CP_SUP For ECP pick index 1 */ #ifdef TFU_UPGRADE @@ -19169,7 +18980,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlRbInfoAddUeTx); if (hqP->reqLnk.node == NULLP) { @@ -19223,7 +19033,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); - TRC2(rgSCHCmnDlRbInfoAddUeRetx); if (cellSch->dl.isDlFreqSel) { @@ -19273,7 +19082,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); - TRC2(rgSCHCmnDlRbInfoAddUeRetxTx); if (cellSch->dl.isDlFreqSel) { @@ -19323,7 +19131,6 @@ RgSchDlHqProcCb *hqP; { CmLList *schdLnkNode; - TRC2(rgSCHCmnDlAdd2NonSchdRetxLst); #ifdef LTEMAC_SPS if ( (hqP->sch != (RgSchCmnDlHqProc *)NULLP) && @@ -19403,7 +19210,6 @@ RgSchCellCb *cell; RgSchTddSubfrmInfo ulSubfrmInfo; U8 maxUlSubfrms; - TRC2(rgSCHCmnDlANFdbkInit); ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx]; maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -19514,7 +19320,6 @@ RgSchCellCb *cell; [RGSCH_NUM_SUB_FRAMES-1]; U8 dlPres = 0; - TRC2(rgSCHCmnDlKdashUlAscInit); /* Generate ACK/NACK offset information for each DL subframe in a radio frame * Calculate this information based on K` in UL Association Set table */ @@ -19620,7 +19425,6 @@ RgSchCellCb *cell; { U8 idx; U16 np; - TRC2(rgSCHCmnDlNpValInit); /* Always Np is 0 for p=0 */ cell->rgSchTddNpValTbl[0] = 0; @@ -19666,7 +19470,6 @@ RgSchCellCb *cell; S16 ret; U8 lstSize; - TRC2(rgSCHCmnDlCreateRachPrmLst); RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz); @@ -19732,9 +19535,8 @@ RgSchCellCb *cell; S8 sfnOffset; U8 numSubfrms; - TRC2(rgSCHCmnDlRachInfoInit); - cmMemset((U8 *)rachRspLst, 0, sizeof(rachRspLst)); + memset(rachRspLst, 0, sizeof(rachRspLst)); RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz); @@ -19892,7 +19694,6 @@ RgSchCellCb *cell; U8 maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ [RGSCH_NUM_SUB_FRAMES-1]; - TRC2(rgSCHCmnDlPhichOffsetInit); /* Generate PHICH offset information for each DL subframe in a radio frame * Calculate this information based on K in PHICH table */ @@ -19997,7 +19798,6 @@ RgSchCellCb *cell; U8 ulDlCfgIdx = cell->ulDlCfgIdx; U8 msg3Subfrm; U8 Mval; - TRC2(rgSCHCmnUpdVars); /* ccpu00132654-ADD- Initializing all the indices in every subframe*/ rgSCHCmnInitVars(cell); @@ -20121,7 +19921,6 @@ U8 cce; #endif { U8 i; - TRC2(rgSCHCmnGetPValFrmCCE); for(i=1; i < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; i++) { @@ -20159,7 +19958,6 @@ RgSchUlAlloc *alloc; RgSchUlHqProcCb *proc; #endif { - TRC2(rgSCHCmnUlAdapRetx); rgSCHUhmRetx(proc, alloc); #ifndef RG_5GTF @@ -20200,7 +19998,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp ulInactvLst; - TRC2(rgSCHCmnHdlUlInactUes); /* Get a List of Inactv UEs for UL*/ cmLListInit(&ulInactvLst); @@ -20237,7 +20034,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp dlInactvLst; - TRC2(rgSCHCmnHdlDlInactUes); /* Get a List of Inactv UEs for DL */ cmLListInit(&dlInactvLst); @@ -20278,7 +20074,6 @@ RgSchUeCb *ue; /* Time difference in subframes */ U32 sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime); - TRC2(rgSCHCmnUeIdleExdThrsld); if (sfDiff > (U32)RG_SCH_CMN_UE_IDLE_THRSLD(ue)) { @@ -20319,7 +20114,6 @@ RgSchCellCb *cell; U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; U32 sfDiff; U8 cnt; - TRC2(rgSCHCmnCfgRachDedPrm); if (cell->macPreambleSet.pres == NOTPRSNT) { @@ -20438,7 +20232,6 @@ RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - TRC2(rgSCHCmnUpdNxtPrchMskIdx); /* Determine the next prach mask Index */ if (cellSch->rachCfg.prachMskIndx == cell->rachCfg.raOccasion.size - 1) @@ -20504,7 +20297,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; U32 sfDiff; - TRC2(rgSCHCmnUpdRachParam); if (cell->macPreambleSet.pres == NOTPRSNT) { @@ -20567,7 +20359,6 @@ U8 *prachMskIdx; RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnAllocPOParam); if (cell->macPreambleSet.pres == PRSNT_NODEF) { @@ -20645,7 +20436,6 @@ RgSchDlSf *dlSf; U8 prachMskIdx; RgSchPdcch *pdcch = NULLP; - TRC2(rgSCHCmnGenPdcchOrder); while (node) { @@ -20718,7 +20508,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlAdd2PdcchOdrQ); if (ueDl->rachInfo.poLnk.node == NULLP) { @@ -20759,7 +20548,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlRmvFrmPdcchOdrQ); cmLListDelFrm(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk); ueDl->rachInfo.poLnk.node = NULLP; @@ -20802,7 +20590,6 @@ U8 prachMskIdx; { RgSchUeACqiCb *acqiCb = RG_SCH_CMN_GET_ACQICB(ue,cell); - TRC2(rgSCHCmnFillPdcchOdr2Sf); pdcch->rnti = ue->ueId; pdcch->dci.dciFormat = TFU_DCI_FORMAT_1A; @@ -20854,7 +20641,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 rapIdIdx; - TRC2(rgSCHCmnDelRachInfo); if (ueDl->rachInfo.poLnk.node) { @@ -20911,7 +20697,6 @@ RgSchRaReqInfo *raReq; #endif { RgSchUeCb *ue = raReq->ue; - TRC2(rgSCHCmnHdlHoPo); if ( ue->isDrxEnabled ) { @@ -20956,7 +20741,6 @@ U16 rapId CmLListCp *ueLst; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; - TRC2(rgSCHCmnGetHoUe); ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -20990,7 +20774,6 @@ U8 preambleId; CmLListCp *ueLst; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; - TRC2(rgSCHCmnDelDedPreamble); ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -21045,7 +20828,6 @@ CmLteTimingInfo timingInfo; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; U8 rapIdIdx; - TRC2(rgSCHCmnGetPoUe); rapIdIdx = rapId -cellSch->rachCfg.dedPrmStart; ueLst = &cellSch->rachCfg.rapIdMap[rapIdIdx].assgndUes; @@ -21101,7 +20883,6 @@ CmLteUeCategory ueCtgy; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); U8 cqi; - TRC2(rgSCHCmnUlGetCqi); cqi = ueUl->maxUlCqi; #ifdef TFU_UPGRADE @@ -21170,7 +20951,6 @@ U8 maxRb; RgSchUlHqProcCb *proc = &ueUl->hqEnt.hqProcCb[cellUl->msg3SchdHqProcIdx]; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); - TRC2(rgSCHCmnUlRbAllocForPoHoUe); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { return RFAILED; @@ -21315,7 +21095,6 @@ RgSchRaReqInfo *raReq; RgSchUlGrnt *grnt; RgSchUlSf *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx]; - TRC2(rgSCHCmnAllocPoHoGrnt); /* Clearing previous allocs if any*/ rgSCHCmnUlUeDelAllocs(cell, ue); @@ -21411,7 +21190,6 @@ RgSchUlAlloc *alloc; U8 idx; #endif { - TRC2(rgSCHCmnUlNonadapRetx); rgSCHUhmRetx(alloc->hqProc, alloc); /* Update alloc to retx */ @@ -21456,7 +21234,6 @@ RgSchUlAlloc *alloc2; #endif { - TRC2(rgSCHCmnUlAllocsOvrLap); if (((alloc1->sbStart >= alloc2->sbStart) && (alloc1->sbStart <= alloc2->sbStart + alloc2->numSb-1)) || @@ -21495,7 +21272,6 @@ RgSchUlAlloc *dstAlloc; #endif { RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlCpyAllocInfo); dstAlloc->grnt = srcAlloc->grnt; dstAlloc->hqProc = srcAlloc->hqProc; @@ -21577,7 +21353,6 @@ RgSchUlAlloc *srcAlloc; /* MS_WORKAROUND ccpu00120827 */ RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); U8 remAllocs; - TRC2(rgSCHCmnUlInsAllocFrmNewSf2OldSf); if ((alloc = rgSCHUtlUlAllocFirst(oldSf)) != NULLP) { @@ -21683,7 +21458,6 @@ RgSchUlSf *newSf; #endif { RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlMergeSfAllocs); UNUSED(cell); /* Merge each alloc of newSf in to oldSf @@ -21731,7 +21505,6 @@ RgSchUlSf *newSf; RgSchUlHoleDb *tempHoleDb = newSf->holeDb; U8 tempAvailSbs = newSf->availSubbands; - TRC2(rgSCHCmnUlSwapSfAllocs); UNUSED(cell); newSf->allocDb = oldSf->allocDb; @@ -21777,7 +21550,6 @@ U8 idx; { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlPrcNonAdptRetx); /* perform non-adaptive retx allocation(adjustment) */ if ((alloc = rgSCHUtlUlAllocFirst(newSf)) != NULLP) @@ -21838,7 +21610,6 @@ RgSchUlSf *newSf; U8 idx; #endif { - TRC2(rgSCHCmnUlPrfmSfMerge); /* Preassigned resources for msg3 in newSf. * Hence do adaptive retx for all NACKED TXs */ rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf); @@ -21881,7 +21652,6 @@ RgSchUlSf *sf; #endif { RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlRmvCmpltdAllocs); if ((alloc = rgSCHUtlUlAllocFirst(sf)) == NULLP) { @@ -21985,7 +21755,6 @@ RgSchCellCb *cell; U8 idx; #endif { - TRC2(rgSCHCmnRlsUlSf); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -22033,7 +21802,6 @@ RgSchUlAlloc *alloc; { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlUpdAllocRetx); alloc->hqProc->reTxAlloc.rnti = alloc->rnti; alloc->hqProc->reTxAlloc.numSb = alloc->numSb; @@ -22106,7 +21874,6 @@ RgSchUlHole *hole; RgSchDlSf *dlSf; RgSchPdcch *pdcch; RgSchUlAlloc *alloc; - TRC2(rgSCHCmnUlAdapRetxAlloc); /* Fetch PDCCH for msg3 */ /* ccpu00116293 - Correcting relation between UL subframe and DL subframe based on RG_UL_DELTA*/ @@ -22271,7 +22038,6 @@ RgSchUlSf *sf; RgSchUlHqProcCb *proc; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlSfRlsRetxProcs); cp = &(cellUl->reTxLst); node = cp->first; @@ -22321,7 +22087,6 @@ RgSchUlSf *sf; RgSchUeCb *ue; RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlSfReTxAllocs); cp = &(cellUl->reTxLst); node = cp->first; @@ -22393,7 +22158,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlRbAlloc); if (cellSch->dl.isDlFreqSel) { @@ -22483,7 +22247,7 @@ RgSchBwRbgInfo *rbgInfo; rbgInfo->lastRbgSize = rbgSize - (dlSubsetBw - ((dlSubsetBw/rbgSize) * rbgSize)); #ifdef RGSCH_SPS_UNUSED - cmMemcpy((U8 *)rbgInfo->rbgSubsetSize, (U8 *) subsetSize, 4 * sizeof(U8)); + memcpy(rbgInfo->rbgSubsetSize, subsetSize, 4 * sizeof(U8)); #endif rbgInfo->numRbs = (rbgInfo->numRbgs * rbgSize > dlTotalBw) ? dlTotalBw:(rbgInfo->numRbgs * rbgSize); @@ -23293,11 +23057,11 @@ Bool isPartialAlloc; { bestAvailNumRbs = numAvailRbs; bestStartPos = startPos; - cmMemcpy((U8 *)bestMask, (U8 *) tmpMask, 4 * sizeof(U32)); + memcpy(bestMask, tmpMask, 4 * sizeof(U32)); } numAvailRbs = 0; startPos = -1; - cmMemset((U8 *)tmpMask, 0, 4 * sizeof(U32)); + memset(tmpMask, 0, 4 * sizeof(U32)); } } if (*allocNumRbs == rbsReq) @@ -23309,7 +23073,7 @@ Bool isPartialAlloc; if (*allocNumRbs == rbsReq) { /* Convert the hole into allocation */ - cmMemcpy((U8 *)crntAllocMask, (U8 *) tmpMask, 4 * sizeof(U32)); + memcpy(crntAllocMask, tmpMask, 4 * sizeof(U32)); RETVOID; } else @@ -23320,7 +23084,7 @@ Bool isPartialAlloc; *allocStart = (U8)bestStartPos; *allocNumRbs = bestAvailNumRbs; /* Convert the hole into allocation */ - cmMemcpy((U8 *)crntAllocMask, (U8 *) bestMask, 4 * sizeof(U32)); + memcpy(crntAllocMask, bestMask, 4 * sizeof(U32)); } } @@ -23553,7 +23317,6 @@ RgSchDlRbAlloc *allocInfo; { U8 addtlRbsAvl = 0; - TRC2(rgSCHCmnFindNumAddtlRbsAvl) if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0) { @@ -23602,7 +23365,6 @@ U8 *numOvrlapgPbchRb; #endif { *numOvrlapgPbchRb = 0; - TRC2(rgSCHCmnFindNumPbchOvrlapRbs) /*Find if we have already crossed the start boundary for PBCH 6 RBs, * if yes then lets find the number of RBs which are getting overlapped * with this allocation.*/ @@ -23688,7 +23450,6 @@ Bool isBcchPcch; U8 divResult; - TRC2(rgSCHCmnNonDlfsPbchRbAllocAdj); origRbsReq = allocInfo->rbsReq; @@ -23876,7 +23637,6 @@ RgSchDlRbAlloc *allocInfo; U8 spsRbsAlloc = 0; RgSchDlSfAllocInfo *dlSfAlloc = &allocInfo->dlSf->dlSfAllocInfo; #endif - TRC2(rgSCHCmnNonDlfsCmnRbAlloc); allocInfo->tbInfo[0].noLyr = 1; @@ -23884,9 +23644,9 @@ RgSchDlRbAlloc *allocInfo; /* Note: Initialize the masks to 0, this might not be needed since alloInfo * is initialized to 0 at the beginning of allcoation */ allocInfo->resAllocInfo.raType0Mask = 0; - cmMemset((U8*)allocInfo->resAllocInfo.raType1Mask, 0, + memset(allocInfo->resAllocInfo.raType1Mask, 0, RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (U32)); - cmMemset((U8*)allocInfo->resAllocInfo.raType2Mask, 0, + memset(allocInfo->resAllocInfo.raType2Mask, 0, RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (U32)); if ((dlSf->spsAllocdBw >= cell->spsBwRbgInfo.numRbs) && @@ -24091,7 +23851,6 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) #endif { RgSchDlSf *dlSf = allocInfo->dlSf; - TRC2(rgSCHCmnNonDlfsCmnRbAllocRar); if(dlSf->bwAlloced == dlSf->bw) @@ -24598,7 +24357,6 @@ RgSchDlRbAlloc *allocInfo; U8 noLyrs; U8 ignoredDfctRbg = FALSE; - TRC2(rgSCHCmnNonDlfsBwAvlbl); if (dlSf->bw <= dlSf->bwAlloced) { RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, "(%d:%d)FAILED CRNTI:%d", @@ -24800,7 +24558,6 @@ U8 numRb; CmLListCp *l; CmLList *n; RgSchSFRPoolInfo *sfrPool; - TRC2(rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc); l = &dlSf->sfrTotalPoolInfo.ccPool; @@ -24886,7 +24643,6 @@ U8 numRb; RgSchSFRPoolInfo *sfrCCPool2 = NULL; S16 ret = RFAILED; - TRC2(rgSCHCmnNonDlfsUpdDSFRTyp2Alloc); /* Move the type2End pivot forward */ @@ -24990,7 +24746,6 @@ U8 rbStrt; U8 numRb; #endif { - TRC2(rgSCHCmnNonDlfsUpdTyp2Alloc); /* Move the type2End pivot forward */ dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); //#ifndef LTEMAC_SPS @@ -25048,7 +24803,6 @@ RgSchUeCb *ue; U32 tb2BytesAlloc = 0; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnNonDlfsType0Alloc); //if(noRbgs == 0) noRbgs = 1; /* Not required as ceilling is used above*/ /* Fix for ccpu00123919*/ @@ -25222,7 +24976,6 @@ U16 bw; U16 rbBitLoc; /* Bit Location to be set as 1 in the current Byte */ U16 nmbRbPerByte; /* PRB's to be set in the current Byte (in case of multiple Bytes) */ - TRC2(rgSCHCmnBuildRntpInfo); rbPtrStartIdx = (startRb)/8; rbPtrEndIdx = (startRb + nmbRb)/8; @@ -25306,7 +25059,6 @@ U8 numRb; S16 ret; #endif - TRC2(rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc); dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); sfrPool->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); @@ -25394,7 +25146,6 @@ RgSchDlRbAlloc *allocInfo; U8 noLyr; U8 iTbs; - TRC2(rgSCHCmnNonDlfsSFRPoolType0Alloc); if (poolInfo->poolstartRB + poolInfo->bw == dlSf->bw) { @@ -25515,7 +25266,6 @@ RgSchDlSf *dlSf; U16 len; U16 ret = ROK; - TRC2(rgSCHCmnNonDlfsDsfrRntpComp); len = (dlSf->bw % 8 == 0) ? dlSf->bw/8 : dlSf->bw/8 + 1; @@ -25558,7 +25308,7 @@ RgSchDlSf *dlSf; "rgSCHUtlRgrLoadInfInd() returned RFAILED"); } - cmMemset(cell->rntpAggrInfo.val,0,len); + memset(cell->rntpAggrInfo.val,0,len); samples = 0; } } @@ -25606,7 +25356,6 @@ U8 *isDlBwAvail; Bool isUECellEdge; RgSchSFRPoolInfo *sfrpoolInfo = NULLP; - TRC2(rgSCHCmnSFRNonDlfsUeRbAlloc); isUECellEdge = RG_SCH_CMN_IS_UE_CELL_EDGE(ue); @@ -25729,7 +25478,6 @@ U8 *isDlBwAvail; #ifdef LAA_DBG U32 dbgRbsReq = 0; #endif - TRC2(rgSCHCmnNonDlfsUeRbAlloc); #ifdef RG_5GTF RgSch5gtfUeCb *ue5gtfCb = &(ue->ue5gtfCb); @@ -25835,7 +25583,6 @@ U8 isRetx; RgSchDlSf *dlSf = allocInfo->ccchSduDlSf; RgSchUeCb *ueCb = NULLP; RgSchDlHqProcCb *hqP = NULLP; - TRC2(rgSCHCmnNonDlfsCcchSduAlloc); if (isRetx) { @@ -25920,7 +25667,6 @@ RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); - TRC2(rgSCHCmnNonDlfsCcchSduRbAlloc); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb,cell); @@ -26025,7 +25771,6 @@ RgSchDlSf *dlSf; #endif { RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnNonDlfsMsg4RbAlloc); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_RACB(raCb); @@ -26169,7 +25914,6 @@ U8 isRetx; RgSchDlSf *dlSf = allocInfo->msg4DlSf; RgSchRaCb *raCb = NULLP; RgSchDlHqProcCb *hqP = NULLP; - TRC2(rgSCHCmnNonDlfsMsg4Alloc); if (isRetx) { @@ -26269,7 +26013,6 @@ CmLListCp *nonSchdHqPLst; RgSchUeCb *ue = NULLP; RgSchDlHqProcCb *hqP = NULLP; U8 isDlBwAvail; - TRC2(rgSCHCmnNonDlfsDedRbAlloc); /* Perform allocaations for the list */ @@ -26362,7 +26105,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { U8 raRspCnt = 0; RgSchDlRbAlloc *reqAllocInfo; - TRC2(rgSCHCmnNonDlfsRbAlloc); /* Allocate for MSG4 retransmissions */ if (allocInfo->msg4Alloc.msg4RetxLst.count) @@ -26519,7 +26261,6 @@ U8 numRb; U8 numRbMinus1 = numRb - 1; U32 riv; - TRC2(rgSCHCmnCalcRiv); if (numRbMinus1 <= bw/2) { @@ -26576,7 +26317,6 @@ U8 raArrSz; U8 sfcount; S16 ret; - TRC2(rgSCHCmnDlCpyRachInfo); /* Allocate RACH response information for each DL * subframe in a radio frame */ @@ -26707,7 +26447,6 @@ U8 noLyr; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); S32 iTbs = 0; - TRC2(rgSchCmnFetchItbs); #ifdef LTE_TDD /* Special Handling for Spl Sf when CFI is 3 as @@ -26798,7 +26537,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RgSchDlRbAlloc *allocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocTxRb1Tb1Cw); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26884,7 +26622,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RgSchDlRbAlloc *allocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocRetxRb1Tb1Cw); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26966,7 +26703,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM1); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27018,7 +26754,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM1); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27070,7 +26805,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM2); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27122,7 +26856,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM2); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27175,7 +26908,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM3); /* Both TBs free for TX allocation */ rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo,\ @@ -27232,7 +26964,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM3); if ((proc->tbInfo[0].state == HQ_TB_NACKED) && (proc->tbInfo[1].state == HQ_TB_NACKED)) @@ -27298,7 +27029,6 @@ U8 *raType; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnSlctPdcchFrmt); /* ccpu00140894- Selective DCI Format and RA type should be selected only * after TX Mode transition is completed*/ @@ -27375,7 +27105,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 noTxLyrs; U8 precInfoAntIdx; - TRC2(rgSCHCmnDlTM3RetxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -27488,7 +27217,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif U8 noTxLyrs; - TRC2(rgSCHCmnDlTM4RetxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -27589,7 +27317,6 @@ Bool *swpFlg; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,proc->hqE->cell); RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlSMGetAttrForTxRetx); if (proc->tbInfo[0].state == HQ_TB_NACKED) { @@ -27661,7 +27388,6 @@ U8 numTxLyrs; Bool bothCwEnbld; #endif { - TRC2(rgSCHCmnDlTM3PrecInf2); return (0); } @@ -27703,7 +27429,6 @@ Bool bothCwEnbld; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precIdx; - TRC2(rgSCHCmnDlTM4PrecInf2); if (ueDl->mimoInfo.ri == numTxLyrs) { @@ -27791,7 +27516,6 @@ Bool bothCwEnbld; { U8 precIdx; - TRC2(rgSCHCmnDlTM3PrecInf4); if (bothCwEnbld) { @@ -27841,7 +27565,6 @@ Bool bothCwEnbld; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoBaseIdx, precIdx; - TRC2(rgSCHCmnDlTM4PrecInf4); precInfoBaseIdx = (ue->mimoInfo.puschFdbkVld)? (16): (ueDl->mimoInfo.pmi); @@ -27926,7 +27649,6 @@ U8 *raType; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoAntIdx; - TRC2(rgSCHCmnDlGetAttrForTM3); /* Avoiding Tx-Retx for LAA cell as firstSchedTime is associated with HQP */ @@ -28127,7 +27849,6 @@ U8 *raType; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoAntIdx; - TRC2(rgSCHCmnDlGetAttrForTM4); *frthrScp = FALSE; /* Integration_fix: SPS Proc shall always have only one Cw */ @@ -28307,7 +28028,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 prcdngInf; U8 numTxLyrs; - TRC2(rgSCHCmnDlTM3TxRetx); frthrScp = FALSE; ret = ROK; @@ -28422,7 +28142,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 prcdngInf; U8 numTxLyrs; - TRC2(rgSCHCmnDlTM4TxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -28539,7 +28258,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 precInfoAntIdx; - TRC2(rgSCHCmnDlTM3TxTx); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -28673,7 +28391,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 precInfoAntIdx; S16 ret; - TRC2(rgSCHCmnDlTM4TxTx); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -28802,7 +28519,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM4); /* Both TBs free for TX allocation */ rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo,\ @@ -28859,7 +28575,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM4); if ((proc->tbInfo[0].state == HQ_TB_NACKED) && (proc->tbInfo[1].state == HQ_TB_NACKED)) @@ -28927,7 +28642,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM5); #if (ERRCLASS & ERRCLS_DEBUG) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); #endif @@ -28981,7 +28695,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM5); #if (ERRCLASS & ERRCLS_DEBUG) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); #endif @@ -29041,7 +28754,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocTxRbTM6); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29136,7 +28848,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocRetxRbTM6); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -29224,7 +28935,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM7); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -29276,7 +28986,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM7); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -29329,7 +29038,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U32 prevSchBits = 0; RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlAllocTxRb); if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) )) { @@ -29409,7 +29117,6 @@ RgSchDlHqProcCb *proc; { RgSchTddSfType txSfType = 0; - TRC2(rgSCHCmnRetxAvoidTdd); /* Get the RBs of TB that will be retransmitted */ if (proc->tbInfo[0].state == HQ_TB_NACKED) @@ -29490,7 +29197,6 @@ RgSchDlHqProcCb *proc; { U8 reqRbs; - TRC2(rgSCHCmnRetxAllocAvoid); if (proc->tbInfo[0].state == HQ_TB_NACKED) { @@ -29563,7 +29269,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U32 newSchBits = 0; RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlAllocRetxRb); if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) )) { @@ -29657,7 +29362,6 @@ U32 *effBo; /* Correcting wrap around issue. * This change has been done at mutliple places in this function.*/ U32 tempNumRb; - TRC2(rgSCHCmnDlAlloc1CwTxRb); reqBytes = bo; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29743,7 +29447,6 @@ U32 cnsmdBytes; U8 iTbs; U16 numRb; - TRC2(rgSCHCmnRdcImcsTxTb); iTbs = allocInfo->tbInfo[tbInfoIdx].iTbs; noLyr = allocInfo->tbInfo[tbInfoIdx].noLyr; @@ -29841,7 +29544,6 @@ U32 *effBo; U32 boTmp = bo; #endif - TRC2(rgSCHCmnDlAlloc2CwTxRb); reqBytes = bo; cellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -30096,7 +29798,6 @@ U32 *effBo; U8 cfi = cellDl->currCfi; U8 iTbs; - TRC2(rgSCHCmnDlAlloc2CwTxRetxRb); ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30220,7 +29921,6 @@ U32 *effBo; U8 imcs2; RgSchDlHqTbCb *lrgTbInfo, *othrTbInfo; - TRC2(rgSCHCmnDlAlloc2CwRetxRb); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30324,7 +30024,6 @@ U32 *effBo; RgSchDlRbAlloc *allocInfo; U8 imcs; - TRC2(rgSCHCmnDlAlloc1CwRetxRb); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30382,7 +30081,6 @@ Bool isAck; #endif { - TRC2(rgSCHCmnDlRelPdcchFbk); rgSCHCmnSpsDlRelPdcchFbk(cell, ue, isAck); RETVOID; @@ -30417,7 +30115,6 @@ RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHCmnDlProcAck); if (RG_SCH_CMN_SPS_DL_IS_SPS_HQP(hqP)) { @@ -30457,7 +30154,6 @@ RgSchUeCb *ue; #endif { - TRC2(rgSCHCmnHdlCrntiCE); #ifdef RGSCH_SPS_STATS rgSchStatCrntiCeRcvCnt++; #endif @@ -30521,7 +30217,6 @@ Bool isExplRel; #endif { - TRC2(rgSCHCmnUlSpsRelInd); rgSCHCmnSpsUlProcRelInd(cell, ue, isExplRel); RETVOID; @@ -30557,7 +30252,6 @@ U16 spsSduSize; #endif { - TRC2(rgSCHCmnUlSpsActInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { @@ -30599,7 +30293,6 @@ CmLteTimingInfo crcTime; #endif { - TRC2(rgSCHCmnUlCrcInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcCrcInd(cell, ue, crcTime); @@ -30639,7 +30332,6 @@ CmLteTimingInfo crcTime; #endif { - TRC2(rgSCHCmnUlCrcFailInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcDtxInd(cell, ue, crcTime); @@ -30690,7 +30382,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlRbAllocInfo *allocInfo = &cellSch->allocInfo; - TRC2(rgSCHCmnDlBcchPcchAlloc); /*Reset the bitmask for BCCH/PCCH*/ @@ -30748,7 +30439,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHBcchPcchDlRbAlloc); if (cellSch->dl.isDlFreqSel) @@ -30799,7 +30489,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchDlRbAlloc *reqAllocInfo; - TRC2(rgSCHCmnNonDlfsBcchPcchRbAlloc); /* 143473 */ /* Allocate for PCCH */ @@ -30848,7 +30537,6 @@ RgSchCellCb *cell; { CmLteTimingInfo pdSchTmInfo; - TRC2(rgSCHChkNUpdSiCfg); pdSchTmInfo = cell->crntTime; @@ -31017,7 +30705,6 @@ RgSchCellCb *cell; U16 x; U16 windowId; - TRC2(rgSCHSelectSi); crntTmInfo = cell->crntTime; @@ -31147,7 +30834,6 @@ RgInfSfAlloc *subfrmAlloc; #endif /* DwPTS Scheduling Changes End */ - TRC2(rgSCHDlSiSched); crntTimInfo = cell->crntTime; @@ -31424,7 +31110,6 @@ RgrUeCqiRept *ueCqiRpt; S16 retVal; RgrStaIndInfo *staInfo = NULLP; - TRC2(rgSCHCmnUeDlPwrCtColltCqiRept) /* Step 1: Store the CQI in collation array */ /* Step 2: Increament the tracking count */ @@ -31497,7 +31182,6 @@ RgSchDlHqProcCb *proc; Bool *reTxAllwd; #endif { - TRC3(rgSCHCmnChkRetxAllowDtx) *reTxAllwd = TRUE; @@ -31587,7 +31271,6 @@ U8 cfi; U32 numRE = *rb * cellDl->noResPerRb[cfi]; U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); - TRC2(rgSCHCmnCalcDwPtsTbSz); /* DwPts Rb cannot exceed the cell Bw */ numDwPtsRb = RGSCH_MIN(numDwPtsRb, cellDl->maxDlBwPerUe); @@ -31671,7 +31354,6 @@ U8 cfi; U32 numRE = *rb * cellDl->noResPerRb[cfi]; U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); - TRC2(rgSCHCmnCalcDwPtsTbSz2Cw); /* DwPts Rb cannot exceed the cell Bw */ numDwPtsRb = RGSCH_MIN(numDwPtsRb, maxRb); @@ -31736,7 +31418,6 @@ RgInfUeDatInd *datInd; Inst inst = cell->instIdx; #endif - TRC2(rgSCHCmnUpdUeDataIndLcg); for (idx = 0; (idx < RGINF_MAX_LCG_PER_UE - 1); idx++) { @@ -31832,7 +31513,6 @@ RgSchCellCb *cell; RgSchDlSf *dlSf; U8 idx; - TRC2(rgSCHCmnInitRbAlloc); /* Initializing RgSchCmnUlRbAllocInfo structure.*/ rgSCHCmnInitDlRbAllocInfo(&cellSch->allocInfo); @@ -31919,7 +31599,6 @@ U8 newTxMode; RgmTransModeInd *txModeChgInd; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnSendTxModeInd); if(!(ueDl->mimoInfo.forceTD & RG_SCH_CMN_TD_TXMODE_RECFG)) { @@ -31980,7 +31659,6 @@ U8 maxiTbs; RgrTxMode txMode; /*!< UE's Transmission Mode */ RgrTxMode modTxMode; /*!< UE's Transmission Mode */ - TRC2(rgSchCheckAndTriggerModeChange); txMode = ue->mimoInfo.txMode; @@ -32066,7 +31744,6 @@ RgSchCellCb *cell; RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnIsDlCsgPrio) /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) { @@ -32113,7 +31790,6 @@ RgSchCellCb *cell; { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnIsUlCsgPrio) /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) @@ -32161,7 +31837,6 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst) RgSchDlSf *sf; U8 idx; - TRC2(rgSchCmnPreDlSch); if(nCell > CM_LTE_MAX_CELLS) { @@ -32237,7 +31912,6 @@ Void rgSchCmnPstDlSch(cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSchCmnPstDlSch); if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE)) { @@ -32262,7 +31936,6 @@ U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) U8 ri; RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb; - TRC3(rgSCHCmnCalcPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && @@ -32412,7 +32085,6 @@ Void rgSCHCmnDlSch (cell) U16 dlCntrlSfIdx; #endif - TRC2(rgSCHCmnDlSch); dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time); #ifdef RG_5GTF diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c index a6330300f..863d1f088 100755 --- a/src/5gnrsch/rg_sch_dbm.c +++ b/src/5gnrsch/rg_sch_dbm.c @@ -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); @@ -180,7 +178,6 @@ U16 numBins; #endif { RgSchUeCellInfo ueCellInfo; - TRC2(rgSCHDbmInitUeCbLst) /* Fix: syed It is better to compute offset dynamically * rather than hardcoding it as 0 */ @@ -214,7 +211,6 @@ S16 rgSCHDbmDeInitUeCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitUeCbLst) return (cmHashListDeinit(&cellCb->ueLst)); @@ -248,7 +244,6 @@ U16 numBins; #endif { RgSchUeCb ue; - TRC2(rgSCHDbmInitSpsUeCbLst) return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, @@ -280,7 +275,6 @@ S16 rgSCHDbmDeInitSpsUeCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitSpsUeCbLst) return (cmHashListDeinit(&cellCb->spsUeLst)); @@ -315,7 +309,6 @@ RgSchUeCb *ueCb; #endif { RgSchUeCellInfo *ueCellInfo = NULLP; - TRC2(rgSCHDbmInsUeCb) ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]]; @@ -351,8 +344,6 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDbmInsSpsUeCb) - return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); @@ -387,8 +378,6 @@ CmLteRnti ueId; { RgSchUeCellInfo *ueCellInfo = NULLP; - TRC2(rgSCHDbmGetUeCb) - cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, sizeof(ueId), 0, (PTR *)&ueCellInfo); @@ -423,8 +412,6 @@ CmLteRnti spsRnti; { RgSchUeCb *ueCb = NULLP; - TRC2(rgSCHDbmGetSpsUeCb) - cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); return (ueCb); @@ -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 */ @@ -538,8 +521,6 @@ RgSchUeCb *ueCb; U8 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); @@ -700,8 +677,6 @@ RgSchUeCb *ueCb; { U8 idx; - TRC2(rgSCHDbmInitDedLcLst); - for (idx = 0; idx < RGSCH_MAX_LC_PER_UE; ++idx) { /* Set Dedicated LCs as not configured */ @@ -742,8 +717,6 @@ RgSchCellCb *cellCb; { U8 idx; - TRC2(rgSCHDbmInitCmnLcLst); - for (idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++) { cellCb->cmnLcCb[idx].lcId = RGSCH_INVALID_LC_ID; @@ -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 */ @@ -856,8 +827,6 @@ RgSchUeCb *ueCb; CmLteLcId idx; #endif { - TRC2(rgSCHDbmGetDlDedLcCb); - if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID) { return (NULLP); @@ -889,7 +858,6 @@ RgSchUeCb *ueCb; #endif { U8 idx; - TRC2(rgSCHDbmGetFirstDlDedLcCb) for(idx = 0; idx < RGSCH_DEDLC_MAX_LCID; idx++) { @@ -926,7 +894,6 @@ RgSchDlLcCb *lcCb; #endif { U8 idx; - TRC2(rgSCHDbmGetNextDlDedLcCb); if (!lcCb) { @@ -970,8 +937,6 @@ CmLteLcId lcId; { U8 idx; - TRC2(rgSCHDbmGetCmnLcCb) - for(idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++) { if(cellCb->cmnLcCb[idx].lcId == lcId) @@ -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,7 +1090,6 @@ 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; @@ -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; @@ -1207,7 +1165,6 @@ RgSchCellCb *cellCb; RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInsPcch) cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId = cmnDlLcCb->lcId; cellCb->cmnLcCb[RGSCH_PCCH_IDX].boLst = cmnDlLcCb->boLst; @@ -1238,7 +1195,6 @@ Void rgSCHDbmInitCmnLcBoLst(cmnDlLcCb) RgSchClcDlLcCb *cmnDlLcCb; #endif { - TRC2(rgSCHDbmInitCmnLcBoLst) cmLListInit(&cmnDlLcCb->boLst); RETVOID; @@ -1268,8 +1224,6 @@ RgSchClcDlLcCb *cmnDlLcCb; RgSchClcBoRpt *cmnBoRpt; #endif { - TRC2(rgSCHDbmInsCmnLcBoRpt) - cmnBoRpt->boLstEnt.next = NULLP; cmnBoRpt->boLstEnt.prev = NULLP; cmnBoRpt->boLstEnt.node = (PTR)cmnBoRpt; @@ -1299,7 +1253,6 @@ PRIVATE Void rgSCHDbmInitRaCbLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitRaCbLst) cmLListInit(&cellCb->raInfo.raCbLst); RETVOID; @@ -1332,8 +1285,6 @@ CmLteRnti key; { CmLList *tmpNode; - TRC2(rgSCHDbmGetRaCb) - CM_LLIST_FIRST_NODE(&cellCb->raInfo.raCbLst,tmpNode); while(tmpNode) { @@ -1370,8 +1321,6 @@ RgSchCellCb *cellCb; { U8 idx; - TRC2(rgSCHDbmInitRaReqLst) - /* ccpu00133557- Memory Leak Fix- initializing for the all nodes * in RAREQ list*/ for(idx = 0; idx < RGSCH_RAREQ_ARRAY_SIZE; idx++) @@ -1403,7 +1352,6 @@ PRIVATE Void rgSCHDbmInitCrntRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitCrntRgrCfgLst) cmLListInit(&cellCb->rgCfgInfo.crntRgrCfgLst); RETVOID; @@ -1430,7 +1378,6 @@ PRIVATE Void rgSCHDbmInitPndngRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmInitPndngRgrCfgLst) cmLListInit(&cellCb->rgCfgInfo.pndngRgrCfgLst); RETVOID; @@ -1460,8 +1407,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmInsCrntRgrCfgElem) - cfgElem->cfgReqLstEnt.next = NULLP; cfgElem->cfgReqLstEnt.prev = NULLP; cmLListAdd2Tail(&cellCb->rgCfgInfo.crntRgrCfgLst, &cfgElem->cfgReqLstEnt); @@ -1492,7 +1437,6 @@ RgSchCellCb *cellCb; RgSchCfgElem *cfgElem; #endif { - TRC2(rgSCHDbmInsPndngRgrCfgElem) cfgElem->cfgReqLstEnt.next = NULLP; cfgElem->cfgReqLstEnt.prev = NULLP; @@ -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)); @@ -1710,9 +1647,7 @@ U16 maxRntis; U16 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) { @@ -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)), @@ -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,7 +1799,6 @@ RgSchCellCb *cellCb; RgSchRntiLnk *rntiLnk; #endif { - TRC2(rgSCHDbmRlsRnti) #ifdef EMTC_ENABLE if(ROK==rgSCHDbmPutEmtcRnti(cellCb,rntiLnk)) { @@ -1923,7 +1853,6 @@ U16 numBins; #endif { RgSchUePucchRecpInfo pucchInfo; - TRC2(rgSCHDbmInitUeTfuPendLst) /* Fix: syed It is better to compute offset dynamically * rather than hardcoding it as 0 */ @@ -1962,7 +1891,6 @@ S16 rgSCHDbmDeInitUeTfuPendLst(cellCb) RgSchCellCb *cellCb; #endif { - TRC2(rgSCHDbmDeInitUeTfuPendLst) cmHashListDeinit(&cellCb->ueTfuPendLst); 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) diff --git a/src/5gnrsch/rg_sch_drx.c b/src/5gnrsch/rg_sch_drx.c index 27efeb8f8..0b2dc1607 100755 --- a/src/5gnrsch/rg_sch_drx.c +++ b/src/5gnrsch/rg_sch_drx.c @@ -315,9 +315,6 @@ RgSchCellCb *cell; U16 dlIndex; U16 ulIndex; - TRC2(rgSCHDrxTtiInd ); - - dlIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE; @@ -400,8 +397,6 @@ U16 ulIndex; #endif { - TRC2(rgSCHDrxTtiHdlOnDur); - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) { @@ -468,8 +463,6 @@ U16 ulIndex; RgSchCmnCell *cellSch = NULLP; Bool delInUlScan = FALSE; - TRC2(rgSCHDrxTtiHdlInActv); - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { @@ -704,8 +697,6 @@ U16 ulIndex; RgSchUeCb *ue=NULLP; RgSchDrxUeCb *drxUe=NULLP; - TRC2(rgSCHDrxTtiHdlShortCycle ); - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) { @@ -800,8 +791,6 @@ U16 ulIndex; #endif /*ERRCLASS & ERRCLS_INT_PAR*/ - TRC2(rgSCHDrxTtiHdlDlHarq ); - rgSCHDrxTtiHdlDlHarqRTT(cell, dlIndex); rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex); @@ -861,10 +850,6 @@ U8 direction; RgSchCmnCell *cellSch = NULLP; Bool delInUlScan = FALSE; - - TRC2(rgSCHDrxStrtInActvTmr); - - if ( direction == RG_SCH_DRX_UL) { #ifndef LTE_TDD @@ -1049,8 +1034,6 @@ U8 tbCnt; U8 firstDlTxOcassion; U8 drxRetxTmrStartSf; #endif - TRC2(rgSCHDrxStartHarqRTTTmr); - drxCell = RG_SCH_DRX_GET_CELL(cell); drxHq = RG_SCH_DRX_GET_DL_HQ(hqP); @@ -1179,9 +1162,6 @@ S16 rgSCHDrxUeCfg (cell, ue, ueCfg) U8 cellIdx; - TRC2(rgSCHDrxUeCfg); - - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { @@ -1341,7 +1321,6 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) U32 numOfCycles; U32 nxtDist; - TRC3(rgSCHDrxGetNxtOnDur); #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) @@ -1445,7 +1424,6 @@ PRIVATE S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg) RgrUeDrxCfg *drxCfg; #endif { - TRC3(rgSCHDrxCpyUeCfg); #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( (ueCb == (RgSchDrxUeCb* )NULLP ) @@ -1529,8 +1507,6 @@ S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg) U16 curIndx; U8 cellIdx; - TRC2(rgSCHDrxUeReCfg); - /* drx was disabled but now enabled for this ue */ if ( (ue->isDrxEnabled == FALSE) @@ -1768,8 +1744,6 @@ Void rgSCHDrxUeHqReset(cell, ue, hqE, cellIdx) RgSchDrxDlHqProcCb *drxHq =NULLP; U8 i; - TRC2(rgSCHDrxUeHqReset); - for(i=0; i < hqE->numHqPrcs; i++) { hqP = &hqE->procs[i]; @@ -1839,7 +1813,6 @@ S16 rgSCHDrxUeDel (cell, ue) #ifdef EMTC_ENABLE RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); #endif - TRC2(rgSCHDrxUeDel); /* ccpu00129899: Moved the drx-enabled check to the caller */ @@ -1911,7 +1884,7 @@ S16 rgSCHDrxUeDel (cell, ue) * Function: rgSCHDrxCellCfg * * Processing steps: - * - Initializes the following drxQ (cmMemset would do). + * - Initializes the following drxQ (memset would do). * * * @param RgSchCellCb *cell @@ -1934,9 +1907,6 @@ S16 rgSCHDrxCellCfg (cell, cellCfg) S16 ret = ROK; Inst instIdx = cell->instIdx; - TRC2(rgSCHDrxCellCfg); - - #if ( ERRCLASS & ERRCLS_INT_PAR ) /*KWORK_FIX :Removed check for cell being NULL*/ if( (cellCfg == (RgrCellCfg* )NULLP)) @@ -2007,9 +1977,6 @@ Void rgSCHDrxCellDel (cell) { Inst instIdx = cell->instIdx; - TRC2(rgSCHCfgRgrCellDel); - - if (cell->drxCb) { /* ccpu00117052 - MOD - Passing double pointer @@ -2060,9 +2027,6 @@ S16 rgSCHDrxSrInd (cell, ue) { RgSchDrxUeCb *drxCb; - TRC2(rgSCHDrxSrInd); - - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { @@ -2129,9 +2093,6 @@ RgSchUeCb *ueCb; { RgSchDrxUeCb *drxCb; - TRC2(rgSCHDrxDedRa); - - drxCb = RG_SCH_DRX_GET_UE(ueCb); /* Mark the UE as active for UL & DL */ @@ -2193,7 +2154,6 @@ Bool calcFrmOffst; drxCell = cell->drxCb; drxUe = ueCb->drxCb; - TRC2(rgSCHDrxMvToNxtOnDurOcc) if(calcFrmOffst == FALSE) { @@ -2305,8 +2265,6 @@ PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) CmLteTimingInfo crntTime; /*!< current SFN & sf */ - TRC2(rgSCHDrxGetNxtTmrExpry); - #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( (cell == (RgSchCellCb* )NULLP) || @@ -2456,8 +2414,6 @@ PRIVATE Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx) CmLteTimingInfo tmrExpry; U16 tmrExpryInSf; /*timer expry in no of subframes*/ - TRC2(rgSCHDrxCalcNxtTmrExpry) - curTimeInSf = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot; @@ -2538,7 +2494,6 @@ U16 offSet; U16 startTime; U16 endTimeInSf; CmLteTimingInfo endTime; - TRC2(rgSCHCfgVldtTddDrxCycCfg) startTime = offSet; do @@ -2608,8 +2563,6 @@ U16 ulIndex; RgSchCmnCell *cellSch = NULLP; Bool delInUlScan = FALSE; - TRC2(rgSCHDrxTtiHdlOnDurUl) - drxCell = (cell->drxCb); delInUlScan = drxCell->delInUlScan; /*********************************************************** @@ -2755,7 +2708,6 @@ U16 dlIndex; * in the onDurationTmrExprQ. If !delInUlScan, then calculate the next * OnDuration occurence, q it there and remove it from the current location. */ - TRC2(rgSCHDrxTtiHdlOnDurDl) /*********************************************************** * Scanning OnDurationQ in DL ***********************************************************/ @@ -2942,8 +2894,6 @@ U16 dlIndex; U8 cellIdx; U32 dlInactvMask; - TRC2(rgSCHDrxTtiHdlDlHarqRTT); - drxCell = cell->drxCb; delInUlScan = drxCell->delInUlScan; @@ -3131,8 +3081,6 @@ U16 ulIndex; U32 ulInactvMask; - TRC2(rgSCHDrxTtiHdlUlHarqRTT); - drxCell = cell->drxCb; delInUlScan = drxCell->delInUlScan; diff --git a/src/5gnrsch/rg_sch_empty.c b/src/5gnrsch/rg_sch_empty.c index 10a80933b..bac9faf89 100644 --- a/src/5gnrsch/rg_sch_empty.c +++ b/src/5gnrsch/rg_sch_empty.c @@ -67,8 +67,6 @@ Void rgSCHCmnSpsInit Void rgSCHCmnSpsInit () #endif /* ANSI */ { - TRC2(rgSCHCmnSpsInit); - RETVOID; } @@ -99,8 +97,6 @@ RgSchErrInfo *err; #endif /* ANSI */ { - TRC2(rgSCHCmnSpsUeCfg); - return ROK; } @@ -131,8 +127,6 @@ RgSchErrInfo *err; #endif /* ANSI */ { - TRC2(rgSCHCmnSpsUeRecfg); - return ROK; } @@ -159,7 +153,6 @@ RgSchUeCb *ue; #endif /* ANSI */ { - TRC2(rgSCHCmnSpsUeDel); RETVOID; } @@ -188,7 +181,6 @@ RgSchErrInfo *err; #endif /* ANSI */ { - TRC2(rgSCHCmnSpsCellCfg); return ROK; } @@ -213,7 +205,6 @@ RgSchCellCb *cell; #endif /* ANSI */ { - TRC2(rgSCHCmnSpsCellDel); RETVOID; } @@ -246,7 +237,6 @@ RgSchErrInfo *err #endif /* ANSI */ { - TRC2(rgSCHCmnSpsDlLcCfg); return ROK; } @@ -256,7 +246,6 @@ RgSchUeCb *ue, RgSchCellCb *cell )) { - TRC2(rgSchCmnDlSfHqDel); RETVOID; } @@ -269,7 +258,6 @@ RgSchErrInfo *err )) { - TRC2(rgSCHCmnSpsDlLcRecfg); return ROK; } @@ -279,7 +267,6 @@ RgSchUeCb *ue, RgSchLcgCb *lcg )) { - TRC2(rgSCHCmnSpsUlLcgDel); RETVOID; } @@ -289,7 +276,6 @@ RgSchUeCb *ue, RgSchDlLcCb *dlLc )) { - TRC2(rgSCHCmnSpsUlLcgDel); RETVOID; } @@ -299,7 +285,6 @@ RgSchCmnUlRbAllocInfo *allocInfo )) { - TRC2(rgSCHCmnSpsUlTti); return ROK; } @@ -310,7 +295,6 @@ RgSchDlLcCb *dlLc )) { - TRC2(rgSCHCmnSpsDlDedBoUpd); RETVOID; } @@ -320,7 +304,6 @@ RgSchDlHqProcCb *hqP )) { - TRC2(rgSCHCmnSpsDlProcAddToRetx); RETVOID; } @@ -331,7 +314,6 @@ CmLteTimingInfo timingInfo )) { - TRC2(rgSCHCmnSpsDlCqiIndHndlr); RETVOID; } @@ -341,7 +323,6 @@ RgSchUeCb *ue )) { - TRC2(rgSCHCmnSpsUlCqiInd); return ROK; } @@ -352,7 +333,6 @@ RgSchLcgCb *ulLcg )) { - TRC2(rgSCHCmnSpsBsrRpt); return ROK; } @@ -362,7 +342,6 @@ RgSchUeCb *ue )) { - TRC2(rgSCHCmnSpsPhrInd); RETVOID; } @@ -373,7 +352,6 @@ Bool isAck )) { - TRC2(rgSCHCmnSpsDlRelPdcchFbk); RETVOID; } @@ -383,7 +361,6 @@ RgSchDlHqProcCb *hqP )) { - TRC2(rgSCHCmnSpsDlProcAck); RETVOID; } @@ -393,7 +370,6 @@ RgSchUeCb *ue )) { - TRC2(rgSCHCmnSpsDlUeReset); RETVOID; } @@ -403,7 +379,6 @@ RgSchUeCb *ue )) { - TRC2(rgSCHCmnSpsUlUeReset); RETVOID; } @@ -414,7 +389,6 @@ Bool isExplRel )) { - TRC2(rgSCHCmnSpsUlProcRelInd); RETVOID; } @@ -425,7 +399,6 @@ U16 spsSduSize )) { - TRC2(rgSCHCmnSpsUlProcActInd); RETVOID; } @@ -436,7 +409,6 @@ CmLteTimingInfo crcTime )) { - TRC2(rgSCHCmnSpsUlProcActInd); return ROK; } @@ -447,7 +419,6 @@ CmLteTimingInfo dtxTime )) { - TRC2(rgSCHCmnSpsUlProcDtxInd); return ROK; } @@ -458,7 +429,6 @@ RgSchDlSf *dlSf )) { - TRC2(rgSCHCmnSpsUlProcDtxInd); RETVOID; } diff --git a/src/5gnrsch/rg_sch_ex_ms.c b/src/5gnrsch/rg_sch_ex_ms.c index 2b2a59ce7..d08e840ea 100755 --- a/src/5gnrsch/rg_sch_ex_ms.c +++ b/src/5gnrsch/rg_sch_ex_ms.c @@ -85,8 +85,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(schActvTsk) - switch(pst->srcEnt) { /* The originator of this message is the stack manager, diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index c0b5a1d2c..b70e203a1 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -160,7 +160,6 @@ RgrCfgReqInfo *cfgReqInfo; Inst inst = (instCb->rgSchInit.inst ); #endif - TRC2(rgSCHGomHndlCfg); /* Apply the configuration for Cell Configuration or Delete */ if (cfgReqInfo->action != RGR_RECONFIG) { @@ -270,7 +269,6 @@ RgrCfgReqInfo *cfgReqInfo; #ifdef DEBUGP Inst inst = (instCb->rgSchInit.inst ); #endif - TRC2(rgSCHGomCfgReq); #ifdef EMTC_ENABLE printf("\n AT MAC rgSCHGomCfgReq \n"); #endif @@ -394,8 +392,6 @@ RgrCfgReqInfo *rgrCfgReq; CmLteTimingInfo actvTime; Inst inst = cell->instIdx; - TRC2(rgSCHGomEnqCfgReq); - /* Allocate memory for config Element */ ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem)); if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP)) @@ -404,7 +400,7 @@ RgrCfgReqInfo *rgrCfgReq; } /* Initialize the configuration element */ - cmMemcpy((U8*)rgrCfgElem->rgrCfg.transId.trans,(U8*)transId.trans, + memcpy(rgrCfgElem->rgrCfg.transId.trans,transId.trans, sizeof(transId.trans)); rgrCfgElem->rgrCfg.reg = reg; rgrCfgElem->rgrCfg.pool = pool; @@ -503,7 +499,6 @@ SpId spId; { RgSchCfgElem *cfgElem; Inst inst= cell->instIdx; - TRC2(rgSCHGomTtiHndlr); /* Dequeue from current config list */ while ((cfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP) @@ -577,8 +572,6 @@ RgSchErrInfo *errInfo; Inst inst = (instCb->rgSchInit.inst ); RgSchUeCb *ue; - TRC2(rgSCHGomHndlCfgReq); - errInfo->errType = RGSCHERR_GOM_CFG_REQ; /* Validate and process the configuration request */ @@ -706,7 +699,6 @@ U8 action; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst); - TRC2(rgSCHGomHndlSCellActDeactReq); RGSCHDBGPRM(inst,(rgSchPBuf(inst), "Processing RGR SCell Actication request:" "%d\n", sCellActDeactEvnt->crnti)); @@ -784,8 +776,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst ); - TRC2(rgSCHGomHndlRecfgReq); - errInfo->errType = RGSCHERR_GOM_RECFG_REQ; /* Validate and process the re-configuration request */ @@ -897,9 +887,6 @@ RgSchErrInfo *errInfo; Inst inst = (instCb->rgSchInit.inst ); RgSchUeCb *ue = NULLP; - TRC2(rgSCHGomHndlResetReq); - - errInfo->errType = RGSCHERR_GOM_RESET_REQ; /* Validate and process the UE reset request */ @@ -968,8 +955,6 @@ RgSchErrInfo *errInfo; #endif VOLATILE U32 startTime=0; - TRC2(rgSCHGomHndlDelReq); - errInfo->errType = RGSCHERR_GOM_DEL_REQ; if(instCb->rgrSap[spId].cell == NULLP) @@ -1066,9 +1051,6 @@ CmLteCellId *cellId; #endif { - TRC2(rgSCHGomGetCellIdFrmCfgReq); - - /* Extract CellId depending on the action and Config Type in the Request * As of now this function is called for only re configuration so removed * othe CASES below if needed we can add them*/ @@ -1164,8 +1146,6 @@ RgrSiCfgReqInfo *cfgReqInfo; U8 nPrb = 0; U8 mcs = 0; - TRC2(rgSCHGomHndlSiCfg); - /* check if cell does not exists */ if (((U8 *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId)) @@ -1252,7 +1232,7 @@ RgrSiCfgReqInfo *cfgReqInfo; return RFAILED; } - cmMemset((U8*)padding,(U8)0,nmPadBytes); + memset(padding,0,nmPadBytes); #ifdef MS_MBUF_CORRUPTION MS_BUF_ADD_ALLOC_CALLER(); @@ -1475,8 +1455,6 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; U8 isEmtc = warningSiCfgReqInfo->emtcEnable; #endif - TRC2(rgSCHGomHndlWarningSiCfg); - #ifdef EMTC_ENABLE if(TRUE == isEmtc) { @@ -1661,8 +1639,6 @@ SpId spId; RgSchWarningSiPdu *warningSiPdu; Buffer *pdu; - TRC3(rgSCHGomHndlWarningSiStopReq) - for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++) { if(cell->siCb.warningSi[idx].siId == siId) @@ -1730,8 +1706,6 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) CmLList *n; S16 ret = RFAILED; - TRC2(rgSchUpdtRNTPInfo); - l = &sf->sfrTotalPoolInfo.ccPool; /*Get the first node from the CC Pool*/ @@ -1802,9 +1776,6 @@ S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) RgSchErrInfo errInfo; U16 i; - TRC2(rgSCHGomHndlLoadInf); - - /* check if cell does not exists */ if (((U8 *)cell == NULLP) || (cell->cellId != loadInfReq->cellId)) { diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c index aab1b4d01..232428f38 100755 --- a/src/5gnrsch/rg_sch_hdfdd.c +++ b/src/5gnrsch/rg_sch_hdfdd.c @@ -107,7 +107,6 @@ Bool hdFddEnbl; #endif /* ANSI */ { U8 sfi; - TRC3(rgSCHHdFddUeCfg) RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): UeId =%d hdFddEnbl=%d", @@ -207,7 +206,6 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif /* ANSI */ { - TRC3(rgSCHHdFddUeDel) RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, " rgSCHHdFddUeDel(): UeId =%d hdFdd=%x", @@ -267,7 +265,6 @@ RgSchCellCb *cellCb; RgSchUePCqiCb *cqiCb = NULLP; RgSchUePCqiCb *riCb = NULLP; - TRC3(rgSCHCmnHdFddPtUlMrk) timeInfo = cellCb->crntTime; @@ -395,8 +392,6 @@ U8 *allow; RgSchDlSf *sf = NULLP; /* Dl subframe info */ U8 ulOffset - TRC3(rgSCHCmnHdFddChkUlAllow) - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, " rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId); @@ -565,8 +560,6 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ CmLteTimingInfo timeInfo; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkDlAllow) - *allow = FALSE; timeInfo = cellCb->crntTime; @@ -724,8 +717,6 @@ Bool *sndNACK; RgSchDlSf *sf; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkNackAllow) - /* Information in timeInfo contains (n+DL_DELTA) th subframe info*/ *sndNACK = FALSE; @@ -800,9 +791,6 @@ RgSchUeCb *ueCb; CmLteTimingInfo timeInfo; U8 ulOffset; - TRC3(rgSCHCmnHdFddUpdULMark) - - ulOffset = RGSCH_PDCCH_PUSCH_DELTA - TFU_CRCIND_ULDELTA + RGSCH_PDCCH_PUSCH_DELTA; RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, timeInfo, ulOffset) @@ -882,8 +870,6 @@ RgSchUeCb *ueCb; U16 sfi; CmLteTimingInfo timeInfo; - TRC3(rgSCHCmnHdFddUpdDLMark) - timeInfo = cellCb->crntTime; RGSCH_INCR_SUB_FRAME(timeInfo, RG_SCH_CMN_DL_DELTA); @@ -953,7 +939,6 @@ Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) U16 tempSfn; S16 tempSfCount; - TRC3(rgSCHHdFddGetSfn) if(((S16)(timeInfo.subframe) + offset) >= RGSCH_NUM_SUB_FRAMES) { /* Increament to number of times of SFNs that can be possible diff --git a/src/5gnrsch/rg_sch_inf.c b/src/5gnrsch/rg_sch_inf.c index 88aacb195..f288719f5 100755 --- a/src/5gnrsch/rg_sch_inf.c +++ b/src/5gnrsch/rg_sch_inf.c @@ -72,8 +72,6 @@ RgInfUeDelInd* ueDelInd; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchUeDelInd) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -123,8 +121,6 @@ Buffer *mBuf; { RgInfUeDelInd ueDelInd; - TRC2(cmUnpkMacSchUeDelInd) - if(SRemPreMsgMult((Data *)&ueDelInd, sizeof(RgInfUeDelInd), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -164,7 +160,6 @@ RgInfDedBoRpt* boRpt; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchDedBoUpdtReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -214,8 +209,6 @@ Buffer *mBuf; { RgInfDedBoRpt boRpt; - TRC2(cmUnpkMacSchDedBoUpdtReq) - if(SRemPreMsgMult((Data *)&boRpt, sizeof(RgInfDedBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -252,7 +245,6 @@ RgInfCmnBoRpt* boRpt; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchCmnBoUpdtReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -302,8 +294,6 @@ Buffer *mBuf; { RgInfCmnBoRpt boRpt; - TRC2(cmUnpkMacSchCmnBoUpdtReq) - if(SRemPreMsgMult((Data *)&boRpt, sizeof(RgInfCmnBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -340,7 +330,6 @@ RgInfSfDatInd* datInd; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchSfRecpInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -387,8 +376,6 @@ Buffer *mBuf; { RgInfSfDatInd* datInd; - TRC2(cmUnpkMacSchCmnBoUpdtReq) - if(oduUnpackPointer((PTR *)&datInd, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -427,8 +414,6 @@ RgInfSpsRelInfo* relInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchSpsRelInd) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -472,8 +457,6 @@ Buffer *mBuf; { RgInfSpsRelInfo *relInfo; - TRC2(cmUnpkMacSchSpsRelInd) - if(oduUnpackPointer((PTR *)&relInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -514,7 +497,6 @@ RgInfSfAlloc* resAllocReq; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacSfAllocReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -561,8 +543,6 @@ Buffer *mBuf; { RgInfSfAlloc* resAllocReq; - TRC2(cmUnpkSchMacSfAllocReq) - if(oduUnpackPointer((PTR *)&resAllocReq, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -597,7 +577,6 @@ RgInfResetHqEnt* hqEntInfo #endif { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacRstHqEntReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -641,8 +620,6 @@ Buffer *mBuf { RgInfResetHqEnt* hqEntRstInfo; - TRC2(cmUnpkSchMacRstHqEntReq) - if(oduUnpackPointer((PTR *)&hqEntRstInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -680,7 +657,6 @@ RgInfRlsHqInfo* sfHqInfo; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacRlsHqReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -726,8 +702,6 @@ Buffer *mBuf; { RgInfRlsHqInfo* sfHqInfo; - TRC2(cmUnpkSchMacRlsHqReq) - if(oduUnpackPointer((PTR *)&sfHqInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -764,7 +738,6 @@ RgInfRlsRnti* rlsRnti; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacRlsRntiReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -813,8 +786,6 @@ Buffer *mBuf; { RgInfRlsRnti rlsRnti; - TRC2(cmUnpkSchMacRlsRntiReq) - if(SRemPreMsgMult((Data *)&rlsRnti, sizeof(RgInfRlsRnti), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -852,7 +823,6 @@ RgInfCellReg* regReq; #endif { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacCellRegReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; @@ -901,8 +871,6 @@ Buffer *mBuf; { RgInfCellReg regReq; - TRC2(cmUnpkSchMacCellRegReq) - if(SRemPreMsgMult((Data *)®Req, sizeof(RgInfCellReg), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -939,8 +907,6 @@ RgInfLcgRegReq *lcgRegReq; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacLcgRegReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -984,8 +950,6 @@ Buffer *mBuf; { RgInfLcgRegReq *lcgRegReq; - TRC2(cmUnpkSchMacLcgRegReq) - if(oduUnpackPointer((PTR *)&lcgRegReq, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -1024,8 +988,6 @@ RgInfSpsLcInfo *lcInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacSpsLcRegReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1066,8 +1028,6 @@ RgInfUlSpsReset *ulSpsResetInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacUlSpsResetReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1111,8 +1071,6 @@ Buffer *mBuf; { RgInfSpsLcInfo *lcInfo; - TRC2(cmUnpkSchMacSpsLcRegReq) - if(oduUnpackPointer((PTR *)&lcInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -1154,8 +1112,6 @@ Buffer *mBuf; { RgInfUlSpsReset *ulSpsResetInfo; - TRC2(cmUnpkSchMacUlSpsResetReq) - if(oduUnpackPointer((PTR *)&ulSpsResetInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -1197,8 +1153,6 @@ CmLteRnti crnti; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacSpsLcDeregReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1240,8 +1194,6 @@ Buffer *mBuf; CmLteCellId cellId; CmLteRnti crnti; - TRC2(cmUnpkSchMacSpsLcDeregReq) - CMCHKUNPK(cmUnpkLteRnti, &crnti, mBuf); CMCHKUNPK(cmUnpkLteCellId, &cellId, mBuf); @@ -1278,8 +1230,6 @@ RgInfL2MeasReq *measInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacL2MeasReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1319,8 +1269,6 @@ RgInfL2MeasStopReq *measInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacL2MeasStopReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1359,8 +1307,7 @@ RgInfL2MeasSndReq *measInfo; { Buffer *mBuf = NULLP; - TRC2(cmPkSchMacL2MeasSendReq) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { + if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1403,8 +1350,6 @@ Buffer *mBuf; { RgInfL2MeasReq measInfo; - TRC2(cmUnpkSchMacL2MeasReq) - if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasReq), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -1444,7 +1389,6 @@ Buffer *mBuf; { RgInfL2MeasStopReq measInfo; - TRC2(cmUnpkSchMacL2MeasStopReq) if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasStopReq), mBuf) != ROK) { SPutMsg(mBuf); @@ -1483,7 +1427,6 @@ Buffer *mBuf; { RgInfL2MeasSndReq measInfo; - TRC2(cmUnpkSchMacL2MeasSendReq) if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasSndReq), mBuf) != ROK) { SPutMsg(mBuf); @@ -1520,8 +1463,6 @@ RgInfL2MeasCfm *measCfm; { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchL2MeasCfm) - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1563,7 +1504,6 @@ RgInfL2MeasCfm *measCfm; { Buffer *mBuf = NULLP; - TRC2(cmPkMacSchL2MeasStopCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } @@ -1606,8 +1546,6 @@ Buffer *mBuf; { RgInfL2MeasCfm measCfm; - TRC2(cmUnpkMacSchL2MeasCfm) - if(SRemPreMsgMult((Data *)&measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); @@ -1647,8 +1585,6 @@ Buffer *mBuf; { RgInfL2MeasCfm measCfm; - TRC2(cmUnpkMacSchL2MeasStopCfm) - if(SRemPreMsgMult((Data *)&measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { SPutMsg(mBuf); diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c index 3635db823..b23df0ccc 100755 --- a/src/5gnrsch/rg_sch_l2m.c +++ b/src/5gnrsch/rg_sch_l2m.c @@ -107,8 +107,6 @@ U32 measTime; U8 qciVal = 0; U32 sampOc = 0; - TRC3(rgSchFillL2MeasCfm) - measInfo = &measCb->measReq; cfm->hdr.transId = measInfo->hdr.transId; @@ -337,9 +335,7 @@ Bool isErr; { LrgSchMeasCfmInfo cfm; - TRC3(rgSchL2mSndCfm) - - cmMemset((U8 *)&cfm, (U8)0, sizeof(LrgSchMeasCfmInfo)); + memset(&cfm, 0, sizeof(LrgSchMeasCfmInfo)); cfm.hdr.transId = measInfo->hdr.transId; cfm.measType = measInfo->measType; cfm.cellId = measInfo->cellId; @@ -380,10 +376,6 @@ LrgSchMeasReqInfo *measInfo; #endif { - - TRC3(rgSchL2mFillCfmPst) - - cfmPst->srcEnt = pst->dstEnt; cfmPst->srcInst = pst->dstInst; cfmPst->srcProcId = pst->dstProcId; @@ -431,7 +423,6 @@ LrgSchMeasReqInfo *measInfo; RgSchL2MeasCb *oldMeasCb; U32 diffTime; - TRC3(rgSchL2mInsertMeasCb) /* * 1. Check if l2mList has any entries. * 2. If yes @@ -491,8 +482,6 @@ RgSchCellCb *cell; U8 idx; #endif - TRC3(rgSchL2CalDlPrbCount) - frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -535,8 +524,6 @@ RgSchCellCb *cell; U8 idx; #endif - TRC3(rgSchL2CalUlPrbCount) - #ifdef LTE_TDD idx = cellUl->schdIdx; if(idx < cellUl->numUlSubfrms) @@ -578,7 +565,6 @@ RgSchErrInfo err; RgSchL2MeasCb *measCb = NULLP; Inst inst = cell->instIdx; UNUSED(err); - TRC3(rgSchL2mAllocMeasCb) if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb, sizeof(RgSchL2MeasCb))) == RFAILED) @@ -587,7 +573,7 @@ RgSchErrInfo err; "Allocation of RgSchL2MeasCb failed"); return (NULLP); } - cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(LrgSchMeasReqInfo)); + memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo)); RGSCHCPYTIMEINFO(cell->crntTime, measCb->startTime); measCb->dlTotalBw = 0; @@ -633,7 +619,6 @@ RgSchErrInfo err; U8 idx; U8 qciVal; - TRC3(rgSchL2mMeasReq) qciVal = 0; if ((measCb = rgSchL2mAllocMeasCb(cell, measInfo, err)) == NULLP) @@ -644,7 +629,7 @@ RgSchErrInfo err; "Allocation of RgSchL2MeasCb failed"); return RFAILED; } - /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\ + /*memcpy(&measCb->measReq, measInfo,\ sizeof(LrgSchMeasReqInfo));*/ rgSchL2mInsertMeasCb(cell, measCb, measInfo); @@ -681,7 +666,7 @@ RgSchErrInfo err; { RgInfL2MeasReq measReq; Pst pst; - cmMemset((U8 *)&measReq, 0, sizeof(RgInfL2MeasReq)); + memset(&measReq, 0, sizeof(RgInfL2MeasReq)); measReq.transId = measInfo->hdr.transId; measReq.measType = measInfo->measType; measReq.timePrd = measInfo->timePrd; @@ -737,10 +722,9 @@ U8 isCalrCrcInd U32 numDlSf; U32 numUlSf; #endif - TRC3(rgSCHL2Meas) - node = cell->l2mList.first; - cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); + node = cell->l2mList.first; + memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); while(node != NULLP) { measCb = (RgSchL2MeasCb *)node->node; @@ -809,7 +793,7 @@ U8 isCalrCrcInd } RgMiLrgSchL2MeasCfm(&(rgSchCb[cell->instIdx].rgSchInit.lmPst), &measCfm); - cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); + memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); /* Delete this measCb from the list */ if(measCb->measReq.timePrd > 0) @@ -823,7 +807,7 @@ U8 isCalrCrcInd measCb->startTime = cell->crntTime; measCb->sfnCycle = 0; measCb->cfmRcvd = FALSE; - cmMemset((U8 *)&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm)); + memset(&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm)); cell->sndL2Meas = FALSE; } /* ccpu00117052 - MOD - Passing double pointer diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 9903a9f30..8f0654665 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -139,8 +139,6 @@ Elmnt sapType; /* SAP Type */ RgSchUpSapCfgInfo *upSapCfg = NULLP; Inst inst = (dInst - SCH_INST_START); - TRC2(rgSCHLmmSapCfg) - /* Check if Gen Config has been done */ switch(sapType) @@ -214,8 +212,8 @@ Elmnt sapType; /* SAP Type */ lowSapCfg->sapPst.prior = cfg->s.schInstCfg.tfuSap[sapIdx].prior; lowSapCfg->suId = cfg->s.schInstCfg.tfuSap[sapIdx].suId; lowSapCfg->spId = cfg->s.schInstCfg.tfuSap[sapIdx].spId; - cmMemcpy((U8 *)&lowSapCfg->bndTmr, - (U8 *)&cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr, + memcpy(&lowSapCfg->bndTmr, + &cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr, sizeof(TmrCfg)); break; case STRGMSAP: @@ -299,8 +297,6 @@ Inst inst; RgSchClcBoRpt *bo = NULL; #endif - TRC2(rgSCHLmmShutdown) - #ifdef LTE_L2_MEAS for (idx = 0; idx < instCb->numSaps; idx++) { @@ -453,7 +449,6 @@ Pst *cfmPst; #endif { Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */ - TRC2(rgSCHLmmGenCntrl) cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -469,8 +464,8 @@ Pst *cfmPst; /* Enable Unsolicited Status (alarms) */ rgSchCb[inst].rgSchInit.usta = TRUE; /*Store the response and TransId for sending the Alarms */ - cmMemcpy((U8 *)&rgSchCb[inst].genCfg.ustaResp.response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgSchCb[inst].genCfg.ustaResp.response, + &cntrl->hdr.response, sizeof(Resp)); rgSchCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId; break; case SADBG: @@ -498,8 +493,8 @@ Pst *cfmPst; * L2 * statistics * */ - cmMemset((U8 *)&hqRetxStats, 0, sizeof(RgSchHqRetxStats)); - cmMemset((U8 *)&hqFailStats, 0, sizeof(RgSchNackAckStats)); + memset(&hqRetxStats, 0, sizeof(RgSchHqRetxStats)); + memset(&hqFailStats, 0, sizeof(RgSchNackAckStats)); #endif break; } @@ -585,7 +580,6 @@ Pst *cfmPst; /* TODO Pass InstId instead of using InstId from cfmPst */ Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance Id */ - TRC2(rgSCHLmmSapCntrl) /* Only TFU SAP can be controlled by LM */ switch(cntrl->hdr.elmId.elmnt) @@ -620,8 +614,8 @@ Pst *cfmPst; rgSchCb[inst].tfuSap[idx].numBndRetries++; /* Store the response and TransId for sending * the Control confirm */ - cmMemcpy((U8 *)&rgSchCb[inst].genCfg.bndCfmResp[idx].response, - (U8 *)&cntrl->hdr.response, sizeof(Resp)); + memcpy(&rgSchCb[inst].genCfg.bndCfmResp[idx].response, + &cntrl->hdr.response, sizeof(Resp)); rgSchCb[inst].genCfg.bndCfmResp[idx].transId = cntrl->hdr.transId; @@ -675,7 +669,7 @@ Pst *cfmPst; (PTR)&rgSchCb[inst].tfuSap[idx]); } } - cmMemset((U8 *)&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb)); + memset(&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb)); rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -698,7 +692,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb)); + memset(&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb)); rgSchCb[inst].rgrSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -721,7 +715,7 @@ Pst *cfmPst; switch(cntrl->t.cntrl.action) { case ADEL: - cmMemset((U8 *)&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb)); + memset(&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb)); rgSchCb[inst].rgmSap[idx].sapSta.sapState = LRG_NOT_CFG; cfm->cfm.status = LCM_PRIM_OK; cfm->cfm.reason = LCM_REASON_NOT_APPL; @@ -776,8 +770,6 @@ RgMngmt *cfm; { Inst inst; - TRC2(SchFillCfmPst) - inst = (reqPst->dstInst - SCH_INST_START); cfmPst->srcEnt = ENTMAC; @@ -832,12 +824,10 @@ PTR cb; /* Entry for which Timer Expired */ CmTmrArg arg; /* Inst dInst = inst + SCH_INST_START; */ - TRC2(rgSCHLmmStartTmr) - UNUSED(tmrEvnt); /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgSchCb[inst].tmrTqCp; arg.tq = rgSchCb[inst].tmrTq; @@ -890,8 +880,6 @@ PTR cb; /* Entry for which Timer Expired */ U8 i; S16 ret; - TRC2(rgSCHLmmStopTmr) - ret = RFAILED; for(i=0;itmrBlk.tmrEvnt == tmrEvnt) { /* Initialize the arg structure */ - cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg)); + memset(&arg, 0, sizeof(CmTmrArg)); arg.tqCp = &rgSchCb[inst].tmrTqCp; arg.tq = rgSchCb[inst].tmrTq; @@ -955,7 +943,6 @@ S16 tmrEvnt; /* Timer Event */ #ifdef DEBUGP Inst inst = tfuSap->cell->instIdx; #endif - TRC2(rgSCHLmmTmrExpiry) switch(tmrEvnt) @@ -1032,8 +1019,6 @@ U8 status; /* Status */ Pst cfmPst; Inst inst = (pst->dstInst - SCH_INST_START); /* scheduler instance */ - TRC2(rgSCHLmmBndCfm) - /* check the SAP State */ switch(rgSchCb[inst].tfuSap[suId].sapSta.sapState) @@ -1054,7 +1039,7 @@ U8 status; /* Status */ cfmPst.region = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.region; cfmPst.pool = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.pool; - cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt)); + memset(&cntrlCfm, 0, sizeof(RgMngmt)); switch(status) { @@ -1132,14 +1117,12 @@ RgUstaDgn *dgn; { RgMngmt usta; - TRC2(rgSCHLmmStaInd) - if(rgSchCb[inst].rgSchInit.usta == FALSE) { return ROK; } - cmMemset((U8 *)&usta, 0, sizeof(RgMngmt)); + memset(&usta, 0, sizeof(RgMngmt)); SGetDateTime(&usta.t.usta.cmAlarm.dt); usta.t.usta.cmAlarm.category = category; @@ -1147,7 +1130,7 @@ RgUstaDgn *dgn; usta.t.usta.cmAlarm.cause = cause; if (dgn != NULLP) { - cmMemcpy((U8 *)&usta.t.usta.dgn, (U8 *)dgn, sizeof(RgUstaDgn)); + memcpy(&usta.t.usta.dgn, dgn, sizeof(RgUstaDgn)); } rgSchCb[inst].rgSchInit.lmPst.selector = @@ -1195,7 +1178,6 @@ Inst inst; #endif { Inst schInst = (inst - SCH_INST_START); - TRC2(schActvTmr) /* Check if any timer in the scheduler instance has expired */ cmPrcTmr(&rgSchCb[schInst].tmrTqCp, diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c index bdd694e14..a8e339270 100755 --- a/src/5gnrsch/rg_sch_mga.c +++ b/src/5gnrsch/rg_sch_mga.c @@ -139,9 +139,6 @@ RgrUeCfg *ueCfg; #endif { - TRC2(rgSCHMeasGapANRepUeCfg); - - ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled; if (ueCfg->ueMesGapCfg.isMesGapEnabled) @@ -219,9 +216,6 @@ RgrUeRecfg *ueRecfg; RgrUeAckNackRepCfg *ackNackReCfg = &(ueRecfg->ueAckNackRecfg); RgSchUeAckNakRepCb *ackNakRepCb = &(ue->ackNakRepCb); - TRC2(rgSCHMeasGapANRepUeRecfg); - - reCfg = &(ueRecfg->ueMeasGapRecfg); ueMeasCb = &(ue->measGapCb); @@ -322,8 +316,6 @@ RgrUeMeasGapCfg *cfg; #endif { - TRC2(rgSCHMeasGapANRepUtlAddUe); - switch (cfg->gapPrd) { case RG_MEAS_GAPPRD_40: @@ -374,8 +366,6 @@ RgSchUeCb *ue; #endif { - TRC2(rgSCHMeasGapANRepUtlRmvUe); - switch (ue->measGapCb.gapPrd) { case RG_MEAS_GAPPRD_40: @@ -438,9 +428,6 @@ Bool isUeDel; #endif { - - TRC2(rgSCHMeasGapANRepUeDel); - if (ue->measGapCb.isMesGapEnabled) { rgSCHMeasGapANRepUtlRmvUe (cell, ue); @@ -525,8 +512,6 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC3(rgSchAckNackRepUtlRmvUe); - for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++) { hqP = &hqEnt->procs[hqIdx]; @@ -632,8 +617,6 @@ RgSchCellCb *cell; RgSchDlSf *dlSf; CmLteTimingInfo repTime; - TRC2(rgSCHMeasGapANRepTtiHndl); - /* Measurement GAP Starts at offSet - however at MAC we are concerned at * subframe + TFU_DELTA. */ @@ -714,8 +697,6 @@ CmLListCp *ackNackRepQ; CmLList *node; RgSchUeCb *ue; - TRC2(rgSchAckNackRepUtlHdlTti); - node = ackNackRepQ->first; while (node) { @@ -761,8 +742,6 @@ CmLListCp *measGapQ; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHMeasGapANRepUtlHdlTti); - node = measGapQ->first; while (node) { @@ -849,8 +828,6 @@ CmLListCp *dlInactvUeLst; RgSchDlHqTbCb *tbCb; U32 i; - TRC2(rgSCHMeasGapANRepGetDlInactvUe); - schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA; #ifdef LTE_TDD @@ -1058,8 +1035,6 @@ CmLListCp *ulInactvUeLst; RgSchDlHqTbCb *tbCb; U32 i; - TRC2(rgSCHMeasGapANRepGetUlInactvUe); - /*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/ schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \ TFU_ULCNTRL_DLDELTA; @@ -1221,7 +1196,6 @@ U8 tmrEvnt; { RgSchCellCb *cell = ue->cell; - TRC2(rgSCHMeasGapANRepDlInactvTmrExpry); switch (tmrEvnt) { @@ -1280,7 +1254,6 @@ U8 tmrEvnt; #endif { RgSchCellCb *cell = ue->cell; - TRC2(rgSCHMeasGapANRepUlInactvTmrExpry); switch (tmrEvnt) { @@ -1332,8 +1305,6 @@ RgSchUeCb *ue; #endif { - TRC2(rgSCHMeasGapANRepTmrExpry); - ue->measGapCb.isMeasuring = FALSE; cmInitTimers (&ue->measGapCb.measGapTmr, 1); @@ -1373,8 +1344,6 @@ RgSchUeCb *ue; #endif { - TRC2(rgSCHAckNakRepTmrExpry); - ue->ackNakRepCb.isAckNakRep = FALSE; cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1); @@ -1432,8 +1401,6 @@ RgSchDlSf *crntDlSf; RgSchDlHqTbCb *tbCb; U32 i; - TRC2(rgSCHAckNakRepAddToQ); - node = crntDlSf->ueLst.first; while (node) { @@ -1505,7 +1472,6 @@ U8 repCnt; S16 idx; S8 diff; - TRC2(rgSCHAckNakRepFindUlDuration) rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms); RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms); diff = repCnt-1; @@ -1558,7 +1524,6 @@ CmLteTimingInfo crntDlTime; U8 *noSubfrms; #endif { - TRC2(rgSCHAckNakRepGetUlOffsetFrmDl) if(dlSf->dlFdbkInfo.sfnOffset != 0) { diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c index 55df2204d..b8ff43b77 100755 --- a/src/5gnrsch/rg_sch_pt.c +++ b/src/5gnrsch/rg_sch_pt.c @@ -263,8 +263,6 @@ RgInfCellReg* regReq; #endif { - TRC3(RgSchMacCellReg); - return ((*RgSchMacCellRegReqMt[0])(pst, regReq)); } @@ -295,8 +293,6 @@ RgInfDedBoRpt* boRpt; #endif { - TRC3(RgMacSchDedBoUpdt); - return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); } @@ -327,8 +323,6 @@ RgInfCmnBoRpt* boRpt; #endif { - TRC3(RgMacSchCmnBoUpdt); - return ((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt)); } @@ -359,8 +353,6 @@ RgInfUeDelInd* ueDelInd; #endif { - TRC3(RgMacSchUeDel); - return ((*RgMacSchUeDelIndMt[0])(pst, ueDelInd)); } /*Fix: end: Inform UE delete to scheduler*/ @@ -391,8 +383,6 @@ RgInfSfDatInd* datInd; #endif { - TRC3(RgMacSchSfRecp); - return ((*RgMacSchSfRecpIndMt[0])(pst, datInd)); } @@ -423,8 +413,6 @@ RgInfSfAlloc* resAllocReq; #endif { - TRC3(RgSchMacSfAlloc); - return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); } @@ -453,8 +441,6 @@ RgInfResetHqEnt* hqEntInfo; #endif { - TRC3(RgSchMacRstHqEnt) - return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); } @@ -485,8 +471,6 @@ RgInfRlsHqInfo* sfHqInfo; #endif { - TRC3(RgSchMacRlsHq); - return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); } @@ -517,8 +501,6 @@ RgInfRlsRnti* rlsRnti; #endif { - TRC3(RgSchMacRlsRnti); - return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); } @@ -547,8 +529,6 @@ RgInfLcgRegReq *lcgRegReq; #endif { - TRC3(RgSchMacLcgReg); - return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); } /* end of RgSchMacLcgReg */ @@ -579,8 +559,6 @@ RgInfSpsRelInfo* relInfo; #endif { - TRC3(RgMacSchS); - return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); } /* end of RgMacSchSpsRel */ @@ -609,8 +587,6 @@ RgInfSpsLcInfo *lcInfo; #endif { - TRC3(RgSchMacSpsLcReg); - return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); } /* end of RgSchMacSpsLcReg */ @@ -641,8 +617,6 @@ RgInfUlSpsReset *ulSpsResetInfo; #endif { - TRC3(RgSchMacUlSpsReset); - return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); } /* end of RgSchMacUlSpsReset */ @@ -675,8 +649,6 @@ CmLteRnti crnti; #endif { - TRC3(RgSchMacSpsLcDereg); - return ((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti)); } /* end of RgSchMacSpsLcDereg */ @@ -707,8 +679,6 @@ RgInfL2MeasReq *measInfo; #endif { - TRC3(RgSchMacL2Meas); - return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ @@ -737,8 +707,6 @@ RgInfL2MeasStopReq *measInfo; #endif { - TRC3(RgSchMacL2MeasStop); - return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ @@ -767,8 +735,6 @@ RgInfL2MeasSndReq *measInfo; #endif { - TRC3(RgSchMacL2MeasSend); - return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasSend */ @@ -797,8 +763,6 @@ RgInfL2MeasCfm *measInfo; #endif { - TRC3(RgMacSchL2Meas); - return ((*RgMacSchL2MeasCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -826,8 +790,6 @@ RgInfL2MeasCfm *measInfo; #endif { - TRC3(RgMacSchL2MeasStop); - return ((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasStop*/ #endif/*LTE_L2_MEAS*/ diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index 3bf2a65c8..132eb98af 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -378,7 +378,6 @@ Void rgSCHPwrInit() #endif { U8 idx; - TRC2(rgSCHPwrInit); rgSchPwrCqiToPwrTbl[0] = 0; /* This should never be used anyway */ for (idx = 1; idx < RG_SCH_CMN_UL_NUM_CQI; ++idx) @@ -412,7 +411,6 @@ PRIVATE S8 rgSCHPwrGetCqiPwr(cqi) U8 cqi; #endif { - TRC2(rgSCHPwrGetCqiPwr); return (rgSchPwrCqiToPwrTbl[cqi]); } /* rgSCHPwrGetCqiPwr */ @@ -446,7 +444,6 @@ U8 cqi; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetCqiPwrForUe); if (!uePwr->deltaMcsEnbld) { @@ -481,7 +478,6 @@ U32 eff; { F64 ks = 1.25; /* or F64 */ F64 tmp = cmPow(2, ks*eff/1024) - 1; - TRC2(rgSCHPwrCalcEfficncyPwr); if (tmp <= 0) return (0); @@ -526,7 +522,6 @@ RgSchUeCb *ue; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue,cell); UNUSED(cell); - TRC2(rgSCHPwrPuschTpcForUe); rgSCHPwrOnSchedPuschTpc(cell, ue); return (uePwr->puschTpc); @@ -567,7 +562,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetMaxUlRb); rgSCHPwrPuschCntrl(cell, ue); /* This stores tpc, delta and maxRb * in uePwr */ @@ -634,8 +628,6 @@ RgSchUeCb *ue; UNUSED(cell); - TRC2(rgSCHPwrPuschCntrl); - if (!uePwr->isPhrAvail) { availPwr = 60; /* setting a large value so that availPwr does @@ -718,7 +710,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrPucchTpcForUe); rgSCHPwrPucchCntrl(cell, ue); return (uePwr->pucchTpc); @@ -757,7 +748,6 @@ RgSchCellCb *cell; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetDelta2FrmCqi); if (uePwr->isPhrAvail) { @@ -811,7 +801,6 @@ U8 *tpc; S8 *tpcDelta; #endif { - TRC2(rgSCHPwrGetPuschTpc); delta = RGSCH_MIN(delta, availPwr); @@ -857,8 +846,6 @@ S8 pwr; { RgSchCmnUlCell *cellUl; - TRC2(rgSCHPwrGetMaxRb); - cellUl = RG_SCH_CMN_GET_UL_CELL(cell); if (pwr <= 0) { @@ -902,7 +889,6 @@ U8 numRb; #ifndef NO_ERRCLS RgSchCmnUlCell *cellUl; #endif - TRC2(rgSCHPwrRbToPwr); #if (ERRCLASS & ERRCLS_DEBUG) cellUl = RG_SCH_CMN_GET_UL_CELL(cell); if (numRb > cellUl->maxUlBwPerUe) @@ -943,7 +929,6 @@ RgSchUeCb *ue; { S8 delta; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrPucchCntrl); rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, &uePwr->pucchTpc, &delta); rgSCHPwrOnSchedPucchTpc(cell, ue, delta); @@ -1014,7 +999,6 @@ RgSchDlSf *dlSf; CmLListCp *lst; CmLList *lnk; RgSchPdcch *pdcch; - TRC2(rgSCHPwrGrpCntrlPucch); lst = &cellPwr->pucchGrpPwr; lnk = lst->first; @@ -1099,7 +1083,6 @@ RgSchUlSf *ulSf; CmLListCp *lst; CmLList *lnk; RgSchPdcch *pdcch; - TRC2(rgSCHPwrGrpCntrlPusch); lst = &cellPwr->puschGrpPwr; lnk = lst->first; @@ -1157,7 +1140,6 @@ Bool *sched; U8 tpc; S8 delta; Bool atleastOne; - TRC2(rgSCHPwrSchedPucchRnti); pdcch->rnti = cb->tpcRnti; @@ -1209,7 +1191,7 @@ Bool *sched; pdcch->dci.u.format3Info.isPucch = TRUE; /* Fill TPC 1 (corresponding to no power change) initially */ - cmMemset((U8 *)tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); + memset(tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next) { @@ -1288,7 +1270,6 @@ Bool *sched; U8 tpc; S8 delta; Bool atleastOne; - TRC2(rgSCHPwrSchedPuschRnti); pdcch->rnti = cb->tpcRnti; @@ -1339,7 +1320,7 @@ Bool *sched; tpcCmds = pdcch->dci.u.format3Info.tpcCmd; /* Fill TPC 1 (corresponding to no power change) initially */ - cmMemset((U8 *)tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); + memset(tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next) { @@ -1409,7 +1390,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPucchFmt3TpcForUe); rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, tpc, delta); RETVOID; @@ -1443,7 +1423,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPucchFmt3aTpcForUe); rgSCHPwrGetAcc1bitTpc(uePwr->remPucchPwr, tpc, delta); RETVOID; @@ -1478,7 +1457,6 @@ S8 *delta; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); S8 adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal); - TRC2(rgSCHPwrGetPuschFmt3TpcForUe); rgSCHPwrGetAcc2bitTpc(adj, tpc, delta); RETVOID; @@ -1512,7 +1490,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPuschFmt3aTpcForUe); /* Don't attempt to look at headroom now, power * adjustment is small anyway */ @@ -1547,7 +1524,6 @@ U8 *tpc; S8 *delta; #endif { - TRC2(rgSCHPwrGetAcc1bitTpc); /* * TPC delta * 0 -1 @@ -1602,7 +1578,6 @@ S8 *delta; */ U8 tpcs[3] = {1, 2, 2}; U8 deltas[3] = {0, 1, 1}; - TRC2(rgSCHPwrGetAcc2bitTpc); if (remPwr <= -1) { *tpc = 0; @@ -1648,7 +1623,6 @@ U8 *tpc; S8 *delta; #endif { - TRC2(rgSCHPwrGetAbsTpc); /* * TPC delta * 0 -4 @@ -1719,8 +1693,6 @@ S8 delta; UNUSED(cell); - TRC2(rgSCHPwrOnPucchGrpPwrForUe); - uePwr->remPucchPwr -= delta; /* UE was already scheduled for PUCCH group power @@ -1782,7 +1754,6 @@ S8 delta; Bool rmvUe = FALSE; UNUSED(cell); - TRC2(rgSCHPwrOnPuschGrpPwrForUe); uePwr->delta = delta; uePwr->remPuschPwr -= delta; @@ -1844,8 +1815,6 @@ RgSchDlSf *sf; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); RgSchDlHqProcCb *proc = rgSCHDhmLastSchedHqProc(hqEnt); - TRC2(rgSCHPwrIsDlUeSched); - if (proc == NULLP) { return (FALSE); @@ -1911,8 +1880,6 @@ RgSchUlSf *sf; RgSchCmnUlCell *cmnCell = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlHqProcCb *proc = rgSCHUhmGetUlHqProc(cell, ue, cmnCell->schdHqProcIdx); - TRC2(rgSCHPwrIsUlUeSched); - UNUSED(sf); #if (ERRCLASS & ERRCLS_DEBUG) @@ -1984,7 +1951,6 @@ S8 pwrDelta; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgSchCmnTpcRntiCb *cb; Bool toAdd; - TRC2(rgSCHPwrPucchDeltaInd); uePwr->remPucchPwr = pwrDelta; @@ -2053,7 +2019,6 @@ S8 delta; * improved its remPwr as part of power control. */ RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); Bool rmvUe = FALSE; - TRC2(rgSCHPwrOnSchedPucchTpc); uePwr->remPucchPwr -= delta; @@ -2112,7 +2077,6 @@ RgSchUeCb *ue; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); Bool rmvUe = FALSE; - TRC2(rgSCHPwrOnSchedPuschTpc); /* Don't do anything for the case of absolute TPC commands */ if (!uePwr->isAccumulated) @@ -2180,8 +2144,6 @@ RgSchCmnAllocRecord *allocInfo; RgInfExtPhrSCellInfo *servCellPhr; S8 pCMax; - TRC2(rgSCHPwrUpdExtPhr); - for (idx = 0; idx < extPhr->numServCells; idx++) { servCellPhr = &extPhr->servCellPhr[idx]; @@ -2260,8 +2222,6 @@ S8 maxUePwr; U8 effPwr; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUpdPhr); - uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr); if (maxUePwr == RG_SCH_CMN_PWR_USE_CFG_MAX_PWR) @@ -2332,7 +2292,6 @@ RgSchUeCb *ue; #ifdef TFU_UPGRADE S32 tmp; #endif - TRC2(rgSCHPwrUlCqiInd); /* * For absolute power cmd case, we could look at the time @@ -2412,7 +2371,6 @@ U8 numRb; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); UNUSED(cell); - TRC2(rgSCHPwrRecordRbAlloc); RETVOID; if (uePwr->isPhrAvail) @@ -2467,7 +2425,6 @@ RgrCellCfg *cfg; CmLteRnti startRnti; U16 size; Bool isFmt3a; - TRC2(rgSCHPwrCellCfg); /* Right now, all UEs have fixed maximum power capability. So * we store cell wide pMax as minimum of configured pMax and @@ -2556,7 +2513,6 @@ RgrCellRecfg *recfg; { UNUSED(cell); UNUSED(recfg); - TRC2(rgSCHPwrCellRecfg); /* Not doing anything for power reconfig, so such structure * in RGR */ @@ -2587,7 +2543,6 @@ RgSchCellCb *cell; #endif { UNUSED(cell); - TRC2(rgSCHPwrCellDel); /* There is no allocated memory, so do nothing */ RETVOID; @@ -2630,7 +2585,6 @@ RgrUeSecCellCfg *sCellInfoCfg; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUeSCellCfg); uePwr->maxUePwr = cellPwr->pMax; uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */ @@ -2718,8 +2672,6 @@ RgrUeCfg *cfg; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUeCfg); - uePwr->maxUePwr = cellPwr->pMax; uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */ uePwr->numRb = 1; @@ -2778,7 +2730,6 @@ RgrUeRecfg *recfg; S16 ret; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgrUeUlPwrCfg *pwrCfg = &recfg->ueUlPwrRecfg; - TRC2(rgSCHPwrUeRecfg); if (pwrCfg->p0UePucch != uePwr->p0UePucch) { @@ -2829,7 +2780,6 @@ RgrUeUlPwrCfg *pwrCfg; RgSchCmnTpcRntiCb *puschRntiCb = NULLP; U8 pucchIdx = 0; U8 puschIdx = 0; - TRC2(rgSCHPwrApplyUePwrCfg); /* Validate Pucch group power control config */ if (pwrCfg->uePucchPwr.pres) @@ -2984,7 +2934,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeDel); if (uePwr->tpcPucchRntiCb) { @@ -3029,7 +2978,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHPwrUeReset); rgSCHPwrUeResetPucch(cell, ue); rgSCHPwrUeResetPusch(cell, ue); @@ -3063,7 +3011,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeResetPucch); uePwr->pucchTpc = 1; uePwr->remPucchPwr = 0; @@ -3104,7 +3051,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeResetPusch); uePwr->isPhrAvail = FALSE; uePwr->phVal = 40; @@ -3148,7 +3094,6 @@ RgSchUeCb *ue; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgSchCmnTpcRntiCb *cb; Bool toAdd; - TRC2(rgSCHPwrOnPuschPwrUpd); if ((cb = uePwr->tpcPuschRntiCb) == NULLP) { @@ -3210,7 +3155,6 @@ Bool isFmt3a; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddRntiToPucchRntiLst); rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPucchRntiLst[cellPwr->tpcPucchRntiCnt++], rnti, isFmt3a); @@ -3248,7 +3192,6 @@ Bool isFmt3a; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddRntiToPuschRntiLst); rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPuschRntiLst[cellPwr->tpcPuschRntiCnt++], rnti, isFmt3a); @@ -3283,9 +3226,8 @@ CmLteRnti rnti; Bool isFmt3a; #endif { - TRC2(rgSCHPwrInitTpcRntiCb); - cmMemset((U8 *)cb, 0, sizeof(*cb)); + memset(cb, 0, sizeof(*cb)); cb->tpcRnti = rnti; cb->isFmt3a = isFmt3a; /* Not initialising lists as memset 0 takes care of it */ @@ -3322,7 +3264,6 @@ CmLteRnti tpcRnti; { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); U16 idx; - TRC2(rgSCHPwrGetPucchRntiCb); if (!cellPwr->tpcPucchRntiCnt) { @@ -3367,7 +3308,6 @@ CmLteRnti tpcRnti; { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); U16 idx; - TRC2(rgSCHPwrGetPuschRntiCb); if (!cellPwr->tpcPuschRntiCnt) { @@ -3414,7 +3354,6 @@ RgSchUeCb *ue; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); UNUSED(cell); - TRC2(rgSCHPwrAddUeToPucchTpcRntiCb); cmLListAdd2Tail(&cb->cfgdUes, &uePwr->pucchGrpLnk); uePwr->pucchGrpLnk.node = (PTR)ue; @@ -3450,7 +3389,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrDelUeFrmPucchTpcRntiCb); rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue); cmLListDelFrm(&cb->cfgdUes, &uePwr->pucchGrpLnk); @@ -3488,7 +3426,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node == NULLP) { @@ -3533,7 +3470,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node != NULLP) { @@ -3570,7 +3506,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrRmvSchdPucchTpcRntiCb); if (cb->schdLnk.node == NULLP) { @@ -3610,7 +3545,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddSchdUeToPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node != NULLP) { @@ -3655,7 +3589,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddSchdPucchTpcRntiCb); cmLListAdd2Tail(&cellPwr->pucchGrpPwr, &cb->schdLnk); cb->schdLnk.node = (PTR)cb; @@ -3690,7 +3623,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddUeToPuschTpcRntiCb); cmLListAdd2Tail(&cb->cfgdUes, &uePwr->puschGrpLnk); uePwr->puschGrpLnk.node = (PTR)ue; @@ -3726,7 +3658,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddSchdUeToPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node != NULLP) { @@ -3773,7 +3704,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrDelUeFrmPuschTpcRntiCb); rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue); cmLListDelFrm(&cb->cfgdUes, &uePwr->puschGrpLnk); @@ -3810,7 +3740,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node == NULLP) { @@ -3855,7 +3784,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node != NULLP) { @@ -3892,7 +3820,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddSchdPuschTpcRntiCb); cmLListAdd2Tail(&cellPwr->puschGrpPwr, &cb->schdLnk); cb->schdLnk.node = (PTR)cb; @@ -3926,7 +3853,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrRmvSchdPuschTpcRntiCb); if (cb->schdLnk.node == NULLP) { @@ -3964,7 +3890,6 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkPucchTpcRntiIdx); if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { @@ -4004,7 +3929,6 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkPuschTpcRntiIdx); if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { @@ -4043,7 +3967,6 @@ U8 idx; #endif { CmLList *lnk; - TRC2(rgSCHPwrChkUniqPucchTpcRntiIdx); for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next) { @@ -4083,7 +4006,6 @@ U8 idx; #endif { CmLList *lnk; - TRC2(rgSCHPwrChkUniqPuschTpcRntiIdx); for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next) { @@ -4122,8 +4044,6 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkTpcRntiIdx); - if (cb->isFmt3a) { if (idx >= TFU_MAX_1BIT_TPC) @@ -4167,7 +4087,6 @@ PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax) U8 pCMax; #endif { - TRC2(rgSCHPwrGetPCMaxValFromPCMax); return ((pCMax & 63) - 30); } @@ -4198,7 +4117,6 @@ PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr) U8 phr; #endif { - TRC2(rgSCHPwrGetPhValFromPhr); return ((phr & 63) - 23); } diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c index 15c09ee09..9f9d5a0f6 100755 --- a/src/5gnrsch/rg_sch_ram.c +++ b/src/5gnrsch/rg_sch_ram.c @@ -143,7 +143,6 @@ RgSchCellCb *cell; RgrUeCfg *ueCfg; #endif { - TRC2(rgSCHRamVldtUeCfg); if (ueCfg->dedPreambleId.pres == PRSNT_NODEF) { if ((ueCfg->dedPreambleId.val < cell->rachCfg.numRaPreamble) || @@ -213,7 +212,6 @@ RgSchErrInfo *err; U8 tid; #endif - TRC2(rgSCHRamProcRaReq) /* SR_RACH_STATS : RACH REQ */ @@ -338,7 +336,6 @@ RgSchErrInfo *err; RgSchRntiLnk *rntiLnk; Inst inst = cell->instIdx; - TRC2(rgSCHRamCreateRaCb) if((rgSCHUtlAllocSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb))) == RFAILED) @@ -445,7 +442,6 @@ RgSchErrInfo *err; /* U32 cnt; */ RgSchDlHqEnt **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell)); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); - TRC2(rgSCHRamRgrUeCfg) /* Fix : set UE inactive in DL until UE is reinitialization completed */ @@ -517,7 +513,6 @@ RgSchErrInfo *err; { TfuUlCqiRpt ulCqiRpt; RgSchCmnCell *cellSch= (RgSchCmnCell *)(cell->sc.sch); - TRC2(rgSCHRamContResCrnti) /* Fix: syed It is incorrect to copy over msg3HqProc to ueCb's @@ -582,7 +577,6 @@ RgSchRaCb *raCb; CmLteTimingInfo expTime = {0}; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #endif - TRC2(rgSCHRamContResCcchsdu) if(raCb->raState != RGSCH_RA_MSG3_PENDING) { RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, @@ -650,7 +644,6 @@ RgInfUeDatInd *pdu; RgSchErrInfo *err; #endif { - TRC2(rgSCHRamProcMsg3) /* Update raCb with PHR if received along with Msg3 */ @@ -712,7 +705,6 @@ RgSchRaCb *raCb; RgInfCmnBoRpt *staRsp; #endif { - TRC2(rgSCHRamUpdtBo) /* Update Bo in RaCb */ raCb->dlCcchInfo.bo = (U32)(staRsp->bo); @@ -752,7 +744,6 @@ S16 rgSCHRamMsg3DatInd(raCb) RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamMsg3DatInd) /* SR_RACH_STATS : MSG3 ACK*/ rgNumMsg3CrcPassed++; @@ -787,7 +778,6 @@ S16 rgSCHRamMsg3FailureInd(raCb) RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamMsg3FailureInd) /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/ rgSCHUhmProcMsg3Failure(&(raCb->msg3HqProc)); @@ -820,7 +810,6 @@ S16 rgSCHRamMsg4FdbkInd(raCb) RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamMsg4FdbkInd) return ROK; } /* rgSCHRamMsg4FdbkInd */ @@ -855,7 +844,6 @@ RgSchCellCb *cell; RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamMsg4Done) RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHRamMsg4Done(): tmpCRNTI = %u", @@ -953,7 +941,6 @@ Bool rlsRnti; { Inst inst = cell->instIdx; Bool isEmtc = FALSE; - TRC2(rgSCHRamDelRaCb) /* Delete from all the lists it is enqueued */ cmLListDelFrm(&(cell->raInfo.raCbLst),&(raCb->raCbLnk)); @@ -1091,7 +1078,6 @@ RgSchCellCb *cell; U8 raIdx; #endif - TRC2(rgSCHRamTtiHndlr) crntSfn = cell->crntTime.sfn; @@ -1217,7 +1203,6 @@ RgSchCellCb *cell; #endif - TRC2(rgSCHRamFreeCell) #ifdef LTE_TDD @@ -1297,7 +1282,6 @@ RgSchCellCb *cell; RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamProcContResExp); raCb->expiryTime.sfn = RGSCH_CONTRES_EXP; /*MSG4 Fix*/ if (raCb->ue) @@ -1327,7 +1311,6 @@ RgSchCellCb *cell; RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamProcContResGrdExp) /*Guard timer has expired, schedule only the contention REsolution CE with @@ -1378,7 +1361,6 @@ RgSchCellCb *cell; CmLList *chkLnk = NULLP; RgSchRaCb *raCb = NULLP; - TRC2(rgSCHChkContResTmrExp) chkLnk = cmLListFirst(&(cell->contResTmrLst)); @@ -1425,7 +1407,6 @@ RgSchCellCb *cell; CmLList *chkLnk = NULLP; RgSchRaCb *raCb = NULLP; - TRC2(rgSCHChkContResGrdTmrExp) chkLnk = cmLListFirst(&(cell->contResGrdTmrLst)); @@ -1489,7 +1470,6 @@ U8 raIdx; U8 raRntiIdx; CmLteRnti raRnti; - TRC2(rgSCHRamDelRaReq) rachRsp = &cell->rachRspLst[raIdx]; @@ -1554,7 +1534,6 @@ RgSchRaCb *raCb; CmLteTimingInfo expTime ={0}; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHRamAddToRaInfoSchdLst) /*Fix: This can be called even when guard timer is not expired. * In this case CR timer expiry should be guard timer expiry time + Guard timer time*/ @@ -1581,7 +1560,6 @@ RgSchCellCb *cell; RgSchRaCb *raCb; #endif { - TRC2(rgSCHRamRmvFrmRaInfoSchdLst) cmLListDelFrm(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk)); raCb->schdLnk.node = NULLP; @@ -1623,7 +1601,6 @@ RgSchCellCb *cell; Bool isEmtc; #endif { - TRC2(rgSCHRamUlFreeAllocation); rgSCHUhmFreeProc(alloc->hqProc, cell); if(!isEmtc) diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c index 320c145ac..eb08051ef 100755 --- a/src/5gnrsch/rg_sch_sc1.c +++ b/src/5gnrsch/rg_sch_sc1.c @@ -220,7 +220,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1DlUeReset); rgSCHSc1DlSuspendUe(cell, ue); @@ -261,7 +260,6 @@ RgSchUeCb *ue; RgSchDlHqProcCb *hqP; RgSchDlLcCb *svc; U8 idx; - TRC2(rgSCHSc1DlActvtUe); /* Add UE's HqProcs From UERetxLst to CellRetxLst */ lst = &ueDl->retxHqProcs; @@ -329,7 +327,6 @@ RgSchUeCb *ue; CmLListCp *lst; CmLList *node; RgSchDlLcCb *svc; - TRC2(rgSCHSc1DlUeRefresh); if (ue->dl.ambrCfgd) { @@ -397,7 +394,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlHqProc *hqProcDl = RG_SCH_CMN_GET_DL_HQP(hqP); - TRC2(rgSCHSc1DlProcRmvFrmCellRetx); if (hqProcDl->retxLnk.node != NULLP) { @@ -442,7 +438,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlUe *sc1Ue = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlHqProc *hqProcDl = RG_GET_SC1_HQP_DL(hqP); - TRC2(rgSCHSc1DlProcRmvFrmUeRetx); if (hqProcDl->retxLnkUe.node != NULLP) { @@ -488,7 +483,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlUe *sc1Ue = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlHqProc *cmnHqDl = RG_GET_SC1_HQP_DL(hqP); - TRC2(rgSCHSc1DlProcAddToUeRetx); cmLListAdd2Tail(&sc1Ue->retxHqProcs, &(cmnHqDl->retxLnkUe)); @@ -529,7 +523,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); - TRC2(rgSCHSc1DlProcAddToCellRetx); if (!RG_SCH_CMN_DL_IS_UE_ACTIVE(hqP->hqE->ue)) { @@ -590,7 +583,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; Bool dlAllowed = FALSE; #endif RgSchDlRbAlloc *dlAllocCb; - TRC2(rgSCHSc1DlRetxAlloc); sc1CellDl = RG_GET_SC1_CELL_DL(cell); #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD))) @@ -709,7 +701,6 @@ PRIVATE Void rgSCHSc1RlsHqProc(hqProc) RgSchDlHqProcCb *hqProc; #endif { - TRC2(rgSCHSc1RlsHqProc) rgSCHDhmRlsHqProc(hqProc); RETVOID; } @@ -769,7 +760,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif S16 ret; - TRC2(rgSCHSc1DlDedSvcAlloc); /* Get the UE to which this service belongs to */ ue = svc->ue; @@ -899,7 +889,6 @@ RgSchDlLcCb *svc; { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchSc1DlUe *ueSc1 = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlAdd2UeSchdSvcs); /* checking SVC's presence in this lst is unnecessary */ cmLListAdd2Tail(&ueSc1->schdSvcs, &svcSc1->schdSvcLnk); @@ -956,7 +945,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchSc1DlUe *ueDl; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); - TRC2(rgSCHSc1DlDedTx); /* Process the first queue that is for RRC signalling and is of */ /* highest priority. */ @@ -1041,7 +1029,6 @@ Void rgSCHSc1DlPreSchd(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlPreSchd); RETVOID; } @@ -1068,7 +1055,6 @@ Void rgSCHSc1DlPstSchd(schInst) Inst schInst #endif { - TRC2(rgSCHSc1DlPstSchd); RETVOID; } @@ -1106,7 +1092,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHSc1DlDedNewTx); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedNewTx\n")); /* Now perform the new UE selections */ @@ -1148,7 +1133,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHSc1DlDedRetx); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedRetx\n")); rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo); @@ -1195,7 +1179,6 @@ RgSchDlLcCb *svc; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAddToSchd); svcSc1 = RG_GET_SC1_SVC_DL(svc->ue,svc,cell); /* The service is already in the scheduler */ @@ -1293,7 +1276,6 @@ RgSchUeCb *ue; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); CmLListCp *lst; - TRC2(rgSCHSc1DlUeRmvFrmSchd); lst = &cellDl->prioLst[ueDl->prio]; if (ueDl->prioLnk.node != NULLP) @@ -1341,8 +1323,6 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); CmLListCp *lst; - TRC2(rgSCHSc1DlSvcRmvFrmUeAmbrLst); - lst = &ueDl->ambrLst; if (svcSc1->prioLnk.node != NULLP) { @@ -1388,7 +1368,6 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAddToUeAmbrLst); /* If svc already present in AMBR List return */ if (svcSc1->prioLnk.node != NULLP) @@ -1452,7 +1431,6 @@ RgSchDlLcCb *svc; RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); CmLListCp *lst; - TRC2(rgSCHSc1DlSvcRmvFrmSchd); lst = &(cellDl->prioLst[svcCmn->prio]); if (svcDl->prioLnk.node != NULLP) @@ -1503,7 +1481,6 @@ RgrDlLchCfg *cfg; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAdd); UNUSED(cfg); @@ -1553,7 +1530,6 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlLcRmv); if (svcSc1 == NULLP) { @@ -1637,7 +1613,6 @@ RgrLchRecfg *recfg; { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcMod); if (RG_SCH_CMN_SVC_IS_GBR(svc)) { @@ -1682,7 +1657,6 @@ RgSchUeCb *ue; CmLList *node; CmLListCp *lst; RgSchUeCb *nodeUe = NULLP; - TRC2(rgSCHSc1DlUeAddToSchd); ueDl->prio = ((RgSchCmnDlSvc *)(ueDl->ambrSvc->sch))->prio; lst = &cellDl->prioLst[ueDl->prio]; @@ -1757,8 +1731,6 @@ RgSchDlLcCb *svc; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngAmbrSvcPosn); - if (svcSc1->bo == 0) { if (ueDl->ambrSvc == svc) @@ -1855,7 +1827,6 @@ RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlLcBoUpd); if (svcSc1->bo == svc->bo) { @@ -1908,7 +1879,6 @@ RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngPrio0SvcPosn); /* In this priority, we just add or remove to the queue */ if (svcSc1->bo > 0) @@ -1957,7 +1927,6 @@ RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngGbrSvcPosn); /* Handle a GBR service. */ svcSc1->effGbr = RGSCH_MIN(svcSc1->bo, svcSc1->gbr); @@ -2004,7 +1973,6 @@ RgSchDlLcCb *svc; { RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell); - TRC2(rgSCHSc1DlMngSvcPosn); (cellDl->svcMngFunc[svcCmn->prio])(cell, ue, svc); RETVOID; @@ -2051,7 +2019,6 @@ RgSchErrInfo *err; S16 ret; RgSchSc1DlCell *cellDl; - TRC2(rgSCHSc1RgrDlCellCfg); if((ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc), \ @@ -2093,7 +2060,6 @@ RgSchSc1DlCell *cellDl; #endif { U8 i; - TRC2(rgSCHSc1DlDeinitQueues); for (i = 0; i < RG_SC1_DL_NUM_Q; ++i) { @@ -2127,7 +2093,6 @@ Void rgSCHSc1DlCellDel(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlCellDel); if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \ == NULLP) @@ -2183,7 +2148,6 @@ RgSchErrInfo *err; Inst inst = cell->instIdx; RgSchSc1DlUe *ueDl; - TRC2(rgSCHSc1RgrDlUeCfg); if((rgSCHUtlAllocSBuf(inst, (Data**)&(ueSchCmn->dl.schSpfc), (sizeof(RgSchSc1DlUe))) != ROK)) @@ -2242,7 +2206,6 @@ S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) RgSchSc1DlHqProc *hqSpcSch; RgSchDlHqProcCb *hqP; U8 cnt; - TRC2(rgSCHSc1DlUeHqEntInit); /* making use of hqE->sch for one shot allocation * of RgSchSc1DlHqProc structures */ if (rgSCHUtlAllocSBuf(cell->instIdx, @@ -2289,7 +2252,6 @@ RgSchCellCb *cell; RgSchDlHqEnt *hqE; #endif { - TRC2(rgSCHSc1DlUeHqEntDeInit); if(hqE->sch) { @@ -2341,7 +2303,6 @@ RgSchErrInfo *err; RgSchCmnDlUe *ueCmnDl = RG_SCH_CMN_GET_DL_UE(ue,cell); /*cell added as part of CA dev*/ RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1RgrDlUeRecfg); if (ue->dl.ambrCfgd) { @@ -2429,7 +2390,6 @@ RgSchUeCb *ue; RgSchDlLcCb *svc; U32 idx; - TRC2(rgSCHSc1DlRmvUeFrmPrioQs); sc1Ue = RG_GET_SC1_UE_DL(ue, cell); @@ -2482,7 +2442,6 @@ RgSchUeCb *ue; U8 i; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1DlInactvtUe); /* ccpu00130170: UE related HARQ Procs are cleared only if UE's Re-establishment procedure is not in progress*/ @@ -2548,7 +2507,6 @@ RgSchUeCb *ue; U8 j; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1DlSuspendUe); /* remove all in use HARQ processes from the subframes. * Store them in UEs hqProc Lst. Add back to cell's @@ -2609,7 +2567,6 @@ Void rgSCHSc1DlScanUpdPdbPrio (cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlScanUpdPdbPrio); RETVOID; } @@ -2646,7 +2603,6 @@ RgSchCellCb *cell; RgInfSfAlloc *sfAlloc; #endif { - TRC2(rgSCHSc1DlFillFlowCntrlInfo); return ROK; } /** @@ -2678,7 +2634,6 @@ RgSchUeCb *ue; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlUeDel); if (sc1DlUe == NULLP) { @@ -2745,7 +2700,6 @@ RgSchErrInfo *err; #endif { S16 ret; - TRC2(rgSCHSc1RgrLcCfg); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(RG_SCH_CMN_GET_LC_SCH_SPFC(ue,dlLc,cell)), \ @@ -2803,7 +2757,6 @@ RgrLchRecfg *lcRecfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcRecfg); UNUSED(err); @@ -2841,7 +2794,6 @@ RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1DlUeReset); return ROK; } @@ -2889,7 +2841,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef LTEMAC_HDFDD Bool dlAllowed = FALSE; #endif - TRC2(rgSCHSc1DlTaCmd); lst = &cellCmnDl->taLst; node = lst->first; @@ -2985,7 +2936,6 @@ CmLListCp *inactvLst; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHSc1DlHndlInActUes); node = inactvLst->first; while(node) @@ -3026,7 +2976,6 @@ Void rgSCHSc1DlInit(rgSchDlApis) RgDlSchdApis *rgSchDlApis; #endif { - TRC2(rgSCHSc1DlInit); /* Init the function pointers */ rgSchDlApis->rgSCHRgrDlUeCfg = rgSCHSc1RgrDlUeCfg; rgSchDlApis->rgSCHRgrDlUeRecfg = rgSCHSc1RgrDlUeRecfg; @@ -3086,7 +3035,6 @@ RgSchSc1DlCell *cellDl; #endif { U8 i; - TRC2(rgSCHSc1DlInitQueues); for (i = 0; i < RG_SC1_DL_NUM_Q; ++i) { @@ -3153,7 +3101,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; RgSchDlRbAlloc *dlAllocCb = NULLP; - TRC2(rgSCHSc1DlRetxAllocFnlz); node = allocInfo->dedAlloc.schdRetxHqPLst.first; while(node) @@ -3243,7 +3190,6 @@ CmLList **node; U32 effBo; U32 rlcHdrEstmt; - TRC2(rgSCHSc1DlSprTxTbDstn); while((*node) && (*effAlloc > 0)) { @@ -3376,7 +3322,6 @@ CmLList **node; RgSchLchAllocInfo lchSchdData; CmLList *prev = NULLP; - TRC2(rgSCHSc1DlNewTxTbDstn); if (ueDl->taReqBytes) { @@ -3531,7 +3476,6 @@ RgSchUeCb *ue; /*ccpu00120365-ADD-added to code to check if second TB is utilized */ U32 tb2Bytes = 0; - TRC2(rgSCHSc1DlNewTxUeFnlz); /* 3.1 MIMO Consider the allocation of New TX TB for distribution */ @@ -3625,7 +3569,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; RgSchCmnDlUe *cmnUeDl; RgSchDlHqProcCb *hqP; - TRC2(rgSCHSc1DlNewTxAllocFnlz); node = allocInfo->dedAlloc.schdTxHqPLst.first; while(node) @@ -3713,7 +3656,6 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo; RgSchDlRbAlloc *ueAllocInfo; RgSchDlRbAlloc *dlAllocCb; - TRC2(rgSCHSc1DlRetxNewTxAllocFnlz); node = cellAllocInfo->dedAlloc.schdTxRetxHqPLst.first; while(node) @@ -3801,7 +3743,6 @@ RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1DlAllocFnlz); rgSCHSc1DlRetxAllocFnlz(cell, allocInfo); @@ -3847,7 +3788,6 @@ Bool isPucchInfo; Void *dlCqi; #endif { - TRC2(rgSCHSc1DlCqiInd); RETVOID; } @@ -3895,7 +3835,6 @@ RgSchDlLcCb *svc; RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); RgSchCmnDlSvc *cmnDlLstSvc; - TRC2(rgSCHSc1DlAdd2UeLcsWithData); lst = &(sc1DlUe->lcsWithData); node = lst->first; @@ -3962,7 +3901,6 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *sc1DlSvc = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlRmFrmUeLcsWithData); cmLListDelFrm(&(sc1DlUe->lcsWithData), &sc1DlSvc->lcWithDataLnk); sc1DlSvc->lcWithDataLnk.node = NULLP; @@ -4091,7 +4029,6 @@ Void rgSCHSc1UlInit(rgSchUlApis) RgUlSchdApis *rgSchUlApis; #endif { - TRC2(rgSCHSc1UlInit); /* Init the function pointers */ rgSchUlApis->rgSCHRgrUlUeCfg = rgSCHSc1RgrUlUeCfg; rgSchUlApis->rgSCHRgrUlUeRecfg = rgSCHSc1RgrUlUeRecfg; @@ -4157,7 +4094,6 @@ RgSchErrInfo *err; { RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell); - TRC2(rgSCHSc1RgrUlUeCfg); if(rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(ueSchCmn->ul.schSpfc), (sizeof(RgSchSc1UlUe))) != ROK) @@ -4205,7 +4141,6 @@ RgrUeRecfg *ueRecfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrUlUeRecfg); return ROK; } /* rgSCHSc1RgrUeRecfg */ @@ -4238,7 +4173,6 @@ RgSchUeCb *ue; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlUeDel); if (ueUl == NULLP) { @@ -4290,7 +4224,6 @@ RgSchUeCb *ue; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlUeReset); ueUl->srRcvd = FALSE; @@ -4342,7 +4275,6 @@ RgSchErrInfo *err; { RgSchSc1UlCell *cellUl; - TRC2(rgSCHSc1RgrUlCellCfg); if((rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->ul.schSpfc), \ @@ -4390,7 +4322,6 @@ RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrUlCellRecfg); return ROK; } @@ -4419,7 +4350,6 @@ RgSchCellCb *cell; { RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1UlCellDel); if (cellUl == NULLP) { @@ -4471,7 +4401,6 @@ RgrLcgCfg *lcgCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcgCfg); return ROK; } /* rgSCHSc1RgrLcgCfg */ @@ -4515,7 +4444,6 @@ RgrLcgRecfg *reCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcgRecfg); return ROK; } /* rgSCHSc1RgrLcgRecfg */ @@ -4547,7 +4475,6 @@ RgSchUeCb *ue; RgSchLcgCb *lcg; #endif { - TRC2(rgSCHSc1LcgDel); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; } @@ -4585,7 +4512,6 @@ RgSchCellCb *cell; /*cell added as part of CA dev*/ RgSchSc1UlUe *ulUe = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlSchdUe); if(ulUe->srRcvd == TRUE) { @@ -4631,7 +4557,6 @@ U8 remUe; { RgSchSc1UlCell *sc1UlCell = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1UlSchdForDataTrans); if (remUe == 0) { @@ -4688,7 +4613,6 @@ U8 *remUe; Bool ulAllowed = FALSE; #endif - TRC2(rgSCHSc1UlSchdUeTxLst); node = ueTxLst->first; while ((node) && (*remUe)) @@ -4769,7 +4693,6 @@ U8 *remUe; Bool ulAllowed = FALSE; #endif - TRC2(rgSCHSc1UlSchdForContRes); node = sc1UlCell->contResLst.first; while ((node) && (*remUe)) @@ -4833,7 +4756,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); U8 remUe = cellUl->maxUeNewTxPerTti; - TRC2(rgSCHSc1UlNewTx); rgSCHSc1UlSchdForContRes(cell, allocInfo, &remUe); rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe); @@ -4868,7 +4790,6 @@ RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1UlSched); rgSCHSc1UlNewTx(cell, allocInfo); RETVOID; } @@ -4906,7 +4827,6 @@ RgSchCellCb *cell; RgSchUeCb *lUe; CmLList *node; - TRC2(rgSCHSc1UlInsUeInQ); node = lst->first; while(node) @@ -4976,7 +4896,6 @@ RgSchUeCb *ue; RgSchCmnLcg *cmnLcg0 = RG_SCH_CMN_GET_UL_LCG(&ue->ul.lcgArr[0]); CmLListCp *lst; - TRC2(rgSCHSc1UlPosnUeInQ); if (!RG_SCH_CMN_UL_IS_UE_ACTIVE(ue)) { @@ -5056,7 +4975,6 @@ RgSchLcgCb *lcg; U8 bsr; #endif { - TRC2(rgSCHSc1UpdBsrShort); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; } /* rgSCHSc1UpdBsrShort */ @@ -5093,7 +5011,6 @@ RgSchLcgCb *lcg; U8 bsr; #endif { - TRC2(rgSCHSc1UpdBsrTrunc); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; } /* rgSCHSc1UpdBsrTrunc */ @@ -5127,7 +5044,6 @@ RgSchUeCb *ue; U8 *bsArr; #endif { - TRC2(rgSCHSc1UpdBsrLong); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; } /* rgSCHSc1UpdBsrLong */ @@ -5162,7 +5078,6 @@ RgSchUeCb *ue; RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1ContResUlGrant); if (ueUl->contResLnk.node) { @@ -5209,7 +5124,6 @@ RgSchUeCb *ue; RgSchSc1UlUe *ulUe = RG_GET_SC1_UE_UL(ue, cell); RgSchSc1UlCell *ulCell = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1SrRcvd); ulUe->srRcvd = TRUE; @@ -5258,7 +5172,6 @@ RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; #endif { - TRC2(rgSCHSc1UlCqiInd); /* Stack Crash problem for TRACE5 changes. Added the return below */ RETVOID; @@ -5294,7 +5207,6 @@ RgInfUeDatInd *datInd; #endif { - TRC2(rgSCHSc1UlLcgUpd); return ROK; } @@ -5327,7 +5239,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1UlUeRefresh); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; } @@ -5368,7 +5279,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; CmLList *node; RgSchDrxUeCb *drxUe = NULLP; CmLListCp ulInactvLst; /* list of UE's becoming UL-inactive */ - TRC2(rgSCHSc1UlDatTransAllocFnlz); cmLListInit(&ulInactvLst); node = allocInfo->schdUeLst.first; @@ -5456,7 +5366,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; RgSchSc1UlUe *ueUl; RgSchUeCb *ue; CmLList *node; - TRC2(rgSCHSc1UlContResAllocFnlz); node = allocInfo->schdContResLst.first; while(node) @@ -5520,7 +5429,6 @@ RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1UlAllocFnlz); rgSCHSc1UlContResAllocFnlz(cell, allocInfo); rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo); @@ -5555,7 +5463,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1UlActvtUe); rgSCHSc1UlPosnUeInQ(cell, ue); RETVOID; @@ -5597,7 +5504,6 @@ CmLListCp *inactvLst; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); CmLList *node = inactvLst->first; - TRC2(rgSCHSc1UlHndlInActUes); while (node) { @@ -5646,7 +5552,7 @@ RgSchUeCb *ue; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHSc1DlProcRmvFrmRetx); + /* Remove the HqP from retx Queue. Release HqP.*/ rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP); diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c index c02637511..8c21fe76d 100755 --- a/src/5gnrsch/rg_sch_scell.c +++ b/src/5gnrsch/rg_sch_scell.c @@ -147,7 +147,6 @@ RgSchDlHqTbCb *tbInfo; U8 bitVal = 0; U8 sCellActDeactBitMask = 0; - TRC3(rgSCHSCellSchdActDeactCe); /* Change the state of all Scells waiting for * activation */ @@ -233,7 +232,6 @@ RgSchUeCb *ue; #endif { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC3(rgSCHSCellAddToActDeactLst); if(NULLP == ue->sCellActLnk.node) {/* Ue is not present in the list */ @@ -278,7 +276,6 @@ RgSchUeCb *ue; #endif { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC3(rgSCHSCellRmvFrmActLst); if (NULLP != ue->sCellActLnk.node) { cmLListDelFrm(&cellCmnDl->secCellActCeLst, &ue->sCellActLnk); @@ -333,7 +330,6 @@ RgSchUeCellInfo *sCellInfo U16 crntTime; #endif - TRC3(rgSCHSCellActivation); sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE; #ifdef TENB_STATS @@ -525,7 +521,6 @@ RgSchUeCellInfo *sCellInfo; #endif { - TRC3(rgSCHCellClearScellLstOfCQI); RgSchUePCqiCb *cqiRiCb = NULLP; RgSchUeCb *ueCb; ueCb = sCellInfo->ue; @@ -596,7 +591,6 @@ RgSchUeCellInfo *sCellInfo RgSchCmnCell *cellSch; Inst inst = sCellInfo->cell->instIdx; - TRC3(rgSCHSCellDeActivation); /* Stop the timer if running */ if(sCellInfo->deactTmr.tmrEvnt != TMR_NONE) @@ -744,7 +738,6 @@ Bool maxHqRetxReached; RgSchCellCb *cell; RgSchUeCellInfo *sCellInfo; - TRC3(rgSCHSCellHndlFdbkInd); ueCb = hqP->hqE->ue; cell = ueCb->cell; @@ -843,7 +836,6 @@ RgSchUeCellInfo *sCellInfo; #endif { - TRC3(rgSCHSCellDeactTmrExpry); if (sCellInfo->ue->isScellExplicitDeAct == TRUE) { /* Deactivation Timer is not configured (infinity), thus send deactivation CE explicitly */ @@ -908,8 +900,6 @@ U8 action; Inst inst = cell->instIdx; S16 ret = ROK; - TRC3(rgSCHSCellTrigActDeact); - if((sCellIdx < 1) || (sCellIdx > RGR_MAX_SCELL_PER_UE)) { @@ -1028,7 +1018,6 @@ RgSchUeCb *ueCb; U8 *sCellIdx; #endif { - TRC3(rgSCHSCellSelectAndAct); for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++) { @@ -1136,7 +1125,6 @@ U8 sCellIdx; RgSchUeCellInfo *sCellInfo; RgSchCmnUlUe *ueUl; - TRC3(rgSCHSCellDelUeSCell); sCellInfo = ueCb->cellInfo[sCellIdx]; @@ -1217,8 +1205,6 @@ RgSchUeCb *ueCb; #endif { - TRC3(rgSCHSCellDelUe); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { rgSCHSCellDelUeSCell(cellCb,ueCb,idx); @@ -1287,8 +1273,6 @@ U8 sCellIdx; RgSchUeCellInfo *sCellInfo; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHSCellPCqiCfg); - RGSCHDBGINFO(priCellCb->instIdx, (rgSchPBuf(priCellCb->instIdx), "rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n", secCellCb->cellId, ueCb->ueId, cqiCfg->type)); @@ -1310,7 +1294,7 @@ U8 sCellIdx; if (cqiCfg->type == RGR_SCH_PCQI_SETUP) { /* 1. Copy the Received CQI Cfg parameters to ueCb */ - cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, + memcpy(&cqiCb->cqiCfg, cqiCfg, sizeof(RgrUePrdDlCqiCfg)); /* 2. Compute Periodic CQI Periodicity and subframe offset */ @@ -1436,7 +1420,6 @@ RgSchUeCb *ue; #endif { RgSchCmnCell *cellSch; - TRC3(rgSCHSCellDlUeReset); for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { @@ -1483,7 +1466,6 @@ RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlLcCfg); for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) @@ -1525,7 +1507,6 @@ RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlLcDel); for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) @@ -1567,7 +1548,6 @@ RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlDedBoUpd); /* If this is not invoked by PCell, then invoke the call to PCell handler @@ -1617,7 +1597,6 @@ RgSchUePCqiCb *cqiCb2; #endif { RgSchUePCqiCb *retCqiCb; - TRC3(rgSCHUtlSCellCmpCqiCfg); /* Collision rules are defined in TS 36.213,7.2.2 */ /* RI, WB first PMI > WB CQI > SB CQI */ /* As of now only taking care of RI > WB CQI > SB CQI */ @@ -1689,7 +1668,6 @@ RgSchUePCqiCb *cqiCb; U32 sCellCnt = 0; CmLteTimingInfo timingInfo; U8 idx = 0; - TRC3(rgSCHUtlSCellHndlCqiCollsn); #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1799,7 +1777,6 @@ RgSchUePCqiCb *cqiCb; U32 cellIdx; U32 sCellCnt = 0; CmLteTimingInfo timingInfo; - TRC3(rgSCHUtlSCellHndlRiCollsn); #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1911,7 +1888,6 @@ RgSchUeCb *ue; #endif { S16 retVal = RFAILED; - TRC3(rgSCHSCellIsActive); for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { @@ -1952,7 +1928,6 @@ RgSchCellCb *cell; RgSchUeCb *ue #endif { - TRC2(rgSCHIsActvReqd) /* Check if remBoCnt in this UE is greater than ZERO for sufficient number of * Scheduling TTIs. If yes then We should activate a secondary cell to handle * outstanding BO */ diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c index 598dbccff..c0452c17a 100755 --- a/src/5gnrsch/rg_sch_tmr.c +++ b/src/5gnrsch/rg_sch_tmr.c @@ -98,9 +98,6 @@ U32 tmrVal; RgSchUeCellInfo *sCellCb = NULLP; #endif - TRC2(rgSCHTmrStartTmr); - - #ifndef LTE_ADV ue = (RgSchUeCb*)cb; #else @@ -226,9 +223,6 @@ Ptr cb; RgSchUeCellInfo *sCellCb = NULLP; #endif - TRC2(rgSCHTmrStopTmr); - - #ifndef LTE_ADV ue = (RgSchUeCb*)cb; #else @@ -350,8 +344,6 @@ S16 tmrEvnt; RgSchUeCellInfo *sCellCb = NULLP; #endif - TRC2(rgSCHTmrProcTmr); - #ifndef LTE_ADV ue = (RgSchUeCb*)cb; #else diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index 13e94e2e1..2f434b6f9 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -834,8 +834,6 @@ TfuRaReqIndInfo *raReqInd; U16 rapId; RgSchUeCb *ue = NULLP; - TRC2(rgSCHTomRaReqInd); - if(cell->cellId != raReqInd->cellId) { err.errType = RGSCHERR_TOM_RAREQIND; @@ -929,7 +927,6 @@ TfuUlCqiIndInfo *ulCqiInd; RgSchUeCb *ue; CmLList *node; TfuUlCqiRpt *ulCqiInfo; - TRC2(rgSCHTomUlCqiInd); node = ulCqiInd->ulCqiRpt.first; if(cell->cellId != ulCqiInd->cellId) @@ -1006,8 +1003,6 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; CmLList *node; TfuPucchDeltaPwr *ueElem; - TRC2(rgSCHTomPucchDeltaPwrInd); - if(cell->cellId != pucchDeltaPwr->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, @@ -1083,8 +1078,6 @@ TfuHqIndInfo *harqAckInd; U32 cellIdx; RgSchCellCb *iterCellP; - TRC2(rgSCHTomHarqAckInd); - if(cell->cellId != harqAckInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() Unable to get" @@ -1270,8 +1263,6 @@ TfuSrIndInfo *srInd; CmLList *node; TfuSrInfo *srInfo; - TRC2(rgSCHTomSrInd); - if(cell->cellId != srInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for srcInd cellId" @@ -1350,7 +1341,6 @@ TfuDoaIndInfo *doaInd; RgSchUeCb *ue; CmLList *node; TfuDoaRpt *doaInfo; - TRC2(rgSCHTomDoaInd); if(cell->cellId != doaInd->cellId) { @@ -1412,7 +1402,6 @@ TfuDlCqiIndInfo *dlCqiInd; RgSchUeCb *ue; CmLList *node; TfuDlCqiRpt *dlCqiInfo; - TRC2(rgSCHTomDlCqiInd); if(cell->cellId != dlCqiInd->cellId) { @@ -1479,7 +1468,6 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) U16 cqiIdx = 0; CmLteTimingInfo timingInfo; - TRC2(rgSCHTomUtlMovePcqiNxtOccasion); if(cqiCb->cqiCfg.cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) { @@ -1556,7 +1544,6 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) U16 crntTime; U16 tempIdx; - TRC2(rgSCHTomUtlMovePriNxtOccasion); crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cell->crntTime.slot); #ifdef XEON_SPECIFIC_CHANGES @@ -1672,8 +1659,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) { U16 srIdx = 0; - TRC2(rgSCHTomUtlMoveSrNxtOccasion); - /* Compute Next Transmission Instance */ srIdx = ue->srCb.peri + ue->srCb.nSrTrIdx; srIdx = srIdx%RG_SCH_PCQI_SRS_SR_TRINS_SIZE; @@ -1732,7 +1717,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) U16 crntTime; - TRC2(rgSCHTomUtlMoveSrsNxtOccasion); crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cell->crntTime.slot); @@ -1830,8 +1814,6 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) RgSchRaCb *raCb; TfuHqInfo hqInfo; - TRC2(rgSCHTomRawCqiInd); - if(cell->cellId != rawCqiInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" @@ -2091,8 +2073,6 @@ S16 rgSCHTomSrsInd(cell, srsInd) CmLList *node; TfuSrsRpt* srsInfo; - TRC2(rgSCHTomSrsInd); - if(cell->cellId != srsInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" @@ -2237,8 +2217,6 @@ TfuCrcIndInfo *crcInd; RgSchUlHqProcCb *ulHqProc; #endif - TRC2(rgSCHTomCrcInd); - if(cell->cellId != crcInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" @@ -2478,9 +2456,6 @@ TfuTimingAdvIndInfo *timingAdvInd; CmLList *node; TfuTimingAdvInfo *timingAdvInfo; - - TRC2(rgSCHTomTimingAdvInd); - if(cell->cellId != timingAdvInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" @@ -2546,8 +2521,6 @@ Inst schInst; RgSchCellCb *cell[CM_LTE_MAX_CELLS]; RgSchCellCb *cellLst[CM_LTE_MAX_CELLS]; - TRC2(rgSCHTomTtiInd); - #ifdef LTE_L2_MEAS glblTtiCnt++; #endif @@ -2857,8 +2830,6 @@ RgSchErrInfo *err; #endif Inst inst = cell->instIdx; - TRC2(rgSCHTomUtlProcUlSf) - if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { @@ -2938,8 +2909,6 @@ RgSchErrInfo *err; U16 validIdx; /* Index computed from recreq's timing info*/ Inst inst = cell->instIdx; - TRC2(rgSCHTomUtlPrcUlTddSpclSf) - if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { @@ -3024,8 +2993,6 @@ RgSchErrInfo *err; S16 ret; U8 sfTyp = 1; /* Dl Subframe */ - TRC2(rgSCHTomUtlProcDlSf); - cmLListInit(&cntrlInfo->phichLst); cmLListInit(&cntrlInfo->dlPdcchLst); cmLListInit(&cntrlInfo->ulPdcchLst); @@ -3166,7 +3133,6 @@ RgSchErrInfo *err; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); #endif - TRC2(rgSCHTomUtlFillPhich) ret = ROK; /* Traversing the list of Phichs */ node = dlSf->phichInfo.phichs.first; @@ -3298,7 +3264,6 @@ RgSchErrInfo *err; U8 isDcivld = FALSE; U8 numUePerTti = 0; - TRC2(rgSCHTomUtlFillDlPdcch) ret = ROK; /* Traversing the scheduled Harq processes */ node = dlSf->pdcchInfo.pdcchs.first; @@ -3440,7 +3405,6 @@ RgSchErrInfo *err; TfuPdcchInfo *tfuPdcch; U8 isDcivld = FALSE; - TRC2(rgSCHTomUtlFillUlPdcch) ret = ROK; /* Traversing the scheduled Harq processes */ node = dlSf->pdcchInfo.pdcchs.first; @@ -3550,8 +3514,6 @@ RgSchCellCb *cell; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHTomUtlProcTA); - node = cell->taUeLst.first; while (node) { @@ -4007,7 +3969,7 @@ RgSchErrInfo *err; pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal; pucchReqInfo->hqInfo.pucchResCnt = ue->f1bCsAVal; - cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #ifdef LTEMAC_SPS /* Two Resources needs to be configured if the * serving cell is in mimo mode else single @@ -4334,7 +4296,7 @@ RgSchErrInfo *err; pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal; pucchReqInfo->hqInfo.pucchResCnt = 1; - cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #endif/*TFU_UPGRADE*/ pucchReqInfo->hqInfo.hqRes[0] = dlSfHqInfo->n3ScellPucch.n3PucchIdx; #ifdef TFU_UPGRADE @@ -4405,8 +4367,6 @@ RgSchErrInfo *err; RgSchUeCb *ue; RgSchDlHqProcCb *prvHqCb=NULLP; - TRC2(rgSCHTomUtlFillHqFdbkRecpReq); - #ifdef CA_DBG { gF1bCsPres = FALSE; @@ -4505,8 +4465,6 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) #endif - TRC2(rgSCHTomUtlFillSrRecpReq); - isAddToLst = FALSE; node = cell->pCqiSrsSrLst[validIdx].srLst.first; @@ -4528,7 +4486,7 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif /*Fill SR params*/ @@ -4596,8 +4554,6 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) Bool *willueRprtCqiRi; #endif { - TRC2(rgSCHTomUtlWillUeRprtCqiRi); - /* Intialising Reporting probability as TRUE */ *willueRprtCqiRi = TRUE; @@ -4668,7 +4624,6 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE inactive state (DRX) */ RgSchUePCqiCb *riCb = NULLP; - TRC2(rgSCHTomUtlFillRiRecpReq); node = cell->pCqiSrsSrLst[validIdx].riLst.first; while(node) @@ -4714,7 +4669,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif /*Fill RI params*/ @@ -4789,8 +4744,6 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) RgSchUeCb *ue = NULLP; U16 ret; - TRC2(rgSCHTomUtlFillCqiRiRecpReq); - while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP) { if (RGSCH_TIMEINFO_SAME (recpReqInfo->timingInfo, ue->ue5gtfCb.nxtCqiRiOccn)) @@ -4804,7 +4757,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif pucchRecpInfo->rnti = ue->ueId; @@ -4868,8 +4821,6 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) RgSchUePCqiCb *cqiCb = NULLP; Bool isAddToLst = FALSE; - TRC2(rgSCHTomUtlFillPcqiRecpReq); - node = cell->pCqiSrsSrLst[validIdx].cqiLst.first; while(node) { @@ -4911,7 +4862,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif @@ -4975,8 +4926,6 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) S16 ret; RgSchUeCb *ue; - TRC2(rgSCHTomUtlFillSrsRecpReq); - node = cell->pCqiSrsSrLst[validIdx].srsLst.first; while(node) { @@ -5071,7 +5020,6 @@ RgSchErrInfo *err; RgSchUlAlloc *alloc; TfuUeRecpReqInfo *datRecpInfo; - TRC2(rgSCHTomUtlFillDatRecpReq) /* processing steps are * - Run through the UL allocations going out in this subframe. @@ -5190,8 +5138,6 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) Bool isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */ U8 numUePerTti = 0; - TRC2(rgSCHTomUtlFillDatRecpReq); - if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot)) { //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot); @@ -5309,7 +5255,6 @@ S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) #endif { RgSchUePCqiCb *riCb = ueCb->nPRiCb; - TRC2(rgSCHTomUtlFillRiBitWidthInfo); if (ueCb->mimoInfo.txMode != RGR_UE_TM_3 && ueCb->mimoInfo.txMode != RGR_UE_TM_4) @@ -5387,7 +5332,6 @@ U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) TfuCqiPucchMode21 *mode21Info; RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb; - TRC3(rgSCHTomUtlFetchPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && @@ -5533,7 +5477,6 @@ S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) U16 tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot); U16 prdNum = tti/cqiCb->cqiPeri; - TRC2(rgSCHTomUtlPcqiSbCalcBpIdx); if((prdNum % cqiCb->h) == 0) { cqiCb->isWb = TRUE; @@ -5595,7 +5538,6 @@ S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) { RgSchUePCqiCb *cqiCb = ue->nPCqiCb; RgSchUePCqiCb *riCb = ue->nPRiCb; - TRC2(rgSCHTomUtlMoveNxtOccasion); /* ccpu00140578::Skip the UE if already RI recpetion * is processed in the same subframe */ @@ -5696,8 +5638,6 @@ Void rgSCHTomPrepareAcqiRecp U8 numOfCells = 0; RgSchUeACqiCb *acqiCb = &ueCb->cellInfo[sCellIdx]->acqiCb; - TRC2(rgSCHTomPrepareAcqiRecp); - /* Fill TFU Recp */ cqiRecpReqInfo->reportType = TFU_APERIODIC_CQI_TYPE; /* Aperiodic */ if (ueCb->mimoInfo.txMode == RGR_UE_TM_3 || @@ -5890,7 +5830,6 @@ S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hq U8 triggerSet = 0; U8 sIdx = 0; #endif - TRC2(rgSCHTomUtlFillDatAperRecpReq); /*Fill RI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; @@ -5996,7 +5935,6 @@ hqPres, validIdx) #endif { TfuUePuschCqiRecpInfo *cqiRecpReqInfo; - TRC2(rgSCHTomUtlFillDatPriRecpReq); /*Fill RI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; @@ -6095,9 +6033,6 @@ S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, U8 cqiPmiSz; /*Raw CQI/PMI Size*/ U8 ri; - TRC2(rgSCHTomUtlFillDatPCqiRecpReq); - - /*Fill CQI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; #ifdef TFU_ALLOC_EVENT_NO_INIT @@ -6204,7 +6139,6 @@ S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, Bool hqPres; #endif { - TRC2(rgSCHTomUtlFillDatSrsRecpReq); datRecpInfo->rnti = alloc->rnti; rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); if(hqPres) @@ -6260,7 +6194,6 @@ S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) #endif { TfuUePuschSrsRecpInfo *srsRecpReqInfo; - TRC2(rgSCHTomFillOnlySrsRecpReq); srsRecpReqInfo = &datRecpInfo->t.puschRecpReq.srsInfo; srsRecpReqInfo->srsBw = (TfuUlSrsBwInfo)alloc->ue->srsCb.srsCfg.srsSetup.srsBw; @@ -6345,8 +6278,6 @@ Bool isDatPresOnSecCell; RgSchEmtcUeInfo *emtcUe = NULLP; #endif - TRC2(rgSCHTomUtlFillCqiSrSrsWithHq); - if(ue) { /*Changes for PUCCH Format3 */ @@ -6654,8 +6585,6 @@ U16 validIdx; U8 ri; /*To fetch RI value*/ Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE Inactive state (DRX)*/ - TRC2(rgSCHTomUtlFillCqiSrsWithSr); - riCb = ue->nPRiCb; cqiCb = ue->nPCqiCb; rgSCHTomUtlWillUeRprtCqiRi(ue, &willUeRprtCqi); @@ -6879,8 +6808,6 @@ noFdbks, memCp, elemIdx, nxtDlsf) RgSchDlHqTbCb *tbCb; RgSchDlHqProcCb *prvHqCb = NULLP; - TRC2(rgSCHTomUtlFillSfRepHqFdbk) - node = dlSf->ackNakRepQ.first; while (node) { @@ -7080,8 +7007,6 @@ RgSchDlHqProcCb *prvHqCb; U8 hqSz = 0; U32 idx = 0; - TRC2(rgSCHTomUtlFillSfHqFdbkInfo) - #ifndef TFU_UPGRADE RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, futTime, TFU_RECPREQ_DLDELTA); #endif @@ -7871,9 +7796,9 @@ U8 hqSz; err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } - cmMemset((U8 *)pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); #endif pucchInfo->pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; pucchInfo->pucchRecpInfo->rnti = rnti; @@ -8138,9 +8063,6 @@ RgSchErrInfo *err; Inst inst = cell->instIdx; S16 ret; - TRC2(rgSCHTomUtlProcDlSfAtCrc); - - cntrlInfo->numDlActvUes = 0; cmLListInit(&cntrlInfo->phichLst); cmLListInit(&cntrlInfo->dlPdcchLst); @@ -8222,8 +8144,6 @@ RgSchCellCb *cell; { RgrTtiIndInfo *rgrTtiInd; - TRC2(rgSCHTomUtlSendSfnTick); - /* TTI to be sent to RRM only once per system frame */ /* Added support for period = 0 to disable tick to RRM */ if ((cell->rrmTtiIndPrd != 0) && @@ -8281,7 +8201,6 @@ Inst schInst; { RgSchDynTddCb *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd); - TRC2(rgSCHDynTDDMrkCrntSfIdx) RG_SCH_DYN_TDD_MARKTYPE(rgSchDynTddInfo, rgSchDynTddInfo->crntDTddSfIdx, RG_SCH_DYNTDD_NOTDEF); @@ -8333,8 +8252,6 @@ RgSchCellCb *cells[]; CmLteTimingInfo frm; - TRC2 (rgSchTomFillCellTtiInfo); - if (CM_LTE_MAX_CELLS < ttiInd->numCells) { RETVOID; @@ -8503,8 +8420,6 @@ RgSchCellCb *cell; #endif { - TRC2(rgSchTomTtiUlAndDlCmnChSch); - cell->rlsHqArr[cell->crntHqIdx].numUes = 0; cell->crntHqIdx++; cell->crntHqIdx = cell->crntHqIdx % RGSCH_NUM_SUB_FRAMES; @@ -8583,8 +8498,6 @@ RgSchCellCb *cell; { U8 suId = cell->tfuSap->sapCfg.suId; - TRC2(rgSchTomTtiMiscFunctions); - /* Invoke RAM Tti Handler */ rgSCHRamTtiHndlr(cell); @@ -8675,7 +8588,6 @@ PRIVATE Void rgSchTomTtiDlSch (cell) RgSchCellCb *cell; #endif { - TRC2(rgSchTomTtiDlSch); if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE)) { @@ -8712,8 +8624,6 @@ RgSchCellCb *cell; dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time); - TRC2(rgSchTomTtiCnsldtSfAlloc); - /* Prepare Subframe allocation info and send to MAC */ rgSCHCmnCnsldtSfAlloc(cell); @@ -8753,8 +8663,6 @@ RgTfuCntrlReqInfo *cntrlInfo; RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time); RgSchErrInfo err; - TRC2(rgSchTomTtiL1DlAndUlCfg); - rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, &err); /* Mark this frame as sent */ dlSf->txDone = TRUE; @@ -8794,7 +8702,6 @@ PRIVATE Void rgSchTomUtlTddRlsSfAndHarq (cell) RgSchCellCb *cell; #endif { - TRC2(rgSchTomUtlTddRlsSfAndHarq); /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2). * Instead rgSchTddDlAscSetIdxKTbl can be used as the K set gives proper @@ -8837,8 +8744,6 @@ RgSchCellCb *cell; { RgSchErrInfo err; - TRC2(rgSCHTomUtlProcTddUlSf); - if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx] [cell->rcpReqTime.subframe] == RG_SCH_TDD_UL_SUBFRAME) { diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c index a74e7af0b..e357e8f79 100755 --- a/src/5gnrsch/rg_sch_uhm.c +++ b/src/5gnrsch/rg_sch_uhm.c @@ -145,8 +145,6 @@ U8 cqi; [ueUl->maxUlCqi]; #endif - TRC2(rgSCHUhmProcDatInd); - rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc); if (hqProc == NULLP) { @@ -215,7 +213,6 @@ Void rgSCHUhmProcMsg3DatInd(hqProc) RgSchUlHqProcCb *hqProc; #endif { - TRC2(rgSCHUhmProcMsg3DatInd); hqProc->rcvdCrcInd = TRUE; hqProc->remTx = 0; /*Reseting the value of rem Tx*/ printf("\nrgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId); @@ -247,7 +244,6 @@ Void rgSCHUhmProcMsg3Failure(hqProc) RgSchUlHqProcCb *hqProc; #endif { - TRC2(rgSCHUhmProcMsg3Failure); #ifdef EMTC_ENABLE RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc); #endif @@ -320,7 +316,6 @@ U8 cqi; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); S32 iTbs; #endif - TRC2(rgSCHUhmProcHqFailure); rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc); if (hqProc == NULLP) @@ -401,7 +396,6 @@ U8 idx; #endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); - TRC2(rgSCHUhmGetUlHqProc); #if (ERRCLASS & ERRCLS_DEBUG) if(idx >= ueUl->hqEnt.numHqPrcs) @@ -443,7 +437,6 @@ U8 maxHqRetx; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUhmNewTx); hqProc->ndi ^= 1; hqProc->alloc = alloc; @@ -492,7 +485,6 @@ RgSchCellCb *cell; RgSchUeCb *ueCb; U8 qci = 1; #endif - TRC2(rgSCHUhmFreeProc); #ifdef LTE_L2_MEAS if (hqProc->alloc && hqProc->alloc->ue) @@ -580,7 +572,6 @@ RgSchUlHqProcCb *hqProc; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUhmRetx); hqProc->alloc = alloc; --hqProc->remTx; @@ -625,8 +616,6 @@ RgrUeCfg *ueCfg; U8 i; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb); - TRC2(rgSCHUhmRgrUeCfg); - ueUl->hqEnt.maxHqRetx = ((ueCfg->ueUlHqCfg.maxUlHqTx) - 1); #ifdef TFU_UPGRADE /* Storing the delta HARQ offset for HARQ + PUSCH */ @@ -689,7 +678,6 @@ RgrUeRecfg *ueRecfg; #endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb); - TRC2(rgSCHUhmRgrUeRecfg); /* [ccpu00123958]-ADD- Check for HARQ Reconfig from the bit mask */ if(RGR_UE_ULHARQ_RECFG & ueRecfg->ueRecfgTypes) @@ -727,7 +715,6 @@ RgSchCellCb *cellCb; RgUeUlHqCb *hqEnt; #endif { - TRC2(rgSCHUhmFreeUe); #ifdef LTE_TDD /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -782,8 +769,6 @@ U8 idx; #endif /* LTEMAC_HDFDD */ RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cellCb); - TRC2(rgSCHUhmAppendPhich) - #ifdef RG_5GTF return ROK; #endif @@ -902,7 +887,6 @@ RgSchUeCb *ueCb; #ifdef LTE_TDD Inst inst = ueCb->cell->instIdx; #endif - TRC2(rgSCHUhmHqEntInit) #ifndef LTE_TDD /* Init the HARQ processes */ @@ -968,8 +952,6 @@ RgSchUlHqProcCb **hqP; CmLList *tmp; RgUeUlHqCb *hqE; - TRC2(rgSCHUhmGetAvlHqProc); - hqE = &ueUl->hqEnt; CM_LLIST_FIRST_NODE(&(hqE->free), tmp); @@ -1040,8 +1022,6 @@ CmLteTimingInfo frm; CmLList *lnk = lst->first; RgSchUlHqProcCb *proc; - TRC2(rgSCHUhmGetUlProcByTime); - while (lnk) { proc = (RgSchUlHqProcCb *)(lnk->node); diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index 5fe435be6..bde585b3d 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -372,7 +372,6 @@ U8 buffSize; U8 pointToChar,pointToEnd, loop; U8 size = endPos - startPos; F64 result = 0; - TRC2(rgSCHUtlParse); pointToEnd = (startPos)%8; for ( loop=0; loopmap[0]; @@ -602,8 +599,6 @@ RgSchPdcch *pdcch; U8 offset; uint16_t mask; - TRC2(rgSCHUtlPdcchPut); - switch(pdcch->aggrLvl) { case CM_LTE_AGGR_LVL2: @@ -674,8 +669,6 @@ U16 nCce; U8 extraBits; U32 cceMapSz; - TRC2(rgSCHUtlPdcchInit); - pdcchInfo = &subFrm->pdcchInfo; while(pdcchInfo->pdcchs.first != NULLP) { @@ -713,7 +706,7 @@ U16 nCce; } } - cmMemset(subFrm->pdcchInfo.map, 0, cceMapSz); + memset(subFrm->pdcchInfo.map, 0, cceMapSz); /* If nCce is not exactly same as the bitMap size(no of bits allocated * to represent the Cce's, then mark the extra bits as unavailable extra bits = (((pdcchInfo->nCce + 7) >> 3)*8) - pdcchInfo->nCce @@ -753,7 +746,6 @@ Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) { CmLListCp *l; CmLList *n; - TRC2(rgSchSFRTotalPoolFree); /*Deinitialise if these cc pools and ce pools are already existent*/ l = &sfrTotalPoolInfo->ccPool; @@ -821,8 +813,6 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) CmLList *temp = NULLP; S16 ret = 0; - TRC2(rgSchSFRTotalPoolInit); - rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); sf->sfrTotalPoolInfo.CCPool1BwAvlbl = 0; sf->sfrTotalPoolInfo.CCPool2BwAvlbl = 0; @@ -1013,8 +1003,6 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) Inst inst = cell->instIdx; U16 len; - TRC2(rgSchDSFRRntpInfoInit); - rntpPtr->pres = PRSNT_NODEF; len = (bw % 8 == 0) ? (bw/8) : (bw/8 + 1); @@ -1062,8 +1050,6 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) Inst inst = cell->instIdx; U16 len; - TRC2(rgSchDSFRRntpInfoFree); - len = (bw % 8 == 0) ? (bw/8) : (bw/8 + 1); if(rntpPtr->pres == PRSNT_NODEF) @@ -1103,7 +1089,6 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) #endif { - TRC2(rgSchSFRResetPoolVariables); pool->bwAlloced = 0; /*type0end will be the last RBG in pool with all available RBs*/ @@ -1149,8 +1134,6 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) CmLList *node = NULLP; RgSchSFRPoolInfo *tempPool = NULLP; - TRC2(rgSCHSFRUtlTotalPoolReset); - totalPoolInfo->ccBwFull = FALSE; totalPoolInfo->ceBwFull = FALSE; totalPoolInfo->isUeCellEdge = FALSE; @@ -1250,7 +1233,6 @@ Bool isForMsg3; RgSchPhich *phich; RgSchDlSf *dlSf; Inst inst = cell->instIdx; - TRC2(rgSCHUtlAddPhich); dlSf = rgSCHUtlSubFrmGet(cell, frm); RGSCH_PHICH_ALLOC(inst, phich,sizeof(RgSchPhich), ret); @@ -1304,8 +1286,6 @@ RgSchDlSf *subFrm; UNUSED(cell); - TRC2(rgSCHUtlPhichReset); - phichInfo = &subFrm->phichInfo; while(phichInfo->phichs.first != NULLP) { @@ -1348,8 +1328,6 @@ CmLteTimingInfo frm; RgSchDlSf *sf; U8 dlIdx; - TRC2(rgSCHUtlSubFrmGet); - #ifdef LTE_TDD dlIdx = rgSCHUtlGetDlSfIdx(cell, &frm); //RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx); @@ -1398,8 +1376,6 @@ RgSchDlSf *sf; U8 i; U8 noRaRsps; - TRC2(rgSCHUtlSubFrmPut); - #ifdef LTE_TDD /* Release all the held PDCCH information */ rgSCHUtlPdcchInit(cell, sf, sf->nCce); @@ -1421,7 +1397,7 @@ RgSchDlSf *sf; } sf->spsAllocdBw = 0; sf->type2Start = sf->bwAlloced; - cmMemset((U8*) &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); + memset( &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); #else sf->bwAlloced = 0; /* Fix for ccpu00123918*/ @@ -1430,7 +1406,7 @@ RgSchDlSf *sf; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { - cmMemset((U8*) sf->rntpInfo.val, 0, sf->rntpInfo.len); + memset(sf->rntpInfo.val, 0, sf->rntpInfo.len); } /* LTE_ADV_FLAG_REMOVED_END */ #endif @@ -1522,8 +1498,6 @@ U32 n; S16 i; U8 ret = 0; - TRC2(rgSCHUtlLog32bitNbase2) - for (i=4; i >= 0; i--) { if (n & b[i]) @@ -1568,7 +1542,6 @@ RgSchUeCb *ue; U8 isAck; #endif { - TRC2(rgSCHUtlDlRelPdcchFbk); cell->sc.apis->rgSCHDlRelPdcchFbk(cell, ue, isAck); RETVOID; } @@ -1603,7 +1576,6 @@ RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAck); cell->sc.apis->rgSCHDlProcAck(cell, hqP); RETVOID; } @@ -1635,7 +1607,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlHdlCrntiCE); cell->sc.apis->rgSCHHdlCrntiCE(cell, ue); RETVOID; @@ -1677,7 +1648,6 @@ Bool isEcp; #endif { U16 regs = 0; - TRC2(rgSCHUtlCalcTotalRegs); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1739,7 +1709,6 @@ U8 bw; U8 ng6; #endif { - TRC2(rgSCHUtlCalcPhichRegs); /* ccpu00115330: Corrected the calculation for number of PHICH groups*/ return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); } @@ -1791,7 +1760,6 @@ Bool isEcp; U16 phichRegs; U16 cceRegs; U8 ng6; - TRC2(rgSCHUtlCalcNCce); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1862,7 +1830,6 @@ Bool isEcp; U16 phichRegs; U16 cceRegs; U8 ng6; - TRC2(rgSCHUtlCalcNCce); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1942,8 +1909,6 @@ U8 *nDmrsRef; /* ACC-TDD */ S16 ret = RFAILED; - TRC2(rgSCHUtlGetPhichInfo); - if ((hqProc != NULLP) && (hqProc->alloc != NULLP)) { *rbStartRef = hqProc->alloc->grnt.rbStart; @@ -2020,7 +1985,6 @@ U8 *hqPId; * min(4,modulation order in grant). Please refer to 36.213-8.6.1*/ CmLteUeCategory ueCtgy; - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { @@ -2096,7 +2060,6 @@ CmLteTimingInfo *timeInfo; TfuUeUlSchRecpInfo *recpReq; #endif { - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { @@ -2212,8 +2175,6 @@ RgrTddPrachInfo *cellCfg; U8 startIdx; U8 endIdx; - TRC2(rgSCHUtlUpdPrachOcc) - /* In the 1st half frame */ if(cellCfg->halfFrm == 0) { @@ -2276,7 +2237,6 @@ RgrCellCfg *cellCfg; U8 subfrmIdx; U8 splFrm; - TRC2(rgSCHUtlPrachCfgInit) if(cellCfg->prachRscInfo.numRsc <= 0) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid" @@ -2362,9 +2322,7 @@ RgSchErrInfo *errInfo; S16 ret = ROK; U16 bw; /*!< Number of RBs in the cell */ - TRC2(rgSCHUtlRgrCellCfg); - - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* ccpu00132657-MOD- Determining DLSF array size independent of DELTAS */ maxDlslots = rgSchTddNumDlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -2422,7 +2380,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2542,9 +2500,8 @@ RgSchErrInfo *errInfo; U16 len; len = (U16)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /*KW fix for LTE_ADV */ /* LTE_ADV_FLAG_REMOVED_END */ - TRC2(rgSCHUtlRgrCellCfg); - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* determine the RBG size and no of RBGs for the configured * DL BW */ @@ -2575,7 +2532,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2721,7 +2678,6 @@ RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrCellRecfg); return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); } @@ -2765,7 +2721,6 @@ RgSchCellCb *cell; RgSchRaReqInfo *raReqInfo; U8 idx; #endif - TRC2(rgSCHUtlFreeCell); #ifdef LTE_TDD maxslots = cell->numDlSubfrms; @@ -2909,7 +2864,6 @@ RgrUeCfg *cfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrUeCfg); /* Assign TM 1 as UE's default TM */ ue->mimoInfo.txMode = RGR_UE_TM_1; @@ -2942,7 +2896,7 @@ RgSchErrInfo *err; #endif ue->csgMmbrSta = cfg->csgMmbrSta; #ifdef RG_PFS_STATS - cmMemset((U8 *)&ue->pfsStats, 0, sizeof(RgSchPfsStats)); + memset(&ue->pfsStats, 0, sizeof(RgSchPfsStats)); #endif /* Call the handler of the scheduler based on cell configuration */ return (cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); @@ -2987,7 +2941,6 @@ RgrLchCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcCfg); return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); } @@ -3030,7 +2983,6 @@ RgrLchRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcRecfg); return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); } @@ -3067,7 +3019,6 @@ CmLteLcId lcId; U8 lcgId; #endif { - TRC2(rgSCHUtlRgrLcDel); cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId); return (ROK); @@ -3108,7 +3059,6 @@ RgrLcgCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcgCfg); return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); } @@ -3148,7 +3098,6 @@ RgrLcgRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcgRecfg); return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); } /* rgSCHUtlRgrLcRecfg */ @@ -3184,7 +3133,6 @@ RgSchUeCb *ue; U8 lcgId; #endif { - TRC2(rgSCHUtlRgrLcgDel); cell->sc.apis->rgSCHFreeLcg(cell, ue, &ue->ul.lcgArr[lcgId]); /* Stack Crash problem for TRACE5 changes. added the return below . */ @@ -3225,7 +3173,6 @@ RgSchUeCb *ue; TfuDoaRpt *doaRpt; #endif { - TRC2(rgSCHUtlDoaInd); ue->mimoInfo.doa.pres = PRSNT_NODEF; ue->mimoInfo.doa.val = doaRpt->doa; RETVOID; @@ -3265,7 +3212,6 @@ CmLteTimingInfo timingInfo; #endif { RgSchCellCb *sCellCb = NULLP; - TRC2(rgSCHUtlDlCqiInd); if (dlCqiRpt->isPucchInfo) { sCellCb = ue->cellInfo[dlCqiRpt->dlCqiInfo.pucchCqi.cellIdx]->cell; @@ -3320,7 +3266,6 @@ TfuSrsRpt *srsRpt; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlSrsInd); cell->sc.apis->rgSCHSrsInd(cell, ue, srsRpt, timingInfo); RETVOID; } @@ -3353,7 +3298,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlTARpt); cell->sc.apis->rgSCHDlTARpt(cell, ue); RETVOID; } @@ -3386,7 +3330,6 @@ RgSchCellCb *cell; CmLteTimingInfo subFrm; #endif { - TRC2(rgSCHUtlDlRlsSubFrm); cell->sc.apis->rgSCHDlRlsSubFrm(cell, subFrm); RETVOID; } @@ -3430,8 +3373,6 @@ U8 isAck; U8 sIdx = 0; #endif - TRC2(rgSCHUtlUpdACqiTrigWt); - if (isAck == TFU_HQFDB_ACK) { cellInfo->acqiCb.aCqiTrigWt += RG_APER_CQI_ACK_WGT; @@ -3508,7 +3449,6 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlUlTransInd); cell->sc.apis->rgSCHHdlUlTransInd(cell, ue, timingInfo); RETVOID; } @@ -3541,7 +3481,6 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcInd(cell, ue, timingInfo); RETVOID; } /* end of rgSCHUtlHdlCrcFailInd */ @@ -3574,7 +3513,6 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcFailInd(cell, ue, timingInfo); RETVOID; } /* end of rgSCHUtlHdlCrcFailInd */ @@ -3610,7 +3548,6 @@ RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAddToRetx); cell->sc.apis->rgSCHDlProcAddToRetx(cell, hqP); RETVOID; } @@ -3813,8 +3750,6 @@ RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) RgSchCellCb *cellCb = NULLP; U8 strtCellId; - TRC2(rgSchUtlGetCellCb); - strtCellId = rgSchCb[inst].genCfg.startCellId; cellCb = rgSchCb[inst].cells[cellId - strtCellId]; @@ -3851,8 +3786,6 @@ U8 rgSchUtlGetServCellIdx(inst,cellId,ue) U8 servCellIdx; U16 strtCellId; - TRC2(rgSchUtlGetCellCb); - strtCellId = rgSchCb[inst].genCfg.startCellId; servCellIdx = ue->cellIdToCellIdxMap[cellId - strtCellId]; @@ -3887,8 +3820,6 @@ S16 rgSchUtlVldtCellId(inst, cellId) { U8 strtCellId; - TRC2(rgSchUtlVldtCellId); - strtCellId = rgSchCb[inst].genCfg.startCellId; if((cellId >= strtCellId) && ((cellId - strtCellId) < CM_LTE_MAX_CELLS)) { @@ -3935,8 +3866,6 @@ RgSchErrInfo *err; /* Changes for UE Category Reconfiguration feature addition */ RgSchCmnUe *ueSch = RG_SCH_CMN_GET_UE(ue, cell); - TRC2(rgSCHUtlRgrUeRecfg); - /* Changes for UE Category Reconfiguration feature addition */ if (ueRecfg->ueRecfgTypes & RGR_UE_UECAT_RECFG) { @@ -4028,7 +3957,6 @@ RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { - TRC2(rgSCHUtlFreeDlLc); cell->sc.apis->rgSCHFreeDlLc(cell, ue, svc); /* Stack Crash problem for TRACE5 changes. added the return below . */ @@ -4062,7 +3990,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlFreeUe); #ifdef LTE_TDD rgSCHUtlDelUeANFdbkInfo(ue,RGSCH_PCELL_INDEX); #endif @@ -4103,7 +4030,6 @@ RgSchUeCb *ue; RgSchDlLcCb *lc; #endif { - TRC2(rgSCHUtlDlDedBoUpd); cell->sc.apis->rgSCHDlDedBoUpd(cell, ue, lc); RETVOID; } @@ -4136,7 +4062,6 @@ RgSchUeCb *ue; RgSchRaCb *raCb; #endif { - TRC2(rgSCHUtlRecMsg3Alloc) cell->sc.apis->rgSCHUlRecMsg3Alloc(cell, ue, raCb); RETVOID; @@ -4175,7 +4100,6 @@ RgSchUlHqProcCb *curProc; RgSchUlHqProcCb *oldProc; #endif { - TRC2(rgSCHUtlUpdUlHqProc); return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); } /* rgSCHUtlUpdUlHqProc */ #endif @@ -4210,8 +4134,6 @@ RgSchUeCb *ue; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlContResUlGrant); - ue->isMsg4PdcchWithCrnti = TRUE; @@ -4250,7 +4172,6 @@ CmLteTimingInfo frm; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlSrRcvd); return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); } /* rgSCHUtlSrRcvd */ @@ -4290,7 +4211,6 @@ U8 bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrShort); cell->sc.apis->rgSCHUpdBsrShort(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); RETVOID; } /* rgSCHUtlUpdBsrShort */ @@ -4333,7 +4253,6 @@ U8 bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrTrunc); cell->sc.apis->rgSCHUpdBsrTrunc(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); RETVOID; } /* rgSCHUtlUpdBsrTrunc */ @@ -4385,7 +4304,6 @@ RgSchErrInfo *err; #endif { U8 bsArr[4]; - TRC2(rgSCHUtlUpdBsrLong); bsArr[0] = bsr0; bsArr[1] = bsr1; @@ -4428,7 +4346,6 @@ RgInfExtPhrCEInfo * extPhr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdExtPhr); return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); } /* rgSCHUtlUpdExtPhr */ @@ -4467,7 +4384,6 @@ U8 phr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdPhr); return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); } /* rgSCHUtlUpdPhr */ @@ -4501,7 +4417,6 @@ RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; #endif { - TRC2(rgSCHUtlUlCqiInd); cell->sc.apis->rgSCHUlCqiInd(cell, ue, ulCqiInfo); RETVOID; } /* rgSCHUtlUlCqiInd */ @@ -4535,7 +4450,6 @@ RgSchUeCb *ue; S8 delta; #endif { - TRC2(rgSCHUtlPucchDeltaPwrInd); cell->sc.apis->rgSCHPucchDeltaPwrInd(cell, ue, delta); RETVOID; } /* rgSCHUtlPucchDeltaPwrInd */ @@ -4565,7 +4479,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUeReset); ue->remBoCnt = 0; cell->sc.apis->rgSCHUeReset(cell, ue); RETVOID; @@ -4607,7 +4520,6 @@ RgSchUeCb *ue; RgSchUlHqProcCb **procRef; #endif { - TRC2(rgSCHUtlUlHqProcForUe); cell->sc.apis->rgSCHUlHqProcForUe(cell, frm, ue, procRef); /* Stack Crash problems for TRACE5 changes. added the return below */ @@ -4642,7 +4554,6 @@ RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHUtlFirstRcptnReq); return (cell->sc.apis->rgSCHFirstRcptnReq(cell)); } @@ -4675,7 +4586,6 @@ RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlNextRcptnReq); return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); } @@ -4709,7 +4619,6 @@ RgSchCellCb *cell; U8 idx; #endif { - TRC2(rgSCHUtlFirstHqFdbkAlloc); return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); } @@ -4743,7 +4652,6 @@ RgSchUlAlloc *alloc; U8 idx; #endif { - TRC2(rgSCHUtlNextHqFdbkAlloc); return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); } @@ -4784,11 +4692,10 @@ SpId spId; S16 ret; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuBndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[instId].tfuSap[suId]); - (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchBndReq (&pst, suId, spId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlTfuBndReq() Call to RgLiTfuBndReq()" @@ -4829,10 +4736,8 @@ Reason reason; S16 ret; Pst pst; - TRC2(rgSCHUtlTfuUBndReq); - /* Get the lower SAP control block from the layer control block. */ - cmMemcpy ((U8*)&pst, (U8*)&(sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchUbndReq (&pst, sapCfg.spId, reason)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuUBndReq() Call to" @@ -4870,12 +4775,11 @@ Bool resetCmnLcInfo; Bool restAlloc; #endif { - TRC2(rgSCHUtlResetSfAlloc); if(TRUE == restAlloc) { if(sfAlloc->ueInfo.numUes) { - cmMemset((U8 *)sfAlloc->ueInfo.allocInfo,0x00, + memset(sfAlloc->ueInfo.allocInfo,0x00, (sizeof(RgInfUeAlloc)*sfAlloc->ueInfo.numUes)); } sfAlloc->ueInfo.numUes = 0; @@ -4915,7 +4819,6 @@ RgSchCellCb *cell; { U8 idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlGetRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { cell->rlsHqArr[idx].cellId = cell->cellId; @@ -4964,7 +4867,6 @@ RgSchCellCb *cell; { U8 idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlPutRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { @@ -5014,7 +4916,6 @@ RgSchCellCb *cell; U8 indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlGetSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5096,7 +4997,6 @@ RgSchCellCb *cell; U8 indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlPutSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5176,8 +5076,6 @@ Size size; /* size */ { /* Moving alarm diagnostics to available scope */ - TRC2(rgSCHUtlAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -5210,7 +5108,7 @@ Size size; /* size */ /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -5247,8 +5145,6 @@ Size size; /* size */ S16 ret; - TRC2(rgSCHUtlFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -5307,8 +5203,6 @@ CmLListCp *siPduLst; CmLList *node; Buffer *pdu; - TRC2(rgSCHUtlFreeWarningSiSeg) - while (siPduLst->first != NULLP) { node = siPduLst->first; @@ -5350,8 +5244,6 @@ RgSchCellCb *cell; RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; - TRC2(rgSCHUtlFreeWarningSiPdu) - warningSi = (RgSchWarningSiInfo *) cell->siCb.\ siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ @@ -5408,10 +5300,8 @@ RgSchCellCb *cell; Buffer *pdu; CmLList *node; - TRC2(rgSCHUtlGetWarningSiPdu) - - warningSi = (RgSchWarningSiInfo *) cell->siCb. - siArray[cell->siCb.siCtx.siId-1].si; + warningSi = (RgSchWarningSiInfo *) cell->siCb. + siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node != NULLP) @@ -5459,8 +5349,6 @@ MsgLen *msgLen; RgSchWarningSiPdu *warningSiPdu; CmLList *node; - TRC2(rgSCHUtlGetMcsAndNPrb) - if(cell->siCb.siCtx.warningSiFlag == FALSE) { *mcs = cell->siCb.crntSiInfo.siInfo[cell->siCb.siCtx.siId-1].mcs; @@ -5519,8 +5407,6 @@ U8 siId; U8 mcs = 0; U8 nPrb = 0; - TRC2(rgSCHUtlCalMcsAndNPrb) - /*Get the nPrb and mcs parametr values */ if (rgSCHUtlGetAllwdCchTbSz(msgLen*8, &nPrb, &mcs) != (msgLen*8)) { @@ -5604,8 +5490,6 @@ U8 dgnType; #endif { - TRC2(rgSCHUtlFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: @@ -5651,7 +5535,6 @@ RgSchCb *schCb; Inst macInst; #endif { - TRC2(rgSCHUtlGetPstToLyr); /* Only the needed params are filled */ pst->region = schCb->rgSchInit.region; @@ -5701,7 +5584,6 @@ CmLteLcId lcId; Bool sendInd; #endif { - TRC2(rgSCHUtlFillRgInfCmnLcInfo); if((sf->bch.tbSize)&& !(sfAlloc->cmnLcInfo.bitMask & RGINF_BCH_INFO)) @@ -5771,8 +5653,6 @@ RgSchCellCb *cell; U8 noRaRsps; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHUtlFillRgInfRarInfo); - #ifdef LTE_TDD noRaRsps = RGSCH_MAX_TDD_RA_RSP_ALLOC; #else @@ -5901,7 +5781,6 @@ TfuPdschDciInfo *pdsch; TfuDciInfo *pdcchDci; #endif { - TRC2(rgSCHUtlFillPdschDciInfo) #ifdef EMTC_ENABLE S16 ret = ROK; @@ -5987,8 +5866,6 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) CmLListCp *l; CmLList *n; - TRC2(rgSchDSFRPwrCheck); - l = &sf->sfrTotalPoolInfo.ccPool; n = cmLListFirst(l); while(n) @@ -6559,7 +6436,6 @@ RgSchErrInfo *err; { S16 ret; - TRC2(rgSCHUtlUpdSch); #ifdef LTEMAC_SPS if (RGSCH_UL_SPS_ACT_PRSENT & pdu->ceInfo.bitMask) @@ -6659,7 +6535,6 @@ RgSchUeCb *ueCb; { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb, cell); RgSchDlHqProcCb *hqP = (RgSchDlHqProcCb *)ueDl->proc; - TRC2(rgSCHUtlAddUeToCcchSduLst); /* Temp Guard: For back to back CCCH SDU BO * twice. Hence an extra guard. If already added to scheduling @@ -6704,8 +6579,6 @@ RgInfCmnBoRpt *staRsp; #endif { RgSchUeCb *ueCb; - TRC2(rgSCHUtlUpdtBo) - if ((ueCb = rgSCHDbmGetUeCb(cell, staRsp->u.rnti)) == NULLP) { @@ -6760,8 +6633,6 @@ RgInfCmnBoRpt *boRpt; RgSchRaCb *raCb; RgSchUeCb *ueCb; - TRC2(rgSCHUtlHndlCcchBoUpdt); - if ((raCb = rgSCHDbmGetRaCb(cell, boRpt->u.rnti)) == NULLP) { #ifdef RGR_V1 @@ -6857,8 +6728,6 @@ U8 *mcs; S32 cn; S32 rt; - TRC2(rgSCHUtlGetAllwdCchTbSz); - for (lt = 0, rt = 43; lt <= rt;) { cn = (lt + rt)/2; @@ -6916,8 +6785,6 @@ RgInfCmnBoRpt *boUpdt; U8 nPrb=0; U8 mcs=0; - TRC2(rgSCHUtlHndlBcchPcchBoUpdt); - dlLc = rgSCHDbmGetBcchOnBch(cell); if (dlLc == NULLP) { @@ -7018,9 +6885,6 @@ U8 status; { S16 ret = ROK; - TRC2(rgSCHUtlRgrBndCfm) - - ret = RgUiRgrBndCfm(&rgSchCb[instId].rgrSap[suId].sapCfg.sapPst, rgSchCb[instId].rgrSap[suId].sapCfg.suId, status); if (ret != ROK) { @@ -7063,9 +6927,6 @@ U8 status; { S16 ret = ROK; - TRC2(rgSCHUtlRgmBndCfm) - - ret = RgUiRgmBndCfm(&rgSchCb[instId].rgmSap[suId].sapCfg.sapPst, rgSchCb[instId].rgmSap[suId].sapCfg.suId, status); if (ret != ROK) { @@ -7113,8 +6974,7 @@ U8 status; Pst cfmPst; Inst inst = 0; - TRC2(schSendCfgCfm) - cmMemset((U8 *)(&cfmPst), 0, sizeof(Pst)); + memset((&cfmPst), 0, sizeof(Pst)); cfmPst.srcEnt = (Ent)ENTDUAPP; cfmPst.srcInst = (Inst) 0; @@ -7170,9 +7030,6 @@ RgrTtiIndInfo *rgrTti; extern Void mtTmrHdlrPublic(void); #endif - TRC2(rgSCHUtlRgrTtiInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -7239,9 +7096,6 @@ RgSchErrInfo *err; S16 ret; RgSchRaCb *raCb; - TRC2(rgSCHUtlProcMsg3) - - /* must have an raCb for this case */ raCb = rgSCHDbmGetRaCb (cellCb, rnti); if (raCb == NULLP) @@ -7301,7 +7155,6 @@ RgSchUeCb *ueCb; Bool isExplRel; #endif { - TRC2(rgSCHUtlSpsRelInd); cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel); return ROK; } /* end of rgSCHUtlSpsRelInd */ @@ -7339,7 +7192,6 @@ RgSchUeCb *ueCb; U16 spsSduSize; #endif { - TRC2(rgSCHUtlSpsActInd); cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize); return ROK; } /* end of rgSCHUtlSpsActInd */ @@ -7382,7 +7234,6 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuGrpPwrCntrlReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7392,7 +7243,7 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; "rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); return RFAILED; } - cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuGrpPwrCntrlReq (&pst, tfuSap->sapCfg.spId, grpPwrCntrlReq)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, @@ -7435,8 +7286,6 @@ TfuCntrlReqInfo *cntrlReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuCntrlReq) - /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7491,7 +7340,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlActvtUe); cell->sc.apis->rgSCHActvtDlUe(cell, ue); return ROK; } @@ -7525,7 +7373,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUlActvtUe); cell->sc.apis->rgSCHActvtUlUe(cell, ue); return ROK; } @@ -7563,7 +7410,6 @@ TfuRecpReqInfo *recpReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuRecpReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7612,8 +7458,6 @@ SuId suId; { RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlValidateTfuSap) - if(suId >= rgSchCb[inst].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Incorrect SuId"); @@ -7668,8 +7512,6 @@ Size memSize; Mem sMem; VOLATILE U32 startTime=0; - TRC2(rgSCHUtlAllocEventMem) - sMem.region = rgSchCb[inst].rgSchInit.region; sMem.pool = rgSchCb[inst].rgSchInit.pool; @@ -7731,7 +7573,6 @@ Ptr memCp; { S16 ret; - TRC2(rgSCHUtlGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else @@ -7769,8 +7610,6 @@ U8 servCellIdx; { U8 idx; - TRC2(rgSCHUtlAllocUeANFdbkInfo); - if (rgSCHUtlAllocSBuf(ue->cell->instIdx, (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \ ue->cell->ackNackFdbkArrSize) != ROK) @@ -7812,7 +7651,6 @@ RgSchUeCb *ue; U8 servCellIdx; #endif { - TRC2(rgSCHUtlDelUeANFdbkInfo); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -7845,7 +7683,6 @@ S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo) RgSchTddANInfo *anFdInfo; #endif { - TRC2(rgSCHUtlInitUeANFdbkInfo); anFdInfo->sfn = RGSCH_MAX_SFN+1; /* defensively setting invalid sfn */ anFdInfo->slot = 0; @@ -7886,8 +7723,6 @@ U8 servCellIdx; { U8 idx; - TRC2(rgSCHUtlGetUeANFdbkInfo); - for (idx = 0; idx < ueCb->cell->ackNackFdbkArrSize; ++idx) { if( (timeInfo->sfn == ueCb->cellInfo[servCellIdx]->anInfo[idx].sfn) && @@ -7926,7 +7761,6 @@ CmLteTimingInfo *timeInfo; #endif { U16 idx = 0; - TRC2(rgSCHUtlGetDlSfIdx); idx = RGSCH_NUM_SUB_FRAMES - \ rgSchTddNumUlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -7973,7 +7807,6 @@ CmLteTimingInfo *nxtDlTime; { U16 idx = curDlTime.slot; U8 count = 0; - TRC2(rgSCHUtlGetNxtDlSfInfo); while(TRUE) { @@ -8026,7 +7859,6 @@ U8 *numSubfrm; { S16 idx = curDlTime.slot; U8 count = 0; - TRC2(rgSCHUtlGetPrevDlSfInfo); do { @@ -8076,7 +7908,6 @@ U8 maxUePerSf; #endif { S16 ret=ROK; - TRC2(rgSCHUtlUlSfInit); sf->idx = idx; #ifdef RG_5GTF @@ -8178,7 +8009,6 @@ RgSchCellCb *cell; RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlSfDeinit); if (sf->allocDb) { rgSCHUtlUlAllocDbDeinit(cell, sf->allocDb); @@ -8228,7 +8058,6 @@ U8 maxAllocs; #endif { S16 ret = rgSCHUtlUlAllocMemInit(cell, &allocDb->mem, maxAllocs); - TRC2(rgSCHUtlUlAllocDbInit); if (ret != ROK) { return (ret); @@ -8264,7 +8093,6 @@ RgSchCellCb *cell; RgSchUlAllocDb *allocDb; #endif { - TRC2(rgSCHUtlUlAllocDbDeinit); rgSCHUtlUlAllocMemDeinit(cell, &allocDb->mem); allocDb->count = 0; allocDb->first = NULLP; @@ -8304,7 +8132,6 @@ U8 num; { S16 ret; RgSchUlHole *hole = NULLP; - TRC2(rgSCHUtlUlHoleDbInit); ret = rgSCHUtlUlHoleMemInit(cell, &holeDb->mem, maxHoles, &hole); if (ret != ROK) @@ -8344,7 +8171,6 @@ RgSchCellCb *cell; RgSchUlHoleDb *holeDb; #endif { - TRC2(rgSCHUtlUlHoleDbDeinit); rgSCHUtlUlHoleMemDeinit(cell, &holeDb->mem); holeDb->count = 0; holeDb->first = NULLP; @@ -8379,7 +8205,6 @@ U8 numSb; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlAllocGetHole); if (numSb < hole->num) { return (rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); @@ -8422,7 +8247,6 @@ RgSchUlHole *hole; * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; RgSchUlAlloc *nxt = hole->nxtAlloc; - TRC2(rgSCHUtlUlAllocGetCompHole); if (prv) { @@ -8491,7 +8315,6 @@ RgSchUlHole *hole; /* Calling rgSchCmnUlAllocGetAndIns is ok, but prv alloc needs to have nxtHole * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; - TRC2(rgSCHUtlUlAllocGetPartHole); if (prv) { @@ -8548,7 +8371,6 @@ RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlAllocFirst); return (sf->allocDb->first); } @@ -8577,7 +8399,6 @@ RgSchUlSf *sf; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocNxt); UNUSED(sf); return (alloc->nxt); } @@ -8615,7 +8436,6 @@ RgSchUlAlloc *prv; { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = prv->nxt; - TRC2(rgSCHUtlUlAllocGetAdjNxt); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) @@ -8666,7 +8486,6 @@ RgSchUlAllocDb *db; { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = db->first; - TRC2(rgSCHUtlUlAllocGetFirst); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) @@ -8721,7 +8540,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = alloc->holeDbRef; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAllocation); if (prv) { @@ -8771,7 +8589,6 @@ RgSchUlAlloc *alloc; RgSchUlAllocDb *allocDb = alloc->allocDbRef; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRelease); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8829,7 +8646,6 @@ RgSchUlAlloc *alloc; RgSchUlAllocDb *allocDb = sf->allocDb; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRls); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8891,7 +8707,6 @@ RgSchUlHole *rgSCHUtlUlHoleFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlHoleFirst); return (sf->holeDb->first); } @@ -8920,7 +8735,6 @@ RgSchUlSf *sf; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleNxt); UNUSED(sf); return (hole->nxt); } @@ -8959,7 +8773,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = sf->holeDb; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAlloc); if (prv) { @@ -9015,7 +8828,6 @@ RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleJoin); prv->num += alloc->numSb + nxt->num; rgSCHUtlUlHoleRls(db, nxt); rgSCHUtlUlHoleIncr(db, prv); @@ -9052,7 +8864,6 @@ RgSchUlHole *prv; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndRight); prv->num += alloc->numSb; rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); @@ -9087,7 +8898,6 @@ RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndLeft); nxt->num += alloc->numSb; nxt->start = alloc->sbStart; rgSCHUtlUlHoleIncr(db, nxt); @@ -9127,7 +8937,6 @@ RgSchUlAlloc *alloc; RETVOID; } #endif - TRC2(rgSCHUtlUlHoleNew); hole->start = alloc->sbStart; hole->num = alloc->numSb; ++db->count; @@ -9163,7 +8972,6 @@ RgSchUlAlloc *prvAlloc; RgSchUlAlloc *nxtAlloc; #endif { - TRC2(rgSCHUtlUlHoleUpdAllocLnks); if (prvAlloc) { prvAlloc->nxtHole = hole; @@ -9205,7 +9013,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIns); if ((cur = db->first) != NULLP) { @@ -9275,7 +9082,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIncr); if ((cur = hole->prv) != NULLP) { @@ -9343,7 +9149,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleDecr); if ((cur = hole->nxt) != NULLP) { @@ -9417,7 +9222,6 @@ RgSchUlHole *hole; { RgSchUlHole *prv = hole->prv; RgSchUlHole *nxt = hole->nxt; - TRC2(rgSCHUtlUlHoleRls); --db->count; if (prv) @@ -9471,7 +9275,6 @@ U8 maxAllocs; { S16 ret; RgSchUlAlloc *allocs; - TRC2(rgSCHUtlUlAllocMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&allocs, maxAllocs * sizeof(*allocs)); @@ -9528,7 +9331,6 @@ RgSchCellCb *cell; RgSchUlAllocMem *mem; #endif { - TRC2(rgSCHUtlUlAllocMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->allocs)), @@ -9570,7 +9372,6 @@ RgSchUlHole **holeRef; { S16 ret; RgSchUlHole *holes; - TRC2(rgSCHUtlUlHoleMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&holes, maxHoles * sizeof(*holes)); @@ -9635,7 +9436,6 @@ RgSchCellCb *cell; RgSchUlHoleMem *mem; #endif { - TRC2(rgSCHUtlUlHoleMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->holes)), @@ -9669,7 +9469,6 @@ RgSchUlAllocMem *mem; #endif { RgSchUlAlloc *alloc; - TRC2(rgSCHUtlUlAllocMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) @@ -9711,7 +9510,6 @@ RgSchUlAllocMem *mem; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocMemRls); alloc->prv = NULLP; alloc->nxt = mem->firstFree; @@ -9747,7 +9545,6 @@ RgSchUlHoleMem *mem; #endif { RgSchUlHole *hole; - TRC2(rgSCHUtlUlHoleMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) @@ -9790,7 +9587,6 @@ RgSchUlHoleMem *mem; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleMemRls); hole->prv = NULLP; hole->nxt = mem->firstFree; @@ -9837,7 +9633,6 @@ U8 numSb; { RgSchUlHole *hole, *nxtHole; RgSchUlAlloc *alloc = NULLP; - TRC2(rgSCHUtlUlGetSpfcAlloc); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { @@ -9932,7 +9727,6 @@ U8 *qci; U8 qciIdx; U8 qciVal; - TRC3(rgSCHUtlValidateQci) for(qciIdx = 0; qciIdx < numQci; qciIdx++) { @@ -9978,7 +9772,6 @@ RgSchErrInfo *err; U16 measType; S16 ret; - TRC3(rgSCHUtlValidateMeasReq) measType = schL2MeasInfo->measType; @@ -10083,9 +9876,8 @@ U8 status; { U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10140,9 +9932,8 @@ U8 status; { U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrWarningSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10183,7 +9974,6 @@ RgSchCellCb *cell; { U8 idx = 0; U32 sizeOfSiInfo = 0; - TRC2(rgSCHUtlPutSiInfo) /*Free the buffers in crntSiInfo*/ RGSCH_FREE_MSG(cell->siCb.crntSiInfo.mib) RGSCH_FREE_MSG(cell->siCb.crntSiInfo.sib1Info.sib1) @@ -10414,8 +10204,8 @@ U8 numCqiRept; idxStart = ue->schCqiInfo.cqiCount - numCqiRept; - cmMemcpy ((U8*)&(staInfo->ueCqiInfo.cqiRept), - (U8*)&(ue->schCqiInfo.cqiRept[idxStart]), + memcpy (&(staInfo->ueCqiInfo.cqiRept), + &(ue->schCqiInfo.cqiRept[idxStart]), numCqiRept * sizeof(RgrUeCqiRept)); staInfo->ueCqiInfo.numCqiRept = numCqiRept; @@ -10468,7 +10258,6 @@ RgrStaIndInfo *rgrSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) rgrSap = cell->rgrSap; @@ -10525,7 +10314,6 @@ CmLteRnti newRnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlIndRntiRls2Mac) /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -10576,9 +10364,6 @@ S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrLoadInfInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -10631,7 +10416,6 @@ CmLteRnti newRnti; #endif { - TRC2(rgSCHUtlRlsRnti) U8 isLegacy = 0; #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -10731,9 +10515,6 @@ RgrUeStaIndInfo *rgrUeSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -10782,8 +10563,6 @@ RgSchCellCb *cell; count++; #endif - TRC2(rgSCHUtlUpdAvgPrbUsage); - frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -10819,7 +10598,7 @@ RgSchCellCb *cell; return RFAILED; } - cmMemset((U8 *) &prbRprtInd->stQciPrbRpts[0], + memset(&prbRprtInd->stQciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgmPrbRptPerQci))); @@ -10902,7 +10681,6 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHUtlReTxTa) /* If TA Timer is running. Stop it */ if (ueCb->taTmr.tmrEvnt != TMR_NONE) @@ -10957,7 +10735,6 @@ RgInfCmnBoRpt *boUpdt; U32 crntTimeInSubFrms = 0; U32 boUpdTimeInSubFrms = 0; U32 distance = 0; - TRC2(rgSCHChkBoUpdate); crntTimeInSubFrms = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) + cell->crntTime.slot + RG_SCH_CMN_DL_DELTA + 2; /* As bo received will scheduled in next TTI @@ -11014,8 +10791,6 @@ U8 hqFdbkIdx; RgSchUlSf *ulSf; U8 ulSF; /* UL SF in the TDD frame */ - TRC2(rgSchUtlCfg0ReTxIdx); - ulSf = &cellUl->ulSfArr[hqFdbkIdx]; ulSF = ulSf->ulSfIdx; @@ -11092,8 +10867,6 @@ U32 *prbReqrd; U8 iTbs; U8 cfi = dlCell->currCfi; - TRC2(rgSchUtlDlCalc1CwPrb); - iTbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; eff = (*(RgSchCmnTbSzEff *)(dlCell->cqiToEffTbl[0][cfi]))[iTbs]; @@ -11151,8 +10924,6 @@ U32 *prbReqrd; U8 iTbs1, iTbs2; U8 cfi = dlCell->currCfi; - TRC2(rgSchUtlDlCalc2CwPrb); - if ((dlUe->mimoInfo.forceTD) ||/* Transmit Diversity (TD) */ (dlUe->mimoInfo.ri < 2))/* 1 layer precoding */ { @@ -11218,8 +10989,6 @@ U32 bo; U32 *prbReqrd; #endif { - TRC2(rgSchUtlCalcTotalPrbReq); - /* Call TM specific Prb calculation routine */ (dlCalcPrbFunc[ue->mimoInfo.txMode - 1])(cell, ue, bo, prbReqrd); @@ -11261,7 +11030,6 @@ U8 numTxAnt; U8 ri; RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cell); - TRC3(rgSCHUtlFetchPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && (ueCb->mimoInfo.txMode != RGR_UE_TM_4)) @@ -11549,9 +11317,7 @@ Bool isGbr; Pst pst; RgInfLcgRegReq lcgRegReq; - TRC3(rgSCHUtlBuildNSendLcgReg); - - cmMemset((U8*)&pst, (U8)0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); lcgRegReq.isGbr = isGbr; lcgRegReq.cellId = cell->cellId; lcgRegReq.crnti = crnti; @@ -11596,8 +11362,6 @@ RgrSchFrmt1b3TypEnum fdbkType; TfuAckNackMode mode = TFU_UCI_FORMAT_1A_1B; - TRC2(rgSchUtlGetFdbkMode); - switch(fdbkType) { case RG_SCH_UCI_FORMAT_NON_CA: @@ -11657,8 +11421,6 @@ CmLteRnti rnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlSndUeSCellDel2Mac) - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst),"RNTI Release IND for UE(%d)\n", rnti)); /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -11701,8 +11463,6 @@ RgrTxMode txMode { U8 maxTbCount; - TRC2(rgSCHUtlGetMaxTbSupp); - /* Primary Cell */ switch(txMode) @@ -12206,8 +11966,6 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) { U32 tptDelta; - TRC3(rgSCHUtlCpuOvrLdAdjItbsCap) - if ((cell->cpuOvrLdCntrl.cpuOvrLdIns) & (RGR_CPU_OVRLD_DL_TPT_UP | RGR_CPU_OVRLD_DL_TPT_DOWN)) { @@ -12468,8 +12226,6 @@ S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); U8 idx; - TRC3(rgSCHUtlResetCpuOvrLdState) - #ifdef CPU_OL_DBG_PRINTS printf("\n CPU OVR LD Ins Rcvd = %d\n", (int)crntCpuOvrLdIns); #endif diff --git a/src/5gnrsch/rg_sch_utl_clist.c b/src/5gnrsch/rg_sch_utl_clist.c index ca1a385c6..c89b7dd2c 100755 --- a/src/5gnrsch/rg_sch_utl_clist.c +++ b/src/5gnrsch/rg_sch_utl_clist.c @@ -61,7 +61,6 @@ Void rgSCHRrCListInit(lCp) RgSchRrCListCp *lCp; /* list control point */ #endif { - TRC2(rgSCHRrCListInit); lCp->first = (RgSchRrCList *)NULLP; lCp->crnt = (RgSchRrCList *)NULLP; @@ -94,7 +93,6 @@ Void rgSCHRrCListAdd2Crnt(lCp, node) RgSchRrCList *node; /* node to be added */ #endif { - TRC2(rgSCHRrCListAdd2Crnt); #ifdef ERRCHK if (lCp == (RgSchRrCListCp *)NULLP) RETVOID; @@ -147,7 +145,6 @@ RgSchRrCListCp *lCp; /* list control point */ RgSchRrCList *node; /* node to be added */ #endif { - TRC2(rgSCHRrCListAdd2Tail); #ifdef ERRCHK if (lCp == (RgSchRrCListCp *)NULLP) @@ -202,7 +199,6 @@ RgSchRrCListCp *lCp; /* list control pointer */ RgSchRrCList *node; /* node to be removed */ #endif { - TRC2(rgSCHRrCListDelFrm); #ifdef ERRCHK if (lCp == (RgSchRrCListCp *)NULLP) @@ -282,7 +278,6 @@ RgSchRrCList *node; /* node to be inserted */ #endif { RgSchRrCList *crnt; - TRC2(rgSCHRrCListInsrtAtCrnt); #ifdef ERRCHK if (lCp == (RgSchRrCListCp *)NULLP) diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 7b1199f19..12f0bbbff 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -130,8 +130,8 @@ uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) return LCM_REASON_INVALID_MSGTYPE; } /* Update the Pst structure for LM interface */ - memcpy((uint8_t *)&schCb[inst].schInit.lmPst, - (uint8_t *)&cfg->s.schInstCfg.genCfg.lmPst, + memcpy(&schCb[inst].schInit.lmPst, + &cfg->s.schInstCfg.genCfg.lmPst, sizeof(Pst)); schCb[inst].schInit.inst = inst; @@ -151,9 +151,9 @@ uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) schCb[inst].genCfg.startCellId = cfg->s.schInstCfg.genCfg.startCellId; #if 0 /* Initialzie the timer queue */ - memset((uint8_t *)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); + memset(&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); /* Initialize the timer control point */ - memset((uint8_t *)&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); + memset(&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); schCb[inst].tmrTqCp.tmrLen = RGSCH_TQ_SIZE; /* SS_MT_TMR needs to be enabled as schActvTmr needs instance information */ @@ -210,7 +210,7 @@ uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) memset(&cfmPst, 0 , sizeof(Pst)); SchFillCfmPst(pst, &cfmPst, cfg); - memset((uint8_t *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = diff --git a/src/5gnrsch/sch_utils.h b/src/5gnrsch/sch_utils.h index 8d1e8b750..310aeb372 100644 --- a/src/5gnrsch/sch_utils.h +++ b/src/5gnrsch/sch_utils.h @@ -52,7 +52,7 @@ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ { \ - memset((U8*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ } \ else \ { \ diff --git a/src/cm/ckw.c b/src/cm/ckw.c index 99e175004..4bbcf4f51 100755 --- a/src/cm/ckw.c +++ b/src/cm/ckw.c @@ -71,7 +71,6 @@ SpId spId; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkCkwBndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -122,7 +121,6 @@ Reason reason; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkCkwUbndReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -173,7 +171,6 @@ U8 status; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkCkwBndCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -221,7 +218,6 @@ RlcTmInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRlcTmInfo) CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf); @@ -254,7 +250,6 @@ RlcEntCfgInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRlcUmInfo) switch(param->dir) { @@ -308,7 +303,6 @@ RlcAmInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRlcAmInfo) /* UP LINK */ CMCHKPK(oduUnpackUInt8, param->ul.reOrdTmr, mBuf); @@ -351,7 +345,6 @@ CkwLChInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkCkwLChInfo) CMCHKPK(oduUnpackUInt8, param->type, mBuf); CMCHKPK(oduUnpackUInt8, param->lChId, mBuf); @@ -385,7 +378,6 @@ RlcEntCfgInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRlcEntCfgInfo) switch(param->entMode) { @@ -468,7 +460,6 @@ Buffer *mBuf; { S16 idx; - TRC3(cmPkRlcCfgInfo) for (idx = param->numEnt-1; idx >= 0; idx--) { @@ -509,7 +500,6 @@ RlcEntCfgCfmInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRlcEntCfgCfmInfo) CMCHKPK(cmPkCmStatus, &(param->status), mBuf); CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); @@ -548,7 +538,6 @@ Buffer *mBuf; { S16 idx; - TRC3(cmPkRlcCfgCfmInfo) for (idx = param->numEnt-1; idx >= 0; idx--) { @@ -594,7 +583,6 @@ RlcCfgCfmInfo *cfgCfmInfo; S16 ret1; Buffer *mBuf; mBuf = NULLP; - TRC3(cmPkRlcCfgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -668,7 +656,6 @@ CkwUeInfo *param; Buffer *mBuf; #endif { - TRC2(cmPkCkwUeInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); @@ -710,7 +697,6 @@ CkwUeInfo *newUeInfo; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkCkwUeIdChgReq) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -782,7 +768,6 @@ CmStatus status; S16 ret1; Buffer *mBuf = NULLP; - TRC3(cmPkCkwUeIdChgCfm) if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) { @@ -849,7 +834,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkCkwBndReq) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW024, pst); CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW025, pst); @@ -888,7 +872,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkCkwUbndReq) CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW026, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, ECKW027, pst); @@ -926,7 +909,6 @@ Buffer *mBuf; SuId suId = 0; U8 status = 0; - TRC3(cmUnpkCkwBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst); CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst); @@ -961,7 +943,6 @@ RlcTmInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcTmInfo) CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf); @@ -994,7 +975,6 @@ RlcEntCfgInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcUmInfo) switch(param->dir) { @@ -1048,7 +1028,6 @@ RlcAmInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcAmInfo) /* DOWN LINK */ CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf); @@ -1091,7 +1070,6 @@ CkwLChInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkCkwLChInfo) CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf); CMCHKUNPK(oduPackUInt8, &(param->type), mBuf); @@ -1125,7 +1103,6 @@ RlcEntCfgCfmInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcEntCfgCfmInfo) CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf); CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf); @@ -1164,7 +1141,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkRlcCfgCfmInfo) CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); @@ -1205,7 +1181,6 @@ RlcEntCfgInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcEntCfgInfo) CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf); CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf); @@ -1289,7 +1264,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkRlcCfgInfo) CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); @@ -1336,7 +1310,6 @@ Buffer *mBuf; SuId suId = 0; RlcCfgCfmInfo *cfgCfmInfo = NULLP; - TRC3(cmUnpkRlcCfgCfm) if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\ sizeof(RlcCfgCfmInfo))) != ROK) @@ -1352,7 +1325,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo)); + memset(cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo)); CMCHKUNPK(SUnpkS16, &suId, mBuf); @@ -1406,7 +1379,6 @@ CkwUeInfo *param; Buffer *mBuf; #endif { - TRC2(cmUnpkCkwUeInfo) CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf); @@ -1447,7 +1419,6 @@ Buffer *mBuf; CkwUeInfo *ueInfo = NULLP; CkwUeInfo *newUeInfo = NULLP; - TRC3(cmUnpkCkwUeIdChgReq) CMCHKUNPK(SUnpkS16, &(spId), mBuf); @@ -1466,7 +1437,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo)); + memset(ueInfo, 0, sizeof(CkwUeInfo)); ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1493,7 +1464,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)newUeInfo, 0, sizeof(CkwUeInfo)); + memset(newUeInfo, 0, sizeof(CkwUeInfo)); ret1 = cmUnpkCkwUeInfo((newUeInfo), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1546,9 +1517,8 @@ Buffer *mBuf; CkwUeInfo *ueInfo = NULLP; CmStatus status; - TRC3(cmUnpkCkwUeIdChgCfm) - cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus)); + memset(&status, 0, sizeof(CmStatus)); CMCHKUNPK(SUnpkS16, &suId, mBuf); CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst); @@ -1567,7 +1537,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo)); + memset(ueInfo, 0, sizeof(CkwUeInfo)); ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) diff --git a/src/cm/cm_bdy5.c b/src/cm/cm_bdy5.c index 76ad18e4d..bd8cfa6e6 100644 --- a/src/cm/cm_bdy5.c +++ b/src/cm/cm_bdy5.c @@ -117,7 +117,6 @@ PFV func; /* function */ CmTimer *tmp1; CmTimer **tmp2; - TRC2(cmPrcTmr) #ifdef CMDBG { @@ -188,7 +187,6 @@ PFV func; /* function */ CmTimer *tmp1; VOLATILE U32 startTime = 0; - TRC2(cmPrcTmr) /*starting Task*/ SStartTask(&startTime, PID_CM_PRC_TMR); @@ -283,7 +281,6 @@ U8 max; /* maximum tmrs */ CmTimer *tPtr; REG1 U8 i; - TRC2(cmInitTimers) for (i = 0, tPtr = timers; i < max; i++, tPtr++) { @@ -329,7 +326,6 @@ CmTmrArg *arg; U32 expire; CmTimer **tmp; - TRC2(cmPlcCbTq) expire = (arg->tqCp->nxtEnt + arg->wait); /* cm_bdy5_c_002.113 - Modification for SRegCfgTmr support */ @@ -359,7 +355,6 @@ CmTmrArg *arg; CmTqType *tq; CmTimer *target; U32 expire; - TRC2(cmPlcCbTq) expire = (arg->tqCp->nxtEnt + arg->wait); ent = (U32)(expire % (U32)(arg->tqCp->tmrLen)); @@ -411,7 +406,6 @@ Void cmRstCbTq(arg) CmTmrArg *arg; #endif { - TRC2(cmRstCbTq) arg->timers[arg->tNum].tqExpire = arg->tqCp->nxtEnt + arg->wait; arg->timers[arg->tNum].ent2bUpd = TRUE; @@ -451,7 +445,6 @@ CmTmrArg *arg; CmTimer *tmp1; CmTimer **tmp2; - TRC2(cmRmvCbTq) target = &arg->timers[arg->tNum]; if (target->tmrEvnt != TMR_NONE) @@ -483,9 +476,6 @@ CmTmrArg *arg; CmTimer *target; CmTqType *tq; - - TRC2(cmRmvCbTq) - target = &arg->timers[arg->tNum]; if (target->tmrEvnt != TMR_NONE) { diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c index 5a65de765..a1f88bb63 100644 --- a/src/cm/cm_gen.c +++ b/src/cm/cm_gen.c @@ -109,7 +109,6 @@ DateTime *dateTime; /* date and time */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkDateTime) /*-- cm_gen_c_001.main_36 - added for micro seconds --*/ #ifdef SS_DATETIME_USEC @@ -153,7 +152,6 @@ Duration *duration; /* duration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkDuration) CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf); CMCHKPK(oduUnpackUInt8, duration->secs, mBuf); @@ -198,7 +196,6 @@ Buffer *mBuf; /* message buffer */ U32 tmp32; #endif - TRC2(oduPackPointer) ret = ROK; switch (PTRSIZE) @@ -304,7 +301,6 @@ EntityId *entityId; /* entity id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkEntityId) CMCHKPK(cmPkInst, entityId->inst, mBuf); CMCHKPK(cmPkEnt, entityId->ent, mBuf); @@ -339,7 +335,6 @@ ElmntId *elmntId; /* element id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkElmntId) CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); CMCHKPK(cmPkElmntInst2, elmntId->elmntInst2, mBuf); @@ -376,7 +371,6 @@ MemoryId *memoryId; /* memoryId */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkMemoryId) CMCHKPK(cmPkPool, memoryId->pool, mBuf); CMCHKPK(cmPkRegion, memoryId->region, mBuf); @@ -413,7 +407,6 @@ Buffer *mBuf; /* message buffer */ { Txt *p; /* part number string */ - TRC2(cmPkSystemId) for (p = systemId->ptNmb; *p; p++); @@ -462,7 +455,6 @@ Buffer *mBuf; /* buffer */ { U8 j; /* Index */ - TRC3(cmPkProtAddr) #ifdef CM_ARI2 CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); @@ -513,7 +505,6 @@ Buffer *mBuf; /* buffer */ U8 j; /* Index */ ProtAddr *pAddr; /* protocol Address */ - TRC3(cmPkProtAddrTbl) if (protAddr->count > MAX_PROT_ADDRS) return RFAILED; @@ -570,7 +561,6 @@ Buffer *mBuf; /* message buffer */ { U8 i; /* loop counter */ - TRC2(cmPkAddrs) if (addrs->length > ADRLEN) return RFAILED; @@ -615,7 +605,6 @@ Buffer *mBuf; /* message buffer */ { U8 i; /* loop counter */ - TRC2(cmPkShrtAddrs) if (addrs->length > SHRTADRLEN) return RFAILED; @@ -659,7 +648,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; /* counter */ - TRC2(cmPkAddrMask) /* pack address mask */ for (i = (ADRLEN - 1); i >= 0; i--) @@ -699,7 +687,6 @@ Buffer *mBuf; /* message buffer */ { Txt *p; /* temporary */ - TRC2(cmPkBndCfg) CMCHKPK(cmPkSelector, bndCfg->selector, mBuf); CMCHKPK(cmPkAddrs, &bndCfg->sapAdr, mBuf); @@ -746,7 +733,6 @@ Pst *pst; Buffer *mBuf; #endif { - TRC2(cmPkPst) CMCHKPK(cmPkEvent, pst->event, mBuf); CMCHKPK(cmPkInst, pst->srcInst, mBuf); @@ -793,7 +779,6 @@ ElmtHdr *m; /* element header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkElmtHdr) #if (LCAMT || ATM_BISUP) CMCHKPK(oduUnpackUInt16, m->compInd, mBuf); @@ -840,7 +825,6 @@ TknU8 *tknU8; /* token U8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU8) if (tknU8->pres) { @@ -881,7 +865,6 @@ TknS8 *tknS8; /* token S8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknS8) if (tknS8->pres) { @@ -922,7 +905,6 @@ TknU16 *tknU16; /* token U16 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU16) if (tknU16->pres) { @@ -963,7 +945,6 @@ TknU32 *tknU32; /* token U32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU32) if (tknU32->pres) { @@ -1006,7 +987,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStr) if (tknStr->pres) { @@ -1055,7 +1035,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrM) if(tknStr->pres) { @@ -1104,7 +1083,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrS) if(tknStr->pres) { @@ -1153,7 +1131,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrE) if(tknStr->pres) { @@ -1204,7 +1181,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; - TRC3(cmPkPnNodeId); for (i = PN_NODEID_LEN - 1; i >= 0; i--) { @@ -1243,7 +1219,6 @@ TknStr4 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr4) CMPKTKNSTR(tknStr, mBuf); @@ -1279,7 +1254,6 @@ TknStr12 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr12) CMPKTKNSTR(tknStr, mBuf); @@ -1314,7 +1288,6 @@ TknStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr32) CMPKTKNSTR(tknStr, mBuf); @@ -1349,7 +1322,6 @@ TknStr64 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr64) CMPKTKNSTR(tknStr, mBuf); @@ -1384,7 +1356,6 @@ TknStr132 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr132) CMPKTKNSTR(tknStr, mBuf); @@ -1419,7 +1390,6 @@ TknStr256 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr256) CMPKTKNSTR(tknStr, mBuf); @@ -1456,7 +1426,6 @@ Buffer *mBuf; /* message buffer */ { U16 i; - TRC2(cmPkTknOid) if (tknOid->pres == TRUE) { @@ -1507,7 +1476,6 @@ TknS32 *tknS32; /* token S32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknS32) if (tknS32->pres) { @@ -1548,7 +1516,6 @@ Header *header; /* header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkHeader) #ifdef LMINT3 CMCHKPK(cmPkMemoryId, &header->response.mem, mBuf); @@ -1594,7 +1561,6 @@ CmStatus *sta; /* status structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkCmStatus) CMCHKPK(oduUnpackUInt16, sta->reason, mBuf); CMCHKPK(oduUnpackUInt16, sta->status, mBuf); @@ -1629,7 +1595,6 @@ CmAlarm *alarm; /* alarm structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkCmAlarm) CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf); CMCHKPK(oduUnpackUInt16, alarm->event, mBuf); @@ -1666,7 +1631,6 @@ SmCfg *smCfg; /* stack manager */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkSmCfg) CMCHKPK(cmPkSelector, smCfg->selector, mBuf); CMCHKPK(cmPkRoute, smCfg->route, mBuf); @@ -1706,7 +1670,6 @@ TmrCfg *tmrCfg; /* timer configuration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTmrCfg) CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf); CMCHKPK(oduPackBool, tmrCfg->enb, mBuf); @@ -1741,7 +1704,6 @@ TknBuf *tknBuf; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknBuf) if(tknBuf->pres) { @@ -1789,7 +1751,6 @@ CmIntf *intf; /* interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkIntf) CMCHKPK(cmPkIntfId, intf->intfId, mBuf); CMCHKPK(cmPkIntfVer, intf->intfVer, mBuf); @@ -1830,7 +1791,6 @@ DateTime *dateTime; /* date/time structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpDateTime) CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); @@ -1875,7 +1835,6 @@ Duration *duration; /* duration structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpDuration) CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); @@ -1921,7 +1880,6 @@ Buffer *mBuf; /* message buffer */ U64 tmp64; #endif - TRC2(oduUnpackPointer) switch (PTRSIZE) { @@ -2044,7 +2002,6 @@ EntityId *entityId; /* entity id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkEntityId) CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); CMCHKUNPK(cmUnpkInst, &entityId->inst, mBuf); @@ -2079,7 +2036,6 @@ ElmntId *elmntId; /* element id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkElmntId) CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); CMCHKUNPK(cmUnpkElmntInst1, &elmntId->elmntInst1, mBuf); @@ -2116,7 +2072,6 @@ MemoryId *memoryId; /* memoryId */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkMemoryId) CMCHKUNPK(cmUnpkRegion, &memoryId->region, mBuf); CMCHKUNPK(cmUnpkPool, &memoryId->pool, mBuf); @@ -2154,7 +2109,6 @@ Buffer *mBuf; /* message buffer */ S16 i; /* loop counter */ MsgLen len; - TRC2(cmUnpkSystemId) CMCHKUNPK(SUnpkS16, &systemId->mVer, mBuf); CMCHKUNPK(SUnpkS16, &systemId->mRev, mBuf); @@ -2202,7 +2156,6 @@ Buffer *mBuf; /* buffer */ { U8 j; /* Index */ - TRC3(cmUnpkProtAddr) CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); @@ -2251,7 +2204,6 @@ Buffer *mBuf; /* buffer */ U8 j; /* Index */ ProtAddr *pAddr; /* Protocol Address */ - TRC3(cmUnpkProtAddrTbl) CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf); for (i = 0; i < protAddr->count; i++) @@ -2303,7 +2255,6 @@ Buffer *mBuf; /* message buffer */ { U8 i; /* loop counter */ - TRC2(cmUnpAddrs) CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); @@ -2346,7 +2297,6 @@ Buffer *mBuf; /* message buffer */ { U8 i; /* loop counter */ - TRC2(cmUnpShrtAddrs) CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); @@ -2389,7 +2339,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; /* counter */ - TRC2(cmUnpAddrMask) /* unpack address mask */ for (i = 0; i< ADRLEN; i++) @@ -2428,7 +2377,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; /* loop counter */ - TRC2(cmUnpBndCfg) for (i = 0; bndCfg->usrId[i]; i++); CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf); @@ -2474,7 +2422,6 @@ Pst *pst; Buffer *mBuf; #endif { - TRC2(cmUnpkPst) #ifdef TDS_ROLL_UPGRADE_SUPPORT CMCHKUNPK(cmUnpkIntfVer, &pst->intfVer, mBuf); @@ -2521,7 +2468,6 @@ ElmtHdr *m; /* element header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpElmtHdr) /* Present */ CMCHKUNPK(oduUnpackBool, &m->pres , mBuf); @@ -2568,7 +2514,6 @@ TknU8 *tknU8; /* token U8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU8) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknU8->pres, mBuf); @@ -2609,7 +2554,6 @@ TknS8 *tknS8; /* token S8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknS8) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf); @@ -2650,7 +2594,6 @@ TknU16 *tknU16; /* token U16 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU16) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknU16->pres, mBuf); @@ -2691,7 +2634,6 @@ TknU32 *tknU32; /* token U32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU32) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknU32->pres, mBuf); @@ -2733,7 +2675,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStr) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2783,7 +2724,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrM) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2834,7 +2774,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrS) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2885,7 +2824,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrE) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2938,7 +2876,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; - TRC3(cmUnpkPnNodeId); for (i = 0; i < PN_NODEID_LEN; i++) { @@ -2977,7 +2914,6 @@ TknStr4 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr4) CMUNPKTKNSTR(tknStr, mBuf); @@ -3013,7 +2949,6 @@ TknStr12 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr12) CMUNPKTKNSTR(tknStr, mBuf); @@ -3048,7 +2983,6 @@ TknStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr32) CMUNPKTKNSTR(tknStr, mBuf); @@ -3083,7 +3017,6 @@ TknStr64 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr64) CMUNPKTKNSTR(tknStr, mBuf); @@ -3118,7 +3051,6 @@ TknStr132 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr132) CMUNPKTKNSTR(tknStr, mBuf); @@ -3153,7 +3085,6 @@ TknStr256 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr256) CMUNPKTKNSTR(tknStr, mBuf); @@ -3190,7 +3121,6 @@ Buffer *mBuf; /* message buffer */ { U16 i; - TRC2(cmUnpkTknOid) /* Unpack the token header */ CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf); @@ -3243,7 +3173,6 @@ TknS32 *tknS32; /* token S32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknS32) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf); @@ -3284,7 +3213,6 @@ Header *header; /* header structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpHeader) CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); @@ -3330,7 +3258,6 @@ CmStatus *sta; /* status structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkCmStatus) CMCHKUNPK(oduPackUInt16, &sta->status, mBuf); CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf); @@ -3365,7 +3292,6 @@ CmAlarm *alarm; /* alarm structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkCmAlarm) CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf); CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf); @@ -3402,7 +3328,6 @@ SmCfg *smCfg; /* stack manager */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpSmCfg) CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); CMCHKUNPK(cmUnpkInst, &smCfg->inst, mBuf); @@ -3442,7 +3367,6 @@ TmrCfg *tmrCfg; /* timer configuration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTmrCfg) CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf); @@ -3479,7 +3403,6 @@ Buffer **tBuf; /* message buffer */ Buffer *mBuf; - TRC2(cmUnpkTknBuf) mBuf = *tBuf; @@ -3545,7 +3468,6 @@ CmIntf *intf; /* interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkIntf) CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); CMCHKUNPK(cmUnpkIntfId, &intf->intfId, mBuf); diff --git a/src/cm/cm_hash.c b/src/cm/cm_hash.c index 4016ea95b..2d2668d56 100644 --- a/src/cm/cm_hash.c +++ b/src/cm/cm_hash.c @@ -193,7 +193,6 @@ U16 *idx; /* idx to return */ U32 len; /* length */ /*cm_hash_c_001.main_23 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHashFuncAnyKey); /* Set up the internal state */ len = keyLen; /* key length */ a = 0x9e3779b9; /* a = b = the golden ratio; an arbitrary value */ @@ -276,7 +275,6 @@ U16 *idx; /* idx to return */ { U32 sum; /* Sum of octets for hash function */ - TRC2(cmHashFuncU32Mod); /* keyLen is marked Unused to remove compilation * warnings. */ @@ -340,7 +338,6 @@ U16 *idx; /* idx to return */ U32 secondU32 = 0; /* Second U32 prepared for higher 4 octets */ U32 sum; /* Sum of the above 2 octets to get the index */ - TRC2(cmHashFuncBCD8); /* keyLen is marked Unused to remove compilation * warnings. */ @@ -413,7 +410,6 @@ U16 *idx; /* idx to return */ U16 cntr; /* Index */ U32 sum; /* Sum of octets for hash function */ - TRC2(cmHashFuncString) sum = 0; @@ -470,7 +466,6 @@ U16 *idx; /* index to return */ { U32 sum; /* sum of key string octets */ - TRC2(cmHashFuncDefault); /* add all bytes of the key */ sum = 0; @@ -540,7 +535,6 @@ U16 *idx; /* index to return */ U32 prod; /* (constant multiplier * key) */ U8 shift; /* Bits to be shifted to get index */ - TRC2(cmHashFuncMult24); UNUSED(keyLen); @@ -601,7 +595,6 @@ U16 *idx; /* index to return */ #endif { - TRC2(cmHashFuncConId); /* switch based on the length of the key */ switch (keyLen) @@ -669,7 +662,6 @@ U16 keyLen; /* length of key string */ U16 *idx; /* index to return */ #endif { - TRC2(cmHashFuncDirIdx); UNUSED(hashListCp); UNUSED(keyLen); @@ -711,7 +703,6 @@ U8 *key2; /* second key string */ U16 keyLen2; /* length of second key string */ #endif { - TRC2(cmHashMatchKey); /* compare key lengths */ if (keyLen1 != keyLen2) @@ -748,7 +739,6 @@ CmListEnt *oldEntry; /* add new entry after this entry */ CmListEnt *newEntry; /* new entry to add */ #endif { - TRC2(cmListInsert); newEntry->next = oldEntry->next; newEntry->prev = oldEntry; @@ -783,7 +773,6 @@ PRIVATE S16 cmListDelete(entry) CmListEnt *entry; /* entry to delete */ #endif { - TRC2(cmListDelete); if (entry == NULLP) return RFAILED; @@ -864,7 +853,6 @@ Pool pool; /* memory pool to allocate bins */ CmListBinEnt *hl; #endif - TRC2(cmHashListInit); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1004,7 +992,6 @@ S16 cmHashListDeinit(hashListCp) CmHashListCp *hashListCp; /* hash list to deinitialize */ #endif { - TRC2(cmHashListDeinit); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1083,7 +1070,6 @@ U16 keyLen; /* length of key */ PTR dupEntry; /* pointer to entry with duplicate key */ U16 idx; /* index for insertion into hash list */ - TRC2(cmHashListInsert); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1164,7 +1150,6 @@ PTR entry; /* entry to delete */ U16 idx; /* index for selecting the right hash list bin */ #endif - TRC2(cmHashListDelete); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1259,7 +1244,6 @@ PTR *entry; /* entry to be returned */ U16 i; /* counter for sequence number */ U16 idx; /* index for insertion into hash list */ - TRC2(cmHashListFind); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1360,7 +1344,6 @@ PTR *entry; /* entry to be returned */ CmHashListEnt *prevListEnt; /* previous hash list entry pointer */ U16 i; /* hash list counter */ - TRC2(cmHashListGetNext); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1475,7 +1458,6 @@ PTR *entry; /* entry to be returned */ CmHashListEnt *hashListEnt; /* temporary hash list entry pointer */ CmHashListEnt *prevListEnt; /* previous hash list entry pointer */ - TRC2(cmHashListBinGetNextEntry); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ @@ -1564,7 +1546,6 @@ U16 *result; /* result of query */ U8 i; #endif - TRC2(cmHashListQuery); /* deal with queries that do not need hashListCp */ @@ -1686,7 +1667,6 @@ U16 keyLen; /* length of key */ /* cm_hash_c_001.main_21. Modify. Compilation Issue resolved. */ U16 nmbEnt; - TRC2(cmHashListOAInsert); #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index 7e8a116fe..fc945f13e 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -338,7 +338,6 @@ U32 timeout; /* timeout value for Poll */ { S32 ret; - TRC2(cmInetPoll); ret = 0; *numRdyFds = 0; @@ -431,7 +430,6 @@ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollSetFd); if ((idx) >= CM_INET_POLL_MAXFDSUPP || (idx) < 0) { @@ -527,7 +525,6 @@ U16 eventMask; /* Event Mask to be set */ { S16 ret; - TRC2(cmInetPollFdIsSet); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) { @@ -586,7 +583,6 @@ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollClearFdREvent); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) @@ -678,7 +674,6 @@ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollClearFdEvent); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) @@ -777,7 +772,6 @@ S16 lastIdx; /* Last index of poll Fd Array */ #endif { - TRC2(cmInetPollDelFd); if(lastIdx < delIdx || lastIdx < 0 || delIdx < 0) { @@ -857,7 +851,6 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ { S16 idx; - TRC2(cmInetPollInitFdArr); /* Sets each element of pollFdArr to initial value fd = -1 events = 0 @@ -1354,7 +1347,6 @@ CmInetFd *sockFd; /* socket file descriptor */ Bool bNewBehavior; #endif /* WIN2K && WIN32 */ - TRC2(cmInetSocket); #if (defined(WIN32) && defined(WIN2K)) bytesReturned = 0; @@ -1515,7 +1507,6 @@ CmInetAddr *myAddr; /* locale Internet address/port */ U32 sizeOfAddr; /* sizeof address passed to the bind call */ CmInetSockAddr *sockAddrPtr; - TRC2(cmInetBind); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -1529,7 +1520,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ #ifdef IPV6_SUPPORTED if (myAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&srcAddr6, 0, sizeof(srcAddr6)); + memset(&srcAddr6, 0, sizeof(srcAddr6)); srcAddr6.sin6_family = AF_INET6; srcAddr6.sin6_port = CM_INET_HTON_U16(myAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&srcAddr6.sin6_addr, @@ -1539,7 +1530,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ } else { - cmMemset((U8*)&srcAddr, 0, sizeof(srcAddr)); + memset(&srcAddr, 0, sizeof(srcAddr)); srcAddr.sin_family = AF_INET; srcAddr.sin_port = CM_INET_HTON_U16(myAddr->u.ipv4Addr.port); srcAddr.sin_addr.s_addr = CM_INET_HTON_U32(myAddr->u.ipv4Addr.address); @@ -1547,7 +1538,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ sockAddrPtr = (CmInetSockAddr *)&srcAddr; } #else - cmMemset((U8*)&srcAddr, 0, sizeof(srcAddr)); + memset(&srcAddr, 0, sizeof(srcAddr)); srcAddr.sin_family = AF_INET; srcAddr.sin_port = CM_INET_HTON_U16(myAddr->port); srcAddr.sin_addr.s_addr = CM_INET_HTON_U32(myAddr->address); @@ -1690,9 +1681,9 @@ U16 port; /* port number */ } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); + memset(&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); + memset(&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); #endif /* IPV6_SUPPORTED */ for (idx = 0; idx < addrLst->count; idx++) @@ -1756,7 +1747,7 @@ U16 port; /* port number */ addrLst->addrs[idx].u.ipv4NetAddr = CM_INET_HTON_U32(addrLst->addrs[idx].u.ipv4NetAddr); cmInetNtoa(addrLst->addrs[idx].u.ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addrs6[idx6].sin6_addr.s6_addr), ipv4Format); idx6++; @@ -1784,7 +1775,7 @@ U16 port; /* port number */ { sockAddrPtr = (struct sockaddr*)address_array; sockAddrLen = sizeof(struct sockaddr_in); - cmMemcpy((U8*)address_array, (U8*)addrs, ipv4_array_size); + memcpy(address_array, addrs, ipv4_array_size); } #ifdef IPV6_SUPPORTED else @@ -1795,7 +1786,7 @@ U16 port; /* port number */ if(ipv6_array_size > 0) { - cmMemcpy((U8*)(address_array + ipv4_array_size), (U8*)addrs6, ipv6_array_size); + memcpy((address_array + ipv4_array_size), addrs6, ipv6_array_size); } #endif /* IPV6_SUPPORTED */ @@ -1987,9 +1978,9 @@ U16 port; /* port number */ #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); + memset(&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); + memset(&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); #endif /* IPV6_SUPPORTED */ cnt = 0; @@ -2049,7 +2040,7 @@ U16 port; /* port number */ ipv4NetAddr = CM_INET_HTON_U32(primAddr->u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)&(addrs6[idx6].sin6_addr), ipv4Format); addresses_array_size += sizeof(struct sockaddr_in6); @@ -2156,7 +2147,7 @@ U16 port; /* port number */ ipv4NetAddr = CM_INET_HTON_U32(addrLst->addrs[idx].u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addrs6[idx6].sin6_addr.s6_addr), ipv4Format); addresses_array_size += sizeof(struct sockaddr_in6); @@ -2190,7 +2181,7 @@ U16 port; /* port number */ if((ipv4_array_size > 0) && (ipv4_array_size <= (CM_INET_NUM_NET_ADDR * \ sizeof(struct sockaddr_in)))) { - cmMemcpy((U8*)address_array, (U8*)&addrs[0], ipv4_array_size); + memcpy(address_array, &addrs[0], ipv4_array_size); } else { @@ -2201,7 +2192,7 @@ U16 port; /* port number */ if((ipv6_array_size > 0) && (ipv6_array_size <= (CM_INET_NUM_NET_ADDR * \ sizeof(struct sockaddr_in)))) { - cmMemcpy((U8*)(address_array + ipv4_array_size), (U8*)addrs6, ipv6_array_size); + memcpy((address_array + ipv4_array_size), addrs6, ipv6_array_size); } else { @@ -2488,9 +2479,9 @@ U32 context; /* value to be passed back, if error occurs */ #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addr, 0, sizeof(struct sockaddr_in)); + memset(&addr, 0, sizeof(struct sockaddr_in)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addr6, 0, sizeof(struct sockaddr_in6)); + memset(&addr6, 0, sizeof(struct sockaddr_in6)); #endif /* IPV6_SUPPORTED */ /* copy message to a flat buffer */ @@ -2575,7 +2566,7 @@ U32 context; /* value to be passed back, if error occurs */ ipv4NetAddr = CM_INET_HTON_U32(dstAddr->u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addr6.sin6_addr.s6_addr), ipv4Format); sockAddrLen = sizeof(struct sockaddr_in6); @@ -2740,7 +2731,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ *mBuf = NULLP; *len = 0; - cmMemset((U8*)ntfy, 0, sizeof(CmInetSctpNotification)); + memset(ntfy, 0, sizeof(CmInetSctpNotification)); buflen = CM_INET_MAX_MSG_LEN; @@ -2759,8 +2750,8 @@ CmInetSctpNotification *ntfy; /* notification parameters */ addrlen = sizeof(struct sockaddr_storage); msgFlags = 0; - cmMemset((U8*)&addr, 0, sizeof(struct sockaddr_storage)); - cmMemset((U8*)&info, 0, sizeof(struct sctp_sndrcvinfo)); + memset(&addr, 0, sizeof(struct sockaddr_storage)); + memset(&info, 0, sizeof(struct sctp_sndrcvinfo)); ret = sctp_recvmsg(sockFd->fd, (Void *)recvbuf, (size_t)buflen, (struct sockaddr*)&addr, &addrlen, &info, @@ -2799,7 +2790,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ if((cmMemcmp(ipv4Format, pAddr6->sin6_addr.s6_addr, 12)) == 0) { srcAddr->type = CM_INET_IPV4ADDR_TYPE; - cmMemcpy((U8*)&srcAddr->u.ipv4NetAddr, (U8*)((pAddr6->sin6_addr.s6_addr) + 12), sizeof(U32)); + memcpy(&srcAddr->u.ipv4NetAddr, ((pAddr6->sin6_addr.s6_addr) + 12), sizeof(U32)); srcAddr->u.ipv4NetAddr = CM_INET_HTON_U32(srcAddr->u.ipv4NetAddr); } @@ -2949,7 +2940,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ ntfy->u.remoteErr.data = NULLP; break; } - cmMemcpy(ntfy->u.remoteErr.data,\ + memcpy(ntfy->u.remoteErr.data,\ sctpNtfy->sn_remote_error.sre_data, datlen); #endif break; @@ -2969,7 +2960,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ ntfy->u.sndFailed.data = NULLP; break; } - cmMemcpy(ntfy->u.sndFailed.data,\ + memcpy(ntfy->u.sndFailed.data,\ sctpNtfy->sn_send_failed.ssf_data, datlen ); #endif ntfy->u.sndFailed.info.stream = sctpNtfy->sn_send_failed.ssf_info.sinfo_stream; @@ -3211,7 +3202,6 @@ Ptr value; /* option value */ /*cm_inet_c_001.main_58 : fix for klockwork issue */ S32 ret; - TRC2(cmInetGetOpt); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -3225,7 +3215,7 @@ Ptr value; /* option value */ { case CM_INET_OPT_SCTP_GET_ASSOC_STA: pSctpStatus = (CmInetSctpStatus*)value; - cmMemset((U8*)&status, 0, sizeof(struct sctp_status)); + memset(&status, 0, sizeof(struct sctp_status)); len = sizeof(status); status.sstat_assoc_id = pSctpStatus->assocId; @@ -3376,7 +3366,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_GET_PADDR_INFO: pPeerAddrInfo = (CmInetSctpPeerAddrInfo*)value; - cmMemset((U8*)&addrInfo, 0, sizeof(struct sctp_paddrinfo)); + memset(&addrInfo, 0, sizeof(struct sctp_paddrinfo)); len = sizeof(addrInfo); addrInfo.spinfo_assoc_id = pPeerAddrInfo->assocId; @@ -3439,7 +3429,7 @@ Ptr value; /* option value */ pPeerAddrParams = (CmInetSctpPeerAddrParams *)value; - cmMemset((U8*)&addrParams, 0, sizeof(struct sctp_paddrparams)); + memset(&addrParams, 0, sizeof(struct sctp_paddrparams)); addrParams.spp_assoc_id = pPeerAddrParams->assocId; @@ -3532,7 +3522,7 @@ Ptr value; /* option value */ pAssocParams = (CmInetSctpAssocParams *)value; - cmMemset((U8*)&assocParams, 0, sizeof(struct sctp_assocparams)); + memset(&assocParams, 0, sizeof(struct sctp_assocparams)); assocParams.sasoc_assoc_id = pAssocParams->assocId; @@ -3553,7 +3543,7 @@ Ptr value; /* option value */ pRtoInfo = (CmInetSctpRtoInfo *)value; - cmMemset((U8*)&rtoInfo, 0, sizeof(struct sctp_rtoinfo)); + memset(&rtoInfo, 0, sizeof(struct sctp_rtoinfo)); len = sizeof(rtoInfo); @@ -3570,7 +3560,7 @@ Ptr value; /* option value */ pInitMsg = (CmInetSctpInitMsg *)value; - cmMemset((U8*)&initMsg, 0, sizeof(struct sctp_initmsg)); + memset(&initMsg, 0, sizeof(struct sctp_initmsg)); len = sizeof(initMsg); @@ -3638,9 +3628,8 @@ S16 cmInetShutDownSctp(sockFd) S32 ret; struct sctp_sndrcvinfo sndRcvInfo; - TRC2(cmInetShutDownSctp); - cmMemset((U8*)&sndRcvInfo, 0, sizeof(sndRcvInfo)); + memset(&sndRcvInfo, 0, sizeof(sndRcvInfo)); #ifdef SUN_KSCTP sndRcvInfo.sinfo_flags = MSG_EOF; @@ -3704,9 +3693,8 @@ S16 cmInetAbortSctpAssoc(sockFd, assocId) S32 ret; struct sctp_sndrcvinfo sndRcvInfo; - TRC2(cmInetAbortSctpAssoc); - cmMemset((U8*)&sndRcvInfo, 0, sizeof(sndRcvInfo)); + memset(&sndRcvInfo, 0, sizeof(sndRcvInfo)); #ifdef SUN_KSCTP sndRcvInfo.sinfo_flags = MSG_ABORT; @@ -3787,7 +3775,6 @@ S16 cmInetConnect(sockFd, servAddr) S32 sizeOfAddr; CmInetSockAddr *sockAddrPtr; - TRC2(cmInetConnect); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -3801,7 +3788,7 @@ S16 cmInetConnect(sockFd, servAddr) #ifdef IPV6_SUPPORTED if (servAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&dstAddr6, 0, sizeof(dstAddr6)); + memset(&dstAddr6, 0, sizeof(dstAddr6)); dstAddr6.sin6_family = AF_INET6; dstAddr6.sin6_port = CM_INET_HTON_U16(servAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&dstAddr6.sin6_addr, @@ -3811,7 +3798,7 @@ S16 cmInetConnect(sockFd, servAddr) } else { - cmMemset((U8*)&dstAddr, 0, sizeof(dstAddr)); + memset(&dstAddr, 0, sizeof(dstAddr)); dstAddr.sin_family = AF_INET; dstAddr.sin_port = CM_INET_HTON_U16(servAddr->u.ipv4Addr.port); dstAddr.sin_addr.s_addr = CM_INET_HTON_U32(servAddr->u.ipv4Addr.address); @@ -3819,7 +3806,7 @@ S16 cmInetConnect(sockFd, servAddr) sockAddrPtr = (CmInetSockAddr *)&dstAddr; } #else - cmMemset((U8*)&dstAddr, 0, sizeof(dstAddr)); + memset(&dstAddr, 0, sizeof(dstAddr)); dstAddr.sin_family = AF_INET; dstAddr.sin_port = CM_INET_HTON_U16(servAddr->port); dstAddr.sin_addr.s_addr = CM_INET_HTON_U32(servAddr->address); @@ -3942,7 +3929,6 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ { S32 ret; /* temporary return value */ - TRC2(cmInetListen); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -4023,7 +4009,6 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ U32 optVal; /* added */ - TRC2(cmInetAccept) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -4112,7 +4097,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ } #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (addrLen == sizeof(struct sockaddr_in)) { peerAddr = (struct sockaddr_in *)&sockAddr; @@ -4171,7 +4156,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ struct cmsghdr *tempHdr; U8 len; - TRC2(cmInet4FillTos) len = 0; @@ -4295,7 +4279,6 @@ S16 flags; /* additional control flags, unused */ MsgLen ioLen; #endif - TRC2(cmInetSendDscpMsg) UNUSED(flags); @@ -4311,7 +4294,7 @@ S16 flags; /* additional control flags, unused */ /* added for IPv6 ext hdr */ #if !(defined(WIN32) || defined(CMINETFLATBUF)) #if (defined(SS_LINUX) || defined(_XPG4_2)) -/* cmMemset((U8*)cmsgData, 0, sizeof(cmsgData)); */ +/* memset(cmsgData, 0, sizeof(cmsgData)); */ #endif /* SS_LINUX || _XPG4_2 */ curMsgIdx = 0; #endif /* WIN32 | CMINETFLATBUF */ @@ -4326,7 +4309,7 @@ S16 flags; /* additional control flags, unused */ #ifdef IPV6_SUPPORTED if (dstAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&remAddr6, 0, sizeof(remAddr6)); + memset(&remAddr6, 0, sizeof(remAddr6)); remAddr6.sin6_family = AF_INET6; remAddr6.sin6_port = CM_INET_HTON_U16(dstAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&remAddr6.sin6_addr, @@ -4336,7 +4319,7 @@ S16 flags; /* additional control flags, unused */ } else { - cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); + memset(&remAddr, 0, sizeof(remAddr)); remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->u.ipv4Addr.port); remAddr.sin_addr.s_addr = @@ -4345,7 +4328,7 @@ S16 flags; /* additional control flags, unused */ sockAddrPtr = (CmInetSockAddr *)&remAddr; } #else -/* cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); */ +/* memset(&remAddr, 0, sizeof(remAddr)); */ remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->port); remAddr.sin_addr.s_addr = CM_INET_HTON_U32(dstAddr->address); @@ -4481,7 +4464,7 @@ S16 flags; /* additional control flags, unused */ } /* added */ -/* cmMemset((U8*)&msg, 0, sizeof(msg)); */ +/* memset(&msg, 0, sizeof(msg)); */ msg.msg_flags = 0; if (dstAddr != NULLP) @@ -4807,7 +4790,6 @@ S16 flags; /* additional control flags, unused */ MsgLen ioLen; #endif - TRC2(cmInetSendMsg) UNUSED(flags); @@ -4823,7 +4805,7 @@ S16 flags; /* additional control flags, unused */ /* added for IPv6 ext hdr */ #if !(defined(WIN32) || defined(CMINETFLATBUF)) #if (defined(SS_LINUX) || defined(_XPG4_2)) -/* cmMemset((U8*)cmsgData, 0, sizeof(cmsgData)); */ +/* memset(cmsgData, 0, sizeof(cmsgData)); */ #endif /* SS_LINUX || _XPG4_2 */ #ifdef IPV6_OPTS_SUPPORTED curMsgIdx = 0; @@ -4840,7 +4822,7 @@ S16 flags; /* additional control flags, unused */ #ifdef IPV6_SUPPORTED if (dstAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&remAddr6, 0, sizeof(remAddr6)); + memset(&remAddr6, 0, sizeof(remAddr6)); remAddr6.sin6_family = AF_INET6; remAddr6.sin6_port = CM_INET_HTON_U16(dstAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&remAddr6.sin6_addr, @@ -4850,7 +4832,7 @@ S16 flags; /* additional control flags, unused */ } else { - cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); + memset(&remAddr, 0, sizeof(remAddr)); remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->u.ipv4Addr.port); remAddr.sin_addr.s_addr = @@ -4859,7 +4841,7 @@ S16 flags; /* additional control flags, unused */ sockAddrPtr = (CmInetSockAddr *)&remAddr; } #else -/* cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); */ +/* memset(&remAddr, 0, sizeof(remAddr)); */ remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->port); remAddr.sin_addr.s_addr = CM_INET_HTON_U32(dstAddr->address); @@ -4995,7 +4977,7 @@ S16 flags; /* additional control flags, unused */ } /* added */ -/* cmMemset((U8*)&msg, 0, sizeof(msg)); */ +/* memset(&msg, 0, sizeof(msg)); */ msg.msg_flags = 0; if (dstAddr != NULLP) @@ -5242,7 +5224,6 @@ U8 protType; /* whether IPv4/IPv6 socket */ struct in6_addr lpBkAddr; U8 len; - TRC2(cmInet6BuildSendPktinfo) len = 0; @@ -5292,7 +5273,7 @@ U8 protType; /* whether IPv4/IPv6 socket */ if(protType == AF_INET6) { /* store ipv6 src addr */ - cmMemcpy((U8 *)&(ipv6Pktinfo->ipi6_addr), (U8 *)srcAddr, 16); + memcpy(&(ipv6Pktinfo->ipi6_addr), srcAddr, 16); len += 16; /* store interface index */ @@ -5356,7 +5337,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ struct cmsghdr *tempHdr; U8 len; - TRC2(cmInetBuildSendHoplimit) len = 0; @@ -5430,7 +5410,6 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ U8 len; U8 optsIdx; - TRC2(cmInet6BuildSendHBHOpts) len = 0; optsIdx = 0; @@ -5481,8 +5460,8 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ len += sizeof(hbhOptsArr->hbhOpts[optsIdx].length); /* copy all value bytes of current HBH/dest option to the flat buffer */ - cmMemcpy((U8 *)(cmsgBuf + len), - (U8 *)(hbhOptsArr->hbhOpts[optsIdx].value), + memcpy((cmsgBuf + len), + (hbhOptsArr->hbhOpts[optsIdx].value), hbhOptsArr->hbhOpts[optsIdx].length); len += hbhOptsArr->hbhOpts[optsIdx].length; } @@ -5552,7 +5531,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ U8 len; U8 addrIdx; - TRC2(cmInet6BuildSendRouteOpts); len = 0; addrIdx = 0; @@ -5601,8 +5579,8 @@ U32 *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ /* fill up all IPV6 addresses from rtOptsArr in the flat buffer */ for (addrIdx = 0; addrIdx < rtOptsArr->numAddrs; addrIdx++) { - cmMemcpy((U8 *)(cmsgBuf + len), - (U8 *)(rtOptsArr->ipv6Addrs[addrIdx]), 16); + memcpy((cmsgBuf + len), + (rtOptsArr->ipv6Addrs[addrIdx]), 16); len += 16; } @@ -5655,7 +5633,6 @@ CmInetMemInfo *info; /* Memory information */ U8 tempType; S16 ret; - TRC2(cmInet6BuildRecvHopOptsArr) /* get length of actual hbh ancillary data */ hbhDataLen -= sizeof(struct cmsghdr); @@ -5815,8 +5792,8 @@ CmInetMemInfo *info; /* Memory information */ return (ROUTRES); } /* copy the value bytes */ - cmMemcpy((U8 *)hbhOptsArr->hbhOpts[optsIdx].value, - (U8 *)(cmsgData + curDataIdx), + memcpy(hbhOptsArr->hbhOpts[optsIdx].value, + (cmsgData + curDataIdx), hbhOptsArr->hbhOpts[optsIdx].length); curDataIdx += hbhOptsArr->hbhOpts[optsIdx].length; } @@ -5866,7 +5843,6 @@ CmInetMemInfo *info; /* Memory information */ U8 i; /* loop counter */ S16 ret; /* temporary return value */ - TRC2(cmInet6BuildRecvRtHdr) /* byte len of actual rtHdr ancil data */ rtDataLen -= sizeof(struct cmsghdr); @@ -5891,8 +5867,8 @@ CmInetMemInfo *info; /* Memory information */ curDataIdx += 1; /* copy 1 reserve byte + 3 strict/loose bytes */ - cmMemcpy((U8 *)(&rtOptsArr->slMap), - (U8 *)(cmsgData + curDataIdx), 4); + memcpy((&rtOptsArr->slMap), + (cmsgData + curDataIdx), 4); curDataIdx += 4; /* also save reserv byte + 3 sl bytes to rtHdro struc */ @@ -5918,8 +5894,8 @@ CmInetMemInfo *info; /* Memory information */ /* copy all the ipv6 addresses */ for(i=0; i < rtOptsArr->numAddrs; i++) { - cmMemcpy((U8 *)(rtOptsArr->ipv6Addrs[i]), - (U8 *)(cmsgData + curDataIdx), 16); + memcpy((rtOptsArr->ipv6Addrs[i]), + (cmsgData + curDataIdx), 16); curDataIdx += 16; } @@ -6148,7 +6124,6 @@ S32 flags; /* additional control flags */ /* cm_inet_c_001.main_55:Removed unused variables errValue and optLen */ - TRC2(cmInetRecvMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -6179,13 +6154,13 @@ S32 flags; /* additional control flags */ #endif /* IPV6_SUPPORTED */ #if (defined(SS_LINUX) || defined(_XPG4_2)) - cmMemset((U8*)ancillData, 0, sizeof(ancillData)); + memset(ancillData, 0, sizeof(ancillData)); #endif /* SS_LINUX || _XPG4_2 */ #endif /* (WIN32 | CMINETFLATBUF) */ /* clear the structure */ - cmMemset((U8*)&remSockAddr, 0, sizeof(remSockAddr)); + memset(&remSockAddr, 0, sizeof(remSockAddr)); /* get number of pending data */ /* removed 3rd arg memInfo. MemInfo is no longer @@ -6821,8 +6796,8 @@ S32 flags; /* additional control flags */ localIf->intfPrsnt = TRUE; localIf->localIf = pkt6Info->ipi6_ifindex; localIf->localIfAddr.type = CM_INET_IPV6ADDR_TYPE; - cmMemcpy((U8 *)&localIf->localIfAddr.u.ipv6NetAddr, - (U8 *)(int *)&pkt6Info->ipi6_addr, 16); + memcpy(&localIf->localIfAddr.u.ipv6NetAddr, + &pkt6Info->ipi6_addr, 16); } } #endif /* LOCAL_INTF */ @@ -7119,7 +7094,6 @@ S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) CmInetSockAddr remSockAddr; /* to get packet's source IP address */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetPeeknew); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -7221,7 +7195,7 @@ S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) if ((fromAddr != NULLP) && (remAddrLen > 0)) { #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (remAddrLen == sizeof(struct sockaddr_in6)) { remAddr6 = (struct sockaddr_in6 *)&remSockAddr; @@ -7313,7 +7287,6 @@ Data *data; /* read data */ CmInetSockAddr remSockAddr; /* to get packet's source IP address */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetPeek); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -7502,7 +7475,7 @@ Data *data; /* read data */ if ((fromAddr != NULLP) && (remAddrLen > 0)) { #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (remAddrLen == sizeof(struct sockaddr_in6)) { remAddr6 = (struct sockaddr_in6 *)&remSockAddr; @@ -7573,7 +7546,6 @@ CmInetFd *sockFd; /* socket file descriptor */ { S32 ret; /* temporary return value */ - TRC2(cmInetClose); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -7649,7 +7621,6 @@ S32 howTo; /* operation flag */ { S32 ret; /* temporary return value */ - TRC2(cmInetShutdown); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -8060,7 +8031,6 @@ Ptr value; /* option value */ U32 *optVal; - TRC2(cmInetSetOpt); /* cm_inet_c_001.main_58 : Added NULL check for value field */ if(value == NULLP) @@ -8641,7 +8611,7 @@ Ptr value; /* option value */ case CM_INET_OPT_LINGER: pSockLinger = (CmInetSockLinger *)value; - cmMemset((U8*)&lngr, 0, sizeof(struct linger)); + memset(&lngr, 0, sizeof(struct linger)); if (pSockLinger->enable == TRUE) lngr.l_onoff = 1; @@ -8655,7 +8625,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_EVENTS: pSctpEvent = (CmInetSctpSockEvent *)value; - cmMemset((U8*)&event, 0, sizeof(struct sctp_event_subscribe)); + memset(&event, 0, sizeof(struct sctp_event_subscribe)); if (pSctpEvent->dataIoEvent == TRUE) event.sctp_data_io_event = 1; @@ -8691,7 +8661,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_PRIM_ADDR: pSctpPrimAddr = (CmInetSctpPrimAddr *)value; - cmMemset((U8*)&setPrim, 0, sizeof(struct sctp_setprim)); + memset(&setPrim, 0, sizeof(struct sctp_setprim)); #ifdef IPV6_SUPPORTED if (pSctpPrimAddr->addr.type == CM_INET_IPV6ADDR_TYPE) @@ -8742,7 +8712,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_PEERADDR_PARAMS: pSctpPAddrParams = (CmInetSctpPeerAddrParams *)value; - cmMemset((U8*)&addrParams, 0, sizeof(struct sctp_paddrparams)); + memset(&addrParams, 0, sizeof(struct sctp_paddrparams)); if (pSctpPAddrParams->s.addrPres == TRUE) @@ -8845,7 +8815,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_ASSOC_PARAMS: pSctpAssocParams = (CmInetSctpAssocParams *)value; - cmMemset((U8*)&assocParams, 0, sizeof(struct sctp_assocparams)); + memset(&assocParams, 0, sizeof(struct sctp_assocparams)); assocParams.sasoc_cookie_life = pSctpAssocParams->cookieLife; assocParams.sasoc_asocmaxrxt = pSctpAssocParams->assocMaxReTx; @@ -8860,7 +8830,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_RTO_INFO: pSctpRtoInfo = (CmInetSctpRtoInfo *)value; - cmMemset((U8*)&rtoinfo, 0, sizeof(struct sctp_rtoinfo)); + memset(&rtoinfo, 0, sizeof(struct sctp_rtoinfo)); rtoinfo.srto_assoc_id = pSctpRtoInfo->assocId; rtoinfo.srto_initial = pSctpRtoInfo->rtoInitial; @@ -8873,7 +8843,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_INIT_MSG: pSctpInitMsg = (CmInetSctpInitMsg *)value; - cmMemset((U8*)&initmsg, 0, sizeof(struct sctp_initmsg)); + memset(&initmsg, 0, sizeof(struct sctp_initmsg)); initmsg.sinit_max_attempts = pSctpInitMsg->maxInitReTx; initmsg.sinit_max_init_timeo = pSctpInitMsg->maxInitTimeout; @@ -8960,7 +8930,6 @@ U32 *dataLen; /* number of pending octets */ /* removed local variables added for recvfrom call */ - TRC2(cmInetGetNumRead); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9099,7 +9068,6 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ #endif /* SS_VW */ #endif /* WIN32 || SS_LINUX || HPOS */ - TRC2(cmInetGetHostByName) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9257,7 +9225,6 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ #endif /* SUNOS */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetGetIpNodeByName) #if (ERRCLASS & ERRCLS_INT_PAR) @@ -9386,7 +9353,6 @@ S8 *asciiAddr; /* ascii address representation */ CmInetIpAddr *address; /* 4 byte interent address */ #endif { - TRC2(cmInetAddr); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9439,7 +9405,6 @@ S8 **asciiAddr; /* ascii address representation */ { struct in_addr inetAddr; /* internet address structure */ - TRC2(cmInetNtoa); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9494,7 +9459,6 @@ U32 len; { S32 domain = 0; - TRC2(cmInetNtop); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9557,7 +9521,6 @@ S8 *asciiAddr; /* ascii address representation */ { S16 ret; - TRC2(cmInetPton); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9612,7 +9575,6 @@ S8 *asciiAddr; /* ascii address representation */ struct sockaddr_storage ss; U32 sslen = sizeof(ss); #endif /* WIN32 */ - TRC2(cmInetPton); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9632,7 +9594,7 @@ S8 *asciiAddr; /* ascii address representation */ /* cm_inet_c_001.main_44 : In windows inet_pton is not implemented. so we are using the below function * to convert the ipv6 address string to appropriate form */ WSAStringToAddressA((LPTSTR)asciiAddr, AF_INET6, NULL, (struct sockaddr*)&ss, &sslen); - cmMemcpy((U8*)address6, (U8*)&(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6)); + memcpy(address6, &(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6)); #endif /* WIN32 */ return ROK; @@ -9803,7 +9765,6 @@ CmInetAddr *locAddr; /*cm_inet_c_001.main_58 : fix for klockwork issue */ S32 ret; - TRC2(cmInetGetSockName); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -9814,7 +9775,7 @@ CmInetAddr *locAddr; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&lclSockAddr, 0, sizeof(lclSockAddr)); + memset(&lclSockAddr, 0, sizeof(lclSockAddr)); size = sizeof(lclSockAddr); #ifdef UNIX @@ -9860,7 +9821,7 @@ CmInetAddr *locAddr; /* Fill the returned address in to locAddr */ #ifdef IPV6_SUPPORTED - cmMemset((U8*)locAddr, 0, sizeof(CmInetAddr)); + memset(locAddr, 0, sizeof(CmInetAddr)); if (size == sizeof(struct sockaddr_in6)) { sockAddr6 = (struct sockaddr_in6 *)&lclSockAddr; @@ -10169,7 +10130,6 @@ CmInetNetAddr *address; /* IP Address */ Bool embedIPV4 = FALSE; /* IPV4 embedded in IPV6 ? */ #endif /* IPV6_SUPPORTED*/ - TRC2(cmInetConvertStrToIpAddr) idx = 0; #ifdef IPV6_SUPPORTED @@ -10178,11 +10138,11 @@ CmInetNetAddr *address; /* IP Address */ compressed = FALSE; embedIPV4 = FALSE; ipv6 = ipv6Reg; /* assign pointer to IPV6 regular, uncompressed */ - cmMemset((U8 *)ipv6Reg, 0, CM_INET_IPV6ADDR_SIZE); - cmMemset((U8 *)ipv6Cmp, 0, CM_INET_IPV6ADDR_SIZE); + memset(ipv6Reg, 0, CM_INET_IPV6ADDR_SIZE); + memset(ipv6Cmp, 0, CM_INET_IPV6ADDR_SIZE); #endif /* IPV6_SUPPORTED*/ - cmMemset((U8 *)ipv4, 0, CM_INET_IPV4ADDR_SIZE); + memset(ipv4, 0, CM_INET_IPV4ADDR_SIZE); /* Check for IP Address */ while ((val[idx] != '.') && (val[idx] != ':') && @@ -10265,7 +10225,7 @@ CmInetNetAddr *address; /* IP Address */ { /* convert number to IPV4 */ ipv6[ipv6Idx] = 0; /* clear out whatever we did */ - cmMemset((U8 *)ipv4, 0, CM_INET_IPV4ADDR_SIZE); + memset(ipv4, 0, CM_INET_IPV4ADDR_SIZE); retVal = cmInetAsciiToIpv4(4, ipv4, len - blkBeginIdx, &(val[blkBeginIdx])); /* stop the loop, embedded IPV4 is the last part of @@ -10331,8 +10291,8 @@ CmInetNetAddr *address; /* IP Address */ /* convert IPV6 to cmInetIpv6 */ address->type = CM_INET_IPV6ADDR_TYPE; - cmMemcpy((U8 *)address->u.ipv6NetAddr, - (CONSTANT U8 *) ipv6Reg, CM_INET_IPV6ADDR_SIZE); + memcpy(address->u.ipv6NetAddr, + ipv6Reg, CM_INET_IPV6ADDR_SIZE); } /* else, IPV6 */ #endif /* IPV6_SUPPORTED */ @@ -10381,7 +10341,6 @@ U8 *val; /* Domain Name String */ U8 byteCount; /* Byte Count */ U8 idx; /* Index for string*/ - TRC2(cmInetAsciiToIpv4) idx = 0; for (byteCount = 0; byteCount < numBytes; byteCount++) @@ -10443,7 +10402,6 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ #endif { S32 ret; - TRC2(cmInetGetAddrInfo); ret = ROK; #if (ERRCLASS & ERRCLS_INT_PAR) @@ -10501,7 +10459,6 @@ Void cmInetFreeAddrInfo(res) CmInetAddrInfo *res; /* Link list of addrInfo structure */ #endif { - TRC2(cmInetFreeAddrInfo); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -10593,7 +10550,6 @@ S32 flags; /* additional control flags */ U32 errValue; /* error value */ U32 optLen; /* option length */ - TRC2(cmInetFlushRcvBuf) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -10609,7 +10565,7 @@ S32 flags; /* additional control flags */ #endif /* (WIN32 | CMINETFLATBUF) */ /* clear the structure */ - cmMemset((U8*)&remSockAddr, 0, sizeof(remSockAddr)); + memset(&remSockAddr, 0, sizeof(remSockAddr)); /* get number of pending data */ ret = cmInetGetNumRead(sockFd, &pendLen); @@ -10719,7 +10675,7 @@ S32 flags; /* additional control flags */ */ while (curLen > 0) { - cmMemset((U8*)recvTempBuf, 0, CM_INET_MAX_BYTES_READ); + memset(recvTempBuf, 0, CM_INET_MAX_BYTES_READ); /* added separate recvfrom calls different OS */ #if( defined(SS_VW) || defined(HPOS) || defined(SS_PS)) @@ -10794,7 +10750,7 @@ S32 flags; /* additional control flags */ */ while (curLen > 0) { - cmMemset((U8*)recvTempBuf, 0, CM_INET_MAX_BYTES_READ); + memset(recvTempBuf, 0, CM_INET_MAX_BYTES_READ); /* update the message structure */ #ifdef SS_LINUX rxArr[0].iov_base = (Void*)recvTempBuf; diff --git a/src/cm/cm_inet.h b/src/cm/cm_inet.h index e90d00109..8fefe778d 100644 --- a/src/cm/cm_inet.h +++ b/src/cm/cm_inet.h @@ -448,7 +448,7 @@ #ifdef IPV6_SUPPORTED #define CM_INET_COPY_IPV6ADDR(_addrToFill, _fromAddr) \ { \ - (Void)cmMemcpy((U8 *)_addrToFill, (U8 *)_fromAddr, sizeof(CmInetIpAddr6)); \ + memcpy(_addrToFill, _fromAddr, sizeof(CmInetIpAddr6)); \ } #if (defined(SUNOS) || defined(HPOS) || defined(SS_VW)) @@ -491,7 +491,7 @@ #ifdef SS_VW #define CM_COPY_VWIPADDR(vwIpAddr, addr) \ { \ - (Void)cmMemcpy((U8 *)addr, (U8 *)&vwIpAddr, sizeof(S32)); \ + memcpy(addr, &vwIpAddr, sizeof(S32)); \ } #endif diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c index f393fd932..20ec8207d 100644 --- a/src/cm/cm_lib.c +++ b/src/cm/cm_lib.c @@ -211,7 +211,6 @@ PTR len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmMemcpy) #ifdef MS_MBUF_CORRUPTION /* checking for valid memory address */ if ((tgt > startPtr128) && (tgt < (startPtr128+regMemSize))) @@ -234,7 +233,7 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize))) } #endif #if (MEMCPY_AVAIL) /* memcpy is available */ - return ((U8 *) memcpy((Void *)tgt, (CONSTANT Void *)src, (size_t)len)); + return ( memcpy(tgt, src, len)); #else while (len--) *tgt++ = *src++; @@ -277,7 +276,6 @@ PTR len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmMemcmp) #if MEMCMP_AVAIL /* memcmp is available */ return ((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len)); #else /* MEMCMP_AVAIL: memcmp is not available */ @@ -326,7 +324,6 @@ PTR len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmMemset) #if MS_MBUF_CORRUPTION /* checking for valid memory address */ if ((str > startPtr128) && (str < (startPtr128+regMemSize))) { @@ -345,7 +342,7 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize))) } else { - memset((void *)str,val,(size_t) len); + memset(str,val, len); } #else /* MEMSET_AVAIL: memset is not available */ while (len --) @@ -403,7 +400,6 @@ CONSTANT U8 *s2; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmStrcmp) #if (STRCMP_AVAIL) return (strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2)); #else /* STRCMP_AVAIL */ @@ -470,7 +466,6 @@ MsgLen len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmStrncmp) #if (STRNCMP_AVAIL) return (strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len)); #else /* STRNCMP_AVAIL */ @@ -523,13 +518,11 @@ CONSTANT U8 *s; { #if (STRLEN_AVAIL) /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/ - TRC2(cmStrlen) return ((MsgLen)strlen((CONSTANT S8 *)s)); #else /* STRLEN_AVAIL */ MsgLen i; /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/ - TRC2(cmStrlen) for (i = 0; *s; i++, s++); return (i); diff --git a/src/cm/cm_llist.c b/src/cm/cm_llist.c index 036cf13b0..12fb582c3 100644 --- a/src/cm/cm_llist.c +++ b/src/cm/cm_llist.c @@ -70,7 +70,6 @@ Void cmLListInit(lCp) CmLListCp *lCp; /* list control point */ #endif { - TRC3(cmLListInit); lCp->first = (CmLList *)NULLP; lCp->last = (CmLList *)NULLP; @@ -108,7 +107,6 @@ CmLListCp *lCp; /* list control point */ CmLList *node; /* node to be added */ #endif { - TRC3(cmLListAdd2Head); #ifdef ERRCHK if (lCp == (CmLListCp *)NULLP) @@ -157,7 +155,6 @@ CmLListCp *lCp; /* list control point */ CmLList *node; /* node to be added */ #endif { - TRC3(cmLListAdd2Tail); #ifdef ERRCHK if (lCp == (CmLListCp *)NULLP) @@ -206,7 +203,6 @@ CmLListCp *lCp; /* list control point */ CmLList *node; /* node to be added */ #endif { - TRC3(cmLListInsCrnt); #ifdef ERRCHK if (!lCp) @@ -261,7 +257,6 @@ CmLListCp *lCp; /* list control point */ CmLList *node; /* node to be added */ #endif { - TRC3(cmLListInsAfterCrnt); #ifdef ERRCHK if (!lCp) @@ -318,7 +313,6 @@ CmLListCp *lCp; /* list control pointer */ CmLList *node; /* node to be removed */ #endif { - TRC3(cmLListDelFrm); #ifdef ERRCHK /* cm_llist_c_001.main_8 : added null check for node */ @@ -388,7 +382,6 @@ Void cmLListCatLList(list1, list2) CmLListCp *list2; /*-- node to be added --*/ #endif { - TRC3(cmLListCatLList); /*-- if the second list is empty nothing to do --*/ if(list2->count == 0) diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c index 91cb9c627..d9327aafc 100755 --- a/src/cm/cm_lte.c +++ b/src/cm/cm_lte.c @@ -101,7 +101,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkLteRlcId); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); @@ -140,7 +139,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkLteRlcId); CMCHKUNPK(cmUnpkLteRbId, ¶m->rbId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rbType, mBuf); @@ -179,7 +177,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkLteTimingInfo); CMCHKPK(oduUnpackUInt16, param->slot, mBuf); CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); @@ -217,7 +214,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkLteTimingInfo); //CMCHKUNPK(oduPackUInt16, ¶m->hSfn, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); @@ -255,7 +251,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkLtePdcpId); CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); CMCHKPK(cmPkLteRbId, param->rbId, mBuf); @@ -294,7 +289,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkLtePdcpId); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c index 7831b917a..b46d8b2e1 100644 --- a/src/cm/cm_mblk.c +++ b/src/cm/cm_mblk.c @@ -105,7 +105,6 @@ Ptr *ptr; /* Location to place allocated event ptr */ CmMemListCp *memCp; /* memory Link list control point */ CmMemCb *cb; /* Allocated Memory Control Block */ - TRC2(cmAllocEvnt) /* Validation check */ #ifndef LTE_ENB_PAL @@ -137,8 +136,8 @@ Ptr *ptr; /* Location to place allocated event ptr */ return RFAILED; /* Reset the contents */ - cmMemset((U8 *)allocPtr, (U8 )0, - (PTR)(maxBlkSize + sizeof(CmMemList)) ); + memset(allocPtr, 0, + (maxBlkSize + sizeof(CmMemList)) ); /* The above allocated memory chunk is structured as follows @@ -215,7 +214,6 @@ Mem *sMem; /* Static Memory region and pool */ #endif { - TRC2(cmInitMemCp) /* Intialise Memory Control Point */ CM_INIT_MEMCP(memCp,maxBlkSize,sMem); @@ -261,7 +259,6 @@ Ptr *allocPtr; /* location to place pointer */ /* cm_mblk_c_001.101: added local variable */ Size blkSize; /* required block size */ - TRC2(cmGetMem) memCp = (CmMemListCp *)memPtr; cb = &memCp->memCb; @@ -310,8 +307,8 @@ Ptr *allocPtr; /* location to place pointer */ /* Reset the contents */ /* Initialise above allocated structure */ /* cm_mblk_c_001.101: use blkSize instead of cb->maxSize */ - cmMemset((U8 *)cb->initPtr, (U8 )0, - (PTR)(blkSize + sizeof(CmMemList) )); + memset(&(cb->initPtr), 0, + (blkSize + sizeof(CmMemList) )); /* The above allocated memory chunk is structured as follows @@ -381,7 +378,6 @@ Ptr *ptr; /* Location to place allocated event ptr */ CmMemListCp *memCp; /* memory Link list control point */ CmMemCb *cb; /* Allocated Memory Control Block */ - TRC2(cmAllocEvntNoInit) /* Validation check */ if( evntSize > maxBlkSize) @@ -401,8 +397,8 @@ Ptr *ptr; /* Location to place allocated event ptr */ return RFAILED; /* Reset the contents */ - cmMemset((U8 *)allocPtr, (U8 )0, - (PTR)(sizeof(CmMemList)) ); + memset(allocPtr, 0, + (sizeof(CmMemList)) ); /* The above allocated memory chunk is structured as follows @@ -484,7 +480,6 @@ Ptr *allocPtr; /* location to place pointer */ /* cm_mblk_c_001.101: added local variable */ Size blkSize; /* required block size */ - TRC2(cmGetMemNoInit) memCp = (CmMemListCp *)memPtr; cb = &memCp->memCb; @@ -510,7 +505,7 @@ Ptr *allocPtr; /* location to place pointer */ { /* Requested memory is available in present chunk */ *allocPtr = (Ptr) cb->runPtr; - //cmMemset((U8 *)*allocPtr, (U8 )0, + //memset(*allocPtr, (U8 )0, // (PTR)(size) ); cb->memAllocated += size; cb->runPtr += size; @@ -535,8 +530,8 @@ Ptr *allocPtr; /* location to place pointer */ /* Reset the contents */ /* Initialise above allocated structure */ /* cm_mblk_c_001.101: use blkSize instead of cb->maxSize */ - cmMemset((U8 *)cb->initPtr, (U8 )0, - (PTR)(sizeof(CmMemList))); + memset(&(cb->initPtr), 0, + (sizeof(CmMemList))); /* The above allocated memory chunk is structured as follows +-------------------+ @@ -600,7 +595,6 @@ Ptr memPtr; /* Link List CP */ CmMemList *prevNode; /* Pointer to previous node */ CmMemListCp *lcp; /* Memory Link List */ - TRC2(cmFreeMem) lcp = (CmMemListCp *)memPtr; @@ -668,7 +662,6 @@ CmMemListCp *lCp; /* list control point */ CmMemList *node; /* node to be added */ #endif { - TRC3(cmAddMemNode); lCp->count++; @@ -719,7 +712,6 @@ CmMemStatus *status; /* memory region,pool and status */ CmMemListCp *memCp; /* Memory Link List */ - TRC3(cmGetMemStatus) memCp = (CmMemListCp *)memPtr; diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index b4295ddf1..bd0655a59 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -489,7 +489,6 @@ CmMmRegCfg *cfg; CmMmBlkHdr ptrHdr; #endif - TRC2(cmMmRegInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -810,7 +809,6 @@ CmMmRegCb *regCb; { U16 bktIdx; - TRC2(cmMmRegDeInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1110,7 +1108,6 @@ Data **prevptr; prevptr=&prevptr1; #endif - TRC2(cmAlloc); #ifndef USE_MEMCAL UNUSED(flags); @@ -1288,7 +1285,7 @@ Data **prevptr; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)*ptr, 0xAB, *size); + memset(*ptr, 0xAB, *size); #endif // printf("Pointer allocated %8p size %d\n", *ptr, *size); /* Store this pointer in hash list */ @@ -1575,7 +1572,7 @@ Data **prevptr; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif @@ -1704,7 +1701,6 @@ Size size; U16 memIndex=0; #endif - TRC2(cmFree); regCb = (CmMmRegCb *)regionCb; @@ -1892,7 +1888,7 @@ Size size; ptrHdr->requestedSize = 0; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)ptr, 0xAB, size); + memset(ptr, 0xAB, size); #endif /* check if the block to be freed is already having the state as FREE */ if (CMM_IS_FREE(ptrHdr->memFlags)) @@ -2201,7 +2197,6 @@ Size size; return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -2413,7 +2408,6 @@ Data **ptr; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmAllocNL); #ifndef USE_MEMCAL UNUSED(flags); @@ -2570,7 +2564,7 @@ Data **ptr; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)*ptr, 0xAB, *size); + memset(*ptr, 0xAB, *size); #endif if ((bkt->nextBlk) && *ptr) #elif SS_LIGHT_MEM_LEAK_STS @@ -2781,7 +2775,7 @@ Data **ptr; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif @@ -2897,7 +2891,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmFreeNL); regCb = (CmMmRegCb *)regionCb; @@ -3042,7 +3035,7 @@ Size size; ptrHdr->requestedSize = 0; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0XAB */ - cmMemset((U8 *)ptr, 0xAB, size); + memset(ptr, 0xAB, size); #endif /* check if the block to be freed is already having the state as FREE */ if (CMM_IS_FREE(ptrHdr->memFlags)) @@ -3197,7 +3190,6 @@ Size size; return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ - TRC2(cmFreeNL); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3248,7 +3240,6 @@ Data **ptr; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmAllocWL); /*cm_mem_c_001.main_23 Removed support of USE_MEMCAL and MEMCAL_DEBUG support for SS_FAP*/ @@ -3323,7 +3314,7 @@ Data **ptr; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif @@ -3370,7 +3361,6 @@ Size size; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmFreeWL); regCb = (CmMmRegCb *)regionCb; @@ -3442,7 +3432,6 @@ Size size; /* The memory block was allocated from the heap pool */ return (cmHeapFree (&(regCb->heapCb), ptr, size)); #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3497,7 +3486,6 @@ SMemCtl *memCtl; { CmMmRegCb *regCb; - TRC2(cmCtl); regCb = (CmMmRegCb *)regionCb; @@ -3654,7 +3642,6 @@ U16 *lstMapIdx; #endif #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmBktInit); size = cfg->bktCfg[bktIdx].size; @@ -3888,7 +3875,6 @@ Size size; #ifdef SSI_DEBUG_LEVEL1 U16 idx; #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmHeapInit); /* Initialize the heap control block */ heapCb->vStart = memAddr; @@ -4062,7 +4048,6 @@ Size *size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapAlloc); /* cm_mem_c_001.main_15 : Additions */ /* Acquire the heap lock */ /* cm_mem_c_001.main_13 : Replaced SLock with WTLock for NT */ @@ -4380,7 +4365,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapFree); /* Roundup the requested size */ size = CMM_DATALIGN(size, (heapCb->minSize)); @@ -4813,7 +4797,6 @@ Void cmInitMemLeak (Void) { U32 indx; - TRC3(cmInitMemLeak); gmemLkCb.isStarted = FALSE; gmemLkCb.head = 0; @@ -4853,7 +4836,6 @@ Void cmDeinitMemLeak (Void) { U32 indx; - TRC3(cmDeinitMemLeak); for(indx = 0; indx < CM_MAX_ALLOC_ENTERIES; indx++) { @@ -4932,7 +4914,6 @@ Void cmRlsAllocBlk(allocQIndx) U32 allocQIndx; #endif { - TRC3(cmRlsAllocBlk); if(allocQIndx < CM_MAX_ALLOC_ENTERIES) { @@ -5009,7 +4990,6 @@ Void cmPrintLeakLog(Void) CmMmBlkHdr *aBkt; static U32 leakCount =0; - TRC3(cmPrintLeakLog); printf("---- START OF LEAK LOG ----"); SLock(&gmemLkCb.memLock); @@ -5097,7 +5077,6 @@ U32 addr; MemAllocInfo *memAllocInfo; #endif - TRC3(cmRlsAllocBlk); #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef BIT_64 @@ -5292,7 +5271,6 @@ U16 bktIdx; S32 traceSize; #endif - TRC3(cmStorAllocBlk); #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 if( memLkCb.memLkMdlInit == FALSE) { @@ -5306,7 +5284,7 @@ U16 bktIdx; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE funcNm = (S8 **)MxHeapAlloc(SsiHeap, (sizeof(U32) * CM_MAX_STACK_TRACE)); - cmMemset((U8*)funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); + memset(funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); #else funcNm = (S8 **)calloc(1, (sizeof(U32) * CM_MAX_STACK_TRACE)); #endif @@ -5328,7 +5306,7 @@ U16 bktIdx; #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef SS_4GMX_LCORE allocInfo = (MemAllocInfo *)MxHeapAlloc(SsiHeap, sizeof(MemAllocInfo)); - cmMemset((U8*)allocInfo, 0, sizeof(MemAllocInfo)); + memset(allocInfo, 0, sizeof(MemAllocInfo)); #else allocInfo = (MemAllocInfo *)calloc(1, sizeof(MemAllocInfo)); #endif @@ -5402,7 +5380,6 @@ Void SLogLkInfo (Void) CmMmRegCb *tmpRegCb; FILE *fp; - TRC3(SLogLkInfo); fp = fopen("meLeakLog.txt", "w"); if(fp == NULL) { @@ -5460,7 +5437,6 @@ Void SLogLkInfo (Void) U8 idx; Txt prntBuf[255]; S8 **funcNm; - TRC3(SLogLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5554,7 +5530,6 @@ Void cmInitMemLeakMdl (Void) U8 memMdl; U8 hashIdx; - TRC3(cmInitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5603,7 +5578,6 @@ Void cmDeinitMemLeakMdl (Void) U8 memMdl; U8 hashIdx; - TRC3(cmDeinitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5642,7 +5616,6 @@ Void cmMemOpenMemLkFile (arg) S8 *msOptArg; #endif { - TRC3(cmMemOpenMemLkFile); memLkCb.fileLkLog = NULLP; memLkCb.fileLkLog = fopen(arg, "w"); RETVOID; @@ -5679,7 +5652,6 @@ Void SFlushLkInfo (Void) U8 i; #endif /* SS_MEM_LEAK_SOL */ - TRC3(SFlushLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5762,7 +5734,6 @@ S32 traceSize; Txt *memFn[]={"SGetMsg", "SGetSBuf", "SGetDBuf", NULLP}; /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC3(cmMemGetModuleId) for(idx = 0; idx < traceSize; idx++) { memReqIdx = -1; @@ -5840,7 +5811,6 @@ S8 **strLst; U32 tempLen; U8 idx; S32 retVal; - TRC3(cmMemGetStrMtchIdx); len = strlen((const S8 *)str); cmpStr[0] = '('; @@ -5909,7 +5879,6 @@ S32 size; Dl_info info; Sym *sym; - TRC3(cmAddrToSymStr); if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { @@ -5963,7 +5932,6 @@ Void *arg; #endif { S8 *buffer; - TRC3(cmLeakCallBack); Backtrace_t *bt = (Backtrace_t *)arg; if (bt->bt_actcount >= bt->bt_maxcount) @@ -5971,7 +5939,7 @@ Void *arg; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); - cmMemset((U8*)buffer, 0, 510); + memset(buffer, 0, 510); #else buffer = (S8 *)calloc(1, 510); #endif @@ -6031,7 +5999,6 @@ CmMmBlkHdr *blkPtr; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 CmMmBlkTail *tailPtr; #endif - TRC2(cmMmRegIsBlkSane); for ( sigCnt=0; sigCnt < CMM_TRAMPLING_SIGNATURE_LEN; sigCnt++) { @@ -6087,8 +6054,6 @@ CmMmBkt *bkt; CmMmBlkHdr *ptrBlk; U32 blkCnt; - TRC2(cmMmBktSanityChk); - bkt->trampleCount = 0; /* scan the entire memory list of the bucket */ @@ -6147,7 +6112,6 @@ CmMmHeapCb *heapCb; #endif { - TRC2(cmMmHeapSanityChk); /* increment the trample count */ heapCb->trampleCount++; @@ -6189,7 +6153,6 @@ U32 key; /* key string */ U16 *idx; /* idx to return */ #endif { - TRC2(cmMmHashFunc); *idx = (U16)(key % hashListCp->numOfbins); @@ -6237,7 +6200,6 @@ Pool pool; /* memory pool to allocate bins */ U16 i; CmMmHashListEnt *hl; - TRC2(cmMmHashListInit); /* initialize control point fields */ hashListCp->hashList = NULLP; @@ -6298,7 +6260,6 @@ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ #endif { - TRC2(cmMmHashListDeinit); /* deallocate memory for bins */ if (hashListCp->numOfbins) @@ -6347,7 +6308,6 @@ U32 key; /* pointer to key */ U16 idx; /* index for insertion into hash list */ U16 i; - TRC2(cmMmHashListInsert); /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) @@ -6427,7 +6387,6 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6468,7 +6427,6 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListDeInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6526,7 +6484,6 @@ U8 entId; /* Tapa task which frees the memory */ CmMemEntries *entry = NULLP; /* Entry which contains the information */ - TRC2(cmHstGrmFreeInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6610,7 +6567,6 @@ U8 entId; U32 ret = 0; CmMemEntries *entry = NULLP; - TRC2(cmHstGrmAllocInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6691,7 +6647,6 @@ U32 *key; { U32 i = 0; - TRC2(cmHstGrmGetHashIdxAndKey); /* Calculate the key using file name and line number */ for(i = 0 ; fileName[i] != '\0'; i++) @@ -6743,7 +6698,6 @@ U8 entId; { U32 idx = 0; - TRC2(cmHstGrmFillEntry); entry->key = key; entry->line = line; entry->entId = entId; @@ -6793,9 +6747,6 @@ CmMemEntries **entry; U32 numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; - TRC2(cmHstGrmFindEntry); - - for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) { /* find for the entry in the bin */ diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index 28a531090..7d857cd20 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -418,7 +418,6 @@ U16 *lstMapIdx; Data **next; #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmStatBktInit); size = cfg->bktCfg[bktIdx].size; @@ -578,7 +577,6 @@ CmMmRegCfg *cfg; Txt errMsg[256] = {'\0'}; #endif - TRC2(cmMmRegInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -834,7 +832,6 @@ CmMmGlobRegCb *regCb; Txt errMsg[256] = {'\0'}; #endif - TRC2(cmMmGlobRegInit); #ifdef SS_MEM_WL_DEBUG if (cmInitBtInfo() == RFAILED) @@ -934,7 +931,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ CmMmDynRegCb *regCb; Data *memPtr; - TRC2(cmIccAllocWithLock); regCb = (CmMmDynRegCb *)regionCb; @@ -1023,7 +1019,6 @@ Size size; /* Size of the block */ { CmMmDynRegCb *regCb; - TRC2(cmIccFreeWithLock); regCb = (CmMmDynRegCb *)regionCb; @@ -1098,7 +1093,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ CmMmDynRegCb *regCb; Data *memPtr; - TRC2(cmIccAlloc); regCb = (CmMmDynRegCb *)regionCb; @@ -1172,7 +1166,6 @@ Size size; /* Size of the block */ #endif { CmMmDynRegCb *regCb; - TRC2(cmIccFree); regCb = (CmMmDynRegCb *)regionCb; @@ -1238,7 +1231,6 @@ CmMmDynRegCb *regCb; Txt regIccStr[64] = {'\0'}; #endif - TRC2(cmMmDynRegInit); /* Register the region/memory with ICC and get the handler for same. The id is starting * from region+1 as the zero is used by PHY code */ @@ -1276,7 +1268,7 @@ CmMmDynRegCb *regCb; printf("\nICC Region is %d\n",regCb->region); /* Call SRegRegion to register the memory region with SSI */ - cmMemset((U8*)®Info, 0, sizeof(regInfo)); + memset(®Info, 0, sizeof(regInfo)); /* Register the lock region for SS_MAX_REGS - 1 region */ if((SS_MAX_REGS - 1) == regCb->region) @@ -1352,7 +1344,6 @@ CmMmDynRegCb *regCb; U16 idx1; U16 numBkts; - TRC2(cmMmDynRegInit); /* Initialize the region control block */ region = regCb->region; @@ -1409,7 +1400,7 @@ CmMmDynRegCb *regCb; } /* Call SRegRegion to register the memory region with SSI */ - cmMemset((U8*)®Info, 0, sizeof(regInfo)); + memset(®Info, 0, sizeof(regInfo)); if((SS_MAX_REGS - 1) == regCb->region) { regInfo.alloc = cmDynAllocWithLock; @@ -1475,7 +1466,6 @@ CmMmRegCb *regCb; { U16 bktIdx; - TRC2(cmMmRegDeInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1941,7 +1931,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ { S16 ret; - TRC2(cmDynAlloc); if((SLock(&dynAllocFreeLock)) != ROK) { @@ -1995,7 +1984,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ { CmMmDynRegCb *regCb; - TRC2(cmDynAlloc); regCb = (CmMmDynRegCb *)regionCb; @@ -2120,7 +2108,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ btInfo->btInfo[btIdx].ptr = (PTR)0; btInfo->btInfo[btIdx].btSize = 0; - cmMemset(btInfo->btInfo[bktIdx].btArr, 0, sizeof (btInfo->btInfo[bktIdx].btArr)); + memset(btInfo->btInfo[bktIdx].btArr, 0, sizeof (btInfo->btInfo[bktIdx].btArr)); btInfo->btInfoIdx = btIdx; } #endif @@ -2140,7 +2128,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else /* *ptr = (Data*) malloc(*size); */ #endif @@ -2325,7 +2313,6 @@ Data **ptr; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmAlloc); #ifndef USE_MEMCAL UNUSED(flags); @@ -2685,7 +2672,7 @@ Data **ptr; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif @@ -2725,7 +2712,6 @@ S16 cmInitDoubleFreeList() U16 offset; CmMemDoubleFree memNode; - TRC2(cmInitDoubleFreeList); offset = (U16)((PTR)(&memNode.tmpListEnt) - (PTR)&memNode); @@ -2941,7 +2927,6 @@ Size size; /* Size of the block */ U8 tmpVal; #endif - TRC2(cmDynFree); regCb = (CmMmDynRegCb *)regionCb; #ifdef SS_MEM_WL_DEBUG @@ -3053,7 +3038,7 @@ Size size; /* Size of the block */ btInfo->btInfo[btIdx].ptr = (PTR)0; btInfo->btInfo[btIdx].btSize = 0; - cmMemset(btInfo->btInfo[bktIdx].btArr, 0, sizeof (btInfo->btInfo[bktIdx].btArr)); + memset(btInfo->btInfo[bktIdx].btArr, 0, sizeof (btInfo->btInfo[bktIdx].btArr)); btInfo->btInfoIdx = btIdx; } @@ -3062,7 +3047,7 @@ Size size; /* Size of the block */ prvAllocPtr[regCb->region] = NULLP; } - cmMemset(ptr, (regCb->region+1), bkt->size); + memset(ptr, (regCb->region+1), bkt->size); #endif /* Get the bucket node from the index returned and allocate the memory */ @@ -3073,7 +3058,6 @@ Size size; /* Size of the block */ return ROK; #else /* use pure is on */ - TRC2(cmDynFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3184,7 +3168,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmFree); regCb = (CmMmRegCb *)regionCb; @@ -3468,7 +3451,6 @@ Size size; return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3534,7 +3516,6 @@ Data **ptr; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmAllocWL); /*cm_mem_c_001.main_23 Removed support of USE_MEMCAL and MEMCAL_DEBUG support for SS_FAP*/ @@ -3632,7 +3613,7 @@ Data **ptr; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else /* *ptr = (Data*) malloc(*size); */ #endif @@ -3694,7 +3675,6 @@ Size size; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmFreeWL); regCb = (CmMmRegCb *)regionCb; @@ -3784,7 +3764,6 @@ Size size; /* The memory block was allocated from the heap pool */ return (cmHeapFree (&(regCb->heapCb), ptr, size)); #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3840,7 +3819,6 @@ SMemCtl *memCtl; { CmMmRegCb *regCb; - TRC2(cmCtl); regCb = (CmMmRegCb *)regionCb; @@ -3975,7 +3953,6 @@ Size size; #ifdef SSI_DEBUG_LEVEL1 U16 idx; #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmHeapInit); /* Initialize the heap control block */ heapCb->vStart = memAddr; @@ -4147,7 +4124,6 @@ Size *size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapAlloc); /* cm_mem_c_001.main_15 : Additions */ /* Acquire the heap lock */ /* cm_mem_c_001.main_13 : Replaced SLock with WTLock for NT */ @@ -4453,7 +4429,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapFree); /* Roundup the requested size */ size = CMM_DATALIGN(size, (heapCb->minSize)); @@ -4841,7 +4816,6 @@ Void cmInitMemLeakMdl (Void) U8 memMdl; U8 hashIdx; - TRC3(cmInitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -4890,7 +4864,6 @@ Void cmDeinitMemLeakMdl (Void) U8 memMdl; U8 hashIdx; - TRC3(cmDeinitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -4929,7 +4902,6 @@ Void cmMemOpenMemLkFile (arg) S8 *msOptArg; #endif { - TRC3(cmMemOpenMemLkFile); memLkCb.fileLkLog = NULLP; memLkCb.fileLkLog = fopen(arg, "w"); RETVOID; @@ -4967,7 +4939,6 @@ Void SLogLkInfo (Void) U8 idx; Txt prntBuf[255]; S8 **funcNm; - TRC3(SLogLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5061,7 +5032,6 @@ Void SFlushLkInfo (Void) U8 i; #endif /* SS_MEM_LEAK_SOL */ - TRC3(SFlushLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5147,7 +5117,6 @@ U16 bktIdx; MemAllocInfo *allocInfo; U8 moduleId; - TRC3(cmStorAllocBlk); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5160,7 +5129,7 @@ U16 bktIdx; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE funcNm = (S8 **)MxHeapAlloc(SsiHeap, (sizeof(U32) * CM_MAX_STACK_TRACE)); - cmMemset((U8*)funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); + memset(funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); #else funcNm = (S8 **)calloc(1, (sizeof(U32) * CM_MAX_STACK_TRACE)); #endif @@ -5177,7 +5146,7 @@ U16 bktIdx; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE allocInfo = (MemAllocInfo *)MxHeapAlloc(SsiHeap, sizeof(MemAllocInfo)); - cmMemset((U8*)allocInfo, 0, sizeof(MemAllocInfo)); + memset(allocInfo, 0, sizeof(MemAllocInfo)); #else allocInfo = (MemAllocInfo *)calloc(1, sizeof(MemAllocInfo)); #endif @@ -5236,7 +5205,6 @@ S32 traceSize; Txt *memFn[]={"SGetMsg", "SGetSBuf", "SGetDBuf", NULLP}; /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC3(cmMemGetModuleId) for(idx = 0; idx < traceSize; idx++) { memReqIdx = -1; @@ -5314,7 +5282,6 @@ S8 **strLst; U32 tempLen; U8 idx; S32 retVal; - TRC3(cmMemGetStrMtchIdx); len = strlen((const S8 *)str); cmpStr[0] = '('; @@ -5383,7 +5350,6 @@ U32 addr; S32 traceSize; MemAllocInfo *memAllocInfo; - TRC3(cmRlsAllocBlk); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5523,7 +5489,6 @@ S32 size; Dl_info info; Sym *sym; - TRC3(cmAddrToSymStr); if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { @@ -5577,7 +5542,6 @@ Void *arg; #endif { S8 *buffer; - TRC3(cmLeakCallBack); Backtrace_t *bt = (Backtrace_t *)arg; if (bt->bt_actcount >= bt->bt_maxcount) @@ -5585,7 +5549,7 @@ Void *arg; /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); - cmMemset((U8*)buffer, 0, 510); + memset(buffer, 0, 510); #else buffer = (S8 *)calloc(1, 510); #endif @@ -5623,7 +5587,6 @@ Void **buffer; S32 count; #endif { - TRC3(backtrace); Backtrace_t bt; ucontext_t u; @@ -5680,7 +5643,6 @@ CmMmBkt *bkt; CmMmBlkHdr *ptrBlk; U32 blkCnt; - TRC2(cmMmBktSanityChk); bkt->trampleCount = 0; @@ -5740,7 +5702,6 @@ CmMmHeapCb *heapCb; #endif { - TRC2(cmMmHeapSanityChk); /* increment the trample count */ heapCb->trampleCount++; @@ -5779,7 +5740,6 @@ CmMmBlkHdr *blkPtr; { U32 sigCnt; - TRC2(cmMmRegIsBlkSane); for ( sigCnt=0; sigCnt < CMM_TRAMPLING_SIGNATURE_LEN; sigCnt++) { @@ -5822,7 +5782,6 @@ U32 key; /* key string */ U16 *idx; /* idx to return */ #endif { - TRC2(cmMmHashFunc); *idx = (U16)(key % hashListCp->numOfbins); @@ -5870,7 +5829,6 @@ Pool pool; /* memory pool to allocate bins */ U16 i; CmMmHashListEnt *hl; - TRC2(cmMmHashListInit); /* initialize control point fields */ hashListCp->hashList = NULLP; @@ -5931,7 +5889,6 @@ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ #endif { - TRC2(cmMmHashListDeinit); /* deallocate memory for bins */ if (hashListCp->numOfbins) @@ -5980,7 +5937,6 @@ U32 key; /* pointer to key */ U16 idx; /* index for insertion into hash list */ U16 i; - TRC2(cmMmHashListInsert); /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) @@ -6060,7 +6016,6 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6101,7 +6056,6 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListDeInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6159,7 +6113,6 @@ U8 entId; /* Tapa task which frees the memory */ CmMemEntries *entry = NULLP; /* Entry which contains the information */ - TRC2(cmHstGrmFreeInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6243,7 +6196,6 @@ U8 entId; U32 ret = 0; CmMemEntries *entry = NULLP; - TRC2(cmHstGrmAllocInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6324,7 +6276,6 @@ U32 *key; { U32 i = 0; - TRC2(cmHstGrmGetHashIdxAndKey); /* Calculate the key using file name and line number */ for(i = 0 ; fileName[i] != '\0'; i++) @@ -6376,7 +6327,6 @@ U8 entId; { U32 idx = 0; - TRC2(cmHstGrmFillEntry); entry->key = key; entry->line = line; entry->entId = entId; @@ -6426,7 +6376,6 @@ CmMemEntries **entry; U32 numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; - TRC2(cmHstGrmFindEntry); for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) @@ -6852,7 +6801,6 @@ U32 isMemThreshReached(reg) Region reg; #endif { - TRC3(isMemThreshReached) if(gMemoryAlarm) { gMemoryAlarm = !(isMemUsageBelowLowerThreshold(reg)); diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 64c44b91e..538d926b3 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -115,7 +115,6 @@ PRIVATE Void TSInfTrigL2Stats(region, pool) Buffer* pBuf; Pst pst = {0}; - TRC2(TSInfTrigL2Stats) SGetMsg(region, pool, &pBuf); //#if defined(SCH_STATS) || defined(TENB_STATS) @@ -156,7 +155,6 @@ Void TSInfTrigStats(region, pool) Pool pool; #endif { - TRC2(TSInfTrigStats) //TODO TSInfTrigL2Stats(region, pool); @@ -176,7 +174,6 @@ PRIVATE Buffer* TSInfUtlAllocMsg(pst) { Buffer *mBuf; - TRC2(TSInfUtlAllocMsg) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { printf("\n MBuf Allocation failed\n"); @@ -199,7 +196,6 @@ PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) S32 i; U32 k; - TRC2(TSInfUtlPackUeInfo) CMCHKPK(oduUnpackUInt32, stats->persistent.numDeactivation, mBuf); CMCHKPK(oduUnpackUInt32, stats->persistent.numActivation, mBuf); @@ -280,7 +276,6 @@ PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) { S32 i,j; - TRC2(TSInfUtlPackCellInfo) CMCHKPK(oduUnpackUInt32, stats->rlc.reOdrTmrExp, mBuf); CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcDrbRetxFail, mBuf); @@ -398,7 +393,6 @@ PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) S32 i; U32 k; - TRC2(TSInfUtlUnpkUeInfo) CMCHKUNPK(oduPackUInt32, &stats->rnti, mBuf); @@ -480,7 +474,6 @@ PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) { S32 i,j; - TRC2(TSInfUtlUnpkCellInfo) CMCHKUNPK(oduPackUInt32, &stats->cellId, mBuf); @@ -599,7 +592,6 @@ Void TSInfPkSndL2UeStats(pst, suId, stats) { Buffer *mBuf; - TRC2(TSInfPkSndL2UeStats) mBuf = TSInfUtlAllocMsg(pst); TSInfUtlPackUeInfo(mBuf, stats); @@ -626,7 +618,6 @@ Void TSInfUnpkL2UeStats(func, pst, mBuf) SuId suId; TSInfL2UeStats stats; - TRC2(TSInfUnpkL2UeStats) SUnpkS16(&suId, mBuf); TSInfUtlUnpkUeInfo(mBuf, &stats); @@ -651,7 +642,6 @@ Void TSInfPkSndL2CellStats(pst, suId, stats) { Buffer *mBuf; - TRC2(TSInfPkSndL2CellStats) mBuf = TSInfUtlAllocMsg(pst); TSInfUtlPackCellInfo(mBuf, stats); @@ -678,7 +668,6 @@ Void TSInfUnpkL2CellStats(func, pst, mBuf) SuId suId; TSInfL2CellStats stats; - TRC2(TSInfUnpkL2CellStats) SUnpkS16(&suId, mBuf); TSInfUtlUnpkCellInfo(mBuf, &stats); diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c index 0f60cab6e..d3ce6dbda 100644 --- a/src/cm/cm_tkns.c +++ b/src/cm/cm_tkns.c @@ -78,7 +78,6 @@ TknS16 *tknS16; /* token S16 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknS16) if (tknS16->pres) { @@ -119,7 +118,6 @@ TknBStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknBStr32) CMPKTKNBSTR(tknStr, mBuf); @@ -153,7 +151,6 @@ TknStr8 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr8) CMPKTKNSTR(tknStr, mBuf); @@ -188,7 +185,6 @@ TknStr16 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr16) CMPKTKNSTR(tknStr, mBuf); @@ -225,7 +221,6 @@ Buffer *mBuf; /* message buffer */ { U16 ndx; - TRC2(cmPkTknStrOSXL) if(tknStr->pres) { @@ -275,7 +270,6 @@ Buffer *mBuf; /* message buffer */ U16 ndx; U16 len; - TRC2(cmPkTknStrBSXL) if(tknStr->pres) { @@ -328,7 +322,6 @@ Buffer *mBuf; /* message buffer */ { U8 ndx; - TRC2(cmPkTknStrBMP4) if(tknStr->pres) { @@ -377,7 +370,6 @@ Buffer *mBuf; /* message buffer */ { U16 ndx; - TRC2(cmPkTknStrBMPXL) if(tknStr->pres) { @@ -424,7 +416,6 @@ Buffer *mBuf; /* message buffer */ { U8 ndx; - TRC2(cmPkTknStrUNI4) if(tknStr->pres) { @@ -473,7 +464,6 @@ Buffer *mBuf; /* message buffer */ { U16 ndx; - TRC2(cmPkTknStrUNIXL) if(tknStr->pres) { @@ -521,7 +511,6 @@ TknS16 *tknS16; /* token S16 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknS16) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf); @@ -562,7 +551,6 @@ TknBStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknBStr32) CMUNPKTKNBSTR(tknStr, mBuf); @@ -597,7 +585,6 @@ TknStr8 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr8) CMUNPKTKNSTR(tknStr, mBuf); @@ -632,7 +619,6 @@ TknStr16 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr16) CMUNPKTKNSTR(tknStr, mBuf); @@ -671,8 +657,6 @@ Ptr ptr; /* pointer to control memory block */ { U16 ndx; - TRC2(cmUnpkTknStrOSXL) - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) @@ -728,7 +712,6 @@ Buffer *mBuf; /* message buffer */ U16 ndx; U16 len; - TRC2(cmUnpkTknStrBSXL) CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -786,7 +769,6 @@ Buffer *mBuf; /* message buffer */ { U8 ndx; - TRC2(cmUnpkTknStrBMP4) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -837,7 +819,6 @@ Ptr ptr; /* pointer to control memory block */ { U16 ndx; - TRC2(cmUnpkTknStrBMPXL) CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -891,7 +872,6 @@ Buffer *mBuf; /* message buffer */ { U8 ndx; - TRC2(cmUnpkTknStrUNI4) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -942,7 +922,6 @@ Ptr ptr; /* pointer to control memory block */ { U16 ndx; - TRC2(cmUnpkTknStrUNIXL) CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c index cba968785..3e52dbbae 100755 --- a/src/cm/cm_tpt.c +++ b/src/cm/cm_tpt.c @@ -126,7 +126,6 @@ CmIpv4TptAddr *pkParam; /* IPv4 Address structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkCmIpv4TptAddr) CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf); CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf); @@ -162,7 +161,6 @@ Buffer *mBuf; /* message buffer */ U8 num; U8 *ptr = (U8*)pkParam; - TRC3(cmPkCmIpv6NetAddr) for(num = 0; num < CM_IPV6ADDR_SIZE; num++) { @@ -198,7 +196,6 @@ CmIpv6TptAddr *pkParam; /* IPv6 transport address */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmIpv6TptAddr) CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf); CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf); @@ -235,7 +232,6 @@ Buffer *mBuf; /* message buffer */ U16 idx; /* Loop Index */ CmNetAddr *netAddr; /* Network Address */ - TRC2(cmPkCmNetAddrTbl) if (pkParam->count > CM_MAX_NET_ADDR) return RFAILED; @@ -281,7 +277,6 @@ CmNetAddr *pkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmNetAddr) switch (pkParam->type) { @@ -330,7 +325,6 @@ CmTptAddr *pkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmTptAddr) switch (pkParam->type) { @@ -381,7 +375,6 @@ CmTptLocalInf *pkParam; /* local interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmTptLocalInf) if (pkParam->intfPrsnt == TRUE) { @@ -423,7 +416,6 @@ CmNetMCastInf6 *pkParam; /* IPv6 multicast information */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmNetMCastInf6) CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf); CMCHKPK(oduUnpackUInt32, pkParam->localInf, mBuf); @@ -458,7 +450,6 @@ CmSockOpts *pkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmSockOpts) switch (pkParam->option) { @@ -526,7 +517,6 @@ Buffer *mBuf; /* message buffer */ { U32 num; - TRC3(cmPkCmSockParam) if( pkParam->numOpts > CM_MAX_SOCK_OPTS) { @@ -571,7 +561,6 @@ Buffer *mBuf; /* message buffer */ { U32 num; - TRC3(cmPkTlsTptParam) if( pkParam->numOpts > CM_MAX_SOCK_OPTS) { @@ -616,7 +605,6 @@ CmTptParam *pkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmTptParam) switch (pkParam->type) { @@ -680,7 +668,6 @@ CmIpv4TptAddr *unpkParam; /* IPv4 Address */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkCmIpv4TptAddr) CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); CMCHKUNPK(cmUnpkCmIpv4NetAddr, &unpkParam->address, mBuf); @@ -717,7 +704,6 @@ Buffer *mBuf; /* message buffer */ U32 num; U8 *ptr = (U8*)unpkParam; - TRC3(cmUnpkCmIpv6NetAddr) ptr += (CM_INET_IPV6ADDR_SIZE - 1); @@ -755,7 +741,6 @@ CmIpv6TptAddr *unpkParam; /* IPv6 transport address */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmIpv6TptAddr) CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6NetAddr, mBuf); @@ -792,7 +777,6 @@ Buffer *mBuf; /* message buffer */ U16 idx; /* Loop Index */ CmNetAddr *netAddr; /* Network Address */ - TRC2(cmUnpkCmNetAddrTbl) /* Unpack the count */ CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf); @@ -836,7 +820,6 @@ CmNetAddr *unpkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmNetAddr) CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -886,7 +869,6 @@ CmTptAddr *unpkParam; Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmTptAddr) CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -938,7 +920,6 @@ CmNetMCastInf6 *unpkParam; /* IPv6 multicast information */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmNetMCastInf6) CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf); CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->mCastAddr, mBuf); @@ -973,7 +954,6 @@ CmSockOpts *unpkParam; /* socket options */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmSockOpts) CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf); CMCHKUNPK(oduPackUInt32, &unpkParam->option, mBuf); @@ -1043,7 +1023,6 @@ Buffer *mBuf; /* message buffer */ { U32 num; - TRC3(cmUnpkCmSockParam) CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf); CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf); @@ -1090,7 +1069,6 @@ Buffer *mBuf; /* message buffer */ { U32 num; - TRC3(cmUnpkTlsTptParam) CMCHKUNPK(SUnpkS16, &unpkParam->ctxId, mBuf); CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf); @@ -1137,7 +1115,6 @@ CmTptParam *unpkParam; /* transport parameters */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmTptParam) CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -1198,7 +1175,6 @@ CmIpHdrParm *pkParam; /* IP hdr parameters */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmIpHdrParm) switch (pkParam->type) { @@ -1269,7 +1245,6 @@ CmTptLocalInf *unpkParam; /* local interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmUnpkCmTptLocalInf) /* first unpack the bool intfPrsnt value which is always packed */ CMCHKUNPK(oduUnpackBool, &unpkParam->intfPrsnt, mBuf); @@ -1312,7 +1287,6 @@ CmIpv6ExtHdr *pkParam; /*IPV6 extension hdrs */ Buffer *mBuf; /* message buffer */ #endif { - TRC3(cmPkCmIpv6ExtHdr) /* pack first Route hdr */ if (pkParam->rtOptsPrsnt) @@ -1360,7 +1334,6 @@ Buffer *mBuf; /* message buffer */ { U8 idx; - TRC3(cmPkCmIpv6RtHdr); /* pack all IPV6 addrs in the route hdr */ for(idx = 0; idx < pkParam->numAddrs; idx++) @@ -1406,7 +1379,6 @@ Mem *memInfo; /* meminfo to allocate for Route hdr */ U8 idx; /* array index */ S32 retVal; /* temporary return value */ - TRC3(cmUnpkCmIpv6RtHdr); CMCHKUNPK(oduPackUInt8, &unpkParam->numAddrs, mBuf); @@ -1460,7 +1432,6 @@ Buffer *mBuf; /* message buffer */ Mem *memInfo; /* meminfo to allocate for IPV6 ext hdr */ #endif { - TRC3(cmUnpkCmIpv6ExtHdr) /* unpack HBH hdr first */ CMCHKUNPK(oduUnpackBool, &unpkParam->hbhHdrPrsnt, mBuf); @@ -1509,7 +1480,6 @@ Buffer *mBuf; /* message buffer */ U8 numOptions; - TRC3(cmPkCmIpv6DestOptsArr); /* pack all HBH options */ for(numOptions = 0; numOptionsnumDestOpts; numOptions++) @@ -1547,7 +1517,6 @@ Buffer *mBuf; /* message buffer */ { U8 optLen; - TRC3(cmPkCmIpv6DestOptsHdr); for(optLen = 0; optLen < pkParam->length; optLen++) { @@ -1590,7 +1559,6 @@ Mem *memInfo; /* meminfo to allocate mem for dest opt */ S32 retVal; /* temporary return value */ U8 optLen; /* length of value field */ - TRC3(cmUnpkCmIpv6DestOptsHdr); /* unpack type, length */ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -1645,7 +1613,6 @@ Mem *memInfo; /* meminfo to allocate mem for dest opts */ U8 numOptions; S16 retVal; - TRC3(cmUnpkCmIpv6DestOptsArr); CMCHKUNPK(oduPackUInt8, &unpkParam->numDestOpts, mBuf); if (unpkParam->numDestOpts) @@ -1699,7 +1666,6 @@ Buffer *mBuf; /* message buffer */ { U8 numOptions; - TRC3(cmPkCmIpv6HBHHdrArr); for(numOptions = 0; numOptionsnumHBHOpts; numOptions++) CMCHKPK(cmPkCmIpv6HBHHdr, &pkParam->hbhOpts[numOptions], mBuf); @@ -1737,7 +1703,6 @@ Buffer *mBuf; /* message buffer */ { U8 optLen; - TRC3(cmPkCmIpv6HBHHdr); /* pack value field */ for(optLen = 0; optLenlength; optLen++) @@ -1783,7 +1748,6 @@ Mem *memInfo; /* meminfo to allocate mem for HBH opt */ S32 retVal; /* temporary return value */ U8 optLen; /* length of value field */ - TRC3(cmUnpkCmIpv6HBHHdr) CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf); @@ -1837,7 +1801,6 @@ Mem *memInfo; /* meminfo to allocate space for HBH opt */ U8 numOptions; S16 retVal; - TRC3(cmUnpkCmIpv6HBHHdrArr); CMCHKUNPK(oduPackUInt8, &unpkParam->numHBHOpts, mBuf); if (unpkParam->numHBHOpts) @@ -1904,7 +1867,6 @@ Buffer *mBuf; /* message buffer */ #endif /* IPV6_OPTS_SUPPORTED */ #endif { - TRC3(cmUnpkCmIpHdrParm) CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -1976,7 +1938,6 @@ Buffer *mBuf; /* message buffer */ /* Variable declaration */ S16 idx; - TRC3(cmPkCmIcmpFilter) switch (pkParam->type) { @@ -2051,8 +2012,6 @@ Buffer *mBuf; /* message buffer */ /* Variable declaration */ S16 idx; - TRC3(cmUnpkCmIcmpFilter) - CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) diff --git a/src/cm/crg.c b/src/cm/crg.c index 5d1508452..3613b5715 100755 --- a/src/cm/crg.c +++ b/src/cm/crg.c @@ -70,7 +70,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -133,7 +132,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkCrgBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -187,7 +185,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -251,7 +248,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkCrgBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -304,7 +300,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -367,7 +362,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkCrgUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -424,7 +418,6 @@ CrgCfgReqInfo * cfgReqInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -513,7 +506,6 @@ Buffer *mBuf; CrgCfgTransId transId; CrgCfgReqInfo *cfgReqInfo; - TRC3(cmUnpkCrgCfgReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -589,7 +581,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -664,7 +655,6 @@ Buffer *mBuf; CrgCfgTransId transId; U8 status; - TRC3(cmUnpkCrgCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -727,7 +717,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkCrgCfgTransId) for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); @@ -766,7 +755,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkCrgCfgTransId) for (i=0; itrans[i], mBuf); @@ -804,7 +792,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgBwCfg) CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); @@ -841,7 +828,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgBwCfg) CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); @@ -878,7 +864,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRachCfg) CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf); return ROK; @@ -914,7 +899,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRachCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3Tx, mBuf); return ROK; @@ -950,7 +934,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCellCfg) #ifdef EMTC_ENABLE CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); @@ -995,7 +978,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCellCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkCrgRachCfg, ¶m->rachCfg, mBuf); @@ -1040,7 +1022,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeUlHqCfg) CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); return ROK; @@ -1227,7 +1208,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUeUlHqCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); return ROK; @@ -1263,7 +1243,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeCfg) #ifdef TENB_MULT_CELL_SUPPRT CMCHKPK(SPkS16, param->rguDlSapId, mBuf); CMCHKPK(SPkS16, param->rguUlSapId, mBuf); @@ -1307,7 +1286,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCrgUeCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -1352,7 +1330,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgDlLchCfg) CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); return ROK; @@ -1388,7 +1365,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgDlLchCfg) CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); return ROK; @@ -1424,7 +1400,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUlLchCfg) CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); @@ -1461,7 +1436,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUlLchCfg) CMCHKUNPK(oduPackUInt8, ¶m->ulTrchType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); @@ -1498,7 +1472,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgLchCfg) /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */ #ifdef LTE_L2_MEAS CMCHKPK(oduUnpackUInt8, param->qci, mBuf); @@ -1543,7 +1516,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgLchCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -1589,7 +1561,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCfg) switch(param->cfgType) { case CRG_LCH_CFG: @@ -1638,7 +1609,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCfg) CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { @@ -1687,7 +1657,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCellRecfg) CMCHKPK(cmPkCrgRachCfg, ¶m->rachRecfg, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -1724,7 +1693,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCellRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkCrgRachCfg, ¶m->rachRecfg, mBuf); @@ -1761,7 +1729,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeRecfg) #ifdef LTE_ADV if(TRUE == param->crgSCellCfg.isSCellCfgPres) { @@ -1811,7 +1778,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUeRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); @@ -1855,7 +1821,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgLchRecfg) CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -1894,7 +1859,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgLchRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -1933,7 +1897,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRecfg) switch(param->recfgType) { case CRG_LCH_CFG: @@ -1982,7 +1945,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRecfg) CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { @@ -2031,7 +1993,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgDel) switch(param->delType) { case CRG_LCH_CFG: @@ -2084,7 +2045,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgDel) CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); switch(param->delType) { @@ -2137,7 +2097,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRst) CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -2174,7 +2133,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRst) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -2211,7 +2169,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCfgReqInfo) switch(param->action) { case CRG_RESET: @@ -2263,7 +2220,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCfgReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); switch(param->action) { diff --git a/src/cm/ctf.c b/src/cm/ctf.c index 595d6d495..59d23930f 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -78,7 +78,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -144,7 +143,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkCtfBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -200,7 +198,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -267,7 +264,6 @@ Buffer *mBuf; SuId suId = 0; U8 status; - TRC3(cmUnpkCtfBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -322,7 +318,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -388,7 +383,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkCtfUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -489,7 +483,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfNhKeyInfo) for(idx=31;idx>=0;idx--) { @@ -536,7 +529,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfKenbStarInfo) for(idx=31;idx>=0;idx--) { @@ -584,7 +576,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfAskeyInfo) for(idx=31;idx>=0;idx--) @@ -630,7 +621,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfKdfReqInfo) switch (param->keyDerType) { @@ -685,7 +675,6 @@ CtfKdfReqInfo* kdfReqInfo; Buffer *mBuf = NULLP; - TRC3(cmPkCtfKdfReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -766,7 +755,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmPkCtfCnmVendorSpecificInfo); if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS) { for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--) @@ -791,7 +779,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCtfCnmCellSyncReq); CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf); CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf); CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf); @@ -816,7 +803,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmPkCtfcfgReqInfo); CMCHKPK(oduUnpackUInt8, param->searchType, mBuf); CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf); @@ -846,7 +832,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkCtfCnmVendorSpecificInfo); CMCHKUNPK(oduPackUInt16, ¶m->numOfVendorSpecifcParam, mBuf); for(i=0; (inumOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++) @@ -868,7 +853,6 @@ CtfCnmCellSyncReq *param; Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCtfCnmCellSyncReq); CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); @@ -895,7 +879,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkCtfsyncReqInfo); CMCHKUNPK(oduPackUInt16, ¶m->numOfPciList, mBuf); for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) @@ -943,7 +926,6 @@ CtfCnmCellSyncReq * cfgReqInfo; Buffer *mBuf = NULLP; - TRC3(cmPkCtfCnmCellSyncReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1044,7 +1026,6 @@ Buffer *mBuf; SpId spId = 0; CtfCfgTransId transId; CtfCnmCellSyncReq *SyncReqMsg = NULLP; - TRC3(cmUnpkCtfCnmCellSyncReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1136,7 +1117,6 @@ CtfCnmInitSyncReq * cfgReqInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCnmInitSyncReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1239,7 +1219,6 @@ Buffer *mBuf; SpId spId = 0; CtfCfgTransId transId; CtfCnmInitSyncReq *syncReqInfo = NULLP; - TRC3(cmUnpkCtfCnmInitSyncReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1308,7 +1287,6 @@ CtfCnmMibInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkCtfctfCnmMibInfo) CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf); @@ -1331,7 +1309,6 @@ CtfCnmInitSyncInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkCtfctfCnmInitSyncInfo) CMCHKPK(oduUnpackUInt16, param->pci, mBuf); CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); @@ -1356,7 +1333,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmPkCtfcfgRspInfo) CMCHKPK(oduUnpackUInt8, param->status, mBuf); @@ -1405,7 +1381,6 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCnmInitSyncRsp) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1488,7 +1463,6 @@ CtfCnmMibInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkCtfctfCnmMibInfo); CMCHKUNPK(oduPackUInt8, ¶m->dlSystemBandWidht, mBuf); @@ -1512,7 +1486,6 @@ CtfCnmInitSyncInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkctfCnmInitSyncInfo); CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); @@ -1537,7 +1510,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkCtfCnmInitSyncRspMsg); CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf); @@ -1582,7 +1554,6 @@ Buffer *mBuf; SpId spId = 0; CtfCfgTransId transId; CtfCnmInitSyncRsp *syncRspInfo = NULLP; - TRC3(cmUnpkCtfCnmInitSyncRsp) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1653,7 +1624,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCellSyncRsp) CMCHKPK(oduUnpackUInt8, param->status, mBuf); return ROK; @@ -1692,7 +1662,6 @@ CtfCnmCellSyncRsp * cfgRspInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCnmCellSyncRsp) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1777,7 +1746,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCnmSyncRspMsg); CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); return ROK; @@ -1815,7 +1783,6 @@ Buffer *mBuf; SpId spId = 0; CtfCfgTransId transId; CtfCnmCellSyncRsp *syncRspMsg = NULLP; - TRC3(cmUnpkCtfCnmCellSyncRsp) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1886,7 +1853,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfcfgIndInfo); CMCHKPK(oduUnpackUInt8, param->status, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); @@ -1926,7 +1892,6 @@ CtfCnmCellSyncInd * cfgIndInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCnmCellSyncInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2011,7 +1976,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCnmSyncIndMsg); CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); @@ -2050,7 +2014,6 @@ Buffer *mBuf; SpId spId = 0; CtfCfgTransId transId; CtfCnmCellSyncInd *syncIndMsg = NULLP; - TRC3(cmUnpkCtfCnmInitSyncRsp) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2146,7 +2109,6 @@ CtfCfgReqInfo* cfgReqInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2247,7 +2209,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfNhKeyInfo) CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); @@ -2291,7 +2252,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfKenbStarInfo) CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); @@ -2336,7 +2296,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfAskeyInfo) CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf); @@ -2378,7 +2337,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfKdfReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) @@ -2431,7 +2389,6 @@ Buffer *mBuf; CtfCfgTransId transId; CtfKdfReqInfo *kdfReqInfo = NULLP; - TRC3(cmUnpkCtfKdfReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2527,7 +2484,6 @@ Buffer *mBuf; CtfCfgTransId transId; CtfCfgReqInfo *cfgReqInfo = NULLP; - TRC3(cmUnpkCtfCfgReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2617,7 +2573,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfNhKeyCfmInfo) for(idx=31;idx>=0;idx--) { @@ -2659,7 +2614,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfKenbStarCfmInfo) for(idx=31;idx>=0;idx--) { @@ -2702,7 +2656,6 @@ Buffer *mBuf; S16 idx; - TRC3(cmPkCtfCtfAskeyCfmInfo) for(idx=15;idx>=0;idx--) { @@ -2750,7 +2703,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfKdfCfmInfo) switch (param->keyDerType) { @@ -2802,7 +2754,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfKdfCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2911,7 +2862,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2984,7 +2934,6 @@ CtfCfgTransId transId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfEnbStopInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3053,7 +3002,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfNhKeyCfmInfo) for(idx=0;idx<32;idx++) { @@ -3095,7 +3043,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfKenbStarCfmInfo) for(idx=0;idx<32;idx++) { @@ -3138,7 +3085,6 @@ Buffer *mBuf; U8 idx; - TRC3(cmUnpkCtfCtfAskeyCfmInfo) for(idx=0;idx<16;idx++) { @@ -3186,7 +3132,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfKdfCfmInfo) CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) @@ -3239,7 +3184,6 @@ Buffer *mBuf; U8 status; CtfKdfCfmInfo kdfCfmInfo; - TRC3(cmUnpkCtfKdfCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3320,7 +3264,6 @@ Buffer *mBuf; CtfCfgTransId transId; U8 status; - TRC3(cmUnpkCtfCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3386,7 +3329,6 @@ Buffer *mBuf; SuId suId = 0; CtfCfgTransId transId; - TRC3(cmUnpkCtfCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3447,7 +3389,6 @@ CtfUeInfo * newUeInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfUeIdChgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3601,7 +3542,6 @@ Buffer *mBuf; CtfUeInfo *ueInfo = NULLP; CtfUeInfo *newUeInfo = NULLP; - TRC3(cmUnpkCtfUeIdChgReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3724,7 +3664,6 @@ CmStatus status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfUeIdChgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3846,7 +3785,6 @@ Buffer *mBuf; CtfUeInfo *ueInfo = NULLP; CmStatus status; - TRC3(cmUnpkCtfUeIdChgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3943,7 +3881,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkCtfCfgTransId) for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); @@ -3982,7 +3919,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkCtfCfgTransId) for (i=0; itrans[i], mBuf); @@ -4020,7 +3956,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfUeInfo) CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -4057,7 +3992,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfUeInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); @@ -4096,7 +4030,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfBwCfgInfo) CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf); CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf); @@ -4138,7 +4071,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfBwCfgInfo) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -4180,7 +4112,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfTxSchemeCfg) CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf); CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf); @@ -4221,7 +4152,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfTxSchemeCfg) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -4265,7 +4195,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfAntennaCfgInfo) CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf); return ROK; @@ -4304,7 +4233,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfAntennaCfgInfo) CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum; return ROK; @@ -4348,7 +4276,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPrachCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4401,7 +4328,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfPrachCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -4448,7 +4374,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPdschCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4491,7 +4416,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfPdschCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -4535,7 +4459,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPuschCfgBasic) CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf); CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf); @@ -4577,7 +4500,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfPuschCfgBasic) CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -4619,7 +4541,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPuschUlRS) CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf); CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf); @@ -4660,7 +4581,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfPuschUlRS) CMCHKUNPK(oduPackUInt8, ¶m->grpHopEnabled, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->seqHopEnabled, mBuf); @@ -4701,7 +4621,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPuschCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4745,7 +4664,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfPuschCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -4789,7 +4707,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPhichCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4834,7 +4751,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfPhichCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -4880,7 +4796,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfPucchCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4927,7 +4842,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfPucchCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -4974,7 +4888,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfSrsUlCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -5021,7 +4934,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfSrsUlCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -5068,7 +4980,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfTddSfCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -5112,7 +5023,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfVendorSpecParams) if( param->buffLen != 0) { SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf); } @@ -5153,7 +5063,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfVendorSpecParams) CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf); @@ -5206,7 +5115,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfTddSfCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -5246,7 +5154,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkCtfUnLicnsdCellParam) CMCHKPK(SPkS32, param->txPowerLimit, mBuf); CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf); @@ -5301,7 +5208,6 @@ Buffer *mBuf; #ifdef EMTC_ENABLE S32 i; #endif - TRC3(cmPkCtfCellCfgInfo) #ifdef EMTC_ENABLE for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) { @@ -5425,7 +5331,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkCtfUnLicnsdCellParam) CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf); @@ -5481,7 +5386,6 @@ Buffer *mBuf; #ifdef EMTC_ENABLE S32 i; #endif - TRC3(cmUnpkCtfCellCfgInfo) /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -5613,7 +5517,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCellRecfgInfo) #ifdef ENABLE_API_LOG CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf); @@ -5721,7 +5624,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkCtfCellRecfgInfo) /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -5830,7 +5732,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedPdschCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -5871,7 +5772,6 @@ Buffer *mBuf; #endif { U32 tmpEnum; - TRC3(cmUnpkCtfDedPdschCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -5915,7 +5815,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedPucchCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -5979,7 +5878,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedPucchCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6043,7 +5941,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedPuschCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6088,7 +5985,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedPuschCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6134,7 +6030,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCqiRptModePeriodic) /* ctf_c_001.main_2: added packning for cqiMask*/ #ifdef CTF_VER1 CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); @@ -6185,7 +6080,6 @@ Buffer *mBuf; #ifdef CTF_VER1 U32 tmpEnum; #endif - TRC3(cmUnpkCtfCqiRptModePeriodic) CMCHKUNPK(oduPackUInt8, ¶m->cqiPeriodicCfgType, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); @@ -6236,7 +6130,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCqiReportCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6318,7 +6211,6 @@ Buffer *mBuf; #if defined (CTF_VER1) || defined (CTF_VER2) U32 tmpEnum; #endif - TRC3(cmUnpkCtfCqiReportCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6400,7 +6292,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedSrsUlCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6450,7 +6341,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedSrsUlCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6500,7 +6390,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedSRCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6545,7 +6434,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedSRCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6595,7 +6483,6 @@ Buffer *mBuf; U8 idx; #endif /* CTF_VER2 */ - TRC3(cmPkCtfDedAntCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6698,7 +6585,6 @@ Buffer *mBuf; U32 tmpEnum; - TRC3(cmUnpkCtfDedAntCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -6948,7 +6834,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfUeCatCfgInfo) /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6989,7 +6874,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfUeCatCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ @@ -7030,7 +6914,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedCfgInfo) #ifdef EMTC_ENABLE CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); #endif @@ -7081,7 +6964,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedCfgInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); @@ -7133,7 +7015,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedRecfgInfo) CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); /*ctf_c_001.main_1*/ @@ -7190,7 +7071,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedRecfgInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); @@ -7249,7 +7129,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCellReleaseInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; @@ -7287,7 +7166,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCellReleaseInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); return ROK; @@ -7325,7 +7203,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfDedReleaseInfo) CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -7364,7 +7241,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfDedReleaseInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); @@ -7404,7 +7280,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCfgInfo) switch(param->cfgElem) { case CTF_UE_CFG: @@ -7452,7 +7327,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { @@ -7500,7 +7374,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfReCfgInfo) switch(param->cfgElem) { case CTF_UE_CFG: @@ -7557,7 +7430,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfReCfgInfo) CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { @@ -7613,7 +7485,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfReleaseInfo) switch(param->cfgElem) { case CTF_UE_CFG: @@ -7661,7 +7532,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfReleaseInfo) CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { @@ -7712,7 +7582,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCfgReqInfo) /* ctf_c_001.main_4: Added support for vendor specific parameters */ #ifdef CTF_VER3 @@ -7778,7 +7647,6 @@ Buffer *mBuf; S16 retVal; #endif - TRC3(cmUnpkCtfCfgReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { @@ -7832,7 +7700,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCellPwrcfgInfo) /* Added the pack for newly added reference signal Power*/ CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); @@ -7877,7 +7744,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCellPwrcfgInfo) /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -7921,7 +7787,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCtfCellStop) /* Added the pack for newly added reference signal Power*/ CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); @@ -7964,7 +7829,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCtfCellStop) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -8006,7 +7870,6 @@ CtfPeriodicRemCellInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkPerRemScanCellInfo) CMCHKPK(oduUnpackUInt16,param->pci, mBuf); CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); @@ -8045,7 +7908,6 @@ Buffer *mBuf; #endif { S16 idx; - TRC3(cmPkCtfPeriodicCellSearchRsp) for(idx = param->numCells - 1; idx >=0; idx--) { @@ -8088,7 +7950,6 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCtfPeriodicRemCellSearchRsp) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -8175,7 +8036,6 @@ CtfPeriodicRemCellInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkCtfPerRemScanCellInfo); CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->dlBw, mBuf); @@ -8197,7 +8057,6 @@ Buffer *mBuf; #endif { S16 idx; - TRC3(cmUnpkCtfPerRemCellSrch); CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); for(idx = 0; idx < (param->numCells); idx++) @@ -8238,7 +8097,6 @@ Buffer *mBuf; SuId suId = 0; CtfCfgTransId transId; CtfPeriodicRemCellSearchRsp *CellSrchRsp = NULLP; - TRC3(cmUnpkPerRemCellSrchRsp) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); diff --git a/src/cm/envdep.h b/src/cm/envdep.h index c43ed7425..9d75d624c 100755 --- a/src/cm/envdep.h +++ b/src/cm/envdep.h @@ -1842,15 +1842,6 @@ typedef S8 *ARGTYPE; **********************************************************************/ /* - trace macros are at the beginning of each function. they may - be used for debugging purposes. the trace macros are turned on - by the following command line option: - - TRACE0 - trace mos support functions - TRACE1 - trace mos interface functions - TRACE2 - trace layer support functions - TRACE3 - trace layer interface functions - TRACE4 - trace interrupt service functions there is one additional trace macro which turns on trace macros 0 - 4 and pushes the text within trace macros 0 - 4 onto a stack. the text @@ -1861,11 +1852,6 @@ typedef S8 *ARGTYPE; */ #ifdef TRACE5 /* trace 5 - call stack */ -#define TRACE0 /* trace 0 - mos support functions */ -#define TRACE1 /* trace 1 - mos interface functions */ -#define TRACE2 /* trace 2 - layer support functions */ -#define TRACE3 /* trace 3 - layer interface functions */ -#define TRACE4 /* trace 4 - interrupt service functions */ #define T5M 64 /* trace 5 - maximum call stack height */ extern S8 *t5s[]; /* trace 5 - call stack */ @@ -1875,98 +1861,6 @@ extern Void FAR exit(int); #endif #endif -#ifdef TRACE5 /* trace 5 - call stack */ -#ifdef ERRCHK -#define TRC0(a) if(t5t>=0&&t5t=0&&t5t=0&&t5t=0&&t5t=0&&t5tlcType) { @@ -241,7 +237,6 @@ Buffer * mBuf; #ifndef SS_RBUF KwuDatReqInfo* datReqInfo; #endif - TRC3(cmPkKwuDatReq) #ifndef SS_RBUF switch(pst->selector) { @@ -266,7 +261,7 @@ Buffer * mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - cmMemcpy((U8*)datReqInfo,(U8*)datReq,sizeof(KwuDatReqInfo)); + memcpy(datReqInfo,datReq,sizeof(KwuDatReqInfo)); CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf); } else @@ -407,7 +402,6 @@ KwuDatIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuDatIndInfo); CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf); #ifdef CCPU_OPT @@ -442,7 +436,6 @@ Buffer * mBuf; #endif KwuDatIndInfo *datIndInfo = NULLP; - TRC3(cmPkKwuDatInd) #ifdef TENB_SPLIT_ARCH /* SSI_CHANGES: */ @@ -474,7 +467,7 @@ Buffer * mBuf; return (ret1); } - cmMemcpy((U8*)datIndInfo,(U8*)datInd,sizeof(KwuDatIndInfo)); + memcpy(datIndInfo, datInd,sizeof(KwuDatIndInfo)); CMCHKPK(oduPackPointer,(PTR)datIndInfo, mBuf); } break; @@ -525,7 +518,6 @@ Buffer *mBuf; { register U32 iter; - TRC3(cmPkKwuDatCfmInfo); for(iter = 0; iter < param->numSduIds; iter++) { CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf); @@ -555,7 +547,6 @@ KwuDatCfmInfo* datCfm; #endif Buffer *mBuf; - TRC3(cmPkKwuDatCfm) mBuf = NULLP; @@ -630,7 +621,6 @@ KwuDiscSduInfo* discSdu; Buffer *mBuf; KwuDiscSduInfo* discSduInfo = NULLP; - TRC3(cmPkKwuDiscSduReq) mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -659,7 +649,7 @@ KwuDiscSduInfo* discSdu; return (ret1); } - cmMemcpy((U8*)discSduInfo,(U8*)discSdu,sizeof(KwuDiscSduInfo)); + memcpy(discSduInfo, discSdu,sizeof(KwuDiscSduInfo)); CMCHKPK(oduPackPointer,(PTR)discSduInfo, mBuf); } break; @@ -703,7 +693,6 @@ Buffer *mBuf; { S16 i; - TRC3(cmPkKwuStaIndInfo); for (i = (param->numSdu - 1); i >= 0; i--) { @@ -726,7 +715,6 @@ KwuFlowCntrlIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuFlowCntrlIndInfo); CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); @@ -746,7 +734,6 @@ KwuFlowCntrlIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuFlowCntrlIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); @@ -776,7 +763,6 @@ KwuStaIndInfo* staInd; #endif /* LCKWU */ Buffer *mBuf; - TRC3(cmPkKwuStaInd) mBuf = NULLP; @@ -852,7 +838,6 @@ CmLteRlcId rlcId; #endif /* LCKWU */ Buffer *mBuf; - TRC3(cmPkKwuReEstCmpInd) mBuf = NULLP; @@ -909,7 +894,6 @@ KwuDiscSduInfo *discCfmSdu; #endif Buffer *mBuf; - TRC3(cmPkKwuDiscSduCfm) mBuf = NULLP; @@ -979,7 +963,6 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; { Buffer *mBuf; - TRC3(cmPkKwuFlowCntrlInd) mBuf = NULLP; @@ -1036,7 +1019,6 @@ KwuDatAckInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkKwuDatAckIndInfo); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); @@ -1061,7 +1043,6 @@ KwuDatAckInfo* datInd; Buffer *mBuf; - TRC3(cmPkKwuDatAckInd); mBuf = NULLP; @@ -1112,8 +1093,6 @@ Buffer *mBuf; SuId suId = 0; SpId spId = 0; - TRC3(cmUnpkKwuBndReq) - CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU020, pst); CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU021, pst); SPutMsg(mBuf); @@ -1139,7 +1118,6 @@ Buffer *mBuf; SuId suId = 0; U8 status = 0; - TRC3(cmUnpkKwuBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst); CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst); @@ -1166,7 +1144,6 @@ Buffer *mBuf; SpId spId = 0; Reason reason = 0; - TRC3(cmUnpkKwuUbndReq) CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU024, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EKWU025, pst); @@ -1189,7 +1166,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatReqInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); @@ -1241,7 +1217,6 @@ Buffer *mBuf; KwuDatReqInfo *datReq = NULLP; KwuDatReqInfo datReqTmp; - TRC3(cmUnpkKwuDatReq) switch(pst->selector) { @@ -1255,7 +1230,7 @@ Buffer *mBuf; /* Allocate the memory statically as there is no free * in RLC */ datReq = &datReqTmp; - cmMemset((U8 *)datReq, 0, sizeof(KwuDatReqInfo)); + memset(datReq, 0, sizeof(KwuDatReqInfo)); #if(ERRCLASS & ERRCLS_DEBUG) ret1 = cmUnpkKwuDatReqInfo( (datReq), mBuf); if(ret1 != ROK) @@ -1305,7 +1280,6 @@ KwuDatIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -1335,7 +1309,6 @@ Buffer *mBuf; KwuDatIndInfo *datInd = NULLP; KwuDatIndInfo datIndTmp; - TRC3(cmUnpkKwuDatInd) switch(pst->selector) { @@ -1414,7 +1387,6 @@ Buffer *mBuf; #endif { register S32 iter; - TRC3(cmUnpkKwuDatCfmInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf); @@ -1448,7 +1420,6 @@ Buffer *mBuf; SuId suId = 0; KwuDatCfmInfo *datCfm = NULLP; - TRC3(cmUnpkKwuDatCfm) CMCHKUNPK(SUnpkS16, &(suId), mBuf); @@ -1475,7 +1446,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)datCfm, 0, sizeof(KwuDatCfmInfo)); + memset(datCfm, 0, sizeof(KwuDatCfmInfo)); ret1 = cmUnpkKwuDatCfmInfo( (datCfm), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) if(ret1 != ROK) @@ -1547,7 +1518,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); + memset(discSdu, 0, sizeof(KwuDiscSduInfo)); ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) if(ret1 != ROK) @@ -1590,7 +1561,6 @@ Buffer *mBuf; { U32 i; - TRC3(cmUnpkKwuStaIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); @@ -1621,7 +1591,6 @@ Buffer *mBuf; SuId suId = 0; KwuStaIndInfo *staInd = NULLP; - TRC3(cmUnpkKwuStaInd) CMCHKUNPK(SUnpkS16, &(suId), mBuf); @@ -1648,7 +1617,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)staInd, 0, sizeof(KwuStaIndInfo)); + memset(staInd, 0, sizeof(KwuStaIndInfo)); ret1 = cmUnpkKwuStaIndInfo( (staInd), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1698,9 +1667,8 @@ Buffer *mBuf; SuId suId = 0; CmLteRlcId rlcId; - TRC3(cmUnpkKwuReEstCmpInd) - cmMemset((U8 *)&rlcId, 0, sizeof(CmLteRlcId)); + memset(&rlcId, 0, sizeof(CmLteRlcId)); CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) @@ -1749,7 +1717,6 @@ Buffer *mBuf; SpId spId = 0; KwuDiscSduInfo *discSdu = NULLP; - TRC3(cmUnpkKwuDiscSduCfm); CMCHKUNPK(SUnpkS16, &(spId), mBuf); @@ -1775,7 +1742,7 @@ Buffer *mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); + memset(discSdu, 0, sizeof(KwuDiscSduInfo)); ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf); #if(ERRCLASS & ERRCLS_DEBUG) @@ -1819,7 +1786,6 @@ Buffer *mBuf; SuId suId; KwuFlowCntrlIndInfo *flowCntrlInfo = NULLP; - TRC3(cmUnpkKwuFlowCntrlInd); CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) @@ -1866,7 +1832,6 @@ KwuDatAckInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuDatAckInfo); CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -1893,7 +1858,6 @@ Buffer *mBuf; SuId suId = 0; KwuDatAckInfo *datInd = NULLP; - TRC3(cmUnpkKwuDatAckInd); if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,\ sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY)) != ROK) @@ -1909,7 +1873,7 @@ Buffer *mBuf; return (ret1); } - cmMemset((U8 *)datInd, 0, sizeof(KwuDatAckInfo)); + memset(datInd, 0, sizeof(KwuDatAckInfo)); CMCHKUNPK(SUnpkS16, &(suId), mBuf); ret1 = cmUnpkKwuDatAckInfo( (datInd), mBuf); diff --git a/src/cm/legtp.c b/src/cm/legtp.c index 837cd95ac..5eb17e6b8 100644 --- a/src/cm/legtp.c +++ b/src/cm/legtp.c @@ -141,7 +141,7 @@ uint8_t unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf) { EgtpConfig egtpCfg; - memset((uint8_t *)&egtpCfg, 0, sizeof(EgtpConfig)); + memset(&egtpCfg, 0, sizeof(EgtpConfig)); oduPackUInt32(&(egtpCfg.maxTunnelId), mBuf); oduPackUInt32(&(egtpCfg.minTunnelId), mBuf); @@ -221,7 +221,7 @@ uint8_t unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf) { CmStatus cfm; - memset((uint8_t *)&cfm, 0, sizeof(CmStatus)); + memset(&cfm, 0, sizeof(CmStatus)); unpackEgtpCfmStatus(&cfm, mBuf); return ((*func)(cfm)); @@ -333,7 +333,7 @@ uint8_t unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf) { CmStatus cfm; - memset((uint8_t *)&cfm, 0, sizeof(CmStatus)); + memset(&cfm, 0, sizeof(CmStatus)); unpackEgtpCfmStatus(&cfm, mBuf); return ((*func)(cfm)); @@ -399,7 +399,7 @@ uint8_t unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf) { EgtpTnlEvt tnlEvt; - memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); + memset(&tnlEvt, 0, sizeof(EgtpTnlEvt)); oduPackUInt32(&(tnlEvt.remTeid), mBuf); oduPackUInt32(&(tnlEvt.lclTeid), mBuf); @@ -471,7 +471,7 @@ uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf) { EgtpTnlEvt tnlEvt; - memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); + memset(&tnlEvt, 0, sizeof(EgtpTnlEvt)); unpackEgtpCfmStatus(&(tnlEvt.cfmStatus), mBuf); oduPackUInt32(&(tnlEvt.remTeid), mBuf); diff --git a/src/cm/lkw.c b/src/cm/lkw.c index d18e724d3..c52ec1f18 100755 --- a/src/cm/lkw.c +++ b/src/cm/lkw.c @@ -126,7 +126,6 @@ RlcMngmt *cfg; /* RLC LM structure */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(packRlcConfigReq) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -192,9 +191,8 @@ Buffer *mBuf; /* message buffer */ S16 ret1; /* Return value */ RlcMngmt cfg; /* RLC LM structure */ - TRC3(unpackRlcConfigReq) - cmMemset((U8 *) &cfg, (U8) 0, (S16) sizeof(RlcMngmt)); + memset(&cfg, 0, sizeof(RlcMngmt)); ret1 = cmUnpkRlcMngmt(&cfg, LKW_EVT_CFG_REQ, mBuf); if(ret1 != ROK) @@ -244,7 +242,6 @@ RlcMngmt *cntrl; /* RLC LM structure */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwCntrlReq) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -310,7 +307,6 @@ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ RlcMngmt cfm; /* Confirmation */ - TRC3(cmUnpkLkwCntrlReq) ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CNTRL_REQ, mBuf); @@ -357,7 +353,6 @@ RlcMngmt *cfm; /* RLC LM structure */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwCntrlCfm) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -424,7 +419,6 @@ Buffer *mBuf; /* message buffer */ RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ - TRC3(cmUnpkLkwCntrlCfm) ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CNTRL_CFM, mBuf); @@ -475,7 +469,6 @@ Buffer *mBuf; /* message buffer */ RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ - TRC3(cmUnpkLkwStsCfm) ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_STS_CFM, mBuf); @@ -525,7 +518,6 @@ RlcMngmt *cfm; /* RLC LM structure */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(packRlcConfigCfm) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -591,7 +583,6 @@ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ RlcMngmt cfm; /* RLC LM structure */ - TRC3(unpackRlcConfigCfm) ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CFG_CFM, mBuf); @@ -641,7 +632,6 @@ RlcMngmt *usta; /* RLC LM structure */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwStaInd) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -708,7 +698,6 @@ Buffer *mBuf; /* message buffer */ RlcMngmt usta; /* RLC LM structure */ S16 ret1; /* return value */ - TRC3(cmUnpkLkwStaInd) ret1 = cmUnpkRlcMngmt(&usta, LKW_EVT_STA_IND, mBuf); @@ -756,7 +745,6 @@ RlcMngmt *sta; /* status */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwStaReq) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -821,7 +809,6 @@ Buffer *mBuf; /* message buffer */ RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ - TRC3(cmUnpkLkwStaReq) ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_STA_CFM, mBuf); @@ -873,7 +860,6 @@ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ Action action; /* Action */ - TRC3(cmUnpkLkwStsReq) CMCHKUNPK(SUnpkS16, &action, mBuf); @@ -926,7 +912,6 @@ Buffer *mBuf; /* message buffer */ RlcMngmt sta; /* RLC LM structure */ S16 ret1; /* return value */ - TRC3(cmUnpkLkwStaReq) ret1 = cmUnpkRlcMngmt(&sta, LKW_EVT_STA_REQ, mBuf); @@ -978,7 +963,6 @@ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ RlcMngmt trc; /* RLC LM structure */ - TRC3(cmUnpkLkwTrcInd) ret1 = cmUnpkRlcMngmt(&trc, LKW_EVT_TRC_IND, mBuf); @@ -1025,7 +1009,6 @@ RlcCkwCntSapSta *rcSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmPkCkwSapSta) CMCHKPK(cmPkState, rcSap->state, mBuf); CMCHKPK(SPkS16, rcSap->spId, mBuf); @@ -1056,7 +1039,6 @@ RlcCkwCntSapSta *rcSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmUnpkCkwSapSta) CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf); CMCHKUNPK(cmUnpkState, &rcSap->state, mBuf); @@ -1086,7 +1068,6 @@ RlcKwuSapSta *rlSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmPkKwuSapSta) CMCHKPK(cmPkState, rlSap->state, mBuf); CMCHKPK(SPkS16, rlSap->spId, mBuf); @@ -1117,7 +1098,6 @@ RlcKwuSapSta *rlSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmUnpkKwuSapSta) CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf); CMCHKUNPK(cmUnpkState, &rlSap->state, mBuf); @@ -1148,7 +1128,6 @@ RlcRguSapSta *mkSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmPkRguSapSta) CMCHKPK(cmPkState, mkSap->state, mBuf); CMCHKPK(cmPkSuId, mkSap->suId, mBuf); @@ -1179,7 +1158,6 @@ RlcRguSapSta *mkSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif { - TRC3(cmUnpkRguSapSta) CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf); CMCHKUNPK(cmUnpkState, &mkSap->state, mBuf); @@ -1213,7 +1191,6 @@ RlcMngmt *cfm; /* solicited status confirm */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwStaCfm); ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -1277,7 +1254,6 @@ Buffer *trcBuf; /* trace buffer */ S16 ret1 = ROK; /* return value */ Buffer *mBuf = NULLP; /* Buffer to trace */ - TRC3(cmPkLkwTrcInd); ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -1364,7 +1340,6 @@ RlcMngmt *sts; /* statistics request */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwStsReq) ret1 = SGetMsg(pst->region, pst->pool, &mBuf); if (ret1 != ROK) @@ -1430,7 +1405,6 @@ RlcMngmt *cfm; /* statistics confirmation */ Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ - TRC3(cmPkLkwStsCfm); /* lkw_c_001.main_2 removed warning */ UNUSED(action); ret1 = SGetMsg(pst->region, pst->pool, &mBuf); @@ -1495,7 +1469,6 @@ Buffer *mBuf; /* Message Buffer */ { S16 ret1; /* return value */ - TRC3(cmPkRlcMngmt) switch( eventType ) { @@ -1583,7 +1556,6 @@ Elmnt elmnt; Buffer *mBuf; #endif { - TRC3(cmPkRlcCfg) switch( elmnt ) { @@ -1650,7 +1622,6 @@ Buffer *mBuf; { U8 subAction; /* sub action */ - TRC3(cmPkRlcCntrl) switch( elmnt ) { @@ -1728,7 +1699,6 @@ Elmnt elmnt; Buffer *mBuf; #endif { - TRC3(cmPkRlcUsta) /* lkw_c_001.main_2 removed warning */ UNUSED(elmnt); @@ -1773,7 +1743,6 @@ Buffer *mBuf; #endif { S16 ret1; - TRC3(cmPkRlcSsta) ret1 = RFAILED; switch(elmnt) @@ -1833,7 +1802,6 @@ RlcMngmt *trc; /* trace */ Buffer *mBuf; /* data buffer */ #endif { - TRC3(cmPkRlcTrc) CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf); CMCHKPK(cmPkDateTime, &trc->t.trc.dt, mBuf); @@ -1868,7 +1836,6 @@ Buffer *mBuf; #endif { S16 ret1; - TRC3(cmPkRlcSts) ret1 = RFAILED; switch(elmnt) @@ -1924,7 +1891,6 @@ RlcGenSts *gen; Buffer *mBuf; #endif { - TRC3(cmPkGenSts) CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf); CMCHKPK(oduUnpackUInt32, gen->numOfRb, mBuf); @@ -1964,7 +1930,6 @@ RlcCkwCntSts *rcSap; Buffer *mBuf; #endif { - TRC3(cmPkCkwSapSts) CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf); @@ -1993,7 +1958,6 @@ RlcKwuSapSts *ruSap; Buffer *mBuf; #endif { - TRC3(cmPkCkwSapSts) CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf); CMCHKPK(oduUnpackUInt32, ruSap->sduRx, mBuf); @@ -2033,9 +1997,8 @@ Buffer *mBuf; #endif { S16 ret1; - TRC3(cmUnpkRlcMngmt) - cmMemset((U8 *) param, (U8) 0, (S16) sizeof(RlcMngmt)); + memset(param, 0, sizeof(RlcMngmt)); CMCHKUNPK(cmUnpkHeader, ¶m->hdr, mBuf); CMCHKUNPK(cmUnpkCmStatus, ¶m->cfm, mBuf); @@ -2126,7 +2089,6 @@ Elmnt elmnt; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcCfg) switch(elmnt) { @@ -2195,7 +2157,6 @@ Buffer *mBuf; RlcDbgCntrl *dbgCntrl; RlcTrcCntrl *trcCntrl; - TRC3(cmUnpkRlcCntrl); /* lkw_c_001.main_2 removed warning */ UNUSED(elmnt); @@ -2278,7 +2239,6 @@ Elmnt elmnt; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcUsta); /* lkw_c_001.main_2 removed warning */ UNUSED(elmnt); @@ -2322,7 +2282,6 @@ Buffer *mBuf; #endif { S16 ret1; /* return value */ - TRC3(cmUnpkRlcSsta); CMCHKUNPK(cmUnpkDateTime, &ssta->t.ssta.dt, mBuf); switch(elmnt) @@ -2331,7 +2290,7 @@ Buffer *mBuf; ret1 = ROK; if(eventType == LKW_EVT_STA_CFM) { - cmMemset((U8 *) ptNmb, (U8) 0, LKW_PART_NUM_STR_LEN); + memset( ptNmb, 0, LKW_PART_NUM_STR_LEN); ssta->t.ssta.s.sysId.ptNmb = ptNmb; CMCHKUNPK(cmUnpkSystemId, &ssta->t.ssta.s.sysId,mBuf); } @@ -2382,7 +2341,6 @@ RlcMngmt *trc; Buffer *mBuf; #endif { - TRC3(cmUnpkRlcTrc); CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf); CMCHKUNPK(oduPackUInt16, &trc->t.trc.event, mBuf); @@ -2417,7 +2375,6 @@ Buffer *mBuf; #endif { S16 ret1; /* return value */ - TRC3(cmUnpkRlcSts); CMCHKUNPK(cmUnpkDateTime, &sts->t.sts.dt, mBuf); @@ -2471,7 +2428,6 @@ RlcGenSts *gen; Buffer *mBuf; #endif { - TRC3(cmUnpkGenSts); CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf); CMCHKUNPK(oduPackUInt32, &gen->pdusRecv, mBuf); @@ -2511,7 +2467,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCkwSapSts); CMCHKUNPK(oduPackUInt32, &rcSap->statMsgs, mBuf); @@ -2541,7 +2496,6 @@ RlcKwuSapSts *ruSap; Buffer *mBuf; #endif { - TRC3(cmUnpkKwuSapSts) /* lkw_c_001.main_2 changed from suId to spId */ CMCHKUNPK(cmUnpkSuId, &ruSap->spId, mBuf); @@ -2567,7 +2521,6 @@ RlcL2MeasReqEvt *measReqEvt; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLkwL2MeasReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2628,7 +2581,6 @@ Buffer *mBuf; U8 idx; U16 idx1; - TRC3(cmPkRlcL2MeasReqInfo) if((param->measType & LKW_L2MEAS_DL_IP) || (param->measType & LKW_L2MEAS_UL_IP)) @@ -2675,7 +2627,6 @@ U8 measType; { Buffer *mBuf = NULLP; - TRC3(cmPkLkwL2MeasStopReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2703,7 +2654,6 @@ U8 measType; { Buffer *mBuf = NULLP; - TRC3(cmPkLkwL2MeasSendReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2733,7 +2683,6 @@ Buffer *mBuf; { RlcL2MeasReqEvt measReqEvt; - TRC3(cmUnpkLkwL2MeasReq) if (oduPackUInt32(&measReqEvt.transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2785,7 +2734,6 @@ Buffer *mBuf; S16 ret; RlcL2MeasReqEvt *measReqEvt; - TRC3(cmUnpkLkwL2MeasReq) if((ret = SGetSBuf(pst->region, pst->pool, (Data **)&measReqEvt,\ @@ -2848,7 +2796,6 @@ Buffer *mBuf; U8 idx; U16 idx1; - TRC3(cmUnpkRlcL2MeasReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->measType, mBuf); @@ -2898,7 +2845,6 @@ Buffer *mBuf; #endif { U8 measType; - TRC3(cmUnpkLkwL2MeasReq) CMCHKUNPK(oduPackUInt8, &measType, mBuf); SPutMsg(mBuf); @@ -2921,7 +2867,6 @@ Buffer *mBuf; { U8 measType; - TRC3(cmUnpkLkwL2MeasSendReq) CMCHKUNPK(oduPackUInt8, &measType, mBuf); SPutMsg(mBuf); @@ -2944,7 +2889,6 @@ RlcL2MeasCfmEvt *measCfmEvt; U8 idx; U8 idx1; - TRC3(cmPkLkwL2MeasCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3049,7 +2993,6 @@ Buffer *mBuf; U8 measType; #endif { - TRC3(cmPkRlcL2MeasCfmInfo) if((measType & LKW_L2MEAS_DL_IP) || (measType & LKW_L2MEAS_UL_IP)) @@ -3088,9 +3031,8 @@ Buffer *mBuf; U16 idx1; RlcL2MeasCfmEvt measCfmEvt; - TRC3(cmUnpkLkwL2MeasCfm) - cmMemset((U8 *)&measCfmEvt, 0 , sizeof(RlcL2MeasCfmEvt)); + memset(&measCfmEvt, 0 , sizeof(RlcL2MeasCfmEvt)); if (oduPackUInt32(&measCfmEvt.transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3181,7 +3123,6 @@ Buffer *mBuf; U8 measType; #endif { - TRC3(cmUnpkRlcL2MeasCfmInfo) if((measType & LKW_L2MEAS_DL_IP) || (measType & LKW_L2MEAS_UL_IP)) @@ -3218,7 +3159,6 @@ U8 status #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLkwL2MeasStopCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3250,7 +3190,6 @@ Buffer *mBuf; { U8 measType; U8 status; - TRC3(cmUnpkLkwL2MeasCfm) CMCHKUNPK(oduPackUInt8, &measType, mBuf); CMCHKUNPK(oduPackUInt8, &status, mBuf); SPutMsg(mBuf); diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 4b192331f..e28c1ea3e 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -69,7 +69,6 @@ RgMngmt * cfg; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -125,7 +124,6 @@ Buffer *mBuf; /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; - TRC3(cmUnpkLrgCfgReq) if (cmUnpkRgMngmt(pst, &cfg, EVTLRGCFGREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -167,7 +165,6 @@ RgMngmt * cfg; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -223,7 +220,6 @@ Buffer *mBuf; /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; - TRC3(cmUnpkLrgSchCfgReq) if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -265,7 +261,6 @@ RgMngmt * cfm; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -321,7 +316,6 @@ Buffer *mBuf; { RgMngmt cfm; - TRC3(cmUnpkLrgCfgCfm) if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCFGCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -363,7 +357,6 @@ RgMngmt * cfg; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -419,8 +412,6 @@ Buffer *mBuf; { RgMngmt cfg; - TRC3(cmUnpkLrgSchCfgCfm) - if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -461,7 +452,6 @@ RgMngmt * sts; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStsReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -517,7 +507,6 @@ Buffer *mBuf; { RgMngmt sts; - TRC3(cmUnpkLrgStsReq) if (cmUnpkRgMngmt(pst, &sts, EVTLRGSTSREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -559,7 +548,6 @@ RgMngmt * cfm; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStsCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -615,7 +603,6 @@ Buffer *mBuf; { RgMngmt cfm; - TRC3(cmUnpkLrgStsCfm) if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSTSCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -657,7 +644,6 @@ RgMngmt * sta; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -711,9 +697,8 @@ Buffer *mBuf; { RgMngmt sta; - TRC3(cmUnpkLrgStaReq) - cmMemset((U8 *)&sta, 0, sizeof(RgMngmt)); + memset(&sta, 0, sizeof(RgMngmt)); if (cmUnpkRgMngmt(pst, &sta, EVTLRGSSTAREQ, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -754,7 +739,6 @@ RgMngmt * cfm; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -808,9 +792,8 @@ Buffer *mBuf; { RgMngmt cfm; - TRC3(cmUnpkLrgStaCfm) - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSSTACFM, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -851,7 +834,6 @@ RgMngmt * usta; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -907,7 +889,6 @@ Buffer *mBuf; { RgMngmt usta; - TRC3(cmUnpkLrgStaInd) if (cmUnpkRgMngmt(pst, &usta, EVTLRGUSTAIND, mBuf) != ROK) { SPutMsg(mBuf); @@ -949,7 +930,6 @@ RgMngmt * sta; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1005,7 +985,6 @@ Buffer *mBuf; { RgMngmt sta; - TRC3(cmUnpkLrgSchStaInd) if (cmUnpkRgMngmt(pst, &sta, EVTLRGSCHSTAIND, mBuf) != ROK) { SPutMsg(mBuf); @@ -1047,7 +1026,6 @@ RgMngmt * cntrl; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCntrlReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1103,7 +1081,6 @@ Buffer *mBuf; { RgMngmt cntrl; - TRC3(cmUnpkLrgCntrlReq) if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -1145,7 +1122,6 @@ RgMngmt * cntrl; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCntrlReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1201,7 +1177,6 @@ Buffer *mBuf; { RgMngmt cntrl; - TRC3(cmUnpkLrgSchCntrlReq) if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) { SPutMsg(mBuf); @@ -1243,7 +1218,6 @@ RgMngmt * cfm; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgCntrlCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1299,7 +1273,6 @@ Buffer *mBuf; { RgMngmt cfm; - TRC3(cmUnpkLrgCntrlCfm) if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCNTRLCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -1341,7 +1314,6 @@ RgMngmt * cntrl; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchCntrlCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1397,7 +1369,6 @@ Buffer *mBuf; { RgMngmt cntrl; - TRC3(cmUnpkLrgSchCntrlCfm) if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) { SPutMsg(mBuf); @@ -1442,7 +1413,6 @@ Buffer * trcBuf; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgTrcInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1524,7 +1494,6 @@ Buffer *mBuf; /* lrg_c_001.main_3 - MODIFY - Modified trcBuf to have it initialized to NULLP */ Buffer *trcBuf = NULLP; - TRC3(cmUnpkLrgTrcInd) if (cmUnpkRgMngmt(pst, &trc, EVTLRGTRCIND, mBuf) != ROK) { SPutMsg(mBuf); @@ -1576,7 +1545,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgGenCfg) #ifdef LTE_ADV CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf); @@ -1620,7 +1588,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgGenCfg) CMCHKUNPK(cmUnpkPst, ¶m->lmPst, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); @@ -1664,7 +1631,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgUpSapCfg) CMCHKPK(SPkS16, param->suId, mBuf); CMCHKPK(SPkS16, param->spId, mBuf); @@ -1708,7 +1674,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgUpSapCfg) CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); @@ -1752,7 +1717,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgLowSapCfg) CMCHKPK(cmPkTmrCfg, ¶m->bndTmr, mBuf); CMCHKPK(SPkS16, param->suId, mBuf); @@ -1797,7 +1761,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgLowSapCfg) CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); @@ -1843,7 +1806,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgAckNack) CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf); CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf); @@ -1882,7 +1844,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgSchNackAckStats) for (i=14; i >= 0; i--) { CMCHKPK(cmPkRgAckNack, ¶m->ulCqiStat[i], mBuf); @@ -1923,7 +1884,6 @@ RgSchHqNumRetx *param; Buffer *mBuf; #endif { - TRC3(cmPkRgHqNumRetx) CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf); CMCHKPK(oduUnpackUInt16, param->numOfHQ_4, mBuf); @@ -1965,7 +1925,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgSchHqRetxStats) for (i=14; i >= 0; i--) { CMCHKPK(cmPkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); @@ -2008,7 +1967,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgAckNack) CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->numOfNacks, mBuf); @@ -2046,7 +2004,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkRgSchNackAckStats) for (i=0; i <= 14; i++) { CMCHKUNPK(cmUnpkRgAckNack, ¶m->dlCqiStat[i], mBuf); @@ -2087,7 +2044,6 @@ RgSchHqNumRetx *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgHqNumRetx) CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_1, mBuf); @@ -2128,7 +2084,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkRgSchHqRetxStats) for (i=0; i <= 14; i++) { CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); @@ -2172,7 +2127,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgGenSts) #ifdef MAC_SCH_STATS CMCHKPK(cmPkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); @@ -2214,7 +2168,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgGenSts) CMCHKUNPK(oduPackUInt32, ¶m->numHarqFail, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numUeCfg, mBuf); @@ -2256,7 +2209,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgSapSts) CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); @@ -2294,7 +2246,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgSapSts) CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); @@ -2333,7 +2284,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgSchInstCfg) for (i=param->numSaps-1; i >= 0; i--) { CMCHKPK(cmPkRgLowSapCfg, ¶m->tfuSap[i], mBuf); @@ -2381,7 +2331,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgSchInstCfg) CMCHKUNPK(oduPackUInt8, ¶m->instId, mBuf); CMCHKUNPK(cmUnpkRgGenCfg, ¶m->genCfg, mBuf); @@ -2430,7 +2379,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgCfg) switch(elmnt) { case STSCHINST: @@ -2486,7 +2434,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgCfg) switch(elmnt) { case STGEN: @@ -2540,7 +2487,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgSapSta) CMCHKPK(oduUnpackUInt8, param->sapState, mBuf); return ROK; @@ -2576,7 +2522,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgSapSta) CMCHKUNPK(oduPackUInt8, ¶m->sapState, mBuf); return ROK; @@ -2614,7 +2559,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgSts) switch(elmnt) { case STTFUSAP: @@ -2673,7 +2617,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgSts) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); @@ -2741,7 +2684,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgSsta) switch(elmnt) { case STTFUSAP: @@ -2819,7 +2761,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgSsta) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); @@ -2842,7 +2783,7 @@ Buffer *mBuf; /* KWORK_FIX: Moved the memset under the NULL check */ if (param->s.sysId.ptNmb != NULLP) { - cmMemset((U8 *)param->s.sysId.ptNmb, 0, LRG_MAX_PT_NUM_SIZE); + memset(param->s.sysId.ptNmb, 0, LRG_MAX_PT_NUM_SIZE); CMCHKUNPK(cmUnpkSystemId, ¶m->s.sysId, mBuf); } } @@ -2895,7 +2836,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgUstaDgn) switch(param->type) { case LRG_USTA_DGNVAL_MEM: @@ -2938,7 +2878,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgUstaDgn) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); switch(param->type) { @@ -2981,7 +2920,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgUsta) CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); @@ -3018,7 +2956,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgUsta) CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); @@ -3055,7 +2992,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgTrc) CMCHKPK(oduUnpackUInt8, param->evnt, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); @@ -3092,7 +3028,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgTrc) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->evnt, mBuf); @@ -3129,7 +3064,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgDbgCntrl) CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf); return ROK; @@ -3163,7 +3097,6 @@ RgSchUlAllocCntrl *param; Buffer *mBuf; #endif { - TRC3(cmPkRgSchUlAllocCntrl) CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(oduUnpackUInt16, param->numOfRb, mBuf); @@ -3202,7 +3135,6 @@ RgSchUlAllocCntrl *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgSchUlAllocCntrl) CMCHKUNPK(oduPackUInt16, ¶m->logTime, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->enaLog, mBuf); @@ -3245,7 +3177,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgDbgCntrl) CMCHKUNPK(oduPackUInt32, ¶m->dbgMask, mBuf); return ROK; @@ -3281,7 +3212,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgSapCntrl) CMCHKPK(SPkS16, param->spId, mBuf); CMCHKPK(SPkS16, param->suId, mBuf); @@ -3318,7 +3248,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgSapCntrl) CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); @@ -3357,7 +3286,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgCntrl) switch(elmnt) { case STTFUSAP: @@ -3435,7 +3363,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgCntrl) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); @@ -3515,7 +3442,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgMngmt) switch(eventType) { case EVTLRGCNTRLREQ: @@ -3601,7 +3527,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgMngmt) CMCHKUNPK(cmUnpkHeader, ¶m->hdr, mBuf); CMCHKUNPK(cmUnpkCmStatus, ¶m->cfm, mBuf); @@ -3673,7 +3598,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkNmbActvUeQciReq) for(idx = 0; idx < nmbActvUeQci->numQci; idx++) { @@ -3711,8 +3635,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkAvgPrbQciReq) - for(idx = 0; idx < avgPrbQciReq->numQci; idx++) { CMCHKPK(oduUnpackUInt8, avgPrbQciReq->qci[idx], mBuf); @@ -3748,7 +3670,6 @@ LrgSchMeasReqInfo *measInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3808,7 +3729,6 @@ LrgSchMeasStopReqInfo *measInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasStopReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3852,7 +3772,6 @@ LrgSchMeasSndReqInfo *measInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasSendReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3895,8 +3814,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkNmbActvUeQciReq) - CMCHKUNPK(oduPackUInt8, ¶m->sampPrd, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) @@ -3933,7 +3850,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkAvgPrbQciReq) CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) @@ -3974,7 +3890,6 @@ Buffer *mBuf; { LrgSchMeasReqInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasReq) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); @@ -4030,8 +3945,6 @@ Buffer *mBuf; { LrgSchMeasStopReqInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasStopReq) - CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); /*CMCHKUNPK(oduPackUInt16, &measInfo.timePrd, mBuf);*/ @@ -4104,7 +4017,6 @@ LrgSchMeasCfmInfo *measInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasStopCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -4149,7 +4061,6 @@ Buffer *mBuf; { LrgSchMeasCfmInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); @@ -4186,7 +4097,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkNumUeQciCfm) for(idx = 0; idx < param->numQci; idx++) { @@ -4225,7 +4135,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmPkAvgPrbQciCfm) for(idx = 0; idx < param->numQci; idx++) { /*LRG : Review Tag*/ @@ -4262,7 +4171,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRaPrmbsCfm) CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf); CMCHKPK(oduUnpackUInt16, param->randSelPreLowRange, mBuf); CMCHKPK(oduUnpackUInt16, param->dedPreambles, mBuf); @@ -4294,7 +4202,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkAvgPrbCfm) CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf); return ROK; } @@ -4326,7 +4233,6 @@ LrgSchMeasCfmInfo *measInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkLrgSchL2MeasCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -4414,7 +4320,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkNumUeQciCfm) CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { @@ -4452,7 +4357,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkAvgPrbQciCfm) CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) @@ -4490,7 +4394,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRaPrmbsCfm) CMCHKUNPK(oduPackUInt16, ¶m->dedPreambles, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->randSelPreLowRange, mBuf); @@ -4523,7 +4426,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkAvgPrbCfm) CMCHKUNPK(oduPackUInt8, ¶m->prbPerc, mBuf); return ROK; @@ -4558,7 +4460,6 @@ Buffer *mBuf; { LrgSchMeasCfmInfo measInfo; - TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); diff --git a/src/cm/lsctp.c b/src/cm/lsctp.c index f527b1955..1641bc4be 100644 --- a/src/cm/lsctp.c +++ b/src/cm/lsctp.c @@ -83,7 +83,7 @@ uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy) uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf) { CmInetSctpNotification ntfy; - memset((uint8_t*)&ntfy, 0, sizeof(CmInetSctpNotification)); + memset(&ntfy, 0, sizeof(CmInetSctpNotification)); oduPackUInt16(&(ntfy.header.nType), mBuf); if(ntfy.header.nType == CM_INET_SCTP_ASSOC_CHANGE) diff --git a/src/cm/rgm.c b/src/cm/rgm.c index 95b57dd9a..96d81f120 100755 --- a/src/cm/rgm.c +++ b/src/cm/rgm.c @@ -72,7 +72,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLwLcRgmBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -127,7 +126,6 @@ Buffer *mBuf; SpId spId; S16 ret; - TRC3(cmUnpkLwLcRgmBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -176,7 +174,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLwLcRgmUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -226,7 +223,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkLwLcRgmBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -281,7 +277,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkLwLcRgmBndCfm) if (oduPackUInt8(&status, mBuf) != ROK) { @@ -328,7 +323,6 @@ RgmPrbRprtCfg * prbRprtCfg; { Buffer *mBuf = NULLP; U32 len = sizeof(RgmPrbRprtCfg); - TRC3(cmPkLwLcRgmCfgPrbRprt) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -386,7 +380,6 @@ Buffer *mBuf; SpId spId; RgmPrbRprtCfg *prbRprtCfg; - TRC3(cmUnpkLwLcRgmCfgPrbRprt) if (SUnpkS16(&spId, mBuf) != ROK) { @@ -437,7 +430,6 @@ RgmPrbRprtInd * prbRprtInd; { Buffer *mBuf = NULLP; - TRC3(cmPkLwLcRgmPrbRprtInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); @@ -494,7 +486,6 @@ Buffer *mBuf; RgmPrbRprtInd *prbRprtInd; S16 ret; - TRC3(cmUnpkLwLcRgmPrbRprtInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -547,7 +538,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgmBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -602,7 +592,6 @@ Buffer *mBuf; SpId spId; S16 ret; - TRC3(cmUnpkRgmBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -651,7 +640,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgmUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -704,7 +692,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkRgmUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { @@ -750,7 +737,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgmBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -805,7 +791,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkRgmBndCfm) if (oduPackUInt8(&status, mBuf) != ROK) { @@ -849,7 +834,6 @@ RgmPrbRprtCfg * prbRprtCfg; Buffer *mBuf; #endif { - TRC3(cmPkCfgPrbRprt); CMCHKPK(oduUnpackUInt16, prbRprtCfg->usPrbAvgPeriodicty, mBuf); CMCHKPK(oduUnpackUInt8, prbRprtCfg->bConfigType, mBuf); CMCHKPK(oduUnpackUInt8, prbRprtCfg->bCellId, mBuf); @@ -879,7 +863,6 @@ RgmPrbRprtCfg * prbRprtCfg; Buffer *mBuf; #endif { - TRC3(cmUnPkCfgPrbRprt); CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bCellId, mBuf); CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bConfigType, mBuf); CMCHKUNPK(oduPackUInt16, &prbRprtCfg->usPrbAvgPeriodicty, mBuf); @@ -918,7 +901,6 @@ RgmPrbRprtCfg * prbRprtCfg; { Buffer *mBuf = NULLP; U32 len = sizeof(RgmPrbRprtCfg); - TRC3(cmPkRgmCfgPrbRprt) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -978,7 +960,6 @@ Buffer *mBuf; SpId spId; RgmPrbRprtCfg *prbRprtCfg; - TRC3(cmUnpkRgmCfgPrbRprt) if ((SGetSBuf(pst->region, pst->pool, (Data **)&prbRprtCfg, sizeof(RgmPrbRprtCfg))) != ROK) { SPutMsg(mBuf); @@ -1092,7 +1073,6 @@ S16 cmPkPrbRprtInd(prbRprtInd, mBuf) { S32 idx = 0; - TRC3(cmPkPrbRprtInd); /* RRM_SP1_START */ for(idx = RGM_MAX_QCI_REPORTS-1; idx >= 0; idx--) @@ -1131,7 +1111,6 @@ S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf) { U32 idx = 0; - TRC3(cmUnpkPrbRprtInd); /* RRM_SP1_START */ CMCHKUNPK(oduPackUInt8, &prbRprtInd->bCellId, mBuf); @@ -1176,7 +1155,6 @@ RgmPrbRprtInd * prbRprtInd; { Buffer *mBuf = NULLP; - TRC3(cmPkRgmPrbRprtInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); @@ -1232,7 +1210,6 @@ Buffer *mBuf; SuId suId; RgmPrbRprtInd prbRprtInd; - TRC3(cmUnpkRgmPrbRprtInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -1274,7 +1251,6 @@ S16 cmPkTransModeInd(transModeInd, mBuf) Buffer *mBuf; #endif { - TRC3(cmPkTransModeInd); CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf); CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf); CMCHKPK(oduUnpackUInt8, transModeInd->bCellId, mBuf); @@ -1306,7 +1282,6 @@ S16 cmUnpkTransModeInd(transModeInd, mBuf) #endif { U32 tmpModeEnum; - TRC3(cmUnpkTransModeInd); CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf); CMCHKUNPK(oduPackUInt16, &transModeInd->usCrnti, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpModeEnum, mBuf); @@ -1342,7 +1317,6 @@ RgmTransModeInd *transModeInd; { Buffer *mBuf = NULLP; - TRC3(cmPkRgmTransModeInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd)); @@ -1398,7 +1372,6 @@ Buffer *mBuf; SuId suId; RgmTransModeInd transModeInd; - TRC3(cmUnpkRgmTransModeInd) if (SUnpkS16(&suId, mBuf) != ROK) { diff --git a/src/cm/rgr.c b/src/cm/rgr.c index f26ec73e1..742a6d87a 100755 --- a/src/cm/rgr.c +++ b/src/cm/rgr.c @@ -72,7 +72,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -137,7 +136,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkRgrBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -193,7 +191,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -259,7 +256,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkRgrBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -314,7 +310,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -379,7 +374,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkRgrUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -437,7 +431,6 @@ Buffer *mBuf; RgrCfgTransId transId; RgrCfgReqInfo *cfgReqInfo; - TRC3(cmUnpkRgrCfgReq) #if 0 if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -468,7 +461,7 @@ Buffer *mBuf; SPutMsg(mBuf); return RFAILED; } - cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); + memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo)); @@ -513,7 +506,6 @@ RgrTtiIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrTtiInd) CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; @@ -545,7 +537,6 @@ RgrTtiIndInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrTtiIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); @@ -583,7 +574,6 @@ RgrTtiIndInfo *ttiInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrTtiInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -651,7 +641,6 @@ Buffer *mBuf; SuId suId; RgrTtiIndInfo *ttiInd; - TRC3(cmUnpkRgrTtiInd) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -721,7 +710,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -786,7 +774,6 @@ Buffer *mBuf; RgrCfgTransId transId; U8 status; - TRC3(cmUnpkRgrCfgCfm) if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -845,7 +832,6 @@ U8 status; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrSiCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -921,7 +907,6 @@ Buffer *mBuf; RgrCfgTransId transId; U8 status; - TRC3(cmUnpkRgrSiCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -985,7 +970,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrCfgTransId) for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); @@ -1024,7 +1008,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrCfgTransId) for (i=0; itrans[i], mBuf); @@ -1062,7 +1045,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDlHqCfg) CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); @@ -1099,7 +1081,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDlHqCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxDlHqTx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->maxMsg4HqTx, mBuf); @@ -1136,7 +1117,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrRntiCfg) CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); @@ -1173,7 +1153,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); @@ -1209,7 +1188,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrEmtcRntiCfg) CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf); @@ -1249,7 +1227,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrEmtcRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeAStart, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeARange, mBuf); @@ -1290,8 +1267,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDlCmnCodeRateCfg) - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf); @@ -1328,8 +1303,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDlCmnCodeRateCfg) - CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); @@ -1366,8 +1339,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCfiCfg) - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); return ROK; } @@ -1402,8 +1373,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCfiCfg) - CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); return ROK; } @@ -1439,7 +1408,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrPuschSubBandCfg) for (i=param->numSubbands-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf); @@ -1481,7 +1449,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrPuschSubBandCfg) CMCHKUNPK(oduPackUInt8, ¶m->subbandStart, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSubbands, mBuf); @@ -1522,8 +1489,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUlCmnCodeRateCfg) - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); return ROK; } @@ -1558,8 +1523,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUlCmnCodeRateCfg) - CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); return ROK; } @@ -1594,8 +1557,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUlTrgCqiCfg) - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); return ROK; } @@ -1630,8 +1591,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUlTrgCqiCfg) - CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); return ROK; } @@ -1666,8 +1625,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrBwCfg) - CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); return ROK; @@ -1691,7 +1648,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrEmtcSiCfg) CMCHKPK(oduUnpackUInt8, param->siHoppingEnable, mBuf); CMCHKPK(oduUnpackUInt32, param->modPrd, mBuf); @@ -1748,7 +1704,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrEmtcRachCfg) CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf); @@ -1778,7 +1733,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrEmtcPdschCfg) CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); @@ -1797,7 +1751,6 @@ RgrEmtcPuschCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrEmtcPuschCfg) CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); @@ -1821,7 +1774,6 @@ Buffer *mBuf; S32 i; - TRC3(cmPkRgrEmtcPucchCfg) for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); } @@ -1847,7 +1799,6 @@ RgrEmtcPrachCEParamLst *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrEmtcPrachCeParamCfg) CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf); CMCHKPK(oduUnpackUInt16, param->emtcPrachStartSubFrame, mBuf); @@ -1877,7 +1828,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrEmtcPrachCfg) CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); @@ -1903,7 +1853,6 @@ RgrEmtcCellCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrEmtcCfg) CMCHKPK(oduUnpackUInt16, param->pci, mBuf); CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); @@ -1940,7 +1889,6 @@ Buffer *mBuf; S32 i; U32 tmpEnum; - TRC3(cmUnpkRgrEmtcSiCfg) CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); for (i=0; i < param->numSi ; i++) { @@ -1994,7 +1942,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrEmtcRachCfg) for (i=0; i < RGR_MAX_CE_LEVEL; i++) { CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf); CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf); @@ -2021,7 +1968,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrEmtcPdschCfg) CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); return ROK; @@ -2039,7 +1985,6 @@ RgrEmtcPuschCfg *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrEmtcPuschCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); @@ -2063,7 +2008,6 @@ Buffer *mBuf; S32 i; - TRC3(cmUnpkRgrEmtcPucchCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); @@ -2089,7 +2033,6 @@ RgrEmtcPrachCEParamLst *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrEmtcPrachCeParamCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); @@ -2119,7 +2062,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrEmtcPrachCfg) for (i=0; i < RGR_MAX_CE_LEVEL; i++) { CMCHKUNPK(cmUnpkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } @@ -2143,7 +2085,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrEmtcCfg) CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNbIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->emtcPdschNbIdx, mBuf); @@ -2199,8 +2140,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrBwCfg) - CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); return ROK; @@ -2236,8 +2175,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrPhichCfg) - CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); CMCHKPK(oduUnpackUInt32, param->ngEnum, mBuf); return ROK; @@ -2274,7 +2211,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrPhichCfg) CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ngEnum = (RgrPhichNg) tmpEnum; @@ -2312,8 +2248,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrPucchCfg) - CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); CMCHKPK(oduUnpackUInt8, param->cyclicShift, mBuf); CMCHKPK(oduUnpackUInt8, param->deltaShift, mBuf); @@ -2353,7 +2287,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrPucchCfg) CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); @@ -2394,7 +2327,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrSrsCfg) CMCHKPK(oduUnpackUInt8, param->srsSubFrameCfg, mBuf); CMCHKPK(oduUnpackUInt32, param->srsBwEnum, mBuf); @@ -2434,7 +2366,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrSrsCfg) CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -2476,7 +2407,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrRachCfg) CMCHKPK(oduUnpackUInt8, param->prachResource, mBuf); CMCHKPK(oduUnpackUInt16, param->msgSizeGrpA, mBuf); @@ -2530,7 +2460,6 @@ Buffer *mBuf; U32 tmpEnum; S32 i; - TRC3(cmUnpkRgrRachCfg) #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ @@ -2586,7 +2515,6 @@ Buffer *mBuf; S16 idx; #endif/*RGR_SI_SCH*/ - TRC3(cmPkRgrSiCfg) #ifdef RGR_SI_SCH if(param->numSi > sizeof(param->siPeriodicity)/ @@ -2642,7 +2570,6 @@ Buffer *mBuf; S16 idx; #endif/*RGR_SI_SCH*/ - TRC3(cmUnpkRgrSiCfg) CMCHKUNPK(oduPackUInt8, ¶m->siWinSize, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->retxCnt, mBuf); @@ -2697,7 +2624,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrTpcRntiCfg) CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startTpcRnti, mBuf); @@ -2734,7 +2660,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrTpcRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->startTpcRnti, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); @@ -2771,7 +2696,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUlPwrCfg) CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); @@ -2815,7 +2739,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUlPwrCfg) CMCHKUNPK(SUnpkS8, ¶m->p0NominalPusch, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -2859,7 +2782,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrPuschCfg) CMCHKPK(oduUnpackUInt8, param->hopOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->isIntraHop, mBuf); @@ -2897,7 +2819,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrPuschCfg) CMCHKUNPK(oduPackUInt8, ¶m->numSubBands, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isIntraHop, mBuf); @@ -2936,7 +2857,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrCodeBookRstCfg) for (i=1-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt32, param->pmiBitMap[i], mBuf); @@ -2976,7 +2896,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrCodeBookRstCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); for (i=0; i<1; i++) { @@ -3015,7 +2934,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrPreambleSetCfg) CMCHKPK(oduUnpackUInt8, param->size, mBuf); CMCHKPK(oduUnpackUInt8, param->start, mBuf); @@ -3053,7 +2971,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrPreambleSetCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->start, mBuf); @@ -3091,7 +3008,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCmnLchCfg) CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); @@ -3131,7 +3047,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCmnLchCfg) CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); @@ -3171,7 +3086,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDlfsCfg) CMCHKPK(oduUnpackUInt8, param->thresholdCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->isDlFreqSel, mBuf); @@ -3208,7 +3122,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDlfsCfg) CMCHKUNPK(oduPackUInt8, ¶m->isDlFreqSel, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->thresholdCqi, mBuf); @@ -3249,7 +3162,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrTddPrachInfo) CMCHKPK(oduUnpackUInt8, param->ulStartSfIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->halfFrm, mBuf); @@ -3289,7 +3201,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrTddPrachInfo) CMCHKUNPK(oduPackUInt8, ¶m->freqIdx, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -3330,7 +3241,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrTddPrachRscInfo) for (i=param->numRsc-1; i >= 0; i--) { CMCHKPK(cmPkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); @@ -3370,7 +3280,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRgrTddPrachRscInfo) CMCHKUNPK(oduPackUInt8, ¶m->numRsc, mBuf); for (i=0; inumRsc; i++) { @@ -3413,7 +3322,6 @@ Buffer *mBuf; #endif { S32 idx; - TRC3(cmPkRgrEnbPfs) for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) { CMCHKPK(oduUnpackUInt32, param->qciWgt[idx], mBuf); @@ -3454,7 +3362,6 @@ Buffer *mBuf; #endif { S32 idx; - TRC3(cmUnpkRgrEnbPfs) CMCHKUNPK(oduPackUInt8, ¶m->tptCoeffi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->fairCoeffi, mBuf); @@ -3496,7 +3403,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrSpsCellCfg) CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); CMCHKPK(oduUnpackUInt16, param->maxSpsUePerDlSf, mBuf); CMCHKPK(oduUnpackUInt8, param->maxSpsDlBw, mBuf); @@ -3535,7 +3441,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrSpsDlCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxSpsDlBw, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerDlSf, mBuf); @@ -3619,7 +3524,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrlteUCellCfg) CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); return ROK; @@ -3653,7 +3557,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLteUCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->isLaaCell, mBuf); @@ -3689,7 +3592,6 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) #endif { - TRC3(cmPkRgrLteAdvancedUeConfig) CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); CMCHKPK(oduUnpackUInt8, param->isAbsUe, mBuf); CMCHKPK(oduUnpackUInt32, param->pres, mBuf); @@ -3724,7 +3626,6 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) #endif { - TRC3(cmUnpkRgrLteAdvancedUeConfig) CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isAbsUe, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isUeCellEdge, mBuf); @@ -3760,7 +3661,6 @@ S16 cmPkRgrAbsConfig(param, mBuf) { S8 indx = 0; - TRC3(cmPkRgrAbsConfig) CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) { @@ -3800,7 +3700,6 @@ S16 cmPkRgrSfrConfig(param, mBuf) Buffer *mBuf; #endif { - TRC3(cmPkRgrSfrConfig) CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); #ifdef TFU_UPGRADE @@ -3842,7 +3741,6 @@ S16 cmPkRgrDsfrConfig(param, mBuf) Buffer *mBuf; #endif { - TRC3(cmPkRgrDsfrConfig) CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); @@ -3878,7 +3776,6 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf) Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDsfrConfig) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->status, mBuf); return ROK; @@ -3913,7 +3810,6 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) Buffer *mBuf; #endif { - TRC3(cmPkRgrCellLteAdvancedFeatureCfg) CMCHKPK(oduUnpackUInt32, param->pres, mBuf); CMCHKPK(cmPkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ @@ -3954,7 +3850,6 @@ S16 cmUnpkRgrAbsConfig(param, mBuf) { S8 indx = 0; - TRC3(cmUnpkRgrAbsConfig) CMCHKUNPK(oduPackUInt32, ¶m->absLoadPeriodicity, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->absPatternType, mBuf); @@ -3996,7 +3891,6 @@ S16 cmUnpkRgrSfrConfig(param, mBuf) #endif { - TRC3(cmUnpkRgrSfrConfig) CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.startRb, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.endRb, mBuf); @@ -4037,7 +3931,6 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) #endif { - TRC3(cmUnpkRgrCellLteAdvancedFeatureCfg) CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); CMCHKUNPK(cmUnpkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKUNPK(cmUnpkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ @@ -4073,7 +3966,6 @@ RgrSchedEnbCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkMacSchedGnbCfg) CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); CMCHKPK(oduUnpackUInt8, param->maxUlUePerTti, mBuf); @@ -4112,7 +4004,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkMacSchedGnbCfg) CMCHKUNPK(oduPackUInt8, ¶m->numTxAntPorts, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulSchdType, mBuf); @@ -4153,7 +4044,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrCellCfg) #ifdef EMTC_ENABLE /* EMTC related changes start*/ @@ -4279,7 +4169,6 @@ Buffer *mBuf; S32 i; - TRC3(cmUnpkRgrCellCfg) #ifdef EMTC_ENABLE /* EMTC related changes start*/ CMCHKUNPK(cmUnpkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); @@ -4393,7 +4282,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeAprdDlCqiCfg) /*Pack Aperiodic Trigger List only for Pcell */ #ifdef LTE_ADV CMCHKPK(oduUnpackUInt8, param->triggerSet2, mBuf); @@ -4436,7 +4324,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeAprdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -4483,7 +4370,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUePrdDlCqiCfg) CMCHKPK(oduUnpackUInt16, param->cqiPmiCfgIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->k, mBuf); @@ -4526,7 +4412,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUePrdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -4573,7 +4458,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeDlPCqiSetup) CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); CMCHKPK(oduUnpackUInt8, param->sANCQI, mBuf); @@ -4618,7 +4502,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeDlPCqiSetup) CMCHKUNPK(oduPackUInt16, ¶m->cqiPResIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->cqiPCfgIdx, mBuf); @@ -4663,7 +4546,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUePrdDlCqiCfg) CMCHKPK(cmPkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); CMCHKPK(oduUnpackUInt8, param->type, mBuf); @@ -4700,7 +4582,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUePrdDlCqiCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); @@ -4738,7 +4619,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeUlSrsSetupCfg) CMCHKPK(oduUnpackUInt8, param->fDomPosi, mBuf); CMCHKPK(oduUnpackUInt8, param->txComb, mBuf); @@ -4784,7 +4664,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeUlSrsSetupCfg) /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); @@ -4831,7 +4710,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeSrSetupCfg) /* ccpu00131601:DEL - dTMax Packing removed since this param will not * be required by Scheduler*/ @@ -4869,7 +4747,6 @@ RgrUeSrSetupCfg *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeSrSetupCfg) CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->srCfgIdx, mBuf); @@ -4908,7 +4785,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeSrCfg) CMCHKPK(cmPkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); CMCHKPK(oduUnpackUInt8, param->type, mBuf); @@ -4945,7 +4821,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeSrCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); @@ -4983,7 +4858,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeUlSrsCfg) /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKPK(cmPkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); @@ -5022,7 +4896,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeUlSrsCfg) CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ @@ -5062,7 +4935,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeDlCqiCfg) /* rgr_c_001.main_8. Added changes of TFU_UPGRADE */ @@ -5108,7 +4980,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeDlCqiCfg) CMCHKUNPK(cmUnpkRgrUeAprdDlCqiCfg, ¶m->aprdCqiCfg, mBuf); CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->prdCqiCfg, mBuf); @@ -5145,7 +5016,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeMeasGapCfg) CMCHKPK(oduUnpackUInt8, param->gapOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->gapPrd, mBuf); @@ -5183,7 +5053,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeMeasGapCfg) CMCHKUNPK(oduPackUInt8, ¶m->isMesGapEnabled, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->gapPrd, mBuf); @@ -5221,7 +5090,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDrxLongCycleOffst) CMCHKPK(oduUnpackUInt16, param->drxStartOffst, mBuf); CMCHKPK(oduUnpackUInt16, param->longDrxCycle, mBuf); @@ -5258,7 +5126,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDrxLongCycleOffst) CMCHKUNPK(oduPackUInt16, ¶m->longDrxCycle, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->drxStartOffst, mBuf); @@ -5295,7 +5162,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDrxShortDrx) CMCHKPK(oduUnpackUInt8, param->drxShortCycleTmr, mBuf); CMCHKPK(oduUnpackUInt16, param->shortDrxCycle, mBuf); @@ -5333,7 +5199,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDrxShortDrx) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->shortDrxCycle, mBuf); @@ -5369,7 +5234,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeDrxCfg) CMCHKPK(cmPkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); CMCHKPK(cmPkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); @@ -5419,7 +5283,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeDrxCfg) /*rgr_c_001.main_9 ADD added changes for R9*/ #ifdef LTEMAC_R9 @@ -5469,7 +5332,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeCapCfg) CMCHKPK(oduUnpackUInt8, param->txAntSel, mBuf); CMCHKPK(oduUnpackUInt8, param->simCqiAckNack, mBuf); @@ -5509,7 +5371,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeCapCfg) CMCHKUNPK(oduPackUInt8, ¶m->pwrClass, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->intraSfFeqHop, mBuf); @@ -5549,7 +5410,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeAckNackRepCfg) CMCHKPK(oduUnpackUInt32, param->ackNackRepFactor, mBuf); CMCHKPK(oduUnpackUInt16, param->pucchAckNackRep, mBuf); @@ -5588,7 +5448,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeAckNackRepCfg) CMCHKUNPK(oduPackUInt8, ¶m->isAckNackEnabled, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->pucchAckNackRep, mBuf); @@ -5627,7 +5486,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeTxModeCfg) CMCHKPK(oduUnpackUInt32, param->txModeEnum, mBuf); CMCHKPK(oduUnpackUInt32, param->tmTrnstnState, mBuf); @@ -5667,7 +5525,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeTxModeCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -5708,7 +5565,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeUlHqCfg) CMCHKPK(oduUnpackUInt8, param->deltaHqOffst, mBuf); CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); @@ -5745,7 +5601,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeUlHqCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->deltaHqOffst, mBuf); @@ -5782,7 +5637,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeGrpPwrCfg) CMCHKPK(oduUnpackUInt8, param->idx, mBuf); CMCHKPK(cmPkLteRnti, param->tpcRnti, mBuf); @@ -5820,7 +5674,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeGrpPwrCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->tpcRnti, mBuf); @@ -5860,7 +5713,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrUeSpsDlCfg) CMCHKPK(oduUnpackUInt16, param->explicitRelCnt, mBuf); CMCHKPK(oduUnpackUInt32, param->dlSpsPrdctyEnum, mBuf); for (i=param->numPucchVal-1; i >= 0; i--) { @@ -5904,7 +5756,6 @@ Buffer *mBuf; U32 tmpEnum; S32 i; - TRC3(cmUnpkRgrUeSpsDlCfg) CMCHKUNPK(oduPackUInt8, ¶m->isDlSpsEnabled, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSpsHqProc, mBuf); @@ -5949,7 +5800,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRgrUeSpsUlCfg) CMCHKPK(oduUnpackUInt8, param->isLcSRMaskEnab, mBuf); for (i=param->lcCnt-1; i >= 0; i--) { @@ -6005,7 +5855,6 @@ Buffer *mBuf; U32 tmpEnum; S32 i; - TRC3(cmUnpkRgrUeSpsUlCfg) CMCHKUNPK(oduPackUInt8, ¶m->isUlSpsEnabled, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -6059,7 +5908,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeSpsCfg) CMCHKPK(cmPkRgrUeSpsUlCfg, ¶m->ulSpsCfg, mBuf); CMCHKPK(cmPkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); @@ -6097,7 +5945,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeSpsCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->spsRnti, mBuf); CMCHKUNPK(cmUnpkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); @@ -6134,7 +5981,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeUlPwrCfg) CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); @@ -6177,7 +6023,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeUlPwrCfg) CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); @@ -6220,7 +6065,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeQosCfg) CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); @@ -6258,7 +6102,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeQosCfg) CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); @@ -6294,7 +6137,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUePuschDedCfg) CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); @@ -6333,7 +6175,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUePuschDedCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); @@ -6370,7 +6211,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeTxAntSelCfg) CMCHKPK(oduUnpackUInt32, param->selType, mBuf); CMCHKPK(oduUnpackUInt8, param->pres, mBuf); @@ -6408,7 +6248,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeTxAntSelCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); @@ -6445,7 +6284,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeTaTmrCfg) CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); CMCHKPK(oduUnpackUInt8, param->pres, mBuf); @@ -6482,7 +6320,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeTaTmrCfg) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); @@ -6746,7 +6583,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeCfg) #ifdef RG_5GTF CMCHKPK(cmPkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); #endif @@ -6854,7 +6690,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -6960,7 +6795,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrLchQosCfg) CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); @@ -6998,7 +6832,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLchQosCfg) CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); @@ -7036,7 +6869,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrLchSpsCfg) /* SPS_DEV */ CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); @@ -7073,7 +6905,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLchSpsCfg) CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); @@ -7109,7 +6940,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDlLchCfg) /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); @@ -7149,7 +6979,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDlLchCfg) CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); CMCHKUNPK(cmUnpkRgrLchQosCfg, ¶m->dlQos, mBuf); @@ -7193,7 +7022,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUlLchCfg) CMCHKPK(oduUnpackUInt8, param->qci, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -7231,7 +7059,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUlLchCfg) CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); @@ -7273,7 +7100,6 @@ Buffer *mBuf; #ifdef LTE_L2_MEAS S32 i; #endif - TRC3(cmPkRgrUlLcgCfg) CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); @@ -7323,7 +7149,6 @@ Buffer *mBuf; #ifdef LTE_L2_MEAS S32 i; #endif - TRC3(cmUnpkRgrUlLcgCfg) CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ @@ -7404,7 +7229,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrLchCfg) CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); CMCHKPK(cmPkRgrDlLchCfg, ¶m->dlInfo, mBuf); @@ -7445,7 +7269,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLchCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -7471,7 +7294,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrLcgCfg) CMCHKPK(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); @@ -7493,7 +7315,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLcgCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -7531,7 +7352,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCfg) switch(param->cfgType) { case RGR_LCG_CFG: @@ -7586,7 +7406,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCfg) CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { @@ -7641,7 +7460,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrActvTime) CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); CMCHKPK(oduUnpackUInt8, param->pres, mBuf); @@ -7678,7 +7496,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrActvTime) CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); @@ -7715,7 +7532,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCellRecfg) CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); @@ -7774,7 +7590,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCellRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->recfgTypes, mBuf); @@ -7835,7 +7650,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeRecfg) #ifdef EMTC_ENABLE /* Note: As we add more members to emtcUeRecfg, create a new function for pkUnpk */ @@ -7957,7 +7771,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrUeRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); @@ -8077,7 +7890,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrLchRecfg) /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); @@ -8121,7 +7933,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLchRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -8151,7 +7962,6 @@ Buffer *mBuf; #ifdef RG_UNUSED S32 i; #endif - TRC3(cmPkRgrLcgRecfg) CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf); @@ -8184,7 +7994,6 @@ Buffer *mBuf; #ifdef RG_UNUSED S32 i; #endif - TRC3(cmUnpkRgrLcgRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -8233,7 +8042,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrRecfg) switch(param->recfgType) { case RGR_LCG_CFG: @@ -8285,7 +8093,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrRecfg) CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { @@ -8407,7 +8214,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrDel) switch(param->delType) { case RGR_LCG_CFG: @@ -8546,7 +8352,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrDel) CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); switch(param->delType) { @@ -8609,7 +8414,6 @@ Buffer *mBuf; #endif { S32 count; - TRC3(cmPkRgrPrbCfg) for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) { CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); @@ -8656,7 +8460,6 @@ Buffer *mBuf; #endif { S32 count; - TRC3(cmUnpkRgrSonPrbCfg) CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); @@ -8702,7 +8505,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrSonCfg) switch(param->cfgType) { case RGR_SON_PRB_CFG : @@ -8743,7 +8545,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrSonCfg) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->cfgType, mBuf); switch(param->cfgType) { @@ -8787,7 +8588,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrRst) CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -8824,7 +8624,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrRst) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -8858,7 +8657,6 @@ RgrSCellActDeactInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnPkRgrSCellActDeactInfo) CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); return ROK; @@ -8891,7 +8689,6 @@ RgrSCellActDeactEvnt *param; Buffer *mBuf; #endif { - TRC3(cmUnPkRgrSCellActDeactEvnt) U8 idx; @@ -8934,7 +8731,6 @@ RgrSCellActDeactInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrSCellActDeactInfo) CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); @@ -8969,7 +8765,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrSCellActDeactEvnt) S8 idx; for(idx = param->numOfSCells - 1; idx >= 0; idx--) @@ -9014,7 +8809,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCfgReqInfo) switch(param->action) { case RGR_SON_CFG: @@ -9076,7 +8870,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCfgReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); switch(param->action) { @@ -9138,7 +8931,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeBsrTmrCfg) CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); @@ -9174,7 +8966,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeBsrTmrCfg) CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); @@ -9218,7 +9009,6 @@ RgrSiCfgReqInfo * cfgReqInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrSiCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -9313,7 +9103,6 @@ Buffer *mBuf; RgrCfgTransId transId; RgrSiCfgReqInfo *cfgReqInfo; - TRC3(cmUnpkRgrSiCfgReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -9343,7 +9132,7 @@ Buffer *mBuf; SPutMsg(mBuf); return RFAILED; } - cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo)); + memset(cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo)); if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, @@ -9391,7 +9180,6 @@ Buffer *mBuf; /* ccpu00111328: S16 is renamed as MsgLen */ MsgLen msgLen; - TRC3(cmPkRgrSiCfgReqInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(SPkS32, param->cfgType, mBuf); @@ -9446,7 +9234,6 @@ Buffer *mBuf; /*Merge from Mohit Changes*/ S32 cfgType; - TRC3(cmUnpkRgrSiCfgReqInfo) SFndLenMsg(mBuf, &msgLen); if(msgLen > 0) @@ -9512,7 +9299,6 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrWarningSiCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -9618,7 +9404,6 @@ Buffer *mBuf; RgrCfgTransId transId; RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; - TRC3(cmUnpkRgrWarningSiCfgReq) if (SUnpkS16(&spId, mBuf) != ROK) { @@ -9711,7 +9496,6 @@ Buffer *mBuf; CmLList *node, *prevNode; RgrSegmentInfo *pdu; - TRC3(cmPkRgrWarningSiCfgReqInfo) CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); @@ -9778,7 +9562,6 @@ Buffer *mBuf; Buffer *pdu; CmLList *node; - TRC3(cmUnpkRgrWarningSiCfgReqInfo) cmLListInit(¶m->siPduLst); CMCHKUNPK(oduPackUInt32, &count, mBuf); @@ -9850,7 +9633,6 @@ U8 siId; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrWarningSiStopReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -9923,7 +9705,6 @@ Buffer *mBuf; U8 siId; RgrCfgTransId transId; - TRC3(cmUnpkRgrWarningSiStopReq) if (SUnpkS16(&spId, mBuf) != ROK) { @@ -9990,7 +9771,6 @@ U8 status; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrWarningSiCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -10085,7 +9865,6 @@ Buffer *mBuf; RgrCfgTransId transId; U8 status; - TRC3(cmUnpkRgrWarningSiCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -10170,7 +9949,6 @@ RgrLoadInfReqInfo * loadInfReq; { Buffer *mBuf = NULLP; - TRC3(cmPkRgrLoadInfReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -10265,7 +10043,6 @@ Buffer *mBuf; RgrCfgTransId transId; RgrLoadInfReqInfo *loadInfReq; - TRC3(cmUnpkRgrLoadInfReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -10298,7 +10075,7 @@ Buffer *mBuf; return RFAILED; } - cmMemset((U8 *)loadInfReq, 0, sizeof(RgrLoadInfReqInfo)); + memset(loadInfReq, 0, sizeof(RgrLoadInfReqInfo)); if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { @@ -10344,7 +10121,6 @@ RgrLoadInfReqInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrLoadInfReqInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf); @@ -10380,7 +10156,6 @@ RgrLoadInfReqInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrLoadInfReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighStartRb, mBuf); @@ -10421,7 +10196,6 @@ RgrUeCqiReptCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrUeCqiReptCfg) CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); @@ -10457,7 +10231,6 @@ RgrUeCqiReptCfg *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeCqiReptCfg) CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); @@ -10496,7 +10269,6 @@ RgrStaIndInfo* staInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -10583,7 +10355,6 @@ Buffer *mBuf; SuId suId; RgrStaIndInfo *staInd; - TRC3(cmUnpkRgrStaInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -10653,7 +10424,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrStaIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); @@ -10689,7 +10459,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrStaIndInfo) CMCHKUNPK(cmUnpkRgrUeCqiInfo, ¶m->ueCqiInfo, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -10726,7 +10495,6 @@ Buffer *mBuf; { S16 idx; - TRC3(cmPkRgrUeCqiInfo) for (idx = param->numCqiRept - 1; idx >= 0; idx--) { @@ -10766,7 +10534,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkRgrUeCqiInfo) CMCHKUNPK(oduPackUInt8, ¶m->numCqiRept, mBuf); for (idx = 0; idx < param->numCqiRept; idx++) @@ -10804,7 +10571,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrSubBandCqiInfo) CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); @@ -10843,7 +10609,6 @@ Buffer *mBuf; S8 idx; U8 count; - TRC3(cmPkRgrUeCqiRept) CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); @@ -10884,7 +10649,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrSubBandCqiInfo) CMCHKUNPK(oduPackUInt8, ¶m->subBandIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); @@ -10922,7 +10686,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkRgrUeCqiRept) CMCHKUNPK(oduPackUInt8, ¶m->numSubBand, mBuf); for (idx = 0; idx < param->numSubBand; idx++) { @@ -10967,7 +10730,6 @@ RgrLoadInfIndInfo* loadInfInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrLoadInfInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { @@ -11055,7 +10817,6 @@ Buffer *mBuf; SuId suId; RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ - TRC3(cmUnpkRgrLoadInfInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -11126,7 +10887,6 @@ Buffer *mBuf; #endif { U8 idx; - TRC3(cmPkRgrLoadInfIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(oduUnpackUInt16, param->bw, mBuf); @@ -11181,7 +10941,6 @@ Buffer *mBuf; TknStrOSXL *tknStr; U16 ndx; - TRC3(cmUnpkRgrLoadInfIndInfo) CMCHKUNPK(oduPackUInt32, ¶m->type, mBuf); if(RGR_ABS == param->type) @@ -11261,7 +11020,6 @@ RgrUepACfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrUepACfg) if(param->pAPrsnt) { @@ -11302,7 +11060,6 @@ Buffer *mBuf; #endif { U32 tmpEnum; - TRC3(cmUnpkRgrUepACfg) CMCHKUNPK(oduPackUInt8, (U8 *)¶m->pAPrsnt, mBuf); if (param->pAPrsnt) @@ -11342,7 +11099,6 @@ RgrUePdschDedCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrUePdschDedCfg) CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11378,7 +11134,6 @@ RgrUePdschDedCfg *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUePdschDedCfg) CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11416,7 +11171,6 @@ RgrUeUlPwrDedSCellCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrUeUlPwrDedSCellCfg) CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); @@ -11453,7 +11207,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeUlPwrDedSCellCfg) CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); @@ -11662,7 +11415,6 @@ Buffer *mBuf; #endif { S8 idx; - TRC3(cmPkRgrUeSCellAckPucchCfg); if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B) { @@ -11730,7 +11482,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkRgrUeSCellAckPucchCfg); CMCHKUNPK(oduPackUInt32, (U32*)¶m->pucchFormatType, mBuf); //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS) @@ -11806,7 +11557,6 @@ RgrUeStaIndInfo* ueStaInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRgrUeStaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11893,7 +11643,6 @@ Buffer *mBuf; SuId suId; RgrUeStaIndInfo *ueStaInd; - TRC3(cmUnpkRgrUeStaInd) if (SUnpkS16(&suId, mBuf) != ROK) { @@ -11962,7 +11711,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrUeStaIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); @@ -11997,7 +11745,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrUeStaIndInfo) CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -12035,7 +11782,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRgrCellCsgParamCfg) CMCHKPK(oduUnpackUInt8, param->minUlResNonCsg, mBuf); CMCHKPK(oduUnpackUInt8, param->minDlResNonCsg, mBuf); @@ -12070,7 +11816,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRgrCellCsgParamCfg) CMCHKUNPK(oduPackUInt8, ¶m->minDlResNonCsg, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->minUlResNonCsg, mBuf); @@ -12104,7 +11849,6 @@ RgrCellCntrlCmdCfg *param; Buffer *mBuf; #endif { - TRC3(cmPkRgrCellCntrlCmdCfg) switch(param->cmdType) { @@ -12150,7 +11894,6 @@ Buffer *mBuf; { U32 tmpEnum; - TRC3(cmUnpkRgrCellCntrlCmdCfg) CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf); param->cmdType = (RgrCellCntrlCmdType) tmpEnum; diff --git a/src/cm/rgu.c b/src/cm/rgu.c index 36392974a..29345688d 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -77,7 +77,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRguBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -140,7 +139,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkRguBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -193,7 +191,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRguUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -256,7 +253,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkRguUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -310,7 +306,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRguBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -374,7 +369,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkRguBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -430,7 +424,6 @@ Buffer *mBuf; #endif { S32 loop; - TRC3(cmPkRguL2MUlThrpMeasReqInfo); CMCHKPK(oduUnpackUInt8, param->enbMeas, mBuf); for (loop=param->numLcId-1; loop >= 0; loop--) @@ -474,7 +467,6 @@ Buffer *mBuf; #endif { U8 loop; - TRC3(cmUnpkRguL2MUlThrpMeasReqInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); @@ -517,7 +509,6 @@ RguL2MUlThrpMeasReqInfo* measReq; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkRguL2MUlThrpMeasReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -610,7 +601,6 @@ Buffer *mBuf; SpId spId; RguL2MUlThrpMeasReqInfo* measReq; - TRC3(cmUnpkRguL2MUlThrpMeasReq) if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -691,7 +681,6 @@ RguHarqStatusInd *harqStatusInd; U8 idx; RguHarqStatusInd *harqStaInd = NULL; - TRC3(cmPkRguHqStaInd) #ifdef XEON_SPECIFIC_CHANGES if (SGetSBuf(pst->region, pst->pool, (Data **)&harqStaInd, sizeof(RguHarqStatusInd)) != ROK) #else @@ -707,7 +696,7 @@ RguHarqStatusInd *harqStatusInd; return RFAILED; } - cmMemcpy((U8 *)harqStaInd, (U8 *)harqStatusInd, sizeof(RguHarqStatusInd)); + memcpy(harqStaInd, harqStatusInd, sizeof(RguHarqStatusInd)); if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -814,7 +803,6 @@ Buffer *mBuf; SuId suId; U8 idx; - TRC3(cmUnpkRguHqStaInd) if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -884,7 +872,6 @@ RguLcFlowCntrlInfo *param; Buffer *mBuf; #endif { - TRC3(cmPkRguLcFlowCntrlInfo); CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf); CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -906,7 +893,6 @@ Buffer *mBuf; { U32 idx; - TRC3(cmPkRguUeFlowCntrlInfo); for(idx=(param->numLcs - 1); idx >= 0; idx--) { @@ -931,7 +917,6 @@ Buffer *mBuf; { U32 idx; - TRC3(cmPkRguFlowCntrlInfo); for (idx=(param->numUes - 1); idx >= 0; idx--) { @@ -973,7 +958,6 @@ RguFlowCntrlInd *flowCntrlInd; { Buffer *mBuf = NULLP; - TRC3(cmPkRguFlowCntrlInd); if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1024,7 +1008,6 @@ RguLcFlowCntrlInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRguLcFlowCntrlInfo); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); @@ -1045,7 +1028,6 @@ Buffer *mBuf; #endif { U32 idx; - TRC3(cmUnpkRguUeFlowCntrlInfo); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numLcs, mBuf); for(idx=0; idx < param->numLcs; idx++) @@ -1069,7 +1051,6 @@ Buffer *mBuf; { U32 idx; - TRC3(cmUnpkRguFlowCntrlInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numUes, mBuf); @@ -1112,7 +1093,6 @@ Buffer *mBuf; SuId suId; RguFlowCntrlInd *flowCntrlInd; - TRC3(cmUnpkRguFlowCntrlInd) if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1183,7 +1163,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRguPduInfo); for (i=param->numPdu-1; i >= 0; i--) { /* rgu_c_001.main_3: ccpu00111328: S16 is renamed as MsgLen */ @@ -1231,7 +1210,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRguPduInfo); CMCHKUNPK(oduPackUInt8, ¶m->numPdu, mBuf); for (i=0; inumPdu; i++) { @@ -1276,7 +1254,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRguDBoReport); CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf); CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf); @@ -1319,7 +1296,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRguDBoReport); CMCHKUNPK(SUnpkS32, ¶m->bo, mBuf); #ifdef CCPU_OPT @@ -1363,7 +1339,6 @@ Buffer *mBuf; { MsgLen msgLen; - TRC3(cmPkRguCDatReqInfo); if (param->pdu != NULLP) { @@ -1427,7 +1402,6 @@ Buffer *mBuf; { MsgLen msgLen, totalMsgLen; - TRC3(cmUnpkRguCDatReqInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); @@ -1490,7 +1464,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRguLchDatReq); #ifdef L2_OPTMZ CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf); @@ -1533,7 +1506,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRguLchDatReq); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguDBoReport, ¶m->boReport, mBuf); @@ -1576,7 +1548,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRguDatReqTb); /*rgu_c_001.main_5 - ADD - L2M Support */ #ifdef LTE_L2_MEAS CMCHKPK(oduUnpackUInt32, param->tbId, mBuf); @@ -1636,7 +1607,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRguDatReqTb); CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; i++) { @@ -1698,7 +1668,6 @@ Buffer *mBuf; S32 i; S32 idx; - TRC3(cmPkRguDDatReqInfo); for(idx = (param->nmbOfUeGrantPerTti-1); idx >= 0; idx--) { @@ -1770,7 +1739,6 @@ Buffer *mBuf; #endif S32 idx; - TRC3(cmUnpkRguDDatReqInfo); /* After Merging from 2.1 to 2.2 */ /*rgu_c_001.main_5 - ADD - L2M Support */ @@ -1836,7 +1804,6 @@ Buffer *mBuf; { MsgLen msgLen; - TRC3(cmPkRguCDatIndInfo); if (SFndLenMsg(param->pdu, &msgLen) != ROK) return RFAILED; @@ -1882,7 +1849,6 @@ Buffer *mBuf; { MsgLen msgLen, totalMsgLen; - TRC3(cmUnpkRguCDatIndInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); @@ -1925,7 +1891,6 @@ RguLchDatInd *param; Buffer *mBuf; #endif { - TRC3(cmPkRguLchDatInd); CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -1962,7 +1927,6 @@ RguLchDatInd *param; Buffer *mBuf; #endif { - TRC3(cmUnpkRguLchDatInd); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf); @@ -1999,7 +1963,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRguCStaRspInfo); switch(param->lcType) { case CM_LTE_LCH_CCCH: @@ -2054,7 +2017,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRguCStaRspInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); @@ -2108,7 +2070,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkRguLchStaInd); CMCHKPK(SPkS16, param->totBufSize, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -2146,7 +2107,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkRguLchStaInd); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->totBufSize, mBuf); @@ -2184,7 +2144,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkRguStaIndTb); #ifdef LTE_L2_MEAS CMCHKPK(oduUnpackUInt16, param->status, mBuf); @@ -2229,8 +2188,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkRguStaIndTb); - CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; i++) { CMCHKUNPK(cmUnpkRguLchStaInd, ¶m->lchStaInd[i], mBuf); diff --git a/src/cm/tfu.c b/src/cm/tfu.c index 15ee57204..566b05ef6 100755 --- a/src/cm/tfu.c +++ b/src/cm/tfu.c @@ -81,7 +81,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -150,7 +149,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkTfuBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -209,7 +207,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -278,7 +275,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkTfuBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -337,7 +333,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -406,7 +401,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkTfuUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -465,7 +459,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuSchBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -534,7 +527,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkTfuSchBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -593,7 +585,6 @@ U8 status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuSchBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -662,7 +653,6 @@ Buffer *mBuf; SuId suId; U8 status; - TRC3(cmUnpkTfuSchBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -721,7 +711,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuSchUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -790,7 +779,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkTfuSchUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -853,7 +841,6 @@ TfuRaReqIndInfo * raReqInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuRaReqInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -950,7 +937,6 @@ Buffer *mBuf; SuId suId; TfuRaReqIndInfo *raReqInd; - TRC3(cmUnpkTfuRaReqInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -1057,7 +1043,6 @@ TfuRecpReqInfo * recpReq; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuRecpReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1165,7 +1150,6 @@ Buffer *mBuf; SpId spId; TfuRecpReqInfo *recpReq; - TRC3(cmUnpkTfuRecpReq) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -1277,7 +1261,6 @@ TfuUlCqiIndInfo * ulCqiInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuUlCqiInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1375,7 +1358,6 @@ Buffer *mBuf; SuId suId; TfuUlCqiIndInfo *ulCqiInd; - TRC3(cmUnpkTfuUlCqiInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -1472,7 +1454,6 @@ TfuHqIndInfo * hqInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuHqInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1569,7 +1550,6 @@ Buffer *mBuf; SpId spId; TfuHqIndInfo *hqInd; - TRC3(cmUnpkTfuHqInd) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -1665,7 +1645,6 @@ TfuSrIndInfo * srInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuSrInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1761,7 +1740,6 @@ Buffer *mBuf; SpId spId; TfuSrIndInfo *srInd; - TRC3(cmUnpkTfuSrInd) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -1855,7 +1833,6 @@ TfuDlCqiIndInfo * dlCqiInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuDlCqiInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1948,7 +1925,6 @@ Buffer *mBuf; SuId suId; TfuDlCqiIndInfo *dlCqiInd; - TRC3(cmUnpkTfuDlCqiInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2049,7 +2025,6 @@ TfuRawCqiIndInfo * rawCqiInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuRawCqiInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2118,7 +2093,6 @@ Buffer *mBuf; SuId suId; TfuRawCqiIndInfo *rawCqiInd; - TRC3(cmUnpkTfuRawCqiInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2187,7 +2161,6 @@ TfuSrsIndInfo * srsInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuSrsInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2255,7 +2228,6 @@ Buffer *mBuf; SuId suId; TfuSrsIndInfo *srsInd; - TRC3(cmUnpkTfuSrsInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2325,7 +2297,6 @@ TfuDatIndInfo * datInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuDatInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2421,7 +2392,6 @@ Buffer *mBuf; SpId spId; TfuDatIndInfo *datInd; - TRC3(cmUnpkTfuDatInd) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2521,7 +2491,6 @@ TfuCrcIndInfo * crcIndInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuCrcInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2622,7 +2591,6 @@ Buffer *mBuf; SuId suId; TfuCrcIndInfo *crcIndInfo; - TRC3(cmUnpkTfuCrcInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2719,7 +2687,6 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuTimingAdvInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2816,7 +2783,6 @@ Buffer *mBuf; SuId suId; TfuTimingAdvIndInfo *timingAdvInd; - TRC3(cmUnpkTfuTimingAdvInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -2915,7 +2881,6 @@ TfuDatReqInfo * datReq; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuDatReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3014,7 +2979,6 @@ Buffer *mBuf; SpId spId; TfuDatReqInfo *datReq; - TRC3(cmUnpkTfuDatReq) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -3114,7 +3078,6 @@ TfuCntrlReqInfo * cntrlReq; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuCntrlReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3215,7 +3178,6 @@ Buffer *mBuf; SpId spId; TfuCntrlReqInfo *cntrlReq; - TRC3(cmUnpkTfuCntrlReq) if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -3311,7 +3273,6 @@ TfuTtiIndInfo * ttiInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuTtiInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3409,7 +3370,6 @@ SuId suId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuNonRtInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3465,7 +3425,6 @@ Buffer *mBuf; #endif { SuId suId; - TRC3(cmUnpkTfuNonRtInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -3519,7 +3478,6 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuPucchDeltaPwr) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3613,7 +3571,6 @@ Buffer *mBuf; SuId suId; TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; - TRC3(cmUnpkTfuPucchDeltaPwr) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -3700,7 +3657,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuRbAssignA1Val324) CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); @@ -3740,7 +3696,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuRbAssignB1Val324) CMCHKPK(oduUnpackUInt8, param->bmiHqAckNack, mBuf); CMCHKPK(oduUnpackUInt8, param->RV, mBuf); @@ -3779,7 +3734,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuRbAssignVal326) CMCHKPK(oduUnpackUInt8, param->CyclicShiftInd, mBuf); CMCHKPK(oduUnpackUInt8, param->OCCInd, mBuf); @@ -3816,7 +3770,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuRbAssignA1Val324) CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); @@ -3853,7 +3806,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuRbAssignB1Val324) CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); @@ -3892,7 +3844,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuRbAssignVal326) CMCHKUNPK(oduPackUInt8, ¶m->FreqBandIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->OCCInd, mBuf); @@ -3930,7 +3881,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormatA1A2Info) //printf("5GTF_DBG: cmPkTfuDciFormatA1Info() called by eNB\n"); CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); @@ -3999,7 +3949,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormatB1B2Info) CMCHKPK(oduUnpackUInt8, param->DL_PCRS, mBuf); CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); @@ -4067,7 +4016,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormatA1A2Info) CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->xPUSCHRange, mBuf); @@ -4136,7 +4084,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormatB1B2Info) CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->xPDSCHRange, mBuf); @@ -4205,7 +4152,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat0Info) /* tfu_c_001.main_3: Adding pack for hqProcId */ CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); @@ -4263,7 +4209,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat0Info) CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); @@ -4323,7 +4268,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuAllocMapOrRiv) switch(param->type) { /*tfu_c_001.main_7 - ADD - TFU_RESMAP_CHANGE support */ @@ -4385,7 +4329,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuAllocMapOrRiv) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { @@ -4452,7 +4395,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuDciFormat1AllocInfo) CMCHKPK(oduUnpackUInt8, param->rv, mBuf); CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); @@ -4501,7 +4443,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuDciFormat1AllocInfo) CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); for (i=0; itpcCmd, mBuf); @@ -4593,7 +4533,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1Info) CMCHKUNPK(cmUnpkTfuDciFormat1AllocInfo, ¶m->allocInfo, mBuf); @@ -4641,7 +4580,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuDciFormat2AAllocInfo) CMCHKPK(oduUnpackUInt8, param->transSwap, mBuf); CMCHKPK(oduUnpackUInt8, param->precoding, mBuf); @@ -4696,7 +4634,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuDciFormat2AAllocInfo) /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -4759,7 +4696,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat6AAllocInfo) CMCHKPK(oduUnpackUInt8, param->rv, mBuf); CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); @@ -4805,7 +4741,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat6AAllocInfo) CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); @@ -4848,7 +4783,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat2AInfo) CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); @@ -4891,7 +4825,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat2AInfo) CMCHKUNPK(cmUnpkTfuDciFormat2AAllocInfo, ¶m->allocInfo, mBuf); @@ -4939,7 +4872,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuDciFormat2AllocInfo) /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -5009,7 +4941,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuDciFormat2AllocInfo) /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -5077,7 +5008,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat2Info) /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -5130,7 +5060,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat2Info) CMCHKUNPK(cmUnpkTfuDciFormat2AllocInfo, ¶m->allocInfo, mBuf); @@ -5180,7 +5109,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuDciFormat3Info) CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { @@ -5220,7 +5148,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuDciFormat3Info) for (i=0; itpcCmd[i], mBuf); @@ -5260,7 +5187,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuDciFormat3AInfo) CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->tpcCmd[i], mBuf); @@ -5299,7 +5225,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuDciFormat3AInfo) for (i=0; itpcCmd[i], mBuf); @@ -5341,7 +5266,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat60aInfo) CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); CMCHKPK(oduUnpackUInt8, param->isSrs, mBuf); @@ -5389,7 +5313,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPdcchOrderInfoEmtc) CMCHKPK(oduUnpackUInt8, param->ceLevel, mBuf); CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); @@ -5427,7 +5350,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfudciformat61aPdsch) CMCHKPK(oduUnpackUInt8, param->isTBMsg4, mBuf); CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); @@ -5479,7 +5401,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat61aInfo) switch(param->isPdcchOrder) { case FALSE: @@ -5526,7 +5447,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat60aInfo) printf("In cmUnpkTfuDciFormat60aInfo :: Entry \n"); CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); @@ -5576,7 +5496,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPdcchOrderInfoEmtc) printf("In cmUnpkTfuPdcchOrderInfoEmtc :: Entry \n"); CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); @@ -5615,7 +5534,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat61aInfo) CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); printf("1. cmUnpkTfuDciFormat61aInfo :: isPdcchOrder %d \n", param->isPdcchOrder); @@ -5666,7 +5584,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1dAllocInfo) CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); CMCHKPK(oduUnpackUInt8, param->rv, mBuf); @@ -5712,7 +5629,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1dAllocInfo) CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); @@ -5757,7 +5673,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1dInfo) CMCHKPK(oduUnpackUInt8, param->dlPwrOffset, mBuf); @@ -5806,7 +5721,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1dInfo) CMCHKUNPK(cmUnpkTfuDciFormat1dAllocInfo, ¶m->allocInfo, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); @@ -5856,7 +5770,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1cInfo) CMCHKPK(oduUnpackUInt8, param->iTbs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); @@ -5899,7 +5812,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1cInfo) CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); @@ -5942,7 +5854,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1bAllocInfo) CMCHKPK(oduUnpackUInt8, param->pmiCfm, mBuf); CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); @@ -5991,7 +5902,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1bAllocInfo) CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); @@ -6036,7 +5946,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPdcchOrderInfo) CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->preambleIdx, mBuf); @@ -6074,7 +5983,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPdcchOrderInfo) CMCHKUNPK(oduPackUInt8, ¶m->preambleIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->prachMaskIdx, mBuf); @@ -6116,7 +6024,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1aAllocInfo) CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); CMCHKPK(cmPkTknU8, ¶m->harqProcId, mBuf); @@ -6163,7 +6070,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1aAllocInfo) CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); @@ -6206,7 +6112,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfudciformat1aPdsch) CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); @@ -6249,7 +6154,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfudciformat1aPdsch) CMCHKUNPK(cmUnpkTfuDciFormat1aAllocInfo, ¶m->allocInfo, mBuf); @@ -6293,7 +6197,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfudciformat61aPdsch) printf("1. cmUnpkTfudciformat61aPdsch :: Entry \n"); CMCHKUNPK(cmUnpkTfuDciFormat6AAllocInfo, ¶m->allocInfo, mBuf); @@ -6353,7 +6256,6 @@ PRIVATE S16 cmUnpkTfuDirectIndication(param, mBuf) #endif { - TRC3(cmUnpkTfuDirectIndication) CMCHKUNPK(oduPackUInt8, ¶m->directInd, mBuf); @@ -6392,7 +6294,6 @@ S16 cmUnpkTfuDciFormat62AllocInfo(param, mBuf) Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat62AllocInfo) CMCHKUNPK(oduPackUInt8, ¶m->riv, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); @@ -6429,8 +6330,6 @@ PRIVATE S16 cmUnpkTfudciformat62Pdsch(param, mBuf) #endif { - TRC3(cmUnpkTfudciformat62Pdsch) - CMCHKUNPK(cmUnpkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->repNum, mBuf); @@ -6470,7 +6369,6 @@ S16 cmUnpkTfuDciFormat62Info(param, mBuf) #endif { - TRC3(cmUnpkTfuDciFormat62Info) CMCHKUNPK(oduPackUInt8, ¶m->isPaging, mBuf); switch(param->isPaging) { case FALSE: @@ -6527,7 +6425,6 @@ PRIVATE S16 cmPkTfuDirectIndication(param, mBuf) #endif { - TRC3(cmPkTfuDirectIndication) CMCHKPK(oduUnpackUInt8, param->directInd, mBuf); @@ -6569,8 +6466,6 @@ S16 cmPkTfuDciFormat62AllocInfo(param, mBuf) #endif { - TRC3(cmPkTfuDciFormat6AAllocInfo) - CMCHKPK(oduUnpackUInt8, param->rv, mBuf); CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(oduUnpackUInt8, param->riv, mBuf); @@ -6609,7 +6504,6 @@ PRIVATE S16 cmPkTfudciformat62Pdsch(param, mBuf) #endif { - TRC3(cmPkTfudciformat62Pdsch) CMCHKPK(oduUnpackUInt8, param->dciSubRepNum, mBuf); CMCHKPK(oduUnpackUInt8, param->repNum, mBuf); CMCHKPK(cmPkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); @@ -6650,8 +6544,6 @@ S16 cmPkTfuDciFormat62Info(param, mBuf) #endif { - TRC3(cmPkTfuDciFormat62Info) - switch(param->isPaging) { case TRUE: CMCHKPK(cmPkTfudciformat62Pdsch, ¶m->t.pdschInfo, mBuf); @@ -6706,7 +6598,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1aInfo) switch(param->isPdcchOrder) { case FALSE: @@ -6756,7 +6647,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1aInfo) CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); switch(param->isPdcchOrder) { @@ -6806,7 +6696,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormat1bInfo) CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); @@ -6852,7 +6741,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormat1bInfo) CMCHKUNPK(cmUnpkTfuDciFormat1bAllocInfo, ¶m->allocInfo, mBuf); @@ -6908,7 +6796,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciInfo) switch(param->dciFormat) { #ifdef TFU_5GTF @@ -7017,7 +6904,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->dciFormat, mBuf); @@ -7117,7 +7003,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuSubbandInfo) CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); @@ -7155,7 +7040,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuSubbandInfo) CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); @@ -7193,7 +7077,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuSubbandCqiInfo) CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); CMCHKPK(cmPkTfuSubbandInfo, ¶m->subband, mBuf); @@ -7230,7 +7113,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuSubbandCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); @@ -7267,7 +7149,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPdcchCceInfo) CMCHKPK(cmPkLteAggrLvl, param->aggrLvl, mBuf); CMCHKPK(oduUnpackUInt8, param->cceIdx, mBuf); @@ -7304,7 +7185,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPdcchCceInfo) CMCHKUNPK(oduPackUInt8, ¶m->cceIdx, mBuf); CMCHKUNPK(cmUnpkLteAggrLvl,(U32 *)¶m->aggrLvl, mBuf); @@ -7342,7 +7222,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiPucchMode10) switch(param->type) { case TFU_RPT_CQI: @@ -7389,7 +7268,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiPucchMode10) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { @@ -7436,7 +7314,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode11Cqi) CMCHKPK(cmPkTknU8, ¶m->wideDiffCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); @@ -7475,7 +7352,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode11Cqi) CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); @@ -7514,7 +7390,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiPucchMode11) switch(param->type) { case TFU_RPT_CQI: @@ -7561,7 +7436,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiPucchMode11) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { @@ -7607,7 +7481,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode20SubCqi) CMCHKPK(oduUnpackUInt8, param->l, mBuf); CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); @@ -7644,7 +7517,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode20SubCqi) CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); @@ -7682,7 +7554,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode20Cqi) switch(param->isWideband) { case FALSE: @@ -7729,7 +7600,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode20Cqi) CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { @@ -7776,7 +7646,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiPucchMode20) switch(param->type) { case TFU_RPT_CQI: @@ -7823,7 +7692,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiPucchMode20) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { @@ -7870,7 +7738,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode21SubCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->l, mBuf); @@ -7909,7 +7776,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode21SubCqi) CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); @@ -7948,7 +7814,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode21WideCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); @@ -7987,7 +7852,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode21WideCqi) CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); @@ -8026,7 +7890,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiMode21Cqi) switch(param->isWideband) { case FALSE: @@ -8073,7 +7936,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiMode21Cqi) CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { @@ -8120,7 +7982,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCqiPucchMode21) switch(param->type) { case TFU_RPT_CQI: @@ -8167,7 +8028,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCqiPucchMode21) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { @@ -8213,7 +8073,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDlCqiPucch) switch(param->mode) { case TFU_PUCCH_CQI_MODE21: @@ -8266,7 +8125,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDlCqiPucch) CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); @@ -8320,7 +8178,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuSubbandMode12) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); @@ -8358,7 +8215,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuSubbandMode12) CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); @@ -8397,7 +8253,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuCqiPuschMode12) for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandMode12, ¶m->subbandArr[i], mBuf); @@ -8441,7 +8296,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuCqiPuschMode12) CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; i= 0; i--) { CMCHKPK(cmPkTfuSubbandInfo, ¶m->subbandArr[i], mBuf); @@ -8528,7 +8381,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuCqiPuschMode20) CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); @@ -8570,7 +8422,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuCqiPuschMode22) for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { @@ -8621,7 +8472,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuCqiPuschMode22) for (i=0; icqi[i], mBuf); @@ -8654,7 +8504,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuSubbandMode30) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); @@ -8675,7 +8524,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuSubbandMode30) CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); @@ -8714,7 +8562,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuCqiPuschMode30) for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandMode30, ¶m->subbandArr[i], mBuf); @@ -8756,7 +8603,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuCqiPuschMode30) CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); @@ -8781,7 +8627,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuSubbandMode31) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { @@ -8805,7 +8650,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuSubbandMode31) for (i=0; icqi[i], mBuf); @@ -8846,7 +8690,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuCqiPuschMode31) /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -8898,7 +8741,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuCqiPuschMode31) CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); for (i=0; imode) { case TFU_PUSCH_CQI_MODE_31: @@ -9010,7 +8851,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDlCqiPusch) CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); @@ -9069,7 +8909,6 @@ Buffer *mBuf; { U32 idx; - TRC3(cmPkTfuDlCqiInfo) switch(selector) { case FALSE: @@ -9121,7 +8960,6 @@ Buffer *mBuf; { U8 idx; - TRC3(cmUnpkTfuDlCqiInfo) switch(selector) { case TRUE: @@ -9180,7 +9018,6 @@ Buffer *mBuf; U32 count; TfuUeRecpReqInfo *tfuUeRecpReqInfo; - TRC3(cmPkTfuRecpReqInfo) /*ccpu00116923 - ADD - SRS present support*/ /*tfu_c_001.main_7 - ADD - SRS present field inclusion */ @@ -9244,7 +9081,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuUeRecpReqInfo *tfuUeRecpReqInfo; - TRC3(cmUnpkTfuRecpReqInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -9295,7 +9131,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPdcchInfo) #ifdef TFU_5GTF CMCHKPK(oduUnpackUInt8, param->grpId, mBuf); CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); @@ -9344,7 +9179,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPdcchInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef LTEMAC_SPS @@ -9397,7 +9231,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPhichInfo) /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE CMCHKPK(oduUnpackUInt16, param->txPower, mBuf); @@ -9445,7 +9278,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPhichInfo) CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); @@ -9499,7 +9331,6 @@ Buffer *mBuf; CmLList *node; U32 count; - TRC3(cmPkTfuCntrlReqInfo) #ifdef EMTC_ENABLE count = param->dlMpdcchLst.count; node = param->dlMpdcchLst.last; @@ -9605,7 +9436,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuPhichInfo *tfuPhichInfo; - TRC3(cmUnpkTfuCntrlReqInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->ulTiming, mBuf); @@ -9693,7 +9523,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPdschDciInfo) switch(param->format) { #ifdef TFU_5GTF @@ -9793,7 +9622,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPdschDciInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->format, mBuf); switch(param->format) { @@ -9876,7 +9704,6 @@ Buffer *mBuf; #endif { S32 idx, idx2; - TRC3(cmPkTfuBfVectorInfo) for(idx=TFU_MAX_DL_SUBBAND-1;idx>=0; idx--) { for (idx2=param->numPhyAnt -1; idx2 >= 0; idx2--) { @@ -9916,7 +9743,6 @@ S16 cmUnpkTfuBfVectorInfo(param, mBuf) #endif { S32 idx, idx2; - TRC3(cmUnpkTfuBfVectorInfo) for(idx=0;idxsbIndex, mBuf); @@ -9963,7 +9789,6 @@ Buffer *mBuf; U32 lchIdx, pduIdx; #endif - TRC3(cmPkTfuDatReqPduInfo) /* LTE_ADV_FLAG_REMOVED_START */ CMCHKPK(oduUnpackUInt8, param->isEnbSFR, mBuf); @@ -10080,7 +9905,6 @@ Buffer *mBuf; #ifdef L2_OPTMZ U32 lchIdx, pduIdx; #endif - TRC3(cmUnpkTfuDatReqPduInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkTfuPdschDciInfo, ¶m->dciInfo, mBuf); @@ -10191,7 +10015,6 @@ Buffer *mBuf; U32 count; TfuDatReqPduInfo *tfuDatReqPduInfo; - TRC3(cmPkTfuDatReqInfo) count = param->pdus.count; node = param->pdus.last; @@ -10247,7 +10070,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuDatReqPduInfo *tfuDatReqPduInfo; - TRC3(cmUnpkTfuDatReqInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -10293,7 +10115,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDatInfo) CMCHKPK(cmPkBuffer, ¶m->mBuf, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); @@ -10330,7 +10151,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDatInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->mBuf, mBuf); @@ -10373,7 +10193,6 @@ Buffer *mBuf; U32 count; TfuDatInfo *tfuDatInfo; - TRC3(cmPkTfuDatIndInfo) #ifdef TFU_5GTF CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); @@ -10431,7 +10250,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuDatInfo *tfuDatInfo; - TRC3(cmUnpkTfuDatIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -10483,7 +10301,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuSrInfo) CMCHKPK(cmPkLteRnti, param->rnti, mBuf); return ROK; @@ -10522,7 +10339,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuSrInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); return ROK; @@ -10563,7 +10379,6 @@ Buffer *mBuf; U32 count; TfuSrInfo *tfuSrInfo; - TRC3(cmPkTfuSrIndInfo) count = param->srLst.count; node = param->srLst.last; @@ -10616,7 +10431,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuSrInfo *tfuSrInfo; - TRC3(cmUnpkTfuSrIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -10664,7 +10478,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuHqInfo) CMCHKPK(oduUnpackUInt8, param->isPusch, mBuf); for (i=TFU_MAX_HARQ_FDBKS-1; i >= 0; i--) { @@ -10712,7 +10525,6 @@ Buffer *mBuf; #endif { S32 i; - TRC3(cmUnpkTfuHqInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); /* ACC-TDD ccpu00130520 */ @@ -10766,7 +10578,6 @@ Buffer *mBuf; U32 count; TfuHqInfo *tfuHqInfo; - TRC3(cmPkTfuHqIndInfo) count = param->hqIndLst.count; node = param->hqIndLst.last; @@ -10820,7 +10631,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuHqInfo *tfuHqInfo; - TRC3(cmUnpkTfuHqIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -10865,7 +10675,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUlCqiInfo) CMCHKPK(cmPkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); return ROK; @@ -10901,7 +10710,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUlCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); return ROK; @@ -10939,7 +10747,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuUlCqiRpt) for (i=TFU_MAX_UL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuUlCqiInfo, ¶m->ulCqiInfoArr[i], mBuf); @@ -10983,7 +10790,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuUlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isTxPort0, mBuf); @@ -11033,7 +10839,6 @@ Buffer *mBuf; U32 count; TfuUlCqiRpt *tfuUlCqiRpt; - TRC3(cmPkTfuUlCqiIndInfo) count = param->ulCqiRpt.count; node = param->ulCqiRpt.last; @@ -11089,7 +10894,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuUlCqiRpt *tfuUlCqiRpt; - TRC3(cmUnpkTfuUlCqiIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -11137,7 +10941,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDlCqiRpt) if (cmPkTfuDlCqiInfo(param->isPucchInfo, ¶m->dlCqiInfo, mBuf) != ROK) return RFAILED; @@ -11178,7 +10981,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isPucchInfo, mBuf); @@ -11223,7 +11025,6 @@ Buffer *mBuf; U32 count; TfuDlCqiRpt *tfuDlCqiRpt; - TRC3(cmPkTfuDlCqiIndInfo) count = param->dlCqiRptsLst.count; node = param->dlCqiRptsLst.last; @@ -11277,7 +11078,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuDlCqiRpt *tfuDlCqiRpt; - TRC3(cmUnpkTfuDlCqiIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -11323,7 +11123,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuCrcInfo) CMCHKPK(cmPkTknU8, ¶m->rv, mBuf); CMCHKPK(oduUnpackUInt8, param->isFailure, mBuf); @@ -11362,7 +11161,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuCrcInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->isFailure, mBuf); @@ -11407,7 +11205,6 @@ Buffer *mBuf; U32 count; TfuCrcInfo *tfuCrcIndInfo; - TRC3(cmPkTfuCrcIndInfo) #ifdef TFU_5GTF CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); @@ -11466,7 +11263,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuCrcInfo *tfuCrcIndInfo; - TRC3(cmUnpkTfuCrcIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -11516,7 +11312,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuTimingAdvInfo) CMCHKPK(oduUnpackUInt8, param->timingAdv, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); @@ -11554,7 +11349,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuTimingAdvInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->timingAdv, mBuf); @@ -11597,7 +11391,6 @@ Buffer *mBuf; U32 count; TfuTimingAdvInfo *tfuTimingAdvInfo; - TRC3(cmPkTfuTimingAdvIndInfo) count = param->timingAdvLst.count; node = param->timingAdvLst.last; @@ -11651,7 +11444,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuTimingAdvInfo *tfuTimingAdvInfo; - TRC3(cmUnpkTfuTimingAdvIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -11697,7 +11489,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuTtiCellInfo) CMCHKPK(oduUnpackUInt8, param->ulBlankSf, mBuf); CMCHKPK(oduUnpackUInt8, param->dlBlankSf, mBuf); @@ -11739,7 +11530,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuTtiIndInfo) /*CA dev Start*/ for (i=(param->numCells-1); i >= 0; i--) { @@ -11781,7 +11571,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuTtiCellInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -11828,7 +11617,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuRaReqInfo) CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->cqiPres, mBuf); @@ -11874,7 +11662,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuRaReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->rapId, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->ta, mBuf); @@ -11918,7 +11705,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuRachInfo) for (i= (param->numRaReqInfo - 1); i >= 0; i--) { CMCHKPK(cmPkTfuRaReqInfo, &(param->raReqInfoArr[i]), mBuf); @@ -11971,7 +11757,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuRachInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->raRnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numRaReqInfo, mBuf); @@ -12040,7 +11825,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuRaReqIndInfo) for (i= (param->nmbOfRaRnti-1); i >= 0; i--) { @@ -12101,7 +11885,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuRaReqIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -12151,7 +11934,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuPucchDeltaPwrInfo) CMCHKPK(SPkS8, param->pucchDeltaPwr, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); @@ -12188,7 +11970,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuPucchDeltaPwrInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pucchDeltaPwr, mBuf); @@ -12232,7 +12013,6 @@ Buffer *mBuf; U32 count; TfuPucchDeltaPwr *tfuPucchDeltaPwr; - TRC3(cmPkTfuPucchDeltaPwrIndInfo) count = param->pucchDeltaPwrLst.count; node = param->pucchDeltaPwrLst.last; @@ -12287,7 +12067,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuPucchDeltaPwr *tfuPucchDeltaPwr; - TRC3(cmUnpkTfuPucchDeltaPwrIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -12315,7 +12094,6 @@ Buffer *mBuf; #endif { MsgLen msgLen=0; - TRC3(cmPkBuffer) if (SFndLenMsg(*param, &msgLen) != ROK) return RFAILED; if (SCatMsg(mBuf, *param, M1M2) != ROK) @@ -12338,7 +12116,6 @@ Buffer *mBuf; #endif { MsgLen msgLen=0, totalMsgLen=0; - TRC3(cmUnpkBuffer) CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) return RFAILED; @@ -12384,7 +12161,6 @@ TfuDoaIndInfo * doaInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuDoaInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -12450,7 +12226,6 @@ Buffer *mBuf; SuId suId; TfuDoaIndInfo *doaInd; - TRC3(cmUnpkTfuDoaInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -12512,7 +12287,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDciFormatTbInfo) CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(oduUnpackUInt8, param->rv, mBuf); @@ -12551,7 +12325,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDciFormatTbInfo) CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); @@ -12590,7 +12363,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuSubbandDlCqiInfo) for (i=TFU_MAX_TB-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->cqiIdx[i], mBuf); @@ -12630,7 +12402,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuSubbandDlCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); for (i=0; imode) { case TFU_PUSCH_CQI_MODE_31: @@ -12718,7 +12488,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDlCqiPuschInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); switch(param->mode) { @@ -12766,7 +12535,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuDoaRpt) CMCHKPK(oduUnpackUInt32, param->doa, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); @@ -12804,7 +12572,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuDoaRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->doa, mBuf); @@ -12848,7 +12615,6 @@ Buffer *mBuf; CmLList *node; U32 count; TfuDoaRpt *tfuDoaRpt; - TRC3(cmPkTfuDoaIndInfo) count = param->doaRpt.count; node = param->doaRpt.last; @@ -12902,7 +12668,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuDoaRpt *tfuDoaRpt; - TRC3(cmUnpkTfuDoaIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); cmLListInit(¶m->doaRpt); @@ -12952,7 +12717,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuSrsRpt) CMCHKPK(oduUnpackUInt8, param->wideCqi, mBuf); CMCHKPK(oduUnpackUInt8, param->wideCqiPres, mBuf); @@ -13000,7 +12764,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuSrsRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->dopEst, mBuf); @@ -13053,7 +12816,6 @@ Buffer *mBuf; U32 count; TfuSrsRpt *tfuSrsRpt; - TRC3(cmPkTfuSrsIndInfo) count = param->srsRpt.count; node = param->srsRpt.last; @@ -13109,7 +12871,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuSrsRpt *tfuSrsRpt; - TRC3(cmUnpkTfuSrsIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -13160,7 +12921,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuRawCqiRpt) #ifdef TFU_5GTF CMCHKPK(oduUnpackUInt32, param->uciPayload, mBuf); #else @@ -13213,7 +12973,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuRawCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); @@ -13268,7 +13027,6 @@ Buffer *mBuf; TfuRawCqiRpt *tfuRawCqiRpt; CmLList *node; - TRC3(cmPkTfuRawCqiIndInfo) count = param->rawCqiRpt.count; node = param->rawCqiRpt.last; @@ -13323,7 +13081,6 @@ Buffer *mBuf; U32 count, loopCnt; TfuRawCqiRpt *tfuRawCqiRpt; - TRC3(cmUnpkTfuRawCqiIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -13374,7 +13131,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkTfuUePucchHqRecpInfo) CMCHKPK(oduUnpackUInt8, param->a, mBuf); for (i=TFU_MAX_HQ_RES-1; i >= 0; i--) { @@ -13418,7 +13174,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkTfuUePucchHqRecpInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); @@ -13469,7 +13224,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchHqRecpInfo) #ifdef LTE_ADV S32 idx; for (idx=(TFU_MAX_HQ_RES-1); idx >= 0; idx--) { @@ -13515,7 +13269,6 @@ TfuUePucchHqRecpInfo *param; Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchHqRecpInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); @@ -13567,7 +13320,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchSrRecpInfo) CMCHKPK(oduUnpackUInt16, param->n1PucchIdx, mBuf); return ROK; @@ -13604,7 +13356,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchSrRecpInfo) CMCHKUNPK(oduPackUInt16, ¶m->n1PucchIdx, mBuf); return ROK; @@ -13641,7 +13392,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchCqiRecpInfo) CMCHKPK(oduUnpackUInt8, param->cqiPmiSz, mBuf); CMCHKPK(oduUnpackUInt16, param->n2PucchIdx, mBuf); @@ -13679,7 +13429,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchCqiRecpInfo) CMCHKUNPK(oduPackUInt16, ¶m->n2PucchIdx, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSz, mBuf); @@ -13717,7 +13466,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchSrsRecpInfo) CMCHKPK(oduUnpackUInt32, param->srsCyclicShft, mBuf); CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf); @@ -13742,7 +13490,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchUciRecpInfo) CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); CMCHKPK(oduUnpackUInt8, param->pucchIndex, mBuf); @@ -13781,7 +13528,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchSrsRecpInfo) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsBw, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->nRrc, mBuf); @@ -13822,7 +13568,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchBsiBriRecpInfo) CMCHKPK(oduUnpackUInt8, param->briRpt, mBuf); CMCHKPK(oduUnpackUInt8, param->bsiRpt, mBuf); @@ -13861,7 +13606,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchBsiBriRecpInfo) CMCHKUNPK(oduPackUInt8, ¶m->puschFlag, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); @@ -13886,7 +13630,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchUciRecpInfo) CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); @@ -13937,7 +13680,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePucchRecpReq) #ifdef TFU_5GTF CMCHKPK(cmPkTfuUePucchBsiBriRecpInfo, ¶m->bsiBriInfo, mBuf); @@ -13993,7 +13735,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePucchRecpReq) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->uciInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchCqiRecpInfo, ¶m->cqiInfo, mBuf); @@ -14038,7 +13779,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUeUlSchRecpInfo) #ifdef TFU_5GTF CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); CMCHKPK(oduUnpackUInt8, param->uciWoTBFlag, mBuf); @@ -14099,7 +13839,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUeUlSchRecpInfo) CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); @@ -14161,7 +13900,6 @@ Buffer *mBuf; { U32 idx = 0; - TRC3(cmPkTfuUePuschCqiRecpInfo) CMCHKPK(oduUnpackUInt8, param->riBetaOff, mBuf); CMCHKPK(oduUnpackUInt8, param->cqiBetaOff, mBuf); @@ -14208,7 +13946,6 @@ Buffer *mBuf; { U32 idx; - TRC3(cmUnpkTfuUePuschCqiRecpInfo) CMCHKUNPK(oduPackUInt8, ¶m->reportType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->cCNum, mBuf); @@ -14254,7 +13991,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePuschHqRecpInfo) #ifdef TFU_TDD @@ -14298,7 +14034,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePuschHqRecpInfo) CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->hqBetaOff, mBuf); @@ -14350,7 +14085,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePuschRecpReq) CMCHKPK(cmPkTknU8, ¶m->initialNumRbs, mBuf); CMCHKPK(cmPkTknU8, ¶m->initialNSrs, mBuf); @@ -14401,7 +14135,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePuschRecpReq) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->rcpInfo, mBuf); CMCHKUNPK(cmUnpkTfuUeUlSchRecpInfo, ¶m->ulSchInfo, mBuf); @@ -14445,7 +14178,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUeRecpReqInfo) switch(param->type) { case TFU_RECP_REQ_PUSCH: @@ -14497,7 +14229,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUeRecpReqInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef TFU_5GTF @@ -14555,7 +14286,6 @@ Buffer *mBuf; #ifdef TFU_TDD S32 i; #endif - TRC3(cmPkTfuUePucchRecpReq) #ifdef TFU_TDD @@ -14636,7 +14366,6 @@ Buffer *mBuf; #ifdef TFU_TDD S32 i; #endif - TRC3(cmUnpkTfuUePucchRecpReq) CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqType, mBuf); switch(param->hqType) { @@ -14709,7 +14438,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUeMsg3RecpReq) CMCHKPK(oduUnpackUInt32, param->modType, mBuf); CMCHKPK(oduUnpackUInt16, param->size, mBuf); @@ -14759,7 +14487,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUeMsg3RecpReq) CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); @@ -14812,7 +14539,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUePuschRecpReq) CMCHKPK(oduUnpackUInt32, param->modType, mBuf); CMCHKPK(oduUnpackUInt16, param->size, mBuf); @@ -14866,7 +14592,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUePuschRecpReq) CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); @@ -14918,7 +14643,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuUeRecpReqInfo) switch(param->type) { case TFU_RECP_REQ_PUSCH: @@ -14970,7 +14694,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuUeRecpReqInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); @@ -15023,7 +14746,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkTfuErrIndInfo) CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -15058,7 +14780,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkTfuErrIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); @@ -15106,7 +14827,6 @@ TfuErrIndInfo * errInd; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkTfuErrInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -15213,7 +14933,6 @@ Buffer *mBuf; SuId suId; TfuErrIndInfo *errInd; - TRC3(cmUnpkTfuErrInd) if (SUnpkS16(&suId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c index caa75f0b0..04b0c70a7 100644 --- a/src/cu_stub/cu_f1ap_msg_hdl.c +++ b/src/cu_stub/cu_f1ap_msg_hdl.c @@ -469,7 +469,7 @@ S16 BuildAndSendF1SetupRsp() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as UPER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); @@ -598,7 +598,7 @@ S16 BuildAndSendDUUpdateAck() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as UPER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; enRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); @@ -769,7 +769,7 @@ uint8_t BuildAndSendF1ResetReq() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -991,7 +991,7 @@ uint8_t BuildDLRRCContainer(RRCContainer_t *rrcContainer) { /* encode DL-CCCH message into RRC Container */ xer_fprint(stdout, &asn_DEF_DL_CCCH_MessageType, &dl_CCCH_Msg); - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_DL_CCCH_MessageType, 0, &dl_CCCH_Msg, PrepFinalEncBuf, encBuf); /* Encode results */ @@ -1171,7 +1171,7 @@ S16 BuildAndSendDLRRCMessageTransfer() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -1317,7 +1317,7 @@ S16 BuildAndSendUESetRsp() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -2461,7 +2461,7 @@ uint8_t BuildAndSendUESetReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \ xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -2666,7 +2666,7 @@ uint8_t BuildAndSendF1ResetAck() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as UPER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); diff --git a/src/cu_stub/cu_stub.h b/src/cu_stub/cu_stub.h index 138c788c8..b2325c14f 100644 --- a/src/cu_stub/cu_stub.h +++ b/src/cu_stub/cu_stub.h @@ -34,7 +34,7 @@ _ret = SGetSBuf(CU_APP_MEM_REG, CU_POOL, \ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - cmMemset((U8*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } diff --git a/src/cu_stub/cu_stub_egtp.c b/src/cu_stub/cu_stub_egtp.c index b5172a75a..dfdacbbb0 100644 --- a/src/cu_stub/cu_stub_egtp.c +++ b/src/cu_stub/cu_stub_egtp.c @@ -48,7 +48,7 @@ EgtpGlobalCb egtpCb; S16 egtpActvInit() { DU_LOG("\n\nEGTP : Initializing"); - cmMemset ((U8 *)&egtpCb, 0, sizeof(EgtpGlobalCb)); + memset (&egtpCb, 0, sizeof(EgtpGlobalCb)); protType = CM_INET_PROTO_UDP; return ROK; } @@ -123,7 +123,7 @@ S16 cuEgtpCfgReq() { U8 ret; - cmMemcpy((U8 *)&egtpCb.egtpCfg, (U8 *)&cuCfgParams.egtpParams, (PTR)sizeof(EgtpParams)); + memcpy(&egtpCb.egtpCfg, &cuCfgParams.egtpParams, sizeof(EgtpParams)); egtpCb.recvTptSrvr.addr.address = CM_INET_NTOH_U32(egtpCb.egtpCfg.localIp.ipV4Addr); egtpCb.recvTptSrvr.addr.port = EGTP_DFLT_PORT; @@ -289,7 +289,7 @@ S16 cuEgtpTnlAdd(EgtpTnlEvt tnlEvt) } - cmMemset((U8 *)teidCb, 0, sizeof(EgtpTeIdCb)); + memset(teidCb, 0, sizeof(EgtpTeIdCb)); teidCb->teId = tnlEvt.lclTeid; teidCb->remTeId = tnlEvt.remTeid; @@ -303,7 +303,7 @@ S16 cuEgtpTnlAdd(EgtpTnlEvt tnlEvt) egtpCb.dstCb.numTunn++; /* Encoding pre-defined header */ - cmMemset((U8*)&preDefHdr, 0, sizeof(EgtpMsgHdr)); + memset(&preDefHdr, 0, sizeof(EgtpMsgHdr)); preDefHdr.msgType = EGTPU_MSG_GPDU; preDefHdr.teId = teidCb->remTeId; preDefHdr.extHdr.pdcpNmb.pres = FALSE; @@ -678,7 +678,7 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) mLen = 0; ODU_GET_MSG_LEN(mBuf, &mLen); - cmMemset((U8 *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); + memset(&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); ipv4Hdr.length = CM_IPV4_HDRLEN + mLen; ipv4Hdr.hdrVer = 0x45; ipv4Hdr.proto = 1; @@ -692,8 +692,8 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) /* initialize locals */ cnt = 0; - cmMemset(revPkArray, 0, CM_IPV4_HDRLEN); - cmMemset(pkArray, 0, CM_IPV4_HDRLEN); + memset(revPkArray, 0, CM_IPV4_HDRLEN); + memset(pkArray, 0, CM_IPV4_HDRLEN); /* Pack Header Version */ pkArray[cnt++] = ipv4Hdr.hdrVer; diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 9170ba830..3e821049a 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -769,7 +769,7 @@ uint8_t duReadCfg() Pst pst; Buffer *mBuf; - memset((uint8_t *)&duCfgParam, 0, sizeof(DuCfgParams)); + memset(&duCfgParam, 0, sizeof(DuCfgParams)); //Read configs into duCfgParams if(readCfg() != ROK) { @@ -778,7 +778,7 @@ uint8_t duReadCfg() } //Fill pst structure - memset((uint8_t *)&(pst), 0, sizeof(Pst)); + memset(&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTDUAPP; pst.srcInst = (Inst)DU_INST; pst.srcProcId = DU_PROC; diff --git a/src/du_app/du_e2ap_msg_hdl.c b/src/du_app/du_e2ap_msg_hdl.c index be05d8f1a..d8f98ba75 100644 --- a/src/du_app/du_e2ap_msg_hdl.c +++ b/src/du_app/du_e2ap_msg_hdl.c @@ -236,7 +236,7 @@ uint8_t BuildAndSendE2SetupReq() /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\ encBuf); @@ -678,7 +678,7 @@ uint8_t BuildAndSendRicSubscriptionRsp() /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apRicMsg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\ encBuf); @@ -1111,7 +1111,7 @@ uint8_t BuildAndSendRicIndication() } /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\ encBuf); diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c index 3da107443..36f03fea5 100644 --- a/src/du_app/du_egtp.c +++ b/src/du_app/du_egtp.c @@ -56,7 +56,7 @@ uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) { DU_LOG("\n\nEGTP : Initializing"); - memset ((uint8_t *)&egtpCb, 0, sizeof(EgtpGlobalCb)); + memset (&egtpCb, 0, sizeof(EgtpGlobalCb)); protType = CM_INET_PROTO_UDP; return ROK; @@ -169,7 +169,7 @@ uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) Pst rspPst; /* Response Pst structure */ CmStatus cfgCfm; /* Configuration Confirm */ - memcpy((uint8_t *)&egtpCb.egtpCfg, (uint8_t *)&egtpCfg, (PTR)sizeof(EgtpConfig)); + memcpy(&egtpCb.egtpCfg, &egtpCfg, sizeof(EgtpConfig)); egtpCb.recvTptSrvr.addr.address = CM_INET_NTOH_U32(egtpCb.egtpCfg.localIp.ipV4Addr); egtpCb.recvTptSrvr.addr.port = EGTP_DFLT_PORT; @@ -222,7 +222,7 @@ uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) uint8_t egtpFillRspPst(Pst *pst, Pst *rspPst) { - memset((uint8_t *)rspPst, 0, sizeof(Pst)); + memset(rspPst, 0, sizeof(Pst)); rspPst->srcEnt = pst->dstEnt; rspPst->srcInst = pst->dstInst; rspPst->srcProcId = pst->dstProcId; @@ -423,7 +423,7 @@ uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt) return LCM_REASON_MEM_NOAVAIL; } - memset((uint8_t *)teidCb, 0, sizeof(EgtpTeIdCb)); + memset(teidCb, 0, sizeof(EgtpTeIdCb)); teidCb->teId = tnlEvt.lclTeid; teidCb->remTeId = tnlEvt.remTeid; @@ -437,7 +437,7 @@ uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt) egtpCb.dstCb.numTunn++; /* Encoding pre-defined header */ - memset((uint8_t*)&preDefHdr, 0, sizeof(EgtpMsgHdr)); + memset(&preDefHdr, 0, sizeof(EgtpMsgHdr)); preDefHdr.msgType = EGTPU_MSG_GPDU; preDefHdr.teId = teidCb->remTeId; preDefHdr.extHdr.pdcpNmb.pres = FALSE; diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c index ad75fd191..2be5f9250 100644 --- a/src/du_app/du_f1ap_msg_hdl.c +++ b/src/du_app/du_f1ap_msg_hdl.c @@ -1141,7 +1141,7 @@ uint8_t BuildAndSendF1SetupReq() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -1617,7 +1617,7 @@ uint8_t BuildAndSendDUConfigUpdate() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apDuCfg); /* Encode the DU Config Update type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apDuCfg, PrepFinalEncBuf, encBuf); @@ -2061,7 +2061,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb ueCb, uint8_t lcId, \ xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -4962,7 +4962,7 @@ uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer) /* encode cellGrpCfg into duToCuRrcContainer */ xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf); /* Encode results */ @@ -5141,7 +5141,7 @@ uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); /* Encode results */ @@ -5374,7 +5374,7 @@ uint8_t BuildAndSendUESetRsp() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the UE context setup response type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -5540,7 +5540,7 @@ uint8_t BuildAndSendF1ResetReq() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -5694,7 +5694,7 @@ uint8_t BuildAndSendF1ResetAck() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as UPER */ - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); @@ -5960,7 +5960,7 @@ uint8_t BuildAndSendRrcDeliveryReport(uint32_t gnbCuUeF1apId, uint32_t gnbDuUeF1 xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the RRC DELIVERY REPORT type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h index c88061337..d3b5ea2d6 100644 --- a/src/du_app/du_mgr.h +++ b/src/du_app/du_mgr.h @@ -55,7 +55,7 @@ #define MAC_CONFIGURED (MAC_GEN_CFG | MAC_SAP_CFG) #define DU_SET_ZERO(_buf, _size) \ - memset((uint8_t *)(_buf), 0, _size); + memset((_buf), 0, _size); typedef enum { diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index 9964bbe52..50758229e 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -889,11 +889,10 @@ uint8_t duBindUnbindRlcToMacSap(uint8_t inst, uint8_t action) { RlcCntrl *cntrl = NULLP; RlcMngmt rlcMngmt; - Pst pst; + Pst pst; - TRC2(smBindKwToRguSap) - DU_SET_ZERO(&rlcMngmt, sizeof(RlcMngmt)); + DU_SET_ZERO(&rlcMngmt, sizeof(RlcMngmt)); DU_SET_ZERO(&pst, sizeof(Pst)); if (action == ABND) @@ -994,7 +993,7 @@ uint8_t duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy) * ****************************************************************/ uint8_t duFillEgtpPst(Pst *pst, Event event) { - memset((uint8_t *)pst, 0, sizeof(Pst)); + memset(pst, 0, sizeof(Pst)); pst->srcEnt = (Ent)ENTDUAPP; pst->srcInst = (Inst)DU_INST; pst->srcProcId = DU_PROC; @@ -1033,8 +1032,8 @@ uint8_t duBuildEgtpCfgReq() DU_LOG("\nDU_APP : Sending EGTP config request"); - memset((uint8_t *)&egtpCfg, 0, sizeof(EgtpConfig)); - memcpy((uint8_t *)&egtpCfg, (uint8_t *)&duCfgParam.egtpParams, (PTR)sizeof(EgtpConfig)); + memset(&egtpCfg, 0, sizeof(EgtpConfig)); + memcpy(&egtpCfg, &duCfgParam.egtpParams, sizeof(EgtpConfig)); duFillEgtpPst(&pst, EVTCFGREQ); packEgtpCfgReq(&pst, egtpCfg); @@ -1278,7 +1277,7 @@ uint8_t duSendEgtpTestData() mLen = 0; ODU_GET_MSG_LEN(mBuf, &mLen); - memset((uint8_t *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); + memset(&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); ipv4Hdr.length = CM_IPV4_HDRLEN + mLen; ipv4Hdr.hdrVer = 0x45; ipv4Hdr.proto = 1; diff --git a/src/du_app/du_sctp.c b/src/du_app/du_sctp.c index 19a26c77a..6678911cd 100644 --- a/src/du_app/du_sctp.c +++ b/src/du_app/du_sctp.c @@ -159,7 +159,7 @@ uint8_t duSctpCfgReq(SctpParams sctpCfg) f1Params.itfState = DU_SCTP_DOWN; f1Params.srcPort = sctpCfg.duPort[F1_INTERFACE]; f1Params.recvMsgSet = ROK; - memset ((uint8_t *)&f1Params.sockFd, -1, sizeof(CmInetFd)); + memset (&f1Params.sockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&f1Params.destIpNetAddr, &f1Params.destIpAddr); fillAddrLst(&f1Params.destAddrLst, &f1Params.destIpAddr); @@ -170,7 +170,7 @@ uint8_t duSctpCfgReq(SctpParams sctpCfg) ricParams.itfState = DU_SCTP_DOWN; ricParams.srcPort = sctpCfg.duPort[E2_INTERFACE]; ricParams.recvMsgSet = ROK; - memset ((uint8_t *)&ricParams.sockFd, -1, sizeof(CmInetFd)); + memset (&ricParams.sockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&ricParams.destIpNetAddr, &ricParams.destIpAddr); fillAddrLst(&ricParams.destAddrLst, &ricParams.destIpAddr); @@ -401,7 +401,7 @@ uint8_t duFillSctpPst(Pst *pst, Event event) printf("\nDU_APP : Failed to allocate memory"); return RFAILED; } - memset((uint8_t *)pst, 0, sizeof(Pst)); + memset(pst, 0, sizeof(Pst)); pst->srcEnt = (Ent)ENTDUAPP; pst->srcInst = (Inst)DU_INST; pst->srcProcId = DU_PROC; @@ -479,7 +479,7 @@ void sendToDuApp(Buffer *mBuf, Event event) ODU_PRINT_MSG(mBuf, 0, 0); - memset((uint8_t *)&(pst), 0, sizeof(Pst)); + memset(&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTSCTP; pst.srcInst = (Inst)SCTP_INST; pst.srcProcId = DU_PROC; @@ -577,7 +577,7 @@ uint8_t sctpNtfyHdlr(CmInetSctpNotification *ntfy, uint8_t *itfState) /* Pack notification and send to APP */ DU_LOG("\nSCTP : Forwarding received message to duApp"); - memset((uint8_t *)&(pst), 0, sizeof(Pst)); + memset(&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTSCTP; pst.srcInst = (Inst)SCTP_INST; pst.srcProcId = DU_PROC; diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c index 0fb3fe48c..708d89a38 100644 --- a/src/du_app/du_sys_info_hdl.c +++ b/src/du_app/du_sys_info_hdl.c @@ -196,7 +196,7 @@ uint8_t BuildMibPdu() break; } xer_fprint(stdout, &asn_DEF_BCCH_BCH_Message, bcchMsg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_BCCH_BCH_Message, 0, bcchMsg, PrepFinalEncBuf, encBuf); @@ -292,7 +292,7 @@ uint8_t BuildMibMsg() break; } xer_fprint(stdout, &asn_DEF_MIB, mibMsg); - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_MIB, 0, mibMsg, PrepFinalEncBuf, encBuf); @@ -2342,7 +2342,7 @@ uint8_t BuildSib1Msg() xer_fprint(stdout, &asn_DEF_SIB1, sib1Msg); /* Encode the F1SetupRequest type as APER */ - memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_SIB1, 0, sib1Msg, PrepFinalEncBuf,\ encBuf); diff --git a/src/du_app/du_utils.h b/src/du_app/du_utils.h index 4ddc7d249..7146dc3c2 100644 --- a/src/du_app/du_utils.h +++ b/src/du_app/du_utils.h @@ -48,7 +48,7 @@ _ret = SGetSBuf(DU_APP_MEM_REGION, DU_POOL, \ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - memset((uint8_t*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } @@ -66,7 +66,7 @@ if(SGetStaticBuffer(DU_APP_MEM_REGION, DU_POOL, \ (Data **)&_buf, (Size) _size, 0) == ROK) \ { \ - memset((uint8_t *)(_buf), 0, _size); \ + memset((_buf), 0, _size); \ } \ else \ { \ diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 8cdf6476c..962682236 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -815,7 +815,6 @@ int argc; /* argument count */ char **argv; /* argument vector */ #endif { - TRC0(main); #ifdef XEON_MULTIPLE_CELL_CHANGES /* Read the WLS parameters from the file and copy into global control block */ @@ -876,7 +875,6 @@ int argc; /* argument count */ char **argv; /* argument vector */ #endif { - TRC0(ssMain); msArgc = argc; @@ -922,7 +920,6 @@ S16 ssdInitGen() struct sigaction sa; #endif - TRC0(ssdInitGen); /*mt014.301 : 4GMX release related changes*/ #ifdef SS_4GMX_UCORE @@ -1076,7 +1073,6 @@ void Void ssdDeinitGen() #endif { - TRC0(ssdDeinitGen); sem_destroy(&osCp.dep.ssStarted); @@ -1243,7 +1239,6 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock CmMmBlkSetElement *globMemNode; S16 lockRet = 0; - TRC1(ssPutDynMemBlkSet); globReg = osCp.globRegCb; @@ -1331,7 +1326,6 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock CmMmBlkSetElement *globMemNode; S16 lockRet = 0; - TRC1(ssGetDynMemBlkSet); globReg = osCp.globRegCb; @@ -1395,7 +1389,6 @@ Region reg; CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; U8 bktIdx= reg; - TRC3(isMemThreshReached) globReg = osCp.globRegCb; @@ -1681,7 +1674,6 @@ S16 ssdInitMem() #endif #endif /* SS_LOCKLESS_MEMORY */ - TRC0(ssdInitMem); /* Use the default SSI memory manager if the ICC memory manager is not * avilable. If ICC memory manager is avilable, it will be used for @@ -1977,7 +1969,6 @@ Void ssdDeinitMem() /* mt018.201 - added local variables */ U8 i; - TRC0(ssdDeinitMem); /* mt008.301 Additions */ #ifdef SS_MEM_LEAK_STS cmDeinitMemLeakMdl(); @@ -2024,7 +2015,6 @@ S16 ssdInitTsk() U32 tskInd = 0; #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ - TRC0(ssdInitTsk); /*mt013.301 :Added SS_AFFINITY_SUPPORT */ @@ -2062,7 +2052,6 @@ void Void ssdDeinitTsk() #endif { - TRC0(ssdDeinitTsk); RETVOID; } @@ -2097,7 +2086,6 @@ S16 ssdInitDrvr() pthread_attr_t attr; #endif - TRC0(ssdInitDrvr); /* initialize the dependent portion of the driver task entries */ @@ -2171,7 +2159,6 @@ void Void ssdDeinitDrvr() #endif { - TRC0(ssdDeinitDrvr); /* mt008.301: Terminate the Driver Task on exit */ while(pthread_cancel(osCp.dep.isTskHdlrTID)); @@ -2222,7 +2209,6 @@ S16 ssdInitTmr() U32 threadCreated = FALSE; #endif /* SS_THR_REG_MAP */ - TRC0(ssdInitTmr); osCp.dep.tmrTqCp.tmrLen = SS_MAX_TMRS; @@ -2314,7 +2300,6 @@ Void ssdDeinitTmr() S16 ret; #endif /* SS_MULTICORE_SUPPORT */ - TRC0(ssdDeinitTmr); #ifdef SS_MULTICORE_SUPPORT ret = SLock(&osCp.sTskTblLock); @@ -2388,7 +2373,6 @@ S16 ssdInitLog() #endif /* CONAVL */ /* mt008.301: ssdInitFinal changed to ssdInitLog */ - TRC0(ssdInitLog); #ifdef CONAVL @@ -2483,7 +2467,6 @@ Void ssdDeinitLog() #endif { /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */ - TRC0(ssdDeinitLog); #ifdef CONAVL #ifndef CONRD /* mt008.301: Terminate the console reader on exit */ @@ -2524,7 +2507,6 @@ U16 port; } #endif /* SS_MULTIPLE_PROCS */ - TRC0(ssdInitWatchDog); SInitLock(&osCp.wdCp.wdLock, SS_LOCK_MUTEX); @@ -2631,7 +2613,6 @@ S16 ssdInitWatchDgPst(pst) Pst *pst; #endif { - TRC1(ssInitWatchDgPst); pst->selector = SS_LOOSE_COUPLING; @@ -2671,7 +2652,6 @@ S16 ssdWatchDgActvTmr() #endif #endif /* SS_MULTIPLE_PROCS */ { - TRC3(ssWatchDgActvTmr); cmPrcTmr(&osCp.wdCp.watchDgTqCp, osCp.wdCp.watchDgTs, (PFV)ssdWatchDgTmrEvt); @@ -2698,7 +2678,6 @@ S16 event; /* timer number */ Bool restartTmr; int i; - TRC2(ssWatchDgTmrEvt); switch(event) { @@ -2761,7 +2740,6 @@ U16 wait; #endif - TRC2(ssStartWatchDgTmr) /* mt003.301 Modifications */ #ifdef DEBUGP SGetDateTime(&dt); @@ -2814,7 +2792,6 @@ S16 event; int i; #endif - TRC2(ssStopWatchDgTmr) /* mt003.301 Modifications */ #ifdef DEBUGP SGetDateTime(&dt); @@ -2868,7 +2845,6 @@ U32 type; int n; int err; - TRC2(ssdSndHrtBtReq) #ifdef DEBUGP SGetDateTime(&dt); @@ -2982,7 +2958,6 @@ PRIVATE Void mtGetOpts() Cntr idx=0; #endif - TRC0(mtGetOpts); msOptInd = 1; @@ -3347,7 +3322,6 @@ char *opts; /* options */ S8 *cp; #endif - TRC1(SGetOpt); /* mt020.201 - Addition for no command line */ #ifdef NOCMDLINE @@ -3453,7 +3427,6 @@ Void ssdStart() S16 i; - TRC0(ssdStart); /* mt025.201 - Modification for adding lock to timer handler */ @@ -3500,10 +3473,6 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ SsMsgInfo *mInfo; S16 ret; - - TRC0(ssdAttachTTsk); - - if (tTsk->tskType == SS_TSK_PERMANENT) { /* Send a permanent tick message to this task, to start @@ -3584,8 +3553,6 @@ S16 ssdDetachTTsk(tTsk) SsTTskEntry *tTsk; /* pointer to TAPA task entry */ #endif { - TRC0(ssdDetachTTsk); - return ROK; } @@ -3623,7 +3590,6 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ U32 threadCreated = FALSE; #endif - TRC0(ssdCreateSTsk); #ifdef SS_SINGLE_THREADED @@ -3770,7 +3736,6 @@ void* arg; threadArg->argument = arg; threadArg->start_routine = start_routine; - TRC0(SCreatePThread); printf("Creating thread here %s %d\n", __FILE__, __LINE__); { @@ -3829,7 +3794,6 @@ pthread_attr_t *attr { struct sched_param param; - TRC0 (ssdSetPthreadAttr) SMemSet(¶m, 0, sizeof(param)); @@ -3920,7 +3884,6 @@ U32 *coreId; /* the core/processor id to which the affinity i U32 lwpId = *tskId; #endif /*SUNOS*/ #endif /*SS_LINUX*/ - TRC0(ssdGetAffinity); #ifdef SS_LINUX for (tskInd = 0; tskInd < SS_MAX_STSKS; tskInd++) { @@ -4036,7 +3999,6 @@ U32 coreId; /* the core/processor id to which the affinity h #endif /*SUNOS*/ #endif /*SS_LINUX*/ - TRC0(ssdSetAffinity) #ifdef SS_LINUX for (tskInd = 0; tskInd < SS_MAX_STSKS; tskInd++) @@ -4138,7 +4100,6 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ SsMsgInfo *mInfo; - TRC0(ssdDestroySTsk); /* we send a message to this system task to tell it to die */ @@ -4196,7 +4157,6 @@ S16 SThreadYield() #endif { - TRC0(SThreadYield); /* mt024.201 - seperated Linux and other UNIX implementations */ @@ -4251,7 +4211,6 @@ SsTmrEntry *tmr; /* pointer to timer entry */ CmTmrArg arg; - TRC0(ssdRegTmr); /* initialize common timers */ @@ -4301,7 +4260,6 @@ SsTmrEntry *tmr; /* pointer to timer entry */ CmTmrArg arg; - TRC0(ssdDeregTmr); /* stop the timer */ @@ -4351,7 +4309,6 @@ Reason reason; /* reset reason */ Txt errBuf[256]; - TRC0(ssdError); /* get calling task ID */ @@ -4432,7 +4389,6 @@ Txt *errDesc; /* description of error */ Txt errBuf[512]; - TRC0(ssdLogError); /* get calling task ID */ @@ -4541,7 +4497,6 @@ S16 ssdRegDrvrTsk(drvrTsk) SsDrvrTskEntry *drvrTsk; /* driver task entry */ #endif { - TRC0(ssdRegDrvrTsk); return ROK; @@ -4571,7 +4526,6 @@ S16 ssdDeregDrvrTsk(drvrTsk) SsDrvrTskEntry *drvrTsk; /* driver task entry */ #endif { - TRC0(ssdDeregDrvrTsk); return ROK; @@ -4621,7 +4575,6 @@ SsIdx idx; S16 n; S16 ret; - TRC0(ssdProcTTskTerm); ent = tTsk->ent; @@ -5584,7 +5537,6 @@ S16 evnt; /* event */ #endif #endif - TRC0(mtTimeout); /* get the timer entry */ @@ -5875,10 +5827,6 @@ Ptr tskPtr; /* pointer to task entry */ #endif MtIsFlag isFlag; - - TRC0(mtIsTskHdlr); - - for (; ;) { if (read(osCp.dep.isFildes[0], &isFlag, sizeof(isFlag)) != sizeof(isFlag)) @@ -5978,8 +5926,6 @@ int arg; #endif { - TRC0(mtIntSigHndlr); - osCp.dep.sigEvnt=TRUE; #ifdef MSPD @@ -6018,8 +5964,6 @@ Void mtExitClnup() S8 buf[128]; - TRC0(mtExitClnup); - SGetSysTime(&ticks); #ifdef ALIGN_64BIT sprintf(buf, "\n\nmtss(posix) ends\nticks: %u\n", ticks); @@ -6081,7 +6025,6 @@ S16 chan; /* channel */ Txt *buf; /* buffer */ #endif { - TRC1(SDisplay); /* mt020.201 - Fixed typo */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6149,7 +6092,6 @@ void S16 SFini() #endif { - TRC1(SFini); /* mt030.201 added under compilet time flag SS_LINUX and SLES9_PLUS a loop to overcome the child processes being killed upon exiting the @@ -6195,8 +6137,6 @@ S16 SSetDateTime(dt) REG1 DateTime *dt; /* date and time */ #endif { - TRC1(SSetDateTime); - UNUSED(dt); @@ -6242,8 +6182,6 @@ REG1 DateTime *dt; /* date and time */ struct tm tme; - TRC1(SGetDateTime); - #if (ERRCLASS & ERRCLS_INT_PAR) if (dt == NULLP) @@ -6322,7 +6260,6 @@ PRIVATE U64 now; struct timeval ptime; #endif - TRC1(SEpcTime); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6379,7 +6316,6 @@ S16 SGetSysTime(sysTime) Ticks *sysTime; /* system time */ #endif { - TRC1(SGetSysTime); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6438,7 +6374,6 @@ U32 *usec; struct timeval ptime; #endif - TRC1(SGetSysTime); #ifndef SS_LINUX clock_gettime(CLOCK_REALTIME, &ptime); @@ -6497,7 +6432,6 @@ S16 SRandom(value) Random *value; /* random number */ #endif { - TRC1(SRandom); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6539,7 +6473,6 @@ void S16 SExitTsk() #endif { - TRC1(SExitTsk); return ROK; @@ -6568,7 +6501,6 @@ void S16 SExitInt() #endif { - TRC1(SExitInt); return ROK; @@ -6601,7 +6533,6 @@ void S16 SHoldInt() #endif { - TRC1(SHoldInt); return ROK; @@ -6630,7 +6561,6 @@ void S16 SRelInt() #endif { - TRC1(SRelInt); return ROK; @@ -6660,7 +6590,6 @@ void INLINE S16 SEnbInt() #endif { - TRC1(SEnbInt); return ROK; @@ -6690,7 +6619,6 @@ void INLINE S16 SDisInt() #endif { - TRC1(SDisInt); return ROK; @@ -6723,7 +6651,6 @@ VectNmb vectNmb; /* vector number */ PIF *vectFnct; /* vector function */ #endif { - TRC1(SGetVect); UNUSED(vectNmb); @@ -6760,7 +6687,6 @@ VectNmb vectNmb; /* vector number */ PIF vectFnct; /* vector function */ #endif { - TRC1(SPutVect); UNUSED(vectNmb); @@ -6806,7 +6732,6 @@ Inst *inst; /* instance */ SsSTskEntry *sTsk; - TRC1(SGetEntInst); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6881,7 +6806,6 @@ Inst inst; /* instance */ SsSTskEntry *sTsk; - TRC1(SSetEntInst); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -6957,7 +6881,6 @@ Bool flag; /* flag */ MtIsFlag isFlag; - TRC1(SSetIntPend); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -7011,7 +6934,6 @@ S16 SGlobMemInfoShow() Txt prntBuf[100]; CmMmGlobRegCb *globReg; - TRC1(SGlobMemInfoShow); globReg = osCp.globRegCb; @@ -7115,7 +7037,6 @@ U32 *availmem; U16 idx; Txt prntBuf[100]; - TRC1(SRegInfoShow); #if (ERRCLASS & ERRCLS_INT_PAR) if (region > (SS_MAX_REGS-1) ) @@ -7303,7 +7224,6 @@ SsMemDbgInfo *dbgInfo; { U32 idx; - TRC1(SGetRegInfo); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) @@ -7407,7 +7327,6 @@ U8 typeFlag; U32 statMemSize; U32 dynMemSize; - TRC1(SPrintRegMemStatusInfo); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) @@ -7520,7 +7439,6 @@ Region region; U32 idx; U32 cntEnt; - TRC1(SPrintRegMemStats); hashListCp = &mtCMMRegCb[region]->hashListCp; @@ -7628,7 +7546,6 @@ S16 errCode; { Txt prntBuf[150]; - TRC1(SRegMemErrHdlr); if (errCode == RDBLFREE) { @@ -7681,7 +7598,6 @@ Region region; U32 blkCnt; - TRC1(SPrintRegMemProfile); #if (ERRCLASS & ERRCLS_INT_PAR) if (region >= mtMemoCfg.numRegions ) @@ -7916,7 +7832,6 @@ S8 *ts; S8 time_string[40]; S32 microseconds; - TRC1(SGetTimeStamp); #ifndef SS_LINUX clock_gettime(CLOCK_REALTIME, &ptime); @@ -7975,7 +7890,6 @@ Void U32 SGetSystemTsk() #endif { - TRC1(SGetSystemTskS); return (pthread_self()); @@ -8005,7 +7919,6 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() SsSTskEntry *sTsk; S16 ret; - TRC1(ssdAddTmrSTsk); sTsk = NULLP; /* lock the system task table */ ret = SLock(&osCp.sTskTblLock); @@ -8146,7 +8059,6 @@ U8 lockType; Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdInitLockNew); switch(lockType) { @@ -8234,7 +8146,6 @@ U8 lockType; Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdLockNew); switch(lockType) { @@ -8333,7 +8244,6 @@ U8 lockType; Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdUnlockNew); switch(lockType) { @@ -8399,7 +8309,6 @@ U8 lockType; Txt prntBuf[PRNTSZE]; S16 retVal = ROK; - TRC1(ssdDestroyLockNew); switch(lockType) { @@ -8470,7 +8379,6 @@ S16 ssInitRcvWork() pthread_attr_t attr; pthread_t thread; - TRC1(ssInitRcvWork); /* set the required attributes */ pthread_attr_init(&attr); @@ -8529,7 +8437,6 @@ PRIVATE void *workRcvTsk (ptr) struct timespec ts; Pst pst; - TRC1(workRcvTsk); for (;;) @@ -8690,7 +8597,6 @@ Region region /* Region associated with thread */ PRIVATE pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; U32 indx; - TRC1(ssCheckAndAddMemoryRegionMap); /* Here 0xFF is considered as invalid region and if the mapping table * contains 0xFF, that mapping entry is free @@ -8760,7 +8666,6 @@ pthread_t threadId /* Thread Id of system task */ ) { - TRC1(ssCheckAndDelMemoryRegionMap); /* Raghu To-Do Check with team, is it necessary to acquire lock * as del and add may go parallel */ @@ -9028,7 +8933,6 @@ U8 idx; SsSTskEntry *sTsk; S16 ret; - TRC1(ssdReAddTmrSTsk); sTsk = NULLP; /* lock the system task table */ ret = SLock(&osCp.sTskTblLock); @@ -9156,7 +9060,6 @@ S16 ssdReInitTmr() U32 threadCreated = FALSE; #endif /* SS_THR_REG_MAP */ - TRC0(ssdReInitTmr); #ifndef XEON_SPECIFIC_CHANGES ret = ssCheckAndDelMemoryRegionMap(osCp.dep.tmrHdlrTID); diff --git a/src/mt/ss_drvr.c b/src/mt/ss_drvr.c index 77f2c3d68..0bc65757a 100644 --- a/src/mt/ss_drvr.c +++ b/src/mt/ss_drvr.c @@ -128,7 +128,6 @@ ISTsk isTsk; /* interrupt service function */ #endif - TRC1(SRegDrvrTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -253,7 +252,6 @@ Inst channel; #endif { /* ss002.301 Modifications */ - TRC1(SRegDrvrTsk); #if (ERRCLASS & ERRCLS_INT_PAR) if (channel >= SS_MAX_DRVRTSKS) diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c index ed0dfacca..6b594bbe1 100644 --- a/src/mt/ss_gen.c +++ b/src/mt/ss_gen.c @@ -239,7 +239,6 @@ S16 SInit() SsDrvrTskEntry *drvrTsk; #endif /* ss002.301 : Modications */ - TRC1(SInit); osCp.configFilePath = "/mnt/tmp/configFile"; @@ -263,7 +262,7 @@ S16 SInit() #endif /* SS_MULTIPLE_PROCS */ #ifdef SS_THR_REG_MAP - cmMemset(osCp.threadMemoryRegionMap, SS_INVALID_THREAD_REG_MAP, + memset(osCp.threadMemoryRegionMap, SS_INVALID_THREAD_REG_MAP, (sizeof(Region) * SS_MAX_THREAD_REGION_MAP)); ssRegMainThread(); #endif @@ -756,8 +755,6 @@ S16 SDeInit() /* ss007.301 */ U16 regCnt; - TRC1(SDeInit); - ssdDeinitTmr(); SDestroyLock(&osCp.tmrTblLock); @@ -819,7 +816,6 @@ Txt *buf; /* buffer */ #endif { S16 bufSz; - TRC1(SWrtLogBuf); /* buffer synchronisation*/ bufSz = cmStrlen((U8 *)buf); SLock(&osCp.logger.bufLock); @@ -836,7 +832,7 @@ Txt *buf; /* buffer */ { SFlushBufToLog(osCp.logger.buffer); osCp.logger.curBufSiz = 0; - cmMemset((U8 *)osCp.logger.buffer, '\0', osCp.logger.maxBufSiz); + memset(osCp.logger.buffer, '\0', osCp.logger.maxBufSiz); sprintf(osCp.logger.buffer, "%s", buf); osCp.logger.curBufSiz += bufSz; } @@ -880,7 +876,6 @@ S16 SPrint(buf) Txt *buf; /* buffer */ #endif { - TRC1(SPrint); /* ss001.301: additions */ SDisplay(0, buf); @@ -924,10 +919,6 @@ Reason reason; /* reason */ DateTime dt; Txt errBuf[256]; - - TRC1(SError); - - SGetDateTime(&dt); sprintf(errBuf, "\n\ndate: %02d/%02d/%04d time: %02d:%02d:%02d\n", (int)dt.month,(int)dt.day,(int)dt.year + 1900, @@ -986,8 +977,6 @@ Txt *errDesc; /* description of error */ Txt errBuf[512]; - TRC1(SLogError); - /*ss014.301: SSI-4GMX related changes*/ #ifndef SS_4GMX_LCORE SGetDateTime(&dt); @@ -1035,7 +1024,6 @@ void ProcId SFndProcId() #endif { - TRC1(SFndProcId); return (osCp.procId); } /* end of SFndProcId */ @@ -1064,7 +1052,6 @@ Void SSetProcId(procId) ProcId procId; #endif { - TRC1(SSetProcId); osCp.procId = procId; @@ -1102,8 +1089,6 @@ ProcId proc; U16 i; U16 idx; - TRC1(SGetProcIdIdx); - idx = SS_HASH_IDX(proc); for (i = idx; i < SS_MAX_PROCS; i++) @@ -1145,7 +1130,6 @@ ProcId proc; U16 i; U16 idx; - TRC1(SInsProcId); idx = SS_HASH_IDX(proc); @@ -1196,7 +1180,6 @@ ProcId proc; U16 i; U16 idx; - TRC1(SRemProcId); idx = SS_HASH_IDX(proc); @@ -1245,7 +1228,6 @@ PRIVATE S16 SLockOsCp(Void) { S16 ret; - TRC1(SLockOsCp); ret = SLock(&osCp.sTskTblLock); if (ret != ROK) @@ -1303,7 +1285,6 @@ Void PRIVATE S16 SULockOsCp(Void) #endif { - TRC1(SULockOsCp); /* unlock the table */ SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem); @@ -1351,7 +1332,6 @@ ProcId *pIdLst; U16 i; S16 ret; - TRC1(SAddProcIdLst); #if (ERRCLASS & ERRCLS_INT_PAR) /* range check */ @@ -1446,7 +1426,6 @@ ProcId *pIdLst; { U16 i; - TRC1(SRemProcIdLst); #if (ERRCLASS & ERRCLS_INT_PAR) /* range check */ @@ -1512,7 +1491,6 @@ ProcId *pIdLst; U16 i; U16 count = 0; - TRC1(SGetProcIdLst); #if (ERRCLASS & ERRCLS_INT_PAR) if ((numPIds == NULLP) || (pIdLst == NULLP)) @@ -1576,7 +1554,6 @@ Void **xxCb; U16 procIdIdx; SsIdx idx; - TRC1(SGetXxCb); #if (ERRCLASS & ERRCLS_INT_PAR) if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) @@ -1806,7 +1783,6 @@ S16 SFillEntIds(Void) }; /*ss013.301 :Adding TRC MACRO*/ - TRC2(SFillEntIds) memcpy((U8*)osCp.entId, (U8*)entInfo, sizeof(entInfo)); return ROK; @@ -1850,7 +1826,6 @@ U8 *fileName; U8 firstIdx = 0; U8 secondIdx = 0; - TRC1(SGetEntInd); /* ss002.301 Additions */ if ((strippedName = strrchr((const char *)fileName, '/'))) @@ -1949,7 +1924,6 @@ U8 lockType; { S16 retVal = ROK; - TRC1(SLockNew); if((retVal = ssdLockNew(lockId, lockType)) != ROK) { @@ -1986,7 +1960,6 @@ U8 lockType; { S16 retVal = ROK; - TRC1(SInitLockNew); if((retVal = ssdInitLockNew(lockId, lockType)) != ROK) { @@ -2023,7 +1996,6 @@ U8 lockType; { S16 retVal = ROK; - TRC1(SUnlockNew); if((retVal = ssdUnlockNew(lockId, lockType)) != ROK) { @@ -2060,7 +2032,6 @@ U8 lockType; { S16 retVal = ROK; - TRC1(SDestroyLockNew); if((retVal = ssdDestroyLockNew(lockId, lockType)) != ROK) { diff --git a/src/mt/ss_mem.c b/src/mt/ss_mem.c index b86354107..d99e8fb68 100644 --- a/src/mt/ss_mem.c +++ b/src/mt/ss_mem.c @@ -125,10 +125,6 @@ SRegInfo *regInfo; /* information about the region */ { S16 ret; - - TRC1(SRegDynRegion); - - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) @@ -223,10 +219,6 @@ SRegInfo *regInfo; /* information about the region */ { S16 ret; - - TRC1(SRegRegion); - - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) @@ -317,10 +309,6 @@ Region region; /* region ID */ { S16 ret; - - TRC1(SDeregRegion); - - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) @@ -454,7 +442,6 @@ Data **ptr; /* filled with pointer to block */ #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SAlloc); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -651,7 +638,6 @@ Size size; /* size of block */ #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SFree); /* Get the region which is assgined with this thread. The region was * stored in the osCp and is taken with respect to thread ID. This macro @@ -831,7 +817,6 @@ Ent *entId; CmMemEntries *entry = NULLP; U32 blkSize = 0; - TRC1(SRegInfoShow); memset(tapaTsk, ENTNC, sizeof(tapaTsk)); diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c index 92b46b441..bad1d7f11 100644 --- a/src/mt/ss_msg.c +++ b/src/mt/ss_msg.c @@ -279,8 +279,6 @@ Buffer **dBuf; Data *data; SsDblk *dptr; - TRC1(ssGetDBufOfSize) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!dBuf) @@ -411,8 +409,6 @@ Buffer **mBuf; /* pointer to message buffer */ #endif - TRC1(SGetMsgNew) - #ifdef XEON_SPECIFIC_CHANGES region = 0; pool = 0; @@ -626,8 +622,6 @@ Buffer *mBuf; Ent entId = 0; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SPutMsgNew) - #ifdef L2_OPTMZ //#ifdef RADIO_CLUSTER if(clusterMode == RADIO_CLUSTER_MODE) @@ -790,8 +784,6 @@ U8 memType; /* memory type used if shareable or not */ { S16 ret = RFAILED; - TRC1(SPutStaticBuffer); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) @@ -946,8 +938,6 @@ U8 memType; /* memory type used if shareable or not */ S16 ret = RFAILED; U32 flags; - TRC1(SGetStaticBuffer); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) @@ -1253,7 +1243,6 @@ Size size; /* size requested */ Bool hstReg = FALSE; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SGetSBufNew); region = SS_GET_THREAD_MEM_REGION(); #ifdef INTEL_WLS @@ -1526,9 +1515,6 @@ Size size; /* size */ Bool hstReg = FALSE; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SPutSBufNew); - - region = SS_GET_THREAD_MEM_REGION(); #if (!defined(SS_LOCKLESS_MEMORY) && defined(INTEL_WLS)) region = 1; @@ -1706,8 +1692,6 @@ Buffer *mBuf; Buffer *tmp; U8 tmpRegId; - TRC1(SInitMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) @@ -1807,7 +1791,6 @@ S16 SAddPreMsgMultInOrder(src, cnt, mBuf) MsgLen offset; Data *rptr; Data *revSrc; - TRC1(SAddPreMsgMultInOrder) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ @@ -1988,8 +1971,6 @@ Buffer *mBuf; Buffer *tmp; Buffer *newb; - TRC1(SAddPreMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (!mBuf) @@ -2091,8 +2072,6 @@ Buffer *mBuf; SsMsgInfo *minfo; Buffer *tmp; Buffer *newb; - - TRC1(SAddPstMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ @@ -2204,8 +2183,6 @@ Buffer *mBuf; MsgLen offset; Data *rptr; - TRC1(SAddPreMsgMult) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) @@ -2382,8 +2359,6 @@ Buffer *mBuf; MsgLen numBytes; Data *wptr; - TRC1(SAddPstMsgMult) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) @@ -2553,8 +2528,6 @@ Buffer *mBuf; U32 line = __LINE__; #endif - TRC1(SRemPreMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) @@ -2641,8 +2614,6 @@ Buffer *mBuf; /* message buffer */ U32 line = __LINE__; #endif - TRC1(SRemPstMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (dataPtr == NULLP) @@ -2745,7 +2716,6 @@ Buffer *mBuf; /* message buffer */ U32 line = __LINE__; #endif - TRC1(SRemPreMsgMult) /* ss023.103 - Modification of SRemPreMsgMult for bug fix */ @@ -2871,7 +2841,6 @@ Buffer *mBuf; /* message buffer */ U32 line = __LINE__; #endif - TRC1(SRemPstMsgMult) #if (ERRCLASS & ERRCLS_INT_PAR) /* check count */ @@ -2998,8 +2967,6 @@ MsgLen idx; /* index */ SsMsgInfo *minfo; Buffer *tmp; - TRC1(SExamMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) @@ -3097,8 +3064,6 @@ MsgLen dataLen; MsgLen offSetLen; Data *tmpDataPtr = dataPtr; - TRC1(SGetDataFrmMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) @@ -3198,8 +3163,6 @@ MsgLen *lngPtr; /* pointer to length */ { SsMsgInfo *minfo; - TRC1(SFndLenMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) @@ -3300,7 +3263,6 @@ Buffer **mBuf2; /* message 2 */ Buffer *prev; Buffer *next; - TRC1(SSegMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ @@ -3499,8 +3461,6 @@ MsgLen *cCnt; /* copied count */ SsMsgInfo *minfo; Buffer *right; - TRC1(SCpyFixMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check source message buffer */ if (srcBuf == NULLP) @@ -3655,8 +3615,6 @@ MsgLen *cCnt; /* copied count */ SsMsgInfo *minfo; MsgLen numBytes; - TRC1(SCpyMsgFix) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check source message buffer */ if (srcMbuf == NULLP) @@ -3803,8 +3761,6 @@ Buffer **dstBuf; #endif #endif - TRC1(SCpyMsgMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) { @@ -4002,7 +3958,6 @@ Buffer **dstBuf; Data *cptr; MsgLen numBytes; - TRC1(SAddMsgRef) #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) @@ -4155,8 +4110,6 @@ Buffer *mp; /* message block */ S16 r; /* return value */ Size m; /* temporary */ - TRC1(DupMsg); - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) @@ -4306,8 +4259,6 @@ Buffer **bufPtr; /* pointer to buffer */ #endif #endif - TRC1(SGetDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!bufPtr) @@ -4478,7 +4429,6 @@ Buffer *buf; Data *dpdkBuf; #endif - TRC2(SPutDBuf); /* ss021.103 - Addition of ret initialization */ ret = ROK; @@ -4661,8 +4611,6 @@ Order order; /* order */ Buffer *tmp; Buffer *newb; - TRC1(SCatMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ if (mBuf1 == NULLP) @@ -4823,7 +4771,6 @@ MsgLen idx; /* index */ Buffer *prev; MsgLen numBytes; - TRC1(SRepMsg) #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; @@ -4921,8 +4868,6 @@ MsgLen dLen; /* data length */ { SsMsgInfo *minfo; - TRC1(SUpdMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { @@ -5012,8 +4957,6 @@ Buffer *dBuf; /* data buffer */ { SsMsgInfo *minfo; - TRC1(SAddDBufPst) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer queue */ if (!mBuf || !dBuf) @@ -5086,8 +5029,6 @@ Buffer *dBuf; /* data buffer */ SsMsgInfo *minfo; Buffer *tmp; - TRC1(SAddDBufPre) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer queue */ if (!mBuf || !dBuf) @@ -5161,8 +5102,6 @@ Buffer **dBufPtr; /* pointer to data buffer */ { SsMsgInfo *minfo; - TRC1(SRemDBufPre) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (dBufPtr == NULLP) @@ -5239,8 +5178,6 @@ Buffer **dBufPtr; /* pointer to data buffer */ SsMsgInfo *minfo; Buffer *tmp; - TRC1(SRemDBufPst) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!dBufPtr) @@ -5310,8 +5247,6 @@ Buffer *mBuf; /* message buffer */ { SsMsgInfo *minfo; - TRC1(SInitNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { @@ -5363,8 +5298,6 @@ Buffer **dBuf; /* data buffer return */ { SsMsgInfo *minfo; - TRC1(SGetNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { @@ -5422,8 +5355,6 @@ Buffer *mBuf; /* message buffer */ { SsMsgInfo *minfo; - TRC1(SChkNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { @@ -5481,7 +5412,6 @@ Data **retDatPtr; /* return data pointer */ MsgLen *retDatLen; /* return data length */ #endif { - TRC1(SGetDataRx) #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) @@ -5563,7 +5493,6 @@ Data **retDatPtr; /* return data pointer */ MsgLen *retDatLen; /* return data length */ #endif { - TRC1(SGetDataTx) #if (ERRCLASS & ERRCLS_INT_PAR) /* ss021.103 - Modification to check parameters */ @@ -5639,7 +5568,6 @@ Pool *pool; /* pool */ { SsMsgInfo *mInfo; /* message info pointer */ - TRC1(SGetBufRegionPool) #if (ERRCLASS & ERRCLS_INT_PAR) @@ -5722,7 +5650,6 @@ Buffer *mBuf; /* message buffer */ char* file = __FILE__; U32 line = __LINE__; #endif - TRC1(SCompressMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) @@ -5831,7 +5758,6 @@ S16 dst; /* destination id */ Data reg; - TRC1(SPrntMsg) if (mBuf == NULLP) { @@ -5975,7 +5901,6 @@ Buffer *mBuf; /* message buffer */ MsgLen numBytes; MsgLen avail; - TRC1(SGetPstMsgMult) #if ( ERRCLASS & ERRCLS_INT_PAR ) /* check message buffer */ @@ -6075,7 +6000,6 @@ Buffer *mBuf; SsMsgInfo *minfo; Buffer *tmp; - TRC1(SChkMsg) #if ( ERRCLASS & ERRCLS_INT_PAR ) /* check message buffer */ @@ -6130,8 +6054,6 @@ Buffer *dBuf; /* data buffer */ MsgLen len; Data *src; - TRC1(SAlignDBufEven) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) { @@ -6209,8 +6131,6 @@ U32 align; /* alignemnt required */ U32 upShift; /* no. of bytes to be shifted up */ U32 downShift; /* no. of bytes to be shifted down */ - TRC1(SAlignDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) { @@ -6299,8 +6219,6 @@ Size size; /* size */ Pool *pool; /* pointer to pool ID */ #endif { - TRC1(SGetSMem); - UNUSED(size); @@ -6363,8 +6281,6 @@ Pool pool; /* pool ID */ S16 ret; #endif - TRC1(SPutSMem); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ @@ -6460,8 +6376,6 @@ Status *status; /* pointer to status */ SMemCtl mctl; - TRC1(SChkRes); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ @@ -6591,7 +6505,6 @@ Buffer *mBuf2; /* message 2 */ Buffer *tmp; U8 tmp2; - TRC1(SSwapMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ @@ -6699,8 +6612,6 @@ S16 SConvPtrPhy (mBuf) SsDblk *dblkPtr; SsFrtn *frtnPtr; - TRC1(SConvPtrPhy); - /* check mBuf for NULLP */ if ( (mBuf == NULLP) || (*mBuf == NULLP ) ) @@ -6857,8 +6768,6 @@ S16 SConvPhyPtr (workPtr) SsDblk *dblkPtr; SsFrtn *frtnPtr; - TRC1(SConvPhyPtr); - /* check workPtr for NULLP */ if ( (workPtr == NULLP) || (*workPtr == NULLP) ) @@ -7028,8 +6937,6 @@ S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) SsDblk *dblkPtr = NULLP; SsDblk *dptr = NULLP; - TRC1(SCpyFpaMsg); - if ( srcBuf == (Buffer*)NULLP ) { @@ -7178,8 +7085,6 @@ S16 SCpyMsgFpa (srcBuf, dstBuf) U32 numBytes; Pool pool; - TRC1(SCpyMsgFpa); - if (srcBuf == (Buffer*)NULLP) { @@ -7351,7 +7256,6 @@ Buffer *fpaBuf; Buffer *nextBlk; SsDblk *dblkPtr; - TRC1(SPutFpaMsg); if( fpaBuf == NULLP ) { @@ -7448,7 +7352,6 @@ Buffer *dstBuf; MsgLen dCnt; MsgLen numCpd; - TRC1(SCpyPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) @@ -7615,7 +7518,6 @@ Buffer *dstBuf; MsgLen sIdx; MsgLen cpBytes; - TRC1(SRepPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!dstBuf) @@ -7759,7 +7661,6 @@ Buffer *dstBuf; /* message 2 */ U32 line = __LINE__; #endif - TRC1(SMovPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ @@ -7928,7 +7829,6 @@ Buffer *mBuf; MsgLen numBytes; /* no. of bytes to be copied */ MsgLen offset; - TRC1(SPkMsgMult) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ @@ -8106,7 +8006,6 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachPtrToBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) @@ -8209,7 +8108,6 @@ Buffer *buf; MsgLen bufLen; S16 ret = ROK; - TRC2(SPutZbcDBuf); dptr = buf->b_datap; /* Get the length of the buffer */ @@ -8357,7 +8255,6 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachPtrToMBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) @@ -8516,7 +8413,6 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachWlsPtrToMBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) diff --git a/src/mt/ss_pack.c b/src/mt/ss_pack.c index ade96db1d..831c9b1d2 100644 --- a/src/mt/ss_pack.c +++ b/src/mt/ss_pack.c @@ -101,7 +101,6 @@ Buffer *mBuf; /* message buffer */ #endif { S16 ret; /* return code */ - TRC1(SPkS8) ret = SAddPreMsg((Data) val, mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if (ret != ROK) @@ -141,7 +140,6 @@ Buffer *mBuf; /* message buffer */ #endif { S16 ret; /* return code */ - TRC1(oduUnpackUInt8) ret = SAddPreMsg((Data) val, mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if (ret != ROK) @@ -181,7 +179,6 @@ Buffer *mBuf; /* message buffer */ Data pkArray[2]; /* array for packing */ S16 ret; /* return code */ - TRC1(SPkS16) #ifndef FCSPKINT /* backward compatibility, packing order */ pkArray[0] = (Data) GetHiByte(val); pkArray[1] = (Data) GetLoByte(val); @@ -229,7 +226,6 @@ Buffer *mBuf; /* message buffer */ Data pkArray[2]; /* array for packing */ S16 ret; /* return code */ - TRC1(oduUnpackUInt16) #ifndef FCSPKINT /* backward compatibility, packing order */ pkArray[0] = (Data) GetHiByte(val); pkArray[1] = (Data) GetLoByte(val); @@ -278,7 +274,6 @@ Buffer *mBuf; /* message buffer */ Data pkArray[4]; /* packing array */ S16 ret; /* return code */ - TRC1(SPkS32) #ifndef FCSPKINT /* backward compatibility, packing order */ tmp = (U16) GetHiWord(val); pkArray[0] = (Data) GetHiByte(tmp); @@ -335,7 +330,6 @@ Buffer *mBuf; /* message buffer */ Data pkArray[4]; /* packing array */ S16 ret; /* return code */ - TRC1(oduUnpackUInt32) #ifndef FCSPKINT /* backward compatibility, packing order */ tmp = (U16) GetHiWord(val); pkArray[0] = (Data) GetHiByte(tmp); @@ -397,8 +391,6 @@ Buffer *mBuf; /* message buffer */ S8 pkArray[15]; /* packing array */ #endif /*FCSPKINT*/ - TRC1(SPkF32) - sprintf(tmpArray, "%.7e", val); #ifndef FCSPKINT /* backward compatibility, packing order */ @@ -457,8 +449,6 @@ Buffer *mBuf; /* message buffer */ S8 pkArray[25]; /* packing array */ #endif /*FCSPKINT*/ - TRC1(SPkF64) - sprintf(tmpArray, "%.16le", val); #ifndef FCSPKINT /* backward compatibility, packing order */ @@ -510,7 +500,6 @@ Buffer *mBuf; /* message buffer */ { Data tmp; /* temporary value */ S16 ret; /* return code */ - TRC1(SUnpkS8) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -560,7 +549,6 @@ Buffer *mBuf; /* message buffer */ { Data tmp; /* temporary value */ S16 ret; /* return code */ - TRC1(oduPackUInt8) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -610,7 +598,6 @@ Buffer *mBuf; /* message buffer */ U16 tmp16; /* temporary value */ Data unpkArray[2]; /* unpacking array */ S16 ret; /* return code */ - TRC1(SUnpkS16) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -669,7 +656,6 @@ Buffer *mBuf; /* message buffer */ U16 tmp16; /* temporary value */ Data unpkArray[2]; /* unpacking array */ S16 ret; /* return code */ - TRC1(oduPackUInt16) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -729,7 +715,6 @@ Buffer *mBuf; /* message buffer */ U32 tmp32; /* temporary value */ Data unpkArray[4]; /* unpacking array */ S16 ret; /* return code */ - TRC1(SUnpkS32) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -800,7 +785,6 @@ Buffer *mBuf; /* message buffer */ #ifdef ERRCLASS S16 ret; /* return code */ #endif /* ERRCLASS */ - TRC1(oduPackUInt32) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -875,8 +859,6 @@ Buffer *mBuf; /* message buffer */ S8 unpkArray[15]; /* unpacking array */ #endif /* FCSPKINT */ - TRC1(SUnpkF32) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) @@ -942,8 +924,6 @@ Buffer *mBuf; /* message buffer */ S8 unpkArray[25]; /* unpacking array */ #endif /* FCSPKINT */ - TRC1(SUnpkF64) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) diff --git a/src/mt/ss_queue.c b/src/mt/ss_queue.c index ba0b311ea..02f77276b 100644 --- a/src/mt/ss_queue.c +++ b/src/mt/ss_queue.c @@ -102,7 +102,6 @@ S16 SInitQueue(q) Queue *q; /* queue */ #endif { - TRC1(SInitQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue pointer */ @@ -161,7 +160,6 @@ Queue *q; /* queue */ U32 line = __LINE__; #endif - TRC1(SFlushQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -231,7 +229,6 @@ Queue *q2; /* queue 2 */ Order order; /* order */ #endif { - TRC1(SCatQueue) #if (ERRCLASS & ERRCLS_INT_PAR) if (q1 == NULLP) @@ -341,7 +338,6 @@ Queue *q; /* queue */ QLen *lngPtr; /* pointer to length */ #endif { - TRC1(SFndLenQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -403,7 +399,6 @@ QLen idx; /* index */ Buffer *tmpBuf; QLen i; - TRC1(SExamQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -498,7 +493,6 @@ QLen idx; /* index */ Buffer *tBuf; QLen i; - TRC1(SAddQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -623,7 +617,6 @@ QLen idx; /* index */ Buffer *tBuf; QLen i; - TRC1(SRemQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -726,7 +719,6 @@ Buffer *buf; /* buffer */ Queue *q; /* queue */ #endif { - TRC1(SQueueFirst) return (SAddQueue(buf, q, 0)); } /* end of SQueueFirst */ @@ -765,7 +757,6 @@ Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ #endif { - TRC2(SDequeueFirst) return (SRemQueue(bufPtr, q, 0)); } /* end of SDequeueFirst */ @@ -802,7 +793,6 @@ Buffer *buf; /* buffer */ Queue *q; /* queue */ #endif { - TRC1(SQueueLast) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -858,7 +848,6 @@ Queue *q; /* queue */ { S16 ret; - TRC1(SDequeueLast) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -912,7 +901,6 @@ SsDmndQ *dQueue; /* Demand Queue */ U8 i; S16 ret; - TRC0(ssInitDmnddQ) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1011,7 +999,6 @@ SsDmndQ *dQueue; /* demand Queue */ Buffer *tBuf; S16 ret; - TRC0(ssDestroyDmndQ) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1113,7 +1100,6 @@ Order order; /* position */ U32 t = MacGetTick(); #endif - TRC0(ssDmndQPut) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1299,7 +1285,6 @@ SsDmndQ *dQueue; /* demand queue */ { S16 ret; - TRC0(ssDmndQWait) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1364,7 +1349,6 @@ Order order; /* position */ U8 qIndex; #endif - TRC0(ssDmndQGet) #if (ERRCLASS & ERRCLS_INT_PAR) if (mBuf == NULLP) @@ -1544,7 +1528,6 @@ QLen *len; /* queue length */ S16 ret; /* return value */ U8 i; - TRC0(ssFndLenDmndQ) #if (ERRCLASS & ERRCLS_INT_PAR) if ((dQueue == NULLP) || (len == NULLP)) diff --git a/src/mt/ss_strm.c b/src/mt/ss_strm.c index fa54d409e..9d14ed47b 100644 --- a/src/mt/ss_strm.c +++ b/src/mt/ss_strm.c @@ -115,8 +115,6 @@ Region mdRegId; /* region for message and data blocks */ Region datRegId; /* region for data buffers */ #endif { - TRC1(ssStrmCfg); - strmCfg.mdRegion = mdRegId; strmCfg.datRegion = datRegId; @@ -170,10 +168,6 @@ S32 len; /* bytes to remove */ SsMblk *bp; /* mblk for iteration */ SsMblk *first; /* first mblk to be adjusted */ - - TRC1(ssAdjMsg); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -338,8 +332,6 @@ U32 pri; /* message priority */ char* file = __FILE__; U32 line = __LINE__; #endif - TRC1(ssAllocB); - UNUSED(pri); @@ -432,9 +424,6 @@ SsMblk *mp; /* message block */ U32 size; /* size of data content */ - TRC1(ssCopyB); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -501,10 +490,6 @@ SsMblk *mp; /* message block */ SsMblk *first; /* first mblk in message */ SsMblk *bp; /* mblk for iteration */ - - TRC1(ssCopyMsg); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -582,9 +567,6 @@ SsMblk *mp; /* message block */ SsMblk *bp; /* mblk for iteration */ /* ss028.103 - Addition of lock for mBuf reference count */ - TRC1(ssDupB); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -680,10 +662,6 @@ SsMblk *mp; /* message block */ SsMblk *first; /* first mblk in message */ SsMblk *bp; /* mblk for iteration */ - - TRC1(ssDupMsg); - - /* dup the first mblock */ first = bp = ssDupB(mp); if (bp == NULLP) @@ -757,10 +735,6 @@ SsFrtn *fr_rtn; /* free routine */ Size m; /* mblk + dblk */ S16 r; /* return value */ - - TRC1(ssESBAlloc); - - UNUSED(pri); @@ -839,9 +813,6 @@ SsMblk *mp; /* message block */ U32 line = __LINE__; #endif - TRC1(ssFreeB); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -1023,10 +994,6 @@ SsMblk *mp; /* message block */ { SsMblk *bp; /* mblk for iteration */ - - TRC1(ssFreeMsg); - - /* free all the message blocks in the message */ while (mp) { @@ -1065,8 +1032,6 @@ SsMblk *mp; /* first message block */ SsMblk *bp; /* second message block */ #endif { - TRC1(ssLinkB); - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP || bp == NULLP) @@ -1118,10 +1083,6 @@ SsMblk *mp; /* message block */ S32 n; /* temporary */ S32 size; /* size of data */ - - TRC1(ssMsgDSize); - - /* for all blocks that are of type data, count the bytes */ size = 0; while (mp) @@ -1187,10 +1148,6 @@ S32 len; /* number of bytes to align */ S32 n; /* temporary */ U8 type; /* message type */ - - TRC1(ssPullupMsg); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { @@ -1376,10 +1333,6 @@ SsMblk *bp; /* message block */ { SsMblk *rp; /* mblk that will be returned */ - - TRC1(ssRmvB); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP || bp == NULLP) { @@ -1459,10 +1412,6 @@ U32 pri; /* priority of the message buffer */ { SsMblk *bp; /* mblk for iteration */ - - TRC1(ssTestB); - - bp = ssAllocB(size, pri); if (bp) { @@ -1503,10 +1452,6 @@ SsMblk *mp; /* message */ { SsMblk *bp; /* mblk for iteration */ - - TRC1(ssUnlinkB); - - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { diff --git a/src/mt/ss_task.c b/src/mt/ss_task.c index 5f7b45e75..8c016cdf9 100644 --- a/src/mt/ss_task.c +++ b/src/mt/ss_task.c @@ -183,7 +183,6 @@ PAIFS16 initFnct; /* initialization function */ S16 ret; /* return value */ SsTTskEntry *tTsk; - TRC1(SRegInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -368,7 +367,6 @@ ActvTsk actvTsk; /* activate task function */ /* ss021.103 - Addition for pointer */ SsTTskEntry *tTsk; - TRC1(SRegActvTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -594,7 +592,6 @@ Inst inst; /* instance */ Bool destroySTsk; - TRC1(SDeregInitTskTmr); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -866,7 +863,6 @@ ActvTsk actvTsk; /* activation function */ U16 procIdIdx; #endif - TRC1(SRegTTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1173,7 +1169,6 @@ ActvTsk cbTsk; U16 procIdIdx; #endif /* SS_MULTIPLE_PROCS */ - TRC1(SRegCbTsk); #if (ERRCLASS & ERRCLS_INT_PAR) if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) @@ -1300,7 +1295,6 @@ Inst inst; /* instance */ Buffer *mBuf; SsMsgInfo *mInfo; - TRC1(SDeregTTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1570,7 +1564,6 @@ SSTskId *tskId; /* filled in with system task ID */ SsSTskEntry *sTsk; - TRC1(SCreateSTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1838,7 +1831,6 @@ U16 port struct sockaddr_in localAddr={0}; struct sockaddr_in remoteAddr ={0}; - TRC1(SRegLogCfg); #if (ERRCLASS & ERRCLS_INT_PAR) #endif @@ -1944,7 +1936,7 @@ U16 port } - cmMemset((U8*)osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer)); + memset(osCp.logger.buffer, '\0', sizeof(osCp.logger.buffer)); osCp.logger.maxBufSiz = SS_MAX_LOGBUF_SIZE; osCp.logger.curBufSiz = 0; @@ -1994,7 +1986,6 @@ S8 *logBuf #endif FILE* oldFileP; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SFlushBufToLog) buffer = logBuf; @@ -2012,7 +2003,7 @@ S8 *logBuf osCp.logger.curNumFlush++; if(osCp.logger.curNumFlush == osCp.logger.maxNumFlush) { - cmMemset((U8 *)newFileName,'\0',sizeof(newFileName)); + memset(newFileName,'\0',sizeof(newFileName)); /*Store the current File*/ oldFileP = osCp.logger.filep; /*Open a new file and use it as a new log file*/ @@ -2056,7 +2047,6 @@ S16 SCleanUp() #endif { - TRC1(SCleanUp); /*Flush the remaining data in the log file*/ SLock(&osCp.logger.bufLock); if(osCp.logger.started == FALSE) @@ -2118,7 +2108,6 @@ S16 SDeregLogCfg() { - TRC1(SDeregLogCfg); SCleanUp(); @@ -2214,7 +2203,6 @@ SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ U32 coreCount = 0; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SRegCpuInfo) /* check the number of cores */ if ( cpuInfo->numCores > SS_MAX_CORES || cpuInfo->threadsPerCore > SS_MAX_THREADS_PER_CORE || @@ -2280,7 +2268,6 @@ U32 *coreId; /* the core/processor id to which the affinity i S16 ret; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SGetAffinity) /* implementation specific */ ret = ssdGetAffinity(tskId, coreId); @@ -2329,7 +2316,6 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat S16 ret; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SSetAffinity) /* validate the mode */ if (mode < SS_AFFINITY_MODE_DEFAULT || mode > SS_AFFINITY_MODE_EXCL) @@ -2670,7 +2656,6 @@ SSTskId tskId; /* system task to be destroyed */ #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT*/ - TRC1(SDestroySTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -3013,7 +2998,6 @@ SSTskId sTskId; /* system task to use */ #endif - TRC1(SAttachTTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -3467,7 +3451,6 @@ Inst inst; /* instance ID of the task */ U16 procIdIdx; #endif /* SS_MULTIPLE_PROCS */ - TRC1(SDetachTTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -3811,7 +3794,6 @@ Buffer *mBuf; /* message to post */ U32 t = MacGetTick(); #endif - TRC1(SPstTsk); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -4169,7 +4151,7 @@ Buffer *mBuf; /* message to post */ */ tTsk = &osCp.tTskTbl[dstIdx]; - cmMemcpy((U8*)&tempPst, (U8*)pst, sizeof(Pst)); + memcpy(&tempPst, pst, sizeof(Pst)); if(tTsk->cbTsk != NULLP) { retValue = tTsk->cbTsk(&tempPst,mBuf); @@ -4423,7 +4405,6 @@ Ent *ent; /* entity */ U32 tskCnt = 0; - TRC1(SGetTapaTskEntIds); /* Get the tapa task entity Ids from the osCp structure */ for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++) { @@ -4465,7 +4446,6 @@ Ent ent; /* entity */ U32 tskCnt = 0; S16 r = 0; - TRC1(SRegForHstGrm); SS_ACQUIRE_SEMA(&osCp.tTskTblSem, r); if (r != ROK) @@ -4531,7 +4511,6 @@ Bool *hstReg; /* entity */ Bool found = FALSE; *hstReg = 0; - TRC1(SGetHstGrmInfo); for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++) { if( *entId == osCp.tTskTbl[tskCnt].ent) @@ -4591,7 +4570,6 @@ void *data; int i = 0; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SRegCfgWd) osCp.wdCp.globWd.timeout = timeout; osCp.wdCp.globWd.callback = callback; @@ -4638,7 +4616,6 @@ void; int i = 0; /*ss013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC1(SDeregCfgWd) osCp.wdCp.globWd.timeout = 0; osCp.wdCp.globWd.callback = 0; @@ -4673,7 +4650,6 @@ S16 SStartHrtBt(timeInterval) U8 timeInterval; #endif { - TRC1(SStartHrtBt); ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval); ssdSndHrtBtMsg(TRUE, SS_WD_HB_REQ); @@ -4691,7 +4667,6 @@ S16 SStopHrtBt() void #endif { - TRC1(SStopHrtBt); osCp.wdCp.globWd.watchdogStop = 1; @@ -4716,7 +4691,6 @@ Buffer *mBuf; /* message buffer */ Txt prntBuf[PRNTSZE]; #endif /* DEBUGP */ - TRC3(watchDgActvTsk) #ifdef DEBUGP SGetDateTime(&dt); sprintf(prntBuf,"watchDgActvTsk: Time: %02d:%02d:%02d\n",dt.hour,dt.min, dt.sec @@ -4753,7 +4727,6 @@ Buffer *mBuf; /* message buffer */ int socklen = sizeof(struct sockaddr); #endif - TRC3(watchDgActvTsk) #ifdef DEBUGP SGetDateTime(&dt); @@ -4885,7 +4858,6 @@ U64 *totTime; #endif - TRC1(SGetThrdProf); #if (ERRCLASS & ERRCLS_INT_PAR) /* check entity and instance range */ diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c index b532e3e97..0d0fffce2 100644 --- a/src/mt/ss_timer.c +++ b/src/mt/ss_timer.c @@ -168,8 +168,6 @@ PFS16 tmrFnct; /* timer function, typically SActvTmr */ SsTmrActvFn ssTmrActvFn; /* ss041.103 - Moved handling to STmrRegHndlr */ - TRC1(SRegCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn); @@ -205,8 +203,6 @@ PAIFTMRS16 tmrFnct; /* timer function, typically SActvTmr */ SsTmrActvFn ssTmrActvFn; /* ss041.103 - Moved handling to STmrRegHndlr */ - TRC1(SRegCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn); @@ -261,8 +257,6 @@ PAIFTMRS16 tmrFnctMt; /* timer function, typically SActvTmr */ /* ss015.301 - Enclosed all timer activation functions in a union. */ SsTmrActvFn ssTmrActvFn; - TRC1(SRegCfgTmrMt); - ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt; ssTmrActvFn.mtFlag = TRUE; ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn); @@ -353,8 +347,6 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #endif /* ERRCLASS & ERRCLS_INT_PAR */ #endif /* SS_MULTPLE_PROCS */ - TRC1(STmrRegHndlr); - #if (ERRCLASS & ERRCLS_INT_PAR) #ifdef SS_MULTIPLE_PROCS @@ -647,8 +639,6 @@ PFS16 tmrFnct; /* timer function */ SsTmrActvFn ssTmrActvFn; /* ss041.103 - Moved handling to STmrDeregHndlr */ - TRC1(SDeregCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn); @@ -684,8 +674,6 @@ PAIFTMRS16 tmrFnct; /* timer function */ /* ss041.103 - Moved handling to STmrDeregHndlr */ - TRC1(SDeregCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn); @@ -735,8 +723,6 @@ PAIFTMRS16 tmrFnctMt; /* timer function */ /* ss015.301 Enclosed all timer activation functions in a union. */ SsTmrActvFn ssTmrActvFn; - TRC1(SDeregCfgTmrMt); - ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt; ssTmrActvFn.mtFlag = TRUE; @@ -827,9 +813,6 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #endif /* SS_MULTIPLE_PROCS */ - TRC1(STmrDeregHndlr); - - #if (ERRCLASS & ERRCLS_INT_PAR) #ifdef SS_MULTIPLE_PROCS diff --git a/src/ric_stub/ric_e2ap_msg_hdl.c b/src/ric_stub/ric_e2ap_msg_hdl.c index 512ab5b4f..9d31df746 100644 --- a/src/ric_stub/ric_e2ap_msg_hdl.c +++ b/src/ric_stub/ric_e2ap_msg_hdl.c @@ -204,7 +204,7 @@ S16 BuildAndSendE2SetupRsp() BuildGlobalRicId(&(e2SetupRsp->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID)); xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg); - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf, encBuf); @@ -480,7 +480,7 @@ S16 BuildAndSendRicSubscriptionReq() /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apRicMsg); - cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN); + memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\ encBuf); diff --git a/src/ric_stub/ric_e2ap_msg_hdl.h b/src/ric_stub/ric_e2ap_msg_hdl.h index f172ac89f..a7b7850fd 100644 --- a/src/ric_stub/ric_e2ap_msg_hdl.h +++ b/src/ric_stub/ric_e2ap_msg_hdl.h @@ -38,7 +38,7 @@ _ret = SGetSBuf(RIC_APP_MEM_REG, RIC_POOL, \ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - cmMemset((U8*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } diff --git a/src/ric_stub/ric_stub.h b/src/ric_stub/ric_stub.h index 07378c4da..566f07018 100644 --- a/src/ric_stub/ric_stub.h +++ b/src/ric_stub/ric_stub.h @@ -32,7 +32,7 @@ _ret = SGetSBuf(RIC_APP_MEM_REG, RIC_POOL, \ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - cmMemset((uint8_t*)_datPtr, 0, _size); \ + memset(_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } diff --git a/src/rlog/rl_postproc.cpp b/src/rlog/rl_postproc.cpp index 2410d11c6..5be7535a7 100644 --- a/src/rlog/rl_postproc.cpp +++ b/src/rlog/rl_postproc.cpp @@ -243,8 +243,8 @@ int connectToLogServer() /* ccpu00147898 fixes */ memset(&hints, 0, sizeof(hints)); - memset((void*)&serv_addr, 0, sizeof(serv_addr)); - memset((void*)&serv_addr6, 0, sizeof(serv_addr6)); + memset(&serv_addr, 0, sizeof(serv_addr)); + memset(&serv_addr6, 0, sizeof(serv_addr6)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags |= AI_CANONNAME; diff --git a/src/rlog/rl_rlog.c b/src/rlog/rl_rlog.c index d33082d33..9cb1836d2 100644 --- a/src/rlog/rl_rlog.c +++ b/src/rlog/rl_rlog.c @@ -741,7 +741,7 @@ void* rLogServer(void* arg) int newsockfd; int clilen = 0; int domain = AF_INET; - memset((void*)&serv_addr, 0, sizeof(serv_addr)); + memset(&serv_addr, 0, sizeof(serv_addr)); if(gIpType == CM_IPV4ADDR_TYPE) -- 2.16.6