X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_sc1.c;h=eb08051efc40aee5fe228e561967303050cacc6c;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=cb2f594261fa6d1e3bfc704248f2c458efcab14c;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c
index cb2f59426..eb08051ef 100755
--- a/src/5gnrsch/rg_sch_sc1.c
+++ b/src/5gnrsch/rg_sch_sc1.c
@@ -170,10 +170,10 @@ RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 ));
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio ARGS((
+Void rgSCHSc1DlScanUpdPdbPrio ARGS((
 RgSchCellCb *cell
 ));
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( 
+S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( 
 RgSchCellCb    *cell,
 RgInfSfAlloc   *sfAlloc
 ));
@@ -209,18 +209,17 @@ PRIVATE Void rgSCHSc1DlPstSchd ARGS ((
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeReset 
+Void rgSCHSc1DlUeReset 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeReset(cell, ue)
+Void rgSCHSc1DlUeReset(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
 {
-   TRC2(rgSCHSc1DlUeReset);
 
    rgSCHSc1DlSuspendUe(cell, ue);
 
@@ -244,13 +243,13 @@ RgSchUeCb      *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlActvtUe 
+Void rgSCHSc1DlActvtUe 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlActvtUe(cell, ue)
+Void rgSCHSc1DlActvtUe(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -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;
@@ -311,13 +309,13 @@ RgSchUeCb      *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeRefresh
+Void rgSCHSc1DlUeRefresh
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeRefresh(cell, ue)
+Void rgSCHSc1DlUeRefresh(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -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));
@@ -515,13 +509,13 @@ RgSchDlHqProcCb            *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlProcAddToCellRetx
+Void rgSCHSc1DlProcAddToCellRetx
 (
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
+Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *hqP;
 #endif
@@ -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.                                            */
@@ -1037,11 +1025,10 @@ PRIVATE Void rgSCHSc1DlPreSchd
  RgSchCellCb   *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlPreSchd(cell)
+Void rgSCHSc1DlPreSchd(cell)
  RgSchCellCb   *cell;
 #endif
 {
-   TRC2(rgSCHSc1DlPreSchd);
    
    RETVOID;
 }
@@ -1064,11 +1051,10 @@ PRIVATE Void rgSCHSc1DlPstSchd
  Inst       schInst
 )
 #else
-PUBLIC Void rgSCHSc1DlPstSchd(schInst)
+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);
 
@@ -1536,14 +1513,14 @@ RgrDlLchCfg             *cfg;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlLcRmv
+Void rgSCHSc1DlLcRmv
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSc1DlLcRmv(cell, ue, svc)
+Void rgSCHSc1DlLcRmv(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -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)
@@ -1841,21 +1813,20 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlLcBoUpd
+Void rgSCHSc1DlLcBoUpd
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
+Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 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; 
@@ -2035,14 +2003,14 @@ RgSchDlLcCb                *svc;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlCellCfg
+S16 rgSCHSc1RgrDlCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
+S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 RgSchErrInfo  *err;
@@ -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)
    {
@@ -2118,16 +2084,15 @@ RgSchSc1DlCell *cellDl;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlCellDel
+Void rgSCHSc1DlCellDel
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlCellDel(cell)
+Void rgSCHSc1DlCellDel(cell)
 RgSchCellCb  *cell;
 #endif
 {
-   TRC2(rgSCHSc1DlCellDel);
 
    if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \
        == NULLP)
@@ -2164,7 +2129,7 @@ RgSchCellCb  *cell;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlUeCfg
+S16 rgSCHSc1RgrDlUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2172,7 +2137,7 @@ RgrUeCfg     *ueCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
+S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeCfg     *ueCfg;
@@ -2183,7 +2148,6 @@ RgSchErrInfo *err;
    Inst               inst = cell->instIdx;
    RgSchSc1DlUe       *ueDl;
 
-   TRC2(rgSCHSc1RgrDlUeCfg);
 
    if((rgSCHUtlAllocSBuf(inst, 
                (Data**)&(ueSchCmn->dl.schSpfc), (sizeof(RgSchSc1DlUe))) != ROK))
@@ -2228,13 +2192,13 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlUeHqEntInit
+S16 rgSCHSc1DlUeHqEntInit
 (
  RgSchCellCb      *cell,
  RgSchDlHqEnt     *hqEnt
  )
 #else
-PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
+S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
    RgSchCellCb      *cell;
    RgSchDlHqEnt     *hqEnt
 #endif
@@ -2242,7 +2206,6 @@ PUBLIC 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, 
@@ -2278,18 +2241,17 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlUeHqEntDeInit 
+S16 rgSCHSc1DlUeHqEntDeInit 
 (
 RgSchCellCb      *cell,
 RgSchDlHqEnt     *hqE
 )
 #else
-PUBLIC S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
+S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
 RgSchCellCb      *cell;
 RgSchDlHqEnt     *hqE;
 #endif
 {
-   TRC2(rgSCHSc1DlUeHqEntDeInit);
 
    if(hqE->sch)
    {
@@ -2322,7 +2284,7 @@ RgSchDlHqEnt     *hqE;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlUeRecfg
+S16 rgSCHSc1RgrDlUeRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2330,7 +2292,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
+S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -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
@@ -2600,16 +2558,15 @@ RgSchUeCb    *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio
+Void rgSCHSc1DlScanUpdPdbPrio
 (
 RgSchCellCb *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio (cell)
+Void rgSCHSc1DlScanUpdPdbPrio (cell)
 RgSchCellCb *cell;
 #endif
 {
-   TRC2(rgSCHSc1DlScanUpdPdbPrio);
    
    RETVOID;
 }
@@ -2635,18 +2592,17 @@ RgSchCellCb *cell;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo
+S16 rgSCHSc1DlFillFlowCntrlInfo
 (
 RgSchCellCb    *cell,
 RgInfSfAlloc   *sfAlloc
 )
 #else
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
+S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
 RgSchCellCb    *cell;
 RgInfSfAlloc   *sfAlloc;
 #endif
 {
-  TRC2(rgSCHSc1DlFillFlowCntrlInfo);
   return ROK;
 }
 /**
@@ -2664,13 +2620,13 @@ RgInfSfAlloc   *sfAlloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeDel
+Void rgSCHSc1DlUeDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeDel(cell, ue)
+Void rgSCHSc1DlUeDel(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -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)
    {
@@ -2727,7 +2682,7 @@ RgSchUeCb    *ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcCfg
+S16 rgSCHSc1RgrLcCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2736,7 +2691,7 @@ RgrLchCfg *lcCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
+S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -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)), \
@@ -2786,7 +2740,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcRecfg
+S16 rgSCHSc1RgrLcRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2795,7 +2749,7 @@ RgrLchRecfg  *lcRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
+S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -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;
@@ -2971,13 +2922,13 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlHndlInActUes
+Void rgSCHSc1DlHndlInActUes
 (
 RgSchCellCb           *cell,
 CmLListCp             *inactvLst
 )
 #else
-PUBLIC Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
+Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
 RgSchCellCb           *cell;
 CmLListCp             *inactvLst;
 #endif
@@ -2985,7 +2936,6 @@ CmLListCp             *inactvLst;
    CmLList   *node;
    RgSchUeCb *ue;
 
-   TRC2(rgSCHSc1DlHndlInActUes);
 
    node = inactvLst->first;
    while(node)
@@ -3017,16 +2967,15 @@ CmLListCp             *inactvLst;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlInit
+Void rgSCHSc1DlInit
 (
 RgDlSchdApis *rgSchDlApis
 )
 #else
-PUBLIC Void rgSCHSc1DlInit(rgSchDlApis)
+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)
@@ -3790,18 +3732,17 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlAllocFnlz
+Void rgSCHSc1DlAllocFnlz
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
+Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
 {
-   TRC2(rgSCHSc1DlAllocFnlz);
 
    rgSCHSc1DlRetxAllocFnlz(cell, allocInfo);
 
@@ -3832,7 +3773,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlCqiInd
+Void rgSCHSc1DlCqiInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
@@ -3840,14 +3781,13 @@ Bool               isPucchInfo,
 Void               *dlCqi
 )
 #else
-PUBLIC Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
+Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 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;
@@ -3994,7 +3932,7 @@ RgSchDlLcCb                *svc;
  *  @return  S16
  *      -# ROK
  **/
-PUBLIC S16 rgSCHSc1UlLchCfg 
+S16 rgSCHSc1UlLchCfg 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4020,7 +3958,7 @@ RgSchErrInfo     *err
  *  @return  S16
  *      -# ROK
  **/
-PUBLIC S16 rgSCHSc1UlLchRecfg 
+S16 rgSCHSc1UlLchRecfg 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4046,7 +3984,7 @@ RgSchErrInfo     *err
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1UlLchDel
+S16 rgSCHSc1UlLchDel
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4054,7 +3992,7 @@ CmLteLcId        lcId,
 U8               lcgId
 )
 #else
-PUBLIC S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
+S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 CmLteLcId        lcId;
@@ -4082,16 +4020,15 @@ U8               lcgId;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlInit
+Void rgSCHSc1UlInit
 (
 RgUlSchdApis *rgSchUlApis
 )
 #else
-PUBLIC Void rgSCHSc1UlInit(rgSchUlApis)
+Void rgSCHSc1UlInit(rgSchUlApis)
 RgUlSchdApis *rgSchUlApis;
 #endif
 {
-   TRC2(rgSCHSc1UlInit);
    /* Init the function pointers */
    rgSchUlApis->rgSCHRgrUlUeCfg     = rgSCHSc1RgrUlUeCfg;
    rgSchUlApis->rgSCHRgrUlUeRecfg   = rgSCHSc1RgrUlUeRecfg;
@@ -4140,7 +4077,7 @@ RgUlSchdApis *rgSchUlApis;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlUeCfg
+S16 rgSCHSc1RgrUlUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4148,7 +4085,7 @@ RgrUeCfg     *ueCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
+S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeCfg     *ueCfg;
@@ -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)
@@ -4190,7 +4126,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlUeRecfg
+S16 rgSCHSc1RgrUlUeRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4198,14 +4134,13 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
+S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
 RgSchErrInfo *err;
 #endif
 {
-   TRC2(rgSCHSc1RgrUlUeRecfg);
    return ROK;
 }  /* rgSCHSc1RgrUeRecfg */
 
@@ -4224,13 +4159,13 @@ RgSchErrInfo *err;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeDel
+Void rgSCHSc1UlUeDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeDel(cell, ue)
+Void rgSCHSc1UlUeDel(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -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)
    {
@@ -4276,13 +4210,13 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeReset 
+Void rgSCHSc1UlUeReset 
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeReset(cell, ue)
+Void rgSCHSc1UlUeReset(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -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;
 
@@ -4327,14 +4260,14 @@ RgSchUeCb    *ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlCellCfg
+S16 rgSCHSc1RgrUlCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
+S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 RgSchErrInfo  *err;
@@ -4342,7 +4275,6 @@ RgSchErrInfo  *err;
 {
    RgSchSc1UlCell     *cellUl; 
 
-   TRC2(rgSCHSc1RgrUlCellCfg);
 
    if((rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->ul.schSpfc), \
@@ -4377,20 +4309,19 @@ RgSchErrInfo  *err;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlCellRecfg
+S16 rgSCHSc1RgrUlCellRecfg
 (
 RgSchCellCb             *cell,
 RgrCellRecfg            *recfg,
 RgSchErrInfo            *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
+S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
 RgSchCellCb             *cell;
 RgrCellRecfg            *recfg;
 RgSchErrInfo            *err;
 #endif
 {
-   TRC2(rgSCHSc1RgrUlCellRecfg);
    return ROK;
 }
 
@@ -4408,18 +4339,17 @@ RgSchErrInfo            *err;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlCellDel
+Void rgSCHSc1UlCellDel
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHSc1UlCellDel(cell)
+Void rgSCHSc1UlCellDel(cell)
 RgSchCellCb  *cell;
 #endif
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
 
-   TRC2(rgSCHSc1UlCellDel);
 
    if (cellUl == NULLP)
    {
@@ -4454,7 +4384,7 @@ RgSchCellCb  *cell;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcgCfg
+S16 rgSCHSc1RgrLcgCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4463,7 +4393,7 @@ RgrLcgCfg    *lcgCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
+S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -4471,7 +4401,6 @@ RgrLcgCfg    *lcgCfg;
 RgSchErrInfo *err;
 #endif
 {
-   TRC2(rgSCHSc1RgrLcgCfg);
    return ROK;
 }  /* rgSCHSc1RgrLcgCfg */
 
@@ -4498,7 +4427,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcgRecfg
+S16 rgSCHSc1RgrLcgRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4507,7 +4436,7 @@ RgrLcgRecfg  *reCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
+S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -4515,7 +4444,6 @@ RgrLcgRecfg  *reCfg;
 RgSchErrInfo *err;
 #endif
 {
-   TRC2(rgSCHSc1RgrLcgRecfg);
    return ROK;
 }  /* rgSCHSc1RgrLcgRecfg */
 
@@ -4534,20 +4462,19 @@ RgSchErrInfo *err;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1LcgDel
+Void rgSCHSc1LcgDel
 (
 RgSchCellCb   *cell,
 RgSchUeCb     *ue,
 RgSchLcgCb    *lcg
 )
 #else
-PUBLIC Void rgSCHSc1LcgDel(cell, ue, lcg)
+Void rgSCHSc1LcgDel(cell, ue, lcg)
 RgSchCellCb   *cell;
 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);
@@ -4857,18 +4779,17 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlSched 
+Void rgSCHSc1UlSched 
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlSched(cell, allocInfo)
+Void rgSCHSc1UlSched(cell, allocInfo)
 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))
    {
@@ -5041,7 +4960,7 @@ RgSchUeCb           *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrShort
+Void rgSCHSc1UpdBsrShort
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -5049,14 +4968,13 @@ RgSchLcgCb   *lcg,
 U8           bsr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
+Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
 U8           bsr;
 #endif
 {
-   TRC2(rgSCHSc1UpdBsrShort);
    rgSCHSc1UlPosnUeInQ(cell, ue);
    RETVOID;
 }  /* rgSCHSc1UpdBsrShort */
@@ -5078,7 +4996,7 @@ U8           bsr;
  *  @return  Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrTrunc
+Void rgSCHSc1UpdBsrTrunc
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -5086,14 +5004,13 @@ RgSchLcgCb   *lcg,
 U8           bsr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
+Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
 U8           bsr;
 #endif
 {
-   TRC2(rgSCHSc1UpdBsrTrunc);
    rgSCHSc1UlPosnUeInQ(cell, ue);
    RETVOID;
 }  /* rgSCHSc1UpdBsrTrunc */
@@ -5114,20 +5031,19 @@ U8           bsr;
  *  @return  Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrLong
+Void rgSCHSc1UpdBsrLong
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 U8           *bsArr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
+Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 U8           *bsArr;
 #endif
 {
-   TRC2(rgSCHSc1UpdBsrLong);
    rgSCHSc1UlPosnUeInQ(cell, ue);
    RETVOID;
 }  /* rgSCHSc1UpdBsrLong */
@@ -5148,13 +5064,13 @@ U8           *bsArr;
  *  @return Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1ContResUlGrant
+Void rgSCHSc1ContResUlGrant
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1ContResUlGrant(cell, ue)
+Void rgSCHSc1ContResUlGrant(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -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)
    {
@@ -5195,13 +5110,13 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1SrRcvd
+Void rgSCHSc1SrRcvd
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1SrRcvd(cell, ue)
+Void rgSCHSc1SrRcvd(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -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;
 
@@ -5245,20 +5159,19 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlCqiInd
+Void rgSCHSc1UlCqiInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 TfuUlCqiRpt          *ulCqiInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
+Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 TfuUlCqiRpt          *ulCqiInfo;
 #endif
 {
-   TRC2(rgSCHSc1UlCqiInd);
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
   RETVOID;
@@ -5280,21 +5193,20 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @return  S16
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1UlLcgUpd
+S16 rgSCHSc1UlLcgUpd
 (
 RgSchCellCb         *cell,
 RgSchUeCb           *ue,
 RgInfUeDatInd       *datInd
 )
 #else
-PUBLIC S16 rgSCHSc1UlLcgUpd(cell, ue)
+S16 rgSCHSc1UlLcgUpd(cell, ue)
 RgSchCellCb         *cell;
 RgSchUeCb           *ue;
 RgInfUeDatInd       *datInd;
 #endif
 {
 
-   TRC2(rgSCHSc1UlLcgUpd);
 
    return ROK;  
 }
@@ -5316,18 +5228,17 @@ RgInfUeDatInd       *datInd;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeRefresh
+Void rgSCHSc1UlUeRefresh
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeRefresh(cell, ue)
+Void rgSCHSc1UlUeRefresh(cell, ue)
 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)
@@ -5509,18 +5418,17 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlAllocFnlz
+Void rgSCHSc1UlAllocFnlz
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
+Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
 {
-   TRC2(rgSCHSc1UlAllocFnlz);
 
    rgSCHSc1UlContResAllocFnlz(cell, allocInfo);
    rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo);
@@ -5544,18 +5452,17 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlActvtUe 
+Void rgSCHSc1UlActvtUe 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlActvtUe(cell, ue)
+Void rgSCHSc1UlActvtUe(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
 {
-   TRC2(rgSCHSc1UlActvtUe);
 
    rgSCHSc1UlPosnUeInQ(cell, ue);
    RETVOID;
@@ -5581,13 +5488,13 @@ RgSchUeCb      *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlHndlInActUes
+Void rgSCHSc1UlHndlInActUes
 (
 RgSchCellCb           *cell,
 CmLListCp             *inactvLst
 )
 #else
-PUBLIC Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
+Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
 RgSchCellCb           *cell;
 CmLListCp             *inactvLst;
 #endif
@@ -5597,7 +5504,6 @@ CmLListCp             *inactvLst;
    RgSchSc1UlCell  *cellUl  = RG_GET_SC1_CELL_UL(cell);
    CmLList      *node = inactvLst->first;
 
-   TRC2(rgSCHSc1UlHndlInActUes);
 
    while (node)
    {
@@ -5634,19 +5540,19 @@ CmLListCp             *inactvLst;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlProcRmvFrmRetx(
+Void rgSCHSc1DlProcRmvFrmRetx(
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
+Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *hqP;
 #endif
 {
-   TRC2(rgSCHSc1DlProcRmvFrmRetx);
+  
    /* Remove the HqP from retx Queue.
    Release HqP.*/
    rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP);