replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...

[o-du/l2.git] / src / 5gnrsch / rg_sch_dhm.c

diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c
index 671574f..8ee476e 100755 (executable)
--- a/src/5gnrsch/rg_sch_dhm.c
+++ b/src/5gnrsch/rg_sch_dhm.c
@@ -63,13 +63,13 @@ static int RLOG_MODULE_ID=4096;
 extern U32 rgNumSPSSchedDropMaxRetx;
 extern U32 rgNumActDtx;
 #endif
-PUBLIC U32  nackSf[10];
+U32  nackSf[10];
 
 
 
 #ifdef MAC_SCH_STATS
-PUBLIC RgSchNackAckStats hqFailStats;
-PUBLIC RgSchHqRetxStats  hqRetxStats;
+RgSchNackAckStats hqFailStats;
+RgSchHqRetxStats  hqRetxStats;
 #endif /* MAC_SCH_STATS */
 //Chandan Stats Collection
 #ifdef DLHQ_STATS
@@ -103,7 +103,7 @@ U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE]
 
 PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, U8 tbIdx, U8 fdbk,
             Bool maxHqRetxReached));
-PUBLIC void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
+void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
 #ifndef LTE_TDD
 PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS((
 RgSchDlHqProcCb      *hqP,
@@ -150,7 +150,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS((
 
 /* Freeing up the HARQ proc blocked for
  * indefinite time in case of Retx */
-PUBLIC S16 rgSCHDhmDlRetxAllocFail ARGS((
+S16 rgSCHDhmDlRetxAllocFail ARGS((
 RgSchUeCb        *ue, 
 RgSchDlHqProcCb  *proc
 ));
@@ -204,18 +204,17 @@ EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP))
  **/
 /*MS_WORKAROUND for ccpu00122893*/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqEntReset
+Void rgSCHDhmHqEntReset
 (
    RgSchDlHqEnt      *hqE
 )
 #else
-PUBLIC Void rgSCHDhmHqEntReset(hqE)
+Void rgSCHDhmHqEntReset(hqE)
    RgSchDlHqEnt      *hqE;
 #endif
 {
    RgSchDlHqProcCb   *hqP;
    U8                i;
-   TRC2(rgSCHDhmHqEntReset)
    cmLListInit(&hqE->inUse);     
    cmLListInit(&hqE->free);      
    for (i=0; i < hqE->numHqPrcs; i++)
@@ -276,18 +275,17 @@ PUBLIC Void rgSCHDhmHqEntReset(hqE)
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb 
+Void rgSCHDhmAssgnUeHqEntFrmRaCb 
 (
 RgSchUeCb       *ue,
 RgSchRaCb       *raCb
 )
 #else
-PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
+Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
 RgSchUeCb       *ue;
 RgSchRaCb       *raCb;
 #endif
 {
-   TRC2(rgSCHDhmAssgnUeHqEntFrmRaCb)
 
    ue->cellInfo[0]->hqEnt = raCb->dlHqE;
    ue->cellInfo[0]->hqEnt->ue = ue;
@@ -318,18 +316,17 @@ RgSchRaCb       *raCb;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmDelHqEnt 
+Void rgSCHDhmDelHqEnt 
 (
 RgSchCellCb       *cell,
 RgSchDlHqEnt      **hqE
 )
 #else
-PUBLIC Void rgSCHDhmDelHqEnt(cell, hqE)
+Void rgSCHDhmDelHqEnt(cell, hqE)
 RgSchCellCb       *cell;
 RgSchDlHqEnt      **hqE;
 #endif
 {
-   TRC2(rgSCHDhmDelHqEnt)
 
    if (!(*hqE))
    {
@@ -345,20 +342,18 @@ RgSchDlHqEnt      **hqE;
 }
 
 #ifdef ANSI
-PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit
+RgSchDlHqEnt *rgSCHDhmHqEntInit
 (
 RgSchCellCb           *cell
 )
 #else
-PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
+RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
 RgSchCellCb           *cell;
 #endif
 {
    RgSchDlHqEnt      *hqE;
    Inst              inst = cell->instIdx;
 
-   TRC2(rgSCHDhmHqEntInit)
-
    /* Init the HARQ data structure */
    if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE, sizeof(RgSchDlHqEnt)) != ROK)
    {
@@ -423,7 +418,7 @@ RgSchCellCb           *cell;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetAvlHqProc
+S16 rgSCHDhmGetAvlHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
@@ -431,7 +426,7 @@ CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
+S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb               *ue;
 CmLteTimingInfo         timingInfo;
@@ -441,7 +436,6 @@ RgSchDlHqProcCb         **hqP;
    RgSchDlHqEnt         *hqE = NULLP;
    RgSchDlHqProcCb   *tmpHqProc;
    CmLList           *tmp;
-   TRC2(rgSCHDhmGetAvlHqProc);
 
    hqE      = RG_SCH_CMN_GET_UE_HQE(ue, cell);
  
@@ -548,7 +542,7 @@ RgSchDlHqProcCb         **hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqTbRetx
+Void rgSCHDhmHqTbRetx
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timingInfo,
@@ -556,7 +550,7 @@ RgSchDlHqProcCb         *hqP,
 U8                      tbIdx
 )
 #else
-PUBLIC Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
+Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
 RgSchDlHqEnt            *hqE;
 CmLteTimingInfo         timingInfo;
 RgSchDlHqProcCb         *hqP;
@@ -564,7 +558,6 @@ U8                      tbIdx;
 #endif
 {
    U8 othrTbIdx = tbIdx ^ 1;
-   TRC2(rgSCHDhmHqTbRetx)
 
    hqP->tbInfo[tbIdx].timingInfo = timingInfo;
 
@@ -616,16 +609,15 @@ U8                      tbIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
 (
 RgSchDlHqEnt            *hqE
 )
 #else
-PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
+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))
@@ -662,14 +654,14 @@ RgSchDlHqEnt            *hqE;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetCcchSduHqProc
+S16 rgSCHDhmGetCcchSduHqProc
 (
 RgSchUeCb               *ueCb,
 CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
+S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
 RgSchUeCb               *ueCb;
 CmLteTimingInfo         timingInfo;
 RgSchDlHqProcCb         **hqP;
@@ -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)
@@ -736,13 +726,13 @@ RgSchDlHqProcCb         **hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetMsg4HqProc
+S16 rgSCHDhmGetMsg4HqProc
 (
 RgSchRaCb               *raCb,
 CmLteTimingInfo         timingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
+S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
 RgSchRaCb               *raCb;
 CmLteTimingInfo         timingInfo;
 #endif
@@ -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)
@@ -792,14 +780,14 @@ CmLteTimingInfo         timingInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRlsHqpTb
+Void rgSCHDhmRlsHqpTb
 (
 RgSchDlHqProcCb         *hqP,
 U8                      tbIdx,
 Bool                    togNdi
 ) 
 #else
-PUBLIC Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) 
+Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) 
 RgSchDlHqProcCb         *hqP;
 U8                      tbIdx;
 Bool                    togNdi;
@@ -816,8 +804,6 @@ Bool                    togNdi;
    U8                   numLch = 0;
 #endif
 
-   TRC2(rgSCHDhmRlsHqpTb)
-
    /* Reset all tbInfo values */
 
    hqE = hqP->hqE;
@@ -1033,18 +1019,16 @@ rgEmtcsetNullSubFrm(hqP);
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRlsHqProc
+Void rgSCHDhmRlsHqProc
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmRlsHqProc(hqP)
+Void rgSCHDhmRlsHqProc(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
 
-   TRC2(rgSCHDhmRlsHqProc)
-
 
 #ifdef MAC_SCH_STATS
     /* THIS FUNCTION IS NOT CALLED */
@@ -1115,7 +1099,7 @@ rgEmtcsetNullSubFrm(hqP);
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetHqProcFrmId
+S16 rgSCHDhmGetHqProcFrmId
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
@@ -1123,7 +1107,7 @@ U8                      idx,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
+S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb               *ue;
 U8                      idx;
@@ -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 */
@@ -1154,14 +1137,14 @@ RgSchDlHqProcCb         **hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
 CmLteTimingInfo         timingInfo
 )
 #else
-PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
 RgSchCellCb           *cell,
 RgSchUeCb               *ue;
 CmLteTimingInfo         timingInfo;
@@ -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)
@@ -1336,20 +1315,18 @@ Bool              maxHqRetxReached;
  *      -# None.
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmSchdTa
+Void rgSCHDhmSchdTa
 (
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 )
 #else
-PUBLIC Void rgSCHDhmSchdTa(ueCb, tbInfo)
+Void rgSCHDhmSchdTa(ueCb, tbInfo)
 RgSchUeCb         *ueCb;
 RgSchDlHqTbCb     *tbInfo;
 #endif
 {
 
-   TRC2(rgSCHDhmSchdTa)
-
    ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED;
     ueCb->dl.taCb.numRemSf  =  2; 
    tbInfo->schdTa.pres    = PRSNT_NODEF;
@@ -1521,7 +1498,7 @@ RgSchCellCb             *cell;
  *      -# NULLP 
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb *rgSCHDhmHqProcByTime
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timeInfo,
@@ -1529,7 +1506,7 @@ Bool                    *isMsg4,
 RgSchDlSf               *sf
 )
 #else
-PUBLIC RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
                                               isMsg4,sf)
 RgSchDlHqEnt            *hqE;
 CmLteTimingInfo         timeInfo;
@@ -1569,7 +1546,7 @@ RgSchDlSf               *sf;
  *      
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqTbTrnsFail
+Void rgSCHDhmHqTbTrnsFail
 (
 RgSchCellCb             *cell,
 RgSchDlHqProcCb         *hqP,
@@ -1577,7 +1554,7 @@ U8                      tbCnt,
 Bool                    *isMaxRetx
 )
 #else
-PUBLIC Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
+Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
 RgSchCellCb             *cell;
 RgSchDlHqProcCb         *hqP;
 U8                      tbCnt;
@@ -1587,8 +1564,6 @@ Bool                    *isMaxRetx;
    RgSchDlHqEnt         *hqE;
    U8                   maxHqTx;
 
-   TRC2(rgSCHDhmHqTbTrnsFail)
-
    hqE = hqP->hqE;
 
    /* Fetch the maximum number of harq transmissions */
@@ -1747,7 +1722,7 @@ Bool                    *isMaxRetx;
    RETVOID;
 } /* rgSCHDhmHqTbTrnsFail */
 
-PUBLIC U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, 
+U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, 
                                    {{0, 0}, {0, 0}, {0, 0}, {0, 0}}};
 #ifdef LTE_TDD
 #ifdef LTE_ADV
@@ -2058,7 +2033,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb,
 U8                   cbType,
@@ -2069,7 +2044,7 @@ RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
 Void                    *cb;
 U8                      cbType;
 RgSchCellCb             *cellCb;
@@ -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)
    {
@@ -2757,7 +2731,7 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmPrcFdbkForTb
+S16 rgSCHDhmPrcFdbkForTb
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -2772,7 +2746,7 @@ RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
+S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
 RgSchCellCb             *cell;
 RgSchUeCb               *ue;
 RgSchDlHqProcCb         *hqP;
@@ -2804,7 +2778,6 @@ RgSchErrInfo            *err;
    CmLteTimingInfo      frm = timingInfo;
 #endif
 
-   TRC2(rgSCHDhmPrcFdbkForTb)
    if (ue)
    {
       ueDl     = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -3039,7 +3012,7 @@ RgSchErrInfo            *err;
  *  @return     RETVOID
  **/
 #ifdef ANSI
-PUBLIC Void rgSchGetHqFdbkPos
+Void rgSchGetHqFdbkPos
 (
  RgSchCellCb          *cell,
  RgSchUeCb            *ue,
@@ -3049,7 +3022,7 @@ PUBLIC Void rgSchGetHqFdbkPos
  RgTfuHqInfo          *fdbk
  )
 #else
-PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
+Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
  RgSchCellCb          *cell;
  RgSchUeCb            *ue;
  RgSchDlHqProcCb      *hqP;
@@ -3220,14 +3193,14 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
 }/* End of rgSchGetHqFdbkPos */
 #ifdef LTE_ADV
 #ifdef ANSI
-PUBLIC Void rgSchGetHqFdbkPosFormat3
+Void rgSchGetHqFdbkPosFormat3
 (
  RgSchDlHqProcCb      *hqP,
  U8                   *isAck,
  TfuHqFdbk            *fdbk
  )
 #else
-PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
+Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  RgSchDlHqProcCb      *hqP;
  U8                  *isAck;
  TfuHqFdbk           *fdbk;
@@ -3260,7 +3233,7 @@ PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhm5gtfHqFdbkInd 
+S16 rgSCHDhm5gtfHqFdbkInd 
 (
 RgSchUeCb            *ue,
 RgSchCellCb          *cell,
@@ -3269,7 +3242,7 @@ TfuHqFdbk            fdbk,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
+S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
 RgSchUeCb            *ue;
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
@@ -3288,8 +3261,6 @@ RgSchErrInfo         *err;
    U8                   hqPCount = 0;
    RgInfRlsHqInfo       *rlsHqBufs = NULLP;
 
-   TRC2(rgSCHDhm5gtfHqFdbkInd)
-
    RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); 
 
    sf = rgSCHUtlSubFrmGet(cell, timingInfo);
@@ -3348,7 +3319,7 @@ RgSchErrInfo         *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb, 
 U8                   cbType,
@@ -3359,7 +3330,7 @@ RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
 Void                    *cb;
 U8                      cbType;
 RgSchCellCb             *cell;
@@ -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 
@@ -3636,7 +3605,7 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrUeCfg
+Void rgSCHDhmRgrUeCfg
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ueCb,
@@ -3644,14 +3613,13 @@ RgrUeCfg          *ueCfg,
 RgSchErrInfo      *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
+Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
 RgSchCellCb       *cell;
 RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
 RgSchErrInfo      *err;
 #endif
 {
-   TRC2(rgSCHDhmRgrUeCfg)
 
    UNUSED(err);
 
@@ -3704,14 +3672,14 @@ RgSchErrInfo      *err;
  *                -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrCellCfg
+Void rgSCHDhmRgrCellCfg
 (
 RgSchCellCb    *cell,
 RgrCellCfg     *cellCfg,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
+Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
 RgSchCellCb    *cell;
 RgrCellCfg     *cellCfg;
 RgSchErrInfo   *err;
@@ -3723,8 +3691,6 @@ RgSchErrInfo   *err;
    S16         ret;
    U8          idx;
 
-   TRC2(rgSCHDhmRgrCellCfg)
-
    UNUSED(err);
 
    pUeCb = NULLP;
@@ -3791,14 +3757,14 @@ RgSchErrInfo   *err;
  *                -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrCellRecfg
+Void rgSCHDhmRgrCellRecfg
 (
 RgSchCellCb    *cell,
 RgrCellRecfg   *cellRecfg,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
+Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
 RgSchCellCb    *cell;
 RgrCellRecfg   *cellRecfg;
 RgSchErrInfo   *err;
@@ -3809,8 +3775,6 @@ RgSchErrInfo   *err;
    PTR         nUeCb;/* next UE control block */
    S16         ret;
 
-   TRC2(rgSCHDhmRgrCellRecfg)
-
    UNUSED(err);
 
    pUeCb = NULLP;
@@ -3854,18 +3818,16 @@ RgSchErrInfo   *err;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmFreeUe
+Void rgSCHDhmFreeUe
 (
 RgSchUeCb          *ueCb
 )
 #else
-PUBLIC Void rgSCHDhmFreeUe(ueCb)
+Void rgSCHDhmFreeUe(ueCb)
 RgSchUeCb          *ueCb;
 #endif
 {
 
-   TRC2(rgSCHDhmFreeUe)
-
    /* If TA Timer is running. Stop it */
    if (ueCb->taTmr.tmrEvnt != TMR_NONE)
    {
@@ -3924,20 +3886,19 @@ RgSchUeCb          *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmUpdTa
+Void rgSCHDhmUpdTa
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ueCb,
 U8             ta
 )
 #else
-PUBLIC Void rgSCHDhmUpdTa(cell, ueCb, ta)
+Void rgSCHDhmUpdTa(cell, ueCb, ta)
 RgSchCellCb    *cell;
 RgSchUeCb      *ueCb;
 U8             ta;
 #endif
 {
-   TRC2(rgSCHDhmUpdTa)
 
    if (ueCb->dl.taCb.state == RGSCH_TA_IDLE)
    {
@@ -3987,17 +3948,15 @@ U8             ta;
   *      -#None.
   */
 #ifdef ANSI
-PUBLIC Void rgSCHDhmProcTAExp 
+Void rgSCHDhmProcTAExp 
 (
  RgSchUeCb  *ueCb
  )
 #else
-PUBLIC Void rgSCHDhmProcTAExp (ueCb)
+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);  
@@ -4023,22 +3982,20 @@ PUBLIC Void rgSCHDhmProcTAExp (ueCb)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmAddLcData
+S16 rgSCHDhmAddLcData
 (
 Inst               inst,
 RgSchLchAllocInfo  *lchData,
 RgSchDlHqTbCb      *tbInfo
 )
 #else
-PUBLIC S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
+S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
 Inst               inst;
 RgSchLchAllocInfo  *lchData;
 RgSchDlHqTbCb      *tbInfo;
 #endif
 {
 
-   TRC2(rgSCHDhmAddLcData)
-
    if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC)
    {
      return RFAILED;
@@ -4070,13 +4027,13 @@ RgSchDlHqTbCb      *tbInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmTddRlsSubFrm
+S16 rgSCHDhmTddRlsSubFrm
 (
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      uciTimingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
+S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
 RgSchCellCb          *cellCb;
 CmLteTimingInfo      uciTimingInfo;
 #endif
@@ -4086,8 +4043,6 @@ CmLteTimingInfo      uciTimingInfo;
    U8                      noFdbks;
    U8                      i;
 
-   TRC2(rgSCHDhmTddRlsSubFrm)
-
    ascIdx = 
       rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
    noFdbks = ascIdx.numFdbkSubfrms;
@@ -4127,13 +4082,13 @@ U32 macDtx = 0;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
 (
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      uciTimingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
 RgSchCellCb          *cellCb;
 CmLteTimingInfo      uciTimingInfo;
 #endif
@@ -4154,7 +4109,6 @@ CmLteTimingInfo      uciTimingInfo;
    RgSchTddANInfo          *anInfo = NULLP;
    RgSchDlHqTbCb           *tbCb;
    RgSchUeCb               *ue = NULLP;
-   TRC2(rgSCHDhmRlsDlsfHqProc)
 
    ascIdx = 
       rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
@@ -4414,13 +4368,13 @@ CmLteTimingInfo      uciTimingInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
 (
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
 #endif
@@ -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() 
@@ -4580,19 +4532,18 @@ CmLteTimingInfo      timingInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmMarkSpsHqProc
+S16 rgSCHDhmMarkSpsHqProc
 (
 RgSchUeCb               *ue,
 U8                      idx
 )
 #else
-PUBLIC S16 rgSCHDhmMarkSpsHqProc(ue, idx)
+S16 rgSCHDhmMarkSpsHqProc(ue, idx)
 RgSchUeCb               *ue;
 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 */
@@ -4692,13 +4642,13 @@ U8                   *isAck;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmDlRetxAllocFail 
+S16 rgSCHDhmDlRetxAllocFail 
 (
 RgSchUeCb               *ue,
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
+S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
 RgSchUeCb               *ue;
 RgSchDlHqProcCb         *hqP;
 #endif
@@ -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]);
@@ -4857,14 +4805,14 @@ U8                      tbCnt;
 }
 
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff
+S16 rgSCHDhmUpdBlerBasediTbsEff
 (
 RgSchCellCb             *cell,
 RgSchUeCb               *ueCb,
 U8                      tbCnt
 )
 #else
-PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
+S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
 (
 RgSchCellCb             *cell;
 RgSchUeCb               *ueCb;
@@ -4957,8 +4905,6 @@ U8            hqCnt;
 {
    U8       numOfAcks;
    
-   TRC2(rgSCHDhmPrcSplBundlFdbk);
-
    /* Num of ACKs reported by UE */
    numOfAcks = fdbk->isAck[0];
 
@@ -5006,16 +4952,15 @@ U8            hqCnt;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPAdd2FreeLst
+Void rgSCHDhmHqPAdd2FreeLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPAdd2FreeLst(hqP)
+Void rgSCHDhmHqPAdd2FreeLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPAdd2FreeLst)
 
 #ifdef LAA_DBG
    if (hqP->hqPLst)
@@ -5063,16 +5008,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPAdd2InUseLst
+Void rgSCHDhmHqPAdd2InUseLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPAdd2InUseLst(hqP)
+Void rgSCHDhmHqPAdd2InUseLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPAdd2InUseLst)
 
 #ifdef LAA_DBG
    if (hqP->hqPLst)
@@ -5115,16 +5059,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPDelFrmFreeLst
+Void rgSCHDhmHqPDelFrmFreeLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPDelFrmFreeLst(hqP)
+Void rgSCHDhmHqPDelFrmFreeLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPDelFrmFreeLst)
 
 #ifdef LAA_DBG
    if (!hqP->hqPLst)
@@ -5178,16 +5121,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPDelFrmInUseLst
+Void rgSCHDhmHqPDelFrmInUseLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPDelFrmInUseLst(hqP)
+Void rgSCHDhmHqPDelFrmInUseLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPDelFrmInUseLst)
 
 #ifdef LAA_DBG
    if (!hqP->hqPLst)