X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_sc1.c;h=e8442bd8f096eb1bc25c1404faad535d5f96c501;hb=97a2285207414a7948f5e1dfcb5318fa9507c123;hp=c06896ab1f82c14039f4c7a3397bb78bcd1abda7;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c
index c06896ab1..e8442bd8f 100755
--- a/src/5gnrsch/rg_sch_sc1.c
+++ b/src/5gnrsch/rg_sch_sc1.c
@@ -32,9 +32,6 @@
 @brief The scheduling functionality is implemented in this file.
 */
 
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_MODULE_ID=4096;
-static int RLOG_FILE_ID=173;
 
 /* header include files -- defines (.h) */
 #include "common_def.h"
@@ -48,8 +45,6 @@ static int RLOG_FILE_ID=173;
 #include "rg_sch.h"
 #include "rg_sch_cmn.h"
 #include "rg_sch_sc1.h"
-#include "rl_interface.h"
-#include "rl_common.h"
 
 /* header/extern include files (.x) */
 #include "tfu.x"           /* RGU types */
@@ -208,17 +203,7 @@ static Void rgSCHSc1DlPstSchd ARGS ((
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlUeReset 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlUeReset(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlUeReset(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
    rgSCHSc1DlSuspendUe(cell, ue);
@@ -242,24 +227,14 @@ RgSchUeCb      *ue;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlActvtUe 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlActvtUe(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlActvtUe(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    CmLListCp       *lst;
    CmLList         *node;
    RgSchDlHqProcCb *hqP;
    RgSchDlLcCb     *svc;
-   uint8_t              idx;
+   uint8_t         idx;
 
    /* Add UE's HqProcs From UERetxLst to CellRetxLst */
    lst = &ueDl->retxHqProcs;
@@ -308,17 +283,7 @@ RgSchUeCb      *ue;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlUeRefresh
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlUeRefresh(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlUeRefresh(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
                            /*cell added as part of CA dev*/
@@ -379,22 +344,11 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcRmvFrmCellRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcRmvFrmCellRetx(RgSchCellCb *cell,RgSchDlHqProcCb  *hqP)
 {
    RgSchSc1DlCell       *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchCmnDlHqProc     *hqProcDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 
-
    if (hqProcDl->retxLnk.node != NULLP)
    {
       cmLListDelFrm(&cellDl->retxLst[((RgSchSc1DlHqProc *)\
@@ -421,24 +375,11 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcRmvFrmUeRetx
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcRmvFrmUeRetx(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchSc1DlUe            *sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlHqProc     *hqProcDl = RG_GET_SC1_HQP_DL(hqP);
 
-
    if (hqProcDl->retxLnkUe.node != NULLP)
    {
       cmLListDelFrm(&sc1Ue->retxHqProcs,
@@ -466,24 +407,11 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcAddToUeRetx
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcAddToUeRetx(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchSc1DlUe            *sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlHqProc     *cmnHqDl = RG_GET_SC1_HQP_DL(hqP);
 
-
    cmLListAdd2Tail(&sc1Ue->retxHqProcs, 
                     &(cmnHqDl->retxLnkUe));
    cmnHqDl->retxLnkUe.node = (PTR)hqP;
@@ -508,17 +436,7 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlProcAddToCellRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHSc1DlProcAddToCellRetx(RgSchCellCb *cell,RgSchDlHqProcCb  *hqP)
 {
    RgSchSc1DlCell          *sc1CellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchCmnDlHqProc     *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
@@ -553,21 +471,9 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxAlloc
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHSc1DlRetxAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   uint8_t                   i;
+   uint8_t              i;
    CmLListCp            *retxLst;
    CmLList              *node;
    RgSchDlHqProcCb      *hqP;
@@ -577,7 +483,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
 #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD)))
    CmLteTimingInfo      schdTime;
 #endif
-   uint32_t                  effBo;
+   uint32_t             effBo;
    RgSchUeCb            *ue = NULLP;
 #ifdef LTEMAC_HDFDD
    Bool                 dlAllowed = FALSE;
@@ -691,15 +597,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1RlsHqProc
-(
-RgSchDlHqProcCb      *hqProc
-)
-#else
-static Void rgSCHSc1RlsHqProc(hqProc)
-RgSchDlHqProcCb      *hqProc;
-#endif
+static Void rgSCHSc1RlsHqProc(RgSchDlHqProcCb *hqProc)
 {
    rgSCHDhmRlsHqProc(hqProc);
    return;
@@ -724,28 +622,12 @@ RgSchDlHqProcCb      *hqProc;
  *  @return  S16 
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSc1DlDedSvcAlloc
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchDlLcCb                *svc,
-uint32_t                        bo,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchDlLcCb                *svc;
-uint32_t                        bo;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static S16 rgSCHSc1DlDedSvcAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchDlLcCb *svc,uint32_t bo,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchUeCb               *ue;
    RgSchDlHqProcCb         *proc;
-   uint16_t                     rlcHdrEstmt;
-   uint32_t                     effBo;
+   uint16_t                rlcHdrEstmt;
+   uint32_t                effBo;
    RgSchCmnDlCell          *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlSvc           *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
    RgSchSc1DlSvc           *svcSc1;
@@ -793,7 +675,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       /* scheduling may be done for this UE                       */
       if (RG_SCH_CMN_PROC_SLCTD_FOR_RETX(proc))
       {
-         RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
+         DU_LOG("\nERROR  -->  SCH : CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
             "Ue retransmitting",ue->ueId);
          return ROK;
       }
@@ -809,7 +691,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    {
       if (rgSCHDhmGetAvlHqProc(cell, ue, cmnCellDl->time, &proc) != ROK)
       {
-         RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
+         DU_LOG("\nERROR  -->  SCH : CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
             " No HARQ Proc available", ue->ueId);
          return ROK;
       }
@@ -873,19 +755,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlAdd2UeSchdSvcs
-(
-RgSchCellCb                *cell,
-RgSchUeCb          *ue,
-RgSchDlLcCb        *svc
-)
-#else
-static Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb          *ue;
-RgSchDlLcCb        *svc;
-#endif
+static Void rgSCHSc1DlAdd2UeSchdSvcs(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlSvc  *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchSc1DlUe   *ueSc1 = RG_GET_SC1_UE_DL(ue, cell);
@@ -922,25 +792,13 @@ RgSchDlLcCb        *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedTx
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHSc1DlDedTx(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLListCp            *lst;
    CmLList              *node;
    RgSchUeCb            *ue = NULLP;
    RgSchDlLcCb          *svc;
-   uint8_t                   i;
+   uint8_t              i;
    RgSchSc1DlSvc        *svcSc1;
    RgSchSc1DlUe         *ueDl;
    RgSchSc1DlCell       *sc1CellDl = RG_GET_SC1_CELL_DL(cell);
@@ -1019,15 +877,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @param[in]  Inst      schInst
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlPreSchd
-(
- RgSchCellCb   *cell
-)
-#else
-Void rgSCHSc1DlPreSchd(cell)
- RgSchCellCb   *cell;
-#endif
+static Void rgSCHSc1DlPreSchd( RgSchCellCb   *cell)
 {
    
    return;
@@ -1045,15 +895,7 @@ Void rgSCHSc1DlPreSchd(cell)
  *  @param[in]  Inst      schInst
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlPstSchd
-(
- Inst       schInst
-)
-#else
-Void rgSCHSc1DlPstSchd(schInst)
- Inst       schInst
-#endif
+static Void rgSCHSc1DlPstSchd(Inst  schInst)
 {
    
    return;
@@ -1076,23 +918,10 @@ Void rgSCHSc1DlPstSchd(schInst)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedNewTx
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedNewTx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlDedNewTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlSf            *subFrm = allocInfo->dedAlloc.dedDlSf;
-#ifdef DEBUGP
-   Inst                 inst = cell->instIdx;
-#endif
-   RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedNewTx\n"));
+   DU_LOG("\nDEBUG  -->  SCH : rgSCHSc1DlDedNewTx\n");
 
    /* Now perform the new UE selections */
    rgSCHSc1DlDedTx(cell, subFrm, allocInfo);
@@ -1117,23 +946,10 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedRetx
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedRetx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlDedRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   RgSchDlSf            *subFrm = allocInfo->dedAlloc.dedDlSf;
-#ifdef DEBUGP
-   Inst                 inst = cell->instIdx;
-#endif
-   RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedRetx\n"));
+   RgSchDlSf  *subFrm = allocInfo->dedAlloc.dedDlSf;
+   DU_LOG("\nDEBUG  -->  SCH : rgSCHSc1DlDedRetx\n");
 
    rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo);
 
@@ -1159,17 +975,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAddToSchd
-(
-RgSchCellCb                *cell,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcAddToSchd(cell, svc)
-RgSchCellCb                *cell;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcAddToSchd(RgSchCellCb *cell,RgSchDlLcCb  *svc)
 {
    CmLListCp            *lst;
    CmLList              *node;
@@ -1260,17 +1066,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlUeRmvFrmSchd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHSc1DlUeRmvFrmSchd(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHSc1DlUeRmvFrmSchd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
@@ -1305,19 +1101,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1348,25 +1132,13 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAddToUeAmbrLst 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcAddToUeAmbrLst(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
-   RgSchSc1DlUe            *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   CmLList              *node;
-   RgSchDlLcCb          *lsvc;
-   RgSchSc1DlSvc           *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
-   RgSchCmnDlSvc        *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
+   RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
+   CmLList         *node;
+   RgSchDlLcCb     *lsvc;
+   RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
+   RgSchCmnDlSvc   *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
 
 
    /* If svc already present in AMBR List return */
@@ -1414,17 +1186,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcRmvFrmSchd
-(
-RgSchCellCb                *cell,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc)
-RgSchCellCb                *cell;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcRmvFrmSchd(RgSchCellCb *cell,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlSvc *svcDl = RG_GET_SC1_SVC_DL(svc->ue,svc,cell);
@@ -1462,21 +1224,7 @@ RgSchDlLcCb                *svc;
  *  @return                    Void 
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAdd
-(
-RgSchCellCb                *cell,
-RgSchUeCb               *ue,
-RgSchDlLcCb             *svc,
-RgrDlLchCfg             *cfg
-)
-#else
-static Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg)
-RgSchCellCb                *cell;
-RgSchUeCb               *ue;
-RgSchDlLcCb             *svc;
-RgrDlLchCfg             *cfg;
-#endif
+static Void rgSCHSc1DlSvcAdd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc,RgrDlLchCfg *cfg)
 {
    RgSchSc1DlUe  *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1512,19 +1260,7 @@ RgrDlLchCfg             *cfg;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlLcRmv
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSc1DlLcRmv(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSc1DlLcRmv(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlUe  *ueDl;
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1595,21 +1331,7 @@ RgSchDlLcCb                *svc;
  *  @return     Void 
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcMod
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc,
-RgrLchRecfg             *recfg
-)
-#else
-static Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-RgrLchRecfg             *recfg;
-#endif
+static Void rgSCHSc1DlSvcMod(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc,RgrLchRecfg  *recfg)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
@@ -1639,24 +1361,14 @@ RgrLchRecfg             *recfg;
  *  @return                    Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlUeAddToSchd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHSc1DlUeAddToSchd(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHSc1DlUeAddToSchd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlUe   *lueDl;
    CmLList        *node;
    CmLListCp      *lst;
-   RgSchUeCb                  *nodeUe = NULLP;
+   RgSchUeCb      *nodeUe = NULLP;
 
    ueDl->prio = ((RgSchCmnDlSvc *)(ueDl->ambrSvc->sch))->prio;
    lst  = &cellDl->prioLst[ueDl->prio]; 
@@ -1714,19 +1426,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngAmbrSvcPosn
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngAmbrSvcPosn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1812,19 +1512,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlLcBoUpd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSc1DlLcBoUpd(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1864,19 +1552,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngPrio0SvcPosn
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngPrio0SvcPosn(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb  *svc)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1912,19 +1588,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngGbrSvcPosn 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngGbrSvcPosn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1957,19 +1621,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngSvcPosn 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngSvcPosn(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb *svc)
 { 
    RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
@@ -2002,30 +1654,16 @@ RgSchDlLcCb                *svc;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlCellCfg
-(
-RgSchCellCb   *cell,
-RgrCellCfg    *cellCfg,
-RgSchErrInfo  *err
-)
-#else
-S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *err;
-#endif
+S16 rgSCHSc1RgrDlCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err)
 {
    S16         ret;
    RgSchSc1DlCell *cellDl;
 
-
    if((ret = rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc), \
       (sizeof(RgSchSc1DlCell)))) != ROK)
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
-         "Memory allocation FAILED");
+      DU_LOG("\nERROR  -->  SCH : Memory allocation FAILED");
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
       return (ret);
    }
@@ -2049,17 +1687,9 @@ RgSchErrInfo  *err;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlDeinitQueues
-(
-RgSchSc1DlCell *cellDl
-)
-#else
-static Void rgSCHSc1DlDeinitQueues(cellDl)
-RgSchSc1DlCell *cellDl;
-#endif
+static Void rgSCHSc1DlDeinitQueues(RgSchSc1DlCell *cellDl)
 {
-   uint8_t          i;
+   uint8_t i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
@@ -2083,15 +1713,7 @@ RgSchSc1DlCell *cellDl;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlCellDel
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHSc1DlCellDel(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHSc1DlCellDel(RgSchCellCb  *cell)
 {
 
    if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \
@@ -2128,21 +1750,7 @@ RgSchCellCb  *cell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlUeCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeCfg     *ueCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrDlUeCfg(RgSchCellCb  *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg,RgSchErrInfo *err)
 {
    RgSchCmnUe         *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell);
    Inst               inst = cell->instIdx;
@@ -2152,7 +1760,7 @@ RgSchErrInfo *err;
    if((rgSCHUtlAllocSBuf(inst, 
                (Data**)&(ueSchCmn->dl.schSpfc), (sizeof(RgSchSc1DlUe))) != ROK))
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"
+      DU_LOG("\nERROR  -->  SCH : Memory allocation FAILED"
                "CRNTI:%d",ue->ueId);
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
       return RFAILED;
@@ -2191,29 +1799,18 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlUeHqEntInit
-(
- RgSchCellCb      *cell,
- RgSchDlHqEnt     *hqEnt
- )
-#else
-S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
-   RgSchCellCb      *cell;
-   RgSchDlHqEnt     *hqEnt
-#endif
+S16 rgSCHSc1DlUeHqEntInit(RgSchCellCb *cell,RgSchDlHqEnt *hqEnt)
 {
    RgSchSc1DlHqProc   *hqSpcSch;
    RgSchDlHqProcCb    *hqP;
-   uint8_t                 cnt;
+   uint8_t            cnt;
    /* making use of hqE->sch for one shot allocation 
     * of RgSchSc1DlHqProc structures */
    if (rgSCHUtlAllocSBuf(cell->instIdx, 
             (Data**)&(hqEnt->sch),
             (hqEnt->numHqPrcs * sizeof(RgSchSc1DlHqProc))) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
-               "Memory allocation FAILED CRNTI:%d",hqEnt->ue->ueId);
+      DU_LOG("\nERROR  -->  SCH : Memory allocation FAILED CRNTI:%d",hqEnt->ue->ueId);
       return RFAILED;
    }
    hqSpcSch = (RgSchSc1DlHqProc *)(hqEnt->sch);
@@ -2240,17 +1837,7 @@ S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
  *  @param[in]  RgSchDlHqEnt     *hqE 
  *  @return  Void
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlUeHqEntDeInit 
-(
-RgSchCellCb      *cell,
-RgSchDlHqEnt     *hqE
-)
-#else
-S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
-RgSchCellCb      *cell;
-RgSchDlHqEnt     *hqE;
-#endif
+S16 rgSCHSc1DlUeHqEntDeInit(RgSchCellCb *cell,RgSchDlHqEnt *hqE)
 {
 
    if(hqE->sch)
@@ -2283,21 +1870,7 @@ RgSchDlHqEnt     *hqE;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrDlUeRecfg(RgSchCellCb  *cell,RgSchUeCb  *ue,RgrUeRecfg  *ueRecfg,RgSchErrInfo *err)
 {
    RgSchSc1DlUe *ueDl     = RG_GET_SC1_UE_DL(ue, cell);
    RgSchCmnDlUe *ueCmnDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -2374,21 +1947,11 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRmvUeFrmPrioQs
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlRmvUeFrmPrioQs(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1DlUe         *sc1Ue;
    RgSchDlLcCb          *svc;
-   uint32_t                  idx;
+   uint32_t             idx;
 
 
    sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
@@ -2424,23 +1987,13 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlInactvtUe
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlInactvtUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlInactvtUe(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1DlCell       *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchDlHqProcCb      *hqP;
    RgSchCmnDlHqProc     *hqProcDl;
-   uint8_t                   i;
-   RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
+   uint8_t              i;
+   RgSchDlHqEnt         *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
    /* ccpu00130170: UE related HARQ Procs are cleared only 
@@ -2490,22 +2043,12 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSuspendUe 
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlSuspendUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlSuspendUe(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchDlHqProcCb      *hqP;
-   uint8_t                   i;
-   uint8_t                   j;
-   RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
+   uint8_t              i;
+   uint8_t              j;
+   RgSchDlHqEnt         *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
    /* remove all in use HARQ processes from the subframes.
@@ -2557,15 +2100,7 @@ RgSchUeCb    *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlScanUpdPdbPrio
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHSc1DlScanUpdPdbPrio (cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHSc1DlScanUpdPdbPrio(RgSchCellCb *cell)
 {
    
    return;
@@ -2591,17 +2126,7 @@ RgSchCellCb *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlFillFlowCntrlInfo
-(
-RgSchCellCb    *cell,
-RgInfSfAlloc   *sfAlloc
-)
-#else
-S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
-RgSchCellCb    *cell;
-RgInfSfAlloc   *sfAlloc;
-#endif
+S16 rgSCHSc1DlFillFlowCntrlInfo(RgSchCellCb    *cell,RgInfSfAlloc   *sfAlloc)
 {
   return ROK;
 }
@@ -2619,17 +2144,7 @@ RgInfSfAlloc   *sfAlloc;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlUeDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1DlUeDel(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1DlUeDel(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell);
@@ -2681,23 +2196,7 @@ RgSchUeCb    *ue;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchDlLcCb  *dlLc,
-RgrLchCfg *lcCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchCfg *lcCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcCfg(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchDlLcCb  *dlLc,RgrLchCfg *lcCfg,RgSchErrInfo *err)
 {
    S16      ret;
 
@@ -2706,7 +2205,7 @@ RgSchErrInfo *err;
       (sizeof(RgSchSc1DlSvc)));
    if (ret != ROK)
    {
-      RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHSc1CrgLcCfg():"
+      DU_LOG("\nERROR  -->  SCH : rgSCHSc1CrgLcCfg():"
       "SCH struct alloc failed CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId);
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
       return (ret);
@@ -2739,23 +2238,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchDlLcCb  *dlLc,
-RgrLchRecfg  *lcRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchRecfg  *lcRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcRecfg(RgSchCellCb  *cell,RgSchUeCb  *ue,RgSchDlLcCb  *dlLc,RgrLchRecfg  *lcRecfg,RgSchErrInfo *err)
 {
 
    UNUSED(err);
@@ -2780,19 +2263,7 @@ RgSchErrInfo *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSc1RgrDlCellRecfg
-(
-RgSchCellCb             *cell,
-RgrCellRecfg            *recfg,
-RgSchErrInfo            *err
-)
-#else
-static S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err)
-RgSchCellCb             *cell;
-RgrCellRecfg            *recfg;
-RgSchErrInfo            *err;
-#endif
+static S16 rgSCHSc1RgrDlCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err)
 {
    return ROK;
 }
@@ -2816,23 +2287,13 @@ RgSchErrInfo            *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlTaCmd
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlTaCmd(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlTaCmd(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLListCp            *lst;
    CmLList              *node;
    RgSchDlHqProcCb      *proc;
    RgSchUeCb            *ue;
-   uint32_t                  effBo;
+   uint32_t             effBo;
    RgSchCmnDlCell       *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlUe         *cmnUeDl; 
    RgSchSc1DlUe         *ueDl;
@@ -2921,22 +2382,11 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @param[out] CmLListCp   *inactvLst
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlHndlInActUes
-(
-RgSchCellCb           *cell,
-CmLListCp             *inactvLst
-)
-#else
-Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
-RgSchCellCb           *cell;
-CmLListCp             *inactvLst;
-#endif
+Void rgSCHSc1DlHndlInActUes(RgSchCellCb *cell,CmLListCp *inactvLst)
 {
    CmLList   *node;
    RgSchUeCb *ue;
 
-
    node = inactvLst->first;
    while(node)
    {
@@ -2966,15 +2416,7 @@ CmLListCp             *inactvLst;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlInit
-(
-RgDlSchdApis *rgSchDlApis
-)
-#else
-Void rgSCHSc1DlInit(rgSchDlApis)
-RgDlSchdApis *rgSchDlApis;
-#endif
+Void rgSCHSc1DlInit(RgDlSchdApis *rgSchDlApis)
 {
    /* Init the function pointers */
    rgSchDlApis->rgSCHRgrDlUeCfg        = rgSCHSc1RgrDlUeCfg;
@@ -3024,17 +2466,9 @@ RgDlSchdApis *rgSchDlApis;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlInitQueues
-(
-RgSchSc1DlCell *cellDl
-)
-#else
-static Void rgSCHSc1DlInitQueues(cellDl)
-RgSchSc1DlCell *cellDl;
-#endif
+static Void rgSCHSc1DlInitQueues(RgSchSc1DlCell *cellDl)
 {
-   uint8_t            i;
+   uint8_t i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
@@ -3085,17 +2519,7 @@ RgSchSc1DlCell *cellDl;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlRetxAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
@@ -3164,31 +2588,15 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlSprTxTbDstn
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-RgSchDlHqTbCb  *tbInfo,
-uint32_t            *effAlloc,
-CmLList        **node
-)
-#else
-static Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchDlHqTbCb  *tbInfo;
-uint32_t            *effAlloc;
-CmLList        **node;
-#endif
+static Void rgSCHSc1DlSprTxTbDstn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqTbCb  *tbInfo,uint32_t  *effAlloc,CmLList **node)
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   uint32_t                bytes;
+   uint32_t           bytes;
    RgSchLchAllocInfo  lchSchdData;
-   uint32_t                effBo;
-   uint32_t                rlcHdrEstmt;
+   uint32_t           effBo;
+   uint32_t           rlcHdrEstmt;
 
 
    while((*node) && (*effAlloc > 0))
@@ -3297,28 +2705,12 @@ CmLList        **node;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxTbDstn 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-RgSchDlHqTbCb  *tbInfo,
-uint32_t            *effAlloc,
-CmLList        **node
-)
-#else
-static Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchDlHqTbCb  *tbInfo;
-uint32_t            *effAlloc;
-CmLList        **node;
-#endif
+static Void rgSCHSc1DlNewTxTbDstn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqTbCb  *tbInfo,uint32_t *effAlloc,CmLList **node)
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1 = NULLP;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   uint32_t                bytes;
+   uint32_t           bytes;
    RgSchLchAllocInfo  lchSchdData;
    CmLList            *prev = NULLP;
 
@@ -3450,19 +2842,7 @@ CmLList        **node;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxUeFnlz 
-(
-RgSchCellCb    *cell,
-RgSchCmnDlRbAllocInfo *allocInfo,
-RgSchUeCb      *ue
-)
-#else
-static Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue)
-RgSchCellCb    *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb      *ue;
-#endif
+static Void rgSCHSc1DlNewTxUeFnlz (RgSchCellCb  *cell,RgSchCmnDlRbAllocInfo *allocInfo,RgSchUeCb *ue)
 {
    CmLList            *node;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
@@ -3470,11 +2850,11 @@ RgSchUeCb      *ue;
                                  /*cell added as part of CA dev*/
    /* 3.1 MIMO Distribute data of each TB across services */
    RgSchDlRbAlloc *dlAllocCb = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue, cell);
-   uint32_t                remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc;
-   uint32_t                remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc;
-   uint32_t                effAlloc = 0;
+   uint32_t           remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc;
+   uint32_t           remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc;
+   uint32_t           effAlloc = 0;
    /*ccpu00120365-ADD-added to code to check if second TB is utilized */
-   uint32_t                tb2Bytes = 0;
+   uint32_t           tb2Bytes = 0;
 
 
 
@@ -3553,17 +2933,7 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlNewTxAllocFnlz (RgSchCellCb  *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
@@ -3634,27 +3004,17 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxNewTxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *cellAllocInfo
-)
-#else
-static Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *cellAllocInfo;
-#endif
+static Void rgSCHSc1DlRetxNewTxAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *cellAllocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
    RgSchSc1DlUe     *sc1DlUe;
    RgSchDlHqProcCb  *hqP;
    RgSchDlHqTbCb    *newTxTbInfo;
-   uint32_t              effAlloc;
-   uint32_t              remTbBytes;
+   uint32_t         effAlloc;
+   uint32_t         remTbBytes;
    RgSchDlRbAlloc   *ueAllocInfo; 
-   RgSchDlRbAlloc *dlAllocCb;
+   RgSchDlRbAlloc   *dlAllocCb;
 
    
    node = cellAllocInfo->dedAlloc.schdTxRetxHqPLst.first;
@@ -3731,17 +3091,7 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1DlAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
 
    rgSCHSc1DlRetxAllocFnlz(cell, allocInfo);
@@ -3772,21 +3122,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlCqiInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-Bool               isPucchInfo,
-Void               *dlCqi
-)
-#else
-Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-Bool               isPucchInfo;
-Void               *dlCqi;
-#endif
+Void rgSCHSc1DlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,Bool isPucchInfo,Void *dlCqi)
 {
    return;
 }
@@ -3814,19 +3150,7 @@ Void               *dlCqi;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlAdd2UeLcsWithData
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlAdd2UeLcsWithData(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    CmLListCp            *lst;
    CmLList              *node;
@@ -3884,19 +3208,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRmFrmUeLcsWithData
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlRmFrmUeLcsWithData(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlSvc        *sc1DlSvc = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchSc1DlUe         *sc1DlUe  = RG_GET_SC1_UE_DL(ue, cell);
@@ -3983,21 +3295,7 @@ RgSchErrInfo     *err
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHSc1UlLchDel
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue,
-CmLteLcId        lcId,
-uint8_t               lcgId
-)
-#else
-S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-CmLteLcId        lcId;
-uint8_t               lcgId;
-#endif
+S16 rgSCHSc1UlLchDel(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteLcId lcId,uint8_t lcgId)
 {
   return  (ROK);
 }
@@ -4019,15 +3317,7 @@ uint8_t               lcgId;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1UlInit
-(
-RgUlSchdApis *rgSchUlApis
-)
-#else
-Void rgSCHSc1UlInit(rgSchUlApis)
-RgUlSchdApis *rgSchUlApis;
-#endif
+Void rgSCHSc1UlInit(RgUlSchdApis *rgSchUlApis)
 {
    /* Init the function pointers */
    rgSchUlApis->rgSCHRgrUlUeCfg     = rgSCHSc1RgrUlUeCfg;
@@ -4076,21 +3366,7 @@ RgUlSchdApis *rgSchUlApis;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlUeCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeCfg     *ueCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrUlUeCfg(RgSchCellCb  *cell,RgSchUeCb *ue,RgrUeCfg  *ueCfg,RgSchErrInfo *err)
 {
   
    RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell);
@@ -4098,8 +3374,7 @@ RgSchErrInfo *err;
    if(rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(ueSchCmn->ul.schSpfc), (sizeof(RgSchSc1UlUe))) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
-      "Memory allocation FAILED CRNTI:%d",ue->ueId);
+      DU_LOG("\nERROR  -->  SCH : Memory allocation FAILED CRNTI:%d",ue->ueId);
       err->errCause = RGSCHERR_SCH_SC1_UL_CFG;
       return RFAILED;
    }
@@ -4125,21 +3400,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrUlUeRecfg(RgSchCellCb *cell,RgSchUeCb  *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrUeRecfg */
@@ -4158,17 +3419,7 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlUeDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1UlUeDel(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1UlUeDel(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe   *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
@@ -4209,17 +3460,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlUeReset 
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1UlUeReset(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1UlUeReset(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe   *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
@@ -4259,29 +3500,15 @@ RgSchUeCb    *ue;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlCellCfg
-(
-RgSchCellCb   *cell,
-RgrCellCfg    *cellCfg,
-RgSchErrInfo  *err
-)
-#else
-S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *err;
-#endif
+S16 rgSCHSc1RgrUlCellCfg(RgSchCellCb  *cell,RgrCellCfg  *cellCfg,RgSchErrInfo *err)
 {
    RgSchSc1UlCell     *cellUl; 
 
-
    if((rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->ul.schSpfc), \
       (sizeof(RgSchSc1UlCell))) != ROK))
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
-      "Memory allocation FAILED");
+      DU_LOG("\nERROR  -->  SCH : Memory allocation FAILED");
       err->errCause = RGSCHERR_SCH_SC1_UL_CFG;
       return RFAILED;
    }
@@ -4308,19 +3535,7 @@ RgSchErrInfo  *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlCellRecfg
-(
-RgSchCellCb             *cell,
-RgrCellRecfg            *recfg,
-RgSchErrInfo            *err
-)
-#else
-S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
-RgSchCellCb             *cell;
-RgrCellRecfg            *recfg;
-RgSchErrInfo            *err;
-#endif
+S16 rgSCHSc1RgrUlCellRecfg(RgSchCellCb *cell,RgrCellRecfg  *recfg,RgSchErrInfo  *err)
 {
    return ROK;
 }
@@ -4338,15 +3553,7 @@ RgSchErrInfo            *err;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlCellDel
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHSc1UlCellDel(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHSc1UlCellDel(RgSchCellCb  *cell)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
 
@@ -4383,23 +3590,7 @@ RgSchCellCb  *cell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcgCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-RgrLcgCfg    *lcgCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgCfg    *lcgCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcgCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg,RgrLcgCfg *lcgCfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrLcgCfg */
@@ -4426,23 +3617,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcgRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-RgrLcgRecfg  *reCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgRecfg  *reCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcgRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg,RgrLcgRecfg *reCfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrLcgRecfg */
@@ -4461,19 +3636,7 @@ RgSchErrInfo *err;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1LcgDel
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-RgSchLcgCb    *lcg
-)
-#else
-Void rgSCHSc1LcgDel(cell, ue, lcg)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-RgSchLcgCb    *lcg;
-#endif
+Void rgSCHSc1LcgDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -4496,17 +3659,7 @@ RgSchLcgCb    *lcg;
  *  @param[in]  RgSchUeCb        *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdUe
-(
-RgSchUeCb         *ue,
-RgSchCellCb       *cell
-)
-#else
-static Void rgSCHSc1UlSchdUe(ue,cell)
-RgSchUeCb         *ue;
-RgSchCellCb       *cell;
-#endif
+static Void rgSCHSc1UlSchdUe(RgSchUeCb *ue,RgSchCellCb *cell)
 {
    RgSchCmnUlUe      *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue, cell);
                                 /*cell added as part of CA dev*/
@@ -4541,23 +3694,10 @@ RgSchCellCb       *cell;
  *  @param[in] uint8_t                     remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdForDataTrans
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    remUe
-)
-#else
-static Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    remUe;
-#endif
+static Void rgSCHSc1UlSchdForDataTrans(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t remUe)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
 
-
    if (remUe == 0)
    {
       return;
@@ -4591,26 +3731,12 @@ uint8_t                    remUe;
  *  @param[in] uint8_t                     *remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdUeTxLst
-(
-RgSchCellCb           *cell,
-CmLListCp             *ueTxLst,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    *remUe
-)
-#else
-static Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe)
-RgSchCellCb           *cell;
-CmLListCp             *ueTxLst;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    *remUe;
-#endif
+static Void rgSCHSc1UlSchdUeTxLst(RgSchCellCb *cell,CmLListCp *ueTxLst,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t *remUe)
 {
-   RgSchUeCb         *ue;
-   CmLList           *node;
+   RgSchUeCb *ue;
+   CmLList   *node;
 #ifdef LTEMAC_HDFDD
-   Bool              ulAllowed = FALSE;
+   Bool      ulAllowed = FALSE;
 #endif
 
 
@@ -4671,19 +3797,7 @@ uint8_t                    *remUe;
  *  @param[out] uint8_t                    *remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdForContRes
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    *remUe
-)
-#else
-static Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    *remUe;
-#endif
+static Void rgSCHSc1UlSchdForContRes(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t *remUe)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
    RgSchUeCb         *ue;
@@ -4741,17 +3855,7 @@ uint8_t                    *remUe;
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlNewTx
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlNewTx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlNewTx(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    uint8_t               remUe = cellUl->maxUeNewTxPerTti;
@@ -4778,17 +3882,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
  *  @return Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UlSched 
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1UlSched(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1UlSched(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    rgSCHSc1UlNewTx(cell, allocInfo);
    return;
@@ -4808,19 +3902,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlInsUeInQ 
-(
-CmLListCp           *lst,
-RgSchUeCb           *ue,
-RgSchCellCb         *cell
-)
-#else
-static Void rgSCHSc1UlInsUeInQ(lst, ue, cell)
-CmLListCp           *lst;
-RgSchUeCb           *ue;
-RgSchCellCb         *cell;
-#endif
+static Void rgSCHSc1UlInsUeInQ(CmLListCp *lst,RgSchUeCb *ue,RgSchCellCb *cell)
 {
                               /*cell added as part of CA dev*/
    RgSchSc1UlUe    *ueUl    = RG_GET_SC1_UE_UL(ue, cell);
@@ -4878,17 +3960,7 @@ RgSchCellCb         *cell;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlPosnUeInQ 
-(
-RgSchCellCb         *cell,
-RgSchUeCb           *ue
-)
-#else
-static Void rgSCHSc1UlPosnUeInQ(cell, ue)
-RgSchCellCb         *cell;
-RgSchUeCb           *ue;
-#endif
+static Void rgSCHSc1UlPosnUeInQ(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
                               /*cell added as part of CA dev*/
@@ -4959,21 +4031,7 @@ RgSchUeCb           *ue;
  *  @param[in]  uint8_t           bsr
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrShort
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-uint8_t           bsr
-)
-#else
-Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-uint8_t           bsr;
-#endif
+Void rgSCHSc1UpdBsrShort(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchLcgCb   *lcg,uint8_t  bsr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -4995,21 +4053,7 @@ uint8_t           bsr;
  *  @param[in]  uint8_t           bsr
  *  @return  Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrTrunc
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-uint8_t           bsr
-)
-#else
-Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-uint8_t           bsr;
-#endif
+Void rgSCHSc1UpdBsrTrunc(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchLcgCb   *lcg,uint8_t bsr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5030,19 +4074,7 @@ uint8_t           bsr;
  *  @param[in]  uint8_t bsArr[]
  *  @return  Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrLong
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           *bsArr
-)
-#else
-Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           *bsArr;
-#endif
+Void rgSCHSc1UpdBsrLong(RgSchCellCb  *cell,RgSchUeCb *ue,uint8_t *bsArr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5063,17 +4095,7 @@ uint8_t           *bsArr;
  *  @param[in]  RgSchUeCb    *ue
  *  @return Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1ContResUlGrant
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1ContResUlGrant(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1ContResUlGrant(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
    RgSchSc1UlCell  *cellUl = RG_GET_SC1_CELL_UL(cell);
@@ -5109,17 +4131,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1SrRcvd
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1SrRcvd(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1SrRcvd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ulUe    = RG_GET_SC1_UE_UL(ue, cell);
    RgSchSc1UlCell  *ulCell  = RG_GET_SC1_CELL_UL(cell);
@@ -5158,19 +4170,7 @@ RgSchUeCb    *ue;
  *  @param[in]  TfuUlCqiRpt         *ulCqiInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlCqiInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-TfuUlCqiRpt          *ulCqiInfo
-)
-#else
-Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-TfuUlCqiRpt          *ulCqiInfo;
-#endif
+Void rgSCHSc1UlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo)
 {
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
@@ -5192,22 +4192,9 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @param[in]  RgInfUeDatInd      *datInd
  *  @return  S16
  **/
-#ifdef ANSI
-S16 rgSCHSc1UlLcgUpd
-(
-RgSchCellCb         *cell,
-RgSchUeCb           *ue,
-RgInfUeDatInd       *datInd
-)
-#else
-S16 rgSCHSc1UlLcgUpd(cell, ue)
-RgSchCellCb         *cell;
-RgSchUeCb           *ue;
-RgInfUeDatInd       *datInd;
-#endif
+S16 rgSCHSc1UlLcgUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgInfUeDatInd  *datInd)
 {
 
-
    return ROK;  
 }
 
@@ -5227,17 +4214,7 @@ RgInfUeDatInd       *datInd;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1UlUeRefresh
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1UlUeRefresh(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1UlUeRefresh(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5262,19 +4239,9 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlDatTransAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlDatTransAllocFnlz(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
-   RgSchSc1UlUe         *ueUl;
+   RgSchSc1UlUe      *ueUl;
    RgSchUeCb         *ue;
    CmLList           *node;
    RgSchDrxUeCb      *drxUe    = NULLP;
@@ -5350,17 +4317,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlContResAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlContResAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe      *ueUl;
@@ -5417,17 +4374,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1UlAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1UlAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
 
    rgSCHSc1UlContResAllocFnlz(cell, allocInfo);
@@ -5451,17 +4398,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[in]  RgSchUeCb   *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlActvtUe 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1UlActvtUe(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1UlActvtUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
    rgSCHSc1UlPosnUeInQ(cell, ue);
@@ -5487,23 +4424,12 @@ RgSchUeCb      *ue;
  *  @param[out] CmLListCp   *inactvLst
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlHndlInActUes
-(
-RgSchCellCb           *cell,
-CmLListCp             *inactvLst
-)
-#else
-Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
-RgSchCellCb           *cell;
-CmLListCp             *inactvLst;
-#endif
+Void rgSCHSc1UlHndlInActUes(RgSchCellCb *cell,CmLListCp  *inactvLst)
 {
-   RgSchUeCb    *ue;
-   RgSchSc1UlUe    *ulUe;
-   RgSchSc1UlCell  *cellUl  = RG_GET_SC1_CELL_UL(cell);
-   CmLList      *node = inactvLst->first;
-
+   RgSchUeCb      *ue;
+   RgSchSc1UlUe   *ulUe;
+   RgSchSc1UlCell *cellUl  = RG_GET_SC1_CELL_UL(cell);
+   CmLList        *node = inactvLst->first;
 
    while (node)
    {
@@ -5539,18 +4465,11 @@ CmLListCp             *inactvLst;
  *  @return  Void
  **/
 
-#ifdef ANSI
 Void rgSCHSc1DlProcRmvFrmRetx(
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 )
-#else
-Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
 {
   
    /* Remove the HqP from retx Queue.