X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2F5gnrsch%2Frg_sch_sc1.c;fp=src%2F5gnrsch%2Frg_sch_sc1.c;h=4dcb5f7a344695fc9700c60ab9fba67a91ec3cae;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=eb08051efc40aee5fe228e561967303050cacc6c;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c
index eb08051ef..4dcb5f7a3 100755
--- a/src/5gnrsch/rg_sch_sc1.c
+++ b/src/5gnrsch/rg_sch_sc1.c
@@ -163,7 +163,7 @@ PRIVATE Void rgSCHSc1UlSchdUeTxLst ARGS((
 RgSchCellCb         *cell,
 CmLListCp             *ueTxLst,
 RgSchCmnUlRbAllocInfo *allocInfo,
-U8                    *remUe
+uint8_t                    *remUe
 ));
 PRIVATE Void rgSCHSc1DlProcRmvFrmRetx ARGS((
 RgSchCellCb                *cell,
@@ -223,7 +223,7 @@ RgSchUeCb      *ue;
 
    rgSCHSc1DlSuspendUe(cell, ue);
 
-   RETVOID;
+   return;
 }
 
 
@@ -259,7 +259,7 @@ RgSchUeCb      *ue;
    CmLList         *node;
    RgSchDlHqProcCb *hqP;
    RgSchDlLcCb     *svc;
-   U8              idx;
+   uint8_t              idx;
 
    /* Add UE's HqProcs From UERetxLst to CellRetxLst */
    lst = &ueDl->retxHqProcs;
@@ -289,7 +289,7 @@ RgSchUeCb      *ue;
       rgSCHSc1DlUeAddToSchd(cell, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -357,7 +357,7 @@ RgSchUeCb      *ue;
       /* Update the SVC's positioning in the Queue */
       rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -401,7 +401,7 @@ RgSchDlHqProcCb            *hqP;
                     (hqProcDl->schSpfc))->prio], &(hqProcDl->retxLnk));
       hqProcDl->retxLnk.node = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -445,7 +445,7 @@ RgSchDlHqProcCb            *hqP;
                   &(hqProcDl->retxLnkUe));
       hqProcDl->retxLnkUe.node = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -487,7 +487,7 @@ RgSchDlHqProcCb            *hqP;
    cmLListAdd2Tail(&sc1Ue->retxHqProcs, 
                     &(cmnHqDl->retxLnkUe));
    cmnHqDl->retxLnkUe.node = (PTR)hqP;
-   RETVOID;
+   return;
 }
 
 
@@ -527,12 +527,12 @@ RgSchDlHqProcCb            *hqP;
    if (!RG_SCH_CMN_DL_IS_UE_ACTIVE(hqP->hqE->ue))
    {
       rgSCHSc1DlProcAddToUeRetx(cell, hqP->hqE->ue, hqP);
-      RETVOID;
+      return;
    }
    cmLListAdd2Tail(&sc1CellDl->retxLst[((RgSchSc1DlHqProc *)\
                   (cmnHqDl->schSpfc))->prio], &(cmnHqDl->retxLnk));
    cmnHqDl->retxLnk.node = (PTR)hqP;
-   RETVOID;
+   return;
 }
 
 
@@ -567,7 +567,7 @@ RgSchDlSf                  *subFrm;
 RgSchCmnDlRbAllocInfo      *allocInfo;
 #endif
 {
-   U8                   i;
+   uint8_t                   i;
    CmLListCp            *retxLst;
    CmLList              *node;
    RgSchDlHqProcCb      *hqP;
@@ -577,7 +577,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
 #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD)))
    CmLteTimingInfo      schdTime;
 #endif
-   U32                  effBo;
+   uint32_t                  effBo;
    RgSchUeCb            *ue = NULLP;
 #ifdef LTEMAC_HDFDD
    Bool                 dlAllowed = FALSE;
@@ -656,7 +656,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
                ROK)
          {
             /* SF/RETX Bandwidth expired */
-            RETVOID;
+            return;
          }
          if (effBo == 0)
          {
@@ -667,7 +667,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
             && (hqP->tbInfo[1].state == HQ_TB_ACKED))
          {
             rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP);
-            RETVOID;
+            return;
          }
 
          cmnUeDl->proc = hqP;
@@ -675,7 +675,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
          /*rgSCHCmnDlRbInfoAddUeRetx(allocInfo, ue);*/
       }
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -702,7 +702,7 @@ RgSchDlHqProcCb      *hqProc;
 #endif
 {
    rgSCHDhmRlsHqProc(hqProc);
-   RETVOID;
+   return;
 }
 
 /**
@@ -719,7 +719,7 @@ RgSchDlHqProcCb      *hqProc;
  *  @param[in]  RgSchCellCb            *cell
  *  @param[in]  RgSchDlSf              *subFrm
  *  @param[in]  RgSchDlLcCb            *svc
- *  @param[in]  U32                    bo
+ *  @param[in]  uint32_t                    bo
  *  @param[in]  RgSchCmnDlRbAllocInfo  *allocInfo
  *  @return  S16 
  *
@@ -730,7 +730,7 @@ PRIVATE S16 rgSCHSc1DlDedSvcAlloc
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchDlLcCb                *svc,
-U32                        bo,
+uint32_t                        bo,
 RgSchCmnDlRbAllocInfo      *allocInfo
 )
 #else
@@ -738,14 +738,14 @@ PRIVATE S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo)
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchDlLcCb                *svc;
-U32                        bo;
+uint32_t                        bo;
 RgSchCmnDlRbAllocInfo      *allocInfo;
 #endif
 {
    RgSchUeCb               *ue;
    RgSchDlHqProcCb         *proc;
-   U16                     rlcHdrEstmt;
-   U32                     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;
@@ -893,7 +893,7 @@ RgSchDlLcCb        *svc;
    /* checking SVC's presence in this lst is unnecessary */
    cmLListAdd2Tail(&ueSc1->schdSvcs, &svcSc1->schdSvcLnk);
    svcSc1->schdSvcLnk.node = (PTR)svc;
-   RETVOID;
+   return;
 }
 
 
@@ -940,7 +940,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    CmLList              *node;
    RgSchUeCb            *ue = NULLP;
    RgSchDlLcCb          *svc;
-   U8                   i;
+   uint8_t                   i;
    RgSchSc1DlSvc        *svcSc1;
    RgSchSc1DlUe         *ueDl;
    RgSchSc1DlCell       *sc1CellDl = RG_GET_SC1_CELL_DL(cell);
@@ -960,7 +960,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, svcSc1->bo, allocInfo) != ROK) 
       {
          /* sf bw expired */
-         RETVOID;
+         return;
       }
    }
 
@@ -979,7 +979,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
          if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, svcSc1->effMbr, allocInfo) != ROK) 
          {
             /* sf bw expired */
-            RETVOID;
+            return;
          }
       }
    }
@@ -999,11 +999,11 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
          if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, ueDl->effAmbr, allocInfo) != ROK) 
          {
             /* sf bw expired */
-            RETVOID;
+            return;
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1030,7 +1030,7 @@ Void rgSCHSc1DlPreSchd(cell)
 #endif
 {
    
-   RETVOID;
+   return;
 }
 /**
  * @brief scheduling for a cell
@@ -1056,7 +1056,7 @@ Void rgSCHSc1DlPstSchd(schInst)
 #endif
 {
    
-   RETVOID;
+   return;
 }
 
 
@@ -1098,7 +1098,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    rgSCHSc1DlDedTx(cell, subFrm, allocInfo);
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
-  RETVOID;
+  return;
 
 }
 /**
@@ -1137,7 +1137,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 
    rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo);
 
-   RETVOID;
+   return;
 
 }
 
@@ -1184,7 +1184,7 @@ RgSchDlLcCb                *svc;
    /* The service is already in the scheduler */
    if (svcSc1->prioLnk.node != NULLP)
    {
-      RETVOID;
+      return;
    }
 
    /* If the priority = 0, it is the highest priority with infinite */
@@ -1198,7 +1198,7 @@ RgSchDlLcCb                *svc;
       /* If a svc is put in to cell wide priority Qs
        * then add the same to UE's lcsWithData List */
       rgSCHSc1DlAdd2UeLcsWithData(cell, svc->ue, svc);
-      RETVOID;
+      return;
    }
 
    /* Handle GBR services. We have them of next importance */
@@ -1206,7 +1206,7 @@ RgSchDlLcCb                *svc;
    if (svcCmn->prio <= RG_SCH_SC1_DL_GBR_PRIO_END)
    {
       if (!RG_SC1_SVC_HAS_DATA(svc,cell))
-         RETVOID;
+         return;
       lst  = &(sc1CellDl->prioLst[svcCmn->prio]);
       node = lst->first;
       while(node)
@@ -1239,7 +1239,7 @@ RgSchDlLcCb                *svc;
        * then add the same to UE's lcsWithData List */
       rgSCHSc1DlAdd2UeLcsWithData(cell, svc->ue, svc);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1286,7 +1286,7 @@ RgSchUeCb                  *ue;
        * then remove the same from UE's lcsWithData List */
       rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, ueDl->ambrSvc);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1329,7 +1329,7 @@ RgSchDlLcCb                *svc;
       cmLListDelFrm(lst, &svcSc1->prioLnk);
       svcSc1->prioLnk.node = (PTR)NULLP;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1371,7 +1371,7 @@ RgSchDlLcCb                *svc;
 
    /* If svc already present in AMBR List return */
    if (svcSc1->prioLnk.node != NULLP)
-      RETVOID;
+      return;
 
    node = ueDl->ambrLst.first;
    while(node)
@@ -1395,7 +1395,7 @@ RgSchDlLcCb                *svc;
       svcSc1->prioLnk.node = (PTR)svc;
    }
    
-   RETVOID;
+   return;
 }
 
 
@@ -1441,7 +1441,7 @@ RgSchDlLcCb                *svc;
        * then remove the same from UE's lcsWithData List */
       rgSCHSc1DlRmFrmUeLcsWithData(cell, svc->ue, svc);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1491,7 +1491,7 @@ RgrDlLchCfg             *cfg;
       cmLListAdd2Tail(&ueDl->gbrSvcs, &svcSc1->gbrLnk);
       svcSc1->gbrLnk.node = (PTR)svc;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1533,7 +1533,7 @@ RgSchDlLcCb                *svc;
 
    if (svcSc1 == NULLP)
    {
-      RETVOID;
+      return;
    }
    ueDl = RG_GET_SC1_UE_DL(ue, cell);
 
@@ -1576,7 +1576,7 @@ RgSchDlLcCb                *svc;
    for proper NULLP assignment*/
    rgSCHUtlFreeSBuf(cell->instIdx, 
          (Data**)(&(RG_SCH_CMN_GET_LC_SCH_SPFC(ue,svc,cell))), (sizeof(RgSchSc1DlSvc)));
-   RETVOID;
+   return;
 }
 
 /**
@@ -1620,7 +1620,7 @@ RgrLchRecfg             *recfg;
       svcSc1->gbr   = svcCmn->gbr;
       svcSc1->mbr   = svcCmn->mbr;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1693,7 +1693,7 @@ RgSchUeCb                  *ue;
    /* If a svc is put in to cell wide priority Qs
     * then add the same to UE's lcsWithData List */
    rgSCHSc1DlAdd2UeLcsWithData(cell, ue, ueDl->ambrSvc);
-   RETVOID;
+   return;
 }
 
 
@@ -1770,7 +1770,7 @@ RgSchDlLcCb                *svc;
                rgSCHSc1DlUeRmvFrmSchd(cell, ue);
             }
          }
-         RETVOID;
+         return;
       }
       rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc);
       /* Current ambr svc is always the first node of ambrLst.*/ 
@@ -1791,7 +1791,7 @@ RgSchDlLcCb                *svc;
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1830,17 +1830,17 @@ RgSchDlLcCb                *svc;
 
    if (svcSc1->bo == svc->bo)
    {
-      RETVOID;
+      return;
    }
    svcSc1->bo = svc->bo;
    if (!RG_SCH_CMN_DL_IS_UE_ACTIVE(ue))
    {
-      RETVOID;
+      return;
    }
    rgSCHSc1DlMngSvcPosn(cell, ue, svc);
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
-  RETVOID;
+  return;
 
 }
 
@@ -1889,7 +1889,7 @@ RgSchDlLcCb                *svc;
    {
       rgSCHSc1DlSvcRmvFrmSchd(cell, svc);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1934,7 +1934,7 @@ RgSchDlLcCb                *svc;
    /* Adjust the SVC priority within the queue */
    rgSCHSc1DlSvcRmvFrmSchd(cell, svc);
    rgSCHSc1DlSvcAddToSchd(cell, svc);
-   RETVOID;
+   return;
 }
 
 
@@ -1975,7 +1975,7 @@ RgSchDlLcCb                *svc;
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
 
    (cellDl->svcMngFunc[svcCmn->prio])(cell, ue, svc);
-   RETVOID; 
+   return; 
 }
 
 /*--------------------------*
@@ -2059,14 +2059,14 @@ PRIVATE Void rgSCHSc1DlDeinitQueues(cellDl)
 RgSchSc1DlCell *cellDl;
 #endif
 {
-   U8          i;
+   uint8_t          i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
       cmLListInit(&cellDl->prioLst[i]);
       cmLListInit(&cellDl->retxLst[i]);
    } 
-   RETVOID;
+   return;
 }
 
 
@@ -2097,7 +2097,7 @@ RgSchCellCb  *cell;
    if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \
        == NULLP)
    {
-      RETVOID;
+      return;
    }
       
    /* Perform the deinit for the DL scheduler */
@@ -2107,7 +2107,7 @@ RgSchCellCb  *cell;
    rgSCHUtlFreeSBuf(cell->instIdx, 
       (Data**)(&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc)),
       (sizeof(RgSchSc1DlCell)));
-   RETVOID;
+   return;
 }  /* rgSCHSc1DlCellDel */
 
 /**
@@ -2205,7 +2205,7 @@ S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
 {
    RgSchSc1DlHqProc   *hqSpcSch;
    RgSchDlHqProcCb    *hqP;
-   U8                 cnt;
+   uint8_t                 cnt;
    /* making use of hqE->sch for one shot allocation 
     * of RgSchSc1DlHqProc structures */
    if (rgSCHUtlAllocSBuf(cell->instIdx, 
@@ -2328,7 +2328,7 @@ RgSchErrInfo *err;
       RgSchDlHqProcCb    *hqP;
       Pst                pst;
       RgInfRlsHqInfo     *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
-      U8                 i;
+      uint8_t                 i;
 
       /* Prepare TB2 release information to be sent to MAC */
       rlsHqBufs->numUes = 0;
@@ -2388,7 +2388,7 @@ RgSchUeCb    *ue;
 {
    RgSchSc1DlUe         *sc1Ue;
    RgSchDlLcCb          *svc;
-   U32                  idx;
+   uint32_t                  idx;
 
 
    sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
@@ -2409,7 +2409,7 @@ RgSchUeCb    *ue;
       rgSCHSc1DlSvcRmvFrmSchd(cell, svc);
    }
    
-   RETVOID;
+   return;
 }  /* rgSCHSc1DlRmvUeFrmPrioQs */
 
 /**
@@ -2439,7 +2439,7 @@ RgSchUeCb    *ue;
    RgSchSc1DlCell       *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchDlHqProcCb      *hqP;
    RgSchCmnDlHqProc     *hqProcDl;
-   U8                   i;
+   uint8_t                   i;
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
@@ -2472,7 +2472,7 @@ RgSchUeCb    *ue;
 
    rgSCHSc1DlRmvUeFrmPrioQs(cell, ue);
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1DlInactvtUe */
 
 
@@ -2503,8 +2503,8 @@ RgSchUeCb    *ue;
 #endif
 {
    RgSchDlHqProcCb      *hqP;
-   U8                   i;
-   U8                   j;
+   uint8_t                   i;
+   uint8_t                   j;
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
@@ -2540,7 +2540,7 @@ RgSchUeCb    *ue;
    }
    rgSCHSc1DlRmvUeFrmPrioQs(cell, ue);
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1DlSuspendUe */
 
 /***********************************************************
@@ -2568,7 +2568,7 @@ RgSchCellCb *cell;
 #endif
 {
    
-   RETVOID;
+   return;
 }
 
 /**
@@ -2637,7 +2637,7 @@ RgSchUeCb    *ue;
 
    if (sc1DlUe == NULLP)
    {
-      RETVOID;
+      return;
    }
    if( hqEnt)
    {
@@ -2659,7 +2659,7 @@ RgSchUeCb    *ue;
    for proper NULLP assignment*/
    rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&sc1DlUe), (sizeof(RgSchSc1DlUe))); 
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1DlUeDel */
 
 /**
@@ -2832,7 +2832,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    CmLList              *node;
    RgSchDlHqProcCb      *proc;
    RgSchUeCb            *ue;
-   U32                  effBo;
+   uint32_t                  effBo;
    RgSchCmnDlCell       *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlUe         *cmnUeDl; 
    RgSchSc1DlUe         *ueDl;
@@ -2903,7 +2903,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       /* 3.1 MIMO moving this call to cmn scheduler */
       /*rgSCHCmnDlRbInfoAddUeTx(allocInfo, ue);*/
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -2946,7 +2946,7 @@ CmLListCp             *inactvLst;
        * till it is activated again. */
       rgSCHSc1DlInactvtUe(cell, ue);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -3005,7 +3005,7 @@ RgDlSchdApis *rgSchDlApis;
    rgSchDlApis->rgSCHDlTickForPdbTrkng = rgSCHSc1DlScanUpdPdbPrio;
    rgSchDlApis->rgSCHDlFillFlwCtrlInfo = rgSCHSc1DlFillFlowCntrlInfo; 
 
-   RETVOID;
+   return;
 }
 
 
@@ -3034,7 +3034,7 @@ PRIVATE Void rgSCHSc1DlInitQueues(cellDl)
 RgSchSc1DlCell *cellDl;
 #endif
 {
-   U8            i;
+   uint8_t            i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
@@ -3058,7 +3058,7 @@ RgSchSc1DlCell *cellDl;
    {
       cellDl->svcMngFunc[i] = rgSCHSc1DlMngAmbrSvcPosn;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -3141,7 +3141,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       /* reset the UE allocation Information */
       rgSCHCmnDlUeResetTemp(ue, hqP);
    }
-   RETVOID;
+   return;
 }
 
 /* 3.1 MIMO Alloc distribution functions being performed
@@ -3170,7 +3170,7 @@ PRIVATE Void rgSCHSc1DlSprTxTbDstn
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgSchDlHqTbCb  *tbInfo,
-U32            *effAlloc,
+uint32_t            *effAlloc,
 CmLList        **node
 )
 #else
@@ -3178,17 +3178,17 @@ PRIVATE Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgSchDlHqTbCb  *tbInfo;
-U32            *effAlloc;
+uint32_t            *effAlloc;
 CmLList        **node;
 #endif
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   U32                bytes;
+   uint32_t                bytes;
    RgSchLchAllocInfo  lchSchdData;
-   U32                effBo;
-   U32                rlcHdrEstmt;
+   uint32_t                effBo;
+   uint32_t                rlcHdrEstmt;
 
 
    while((*node) && (*effAlloc > 0))
@@ -3278,7 +3278,7 @@ CmLList        **node;
       lchSchdData.schdData = bytes;
       rgSCHDhmAddLcData(cell->instIdx, &lchSchdData, tbInfo);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -3303,7 +3303,7 @@ PRIVATE Void rgSCHSc1DlNewTxTbDstn
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgSchDlHqTbCb  *tbInfo,
-U32            *effAlloc,
+uint32_t            *effAlloc,
 CmLList        **node
 )
 #else
@@ -3311,14 +3311,14 @@ PRIVATE Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgSchDlHqTbCb  *tbInfo;
-U32            *effAlloc;
+uint32_t            *effAlloc;
 CmLList        **node;
 #endif
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1 = NULLP;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   U32                bytes;
+   uint32_t                bytes;
    RgSchLchAllocInfo  lchSchdData;
    CmLList            *prev = NULLP;
 
@@ -3424,14 +3424,14 @@ CmLList        **node;
       rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc,
                             &ueDl->lcsWithData.first);
       *node = NULLP;
-      RETVOID;
+      return;
    }
    /* make sure node points to the svc not completely
     * satisfied.
     * make sure if not served completely then 
     * the other TB allocation accomodates the same */
    *node = prev;
-   RETVOID;
+   return;
 }
 
 
@@ -3470,11 +3470,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);
-   U32                remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc;
-   U32                remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc;
-   U32                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 */
-   U32                tb2Bytes = 0;
+   uint32_t                tb2Bytes = 0;
 
 
 
@@ -3524,13 +3524,13 @@ RgSchUeCb      *ue;
       rgSCHUtlPdcchPut(cell, &dlAllocCb->dlSf->pdcchInfo, 
             dlAllocCb->pdcch);
       rgSCHSc1RlsHqProc(cmnUeDl->proc);
-      RETVOID;
+      return;
    }
 
    /* Fill PDCCH and assign it to HqP */
    rgSCHCmnFillHqPPdcch(cell, dlAllocCb, cmnUeDl->proc);
 
-   RETVOID;
+   return;
 }
 
 
@@ -3606,7 +3606,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       cmLListInit(&((RgSchSc1DlUe *)(cmnUeDl->schSpfc))->schdSvcs);
       rgSCHCmnDlUeResetTemp(ue, hqP);
    }
-   RETVOID;
+   return;
 }
 
 /* 3.1 Added new function to handle TX+RETX alloc fnlz'n */
@@ -3651,8 +3651,8 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo;
    RgSchSc1DlUe     *sc1DlUe;
    RgSchDlHqProcCb  *hqP;
    RgSchDlHqTbCb    *newTxTbInfo;
-   U32              effAlloc;
-   U32              remTbBytes;
+   uint32_t              effAlloc;
+   uint32_t              remTbBytes;
    RgSchDlRbAlloc   *ueAllocInfo; 
    RgSchDlRbAlloc *dlAllocCb;
 
@@ -3751,7 +3751,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    /*3.1 MIMO new Function added to handle TX+RETX 
     * harq process scheduling finalization */
    rgSCHSc1DlRetxNewTxAllocFnlz(cell, allocInfo);
-   RETVOID;
+   return;
 }
 
 
@@ -3788,7 +3788,7 @@ Bool               isPucchInfo;
 Void               *dlCqi;
 #endif
 {
-   RETVOID;
+   return;
 }
 
 
@@ -3858,7 +3858,7 @@ RgSchDlLcCb                *svc;
       cmLListInsCrnt(lst, &sc1DlSvc->lcWithDataLnk);
       sc1DlSvc->lcWithDataLnk.node = (PTR)svc;
    }
-   RETVOID;
+   return;
 }
 
 
@@ -3904,7 +3904,7 @@ RgSchDlLcCb                *svc;
    
    cmLListDelFrm(&(sc1DlUe->lcsWithData), &sc1DlSvc->lcWithDataLnk);
    sc1DlSvc->lcWithDataLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 /***************** SC1 DL SCHEDULER FUNCTION DEFNs END HERE ****************/
 
@@ -3989,14 +3989,14 @@ S16 rgSCHSc1UlLchDel
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
 CmLteLcId        lcId,
-U8               lcgId
+uint8_t               lcgId
 )
 #else
 S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 CmLteLcId        lcId;
-U8               lcgId;
+uint8_t               lcgId;
 #endif
 {
   return  (ROK);
@@ -4055,7 +4055,7 @@ RgUlSchdApis *rgSchUlApis;
    rgSchUlApis->rgSCHUlActvtUe      = rgSCHSc1UlActvtUe;
    rgSchUlApis->rgSCHUlUeReset      = rgSCHSc1UlUeReset;
    rgSchUlApis->rgSCHRgrUlLcgUpd    = rgSCHSc1UlLcgUpd;
-   RETVOID;
+   return;
 }
 
 /**
@@ -4176,7 +4176,7 @@ RgSchUeCb    *ue;
 
    if (ueUl == NULLP)
    {
-      RETVOID;
+      return;
    }
    if(ueUl->txLnk.node)
    {
@@ -4193,7 +4193,7 @@ RgSchUeCb    *ue;
    rgSCHUtlFreeSBuf(cell->instIdx,
       (Data**)(&(ueUl)), (sizeof(RgSchSc1UlUe)));
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1UlUeDel */
 
 /**
@@ -4237,7 +4237,7 @@ RgSchUeCb    *ue;
       cmLListDelFrm(&(cellUl->contResLst), &(ueUl->contResLnk));
       ueUl->contResLnk.node = NULLP;
    }
-   RETVOID;
+   return;
 }  /* rgSCHSc1UlUeReset */
 
 
@@ -4353,14 +4353,14 @@ RgSchCellCb  *cell;
 
    if (cellUl == NULLP)
    {
-      RETVOID;
+      return;
    }
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
    rgSCHUtlFreeSBuf(cell->instIdx,
       (Data**)(&(cellUl)), (sizeof(RgSchSc1UlCell)));
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1UlCellDel */
 
 /**
@@ -4476,7 +4476,7 @@ RgSchLcgCb    *lcg;
 #endif
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }
 
 /**
@@ -4517,12 +4517,12 @@ RgSchCellCb       *cell;
    {
       cmnUlUe->alloc.reqBytes = RGSCH_MAX(RG_SCH_CMN_UL_SR_BYTES, \
                                 ue->ul.effBsr);
-      RETVOID;
+      return;
    }
 
    cmnUlUe->alloc.reqBytes = ue->ul.effBsr;
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4538,7 +4538,7 @@ RgSchCellCb       *cell;
  *     
  *  @param[in]  RgSchCellCb           *cell
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
- *  @param[in] U8                     remUe 
+ *  @param[in] uint8_t                     remUe 
  *  @return Void 
  **/
 #ifdef ANSI
@@ -4546,13 +4546,13 @@ PRIVATE Void rgSCHSc1UlSchdForDataTrans
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo,
-U8                    remUe
+uint8_t                    remUe
 )
 #else
 PRIVATE Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
-U8                    remUe;
+uint8_t                    remUe;
 #endif
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
@@ -4560,19 +4560,19 @@ U8                    remUe;
 
    if (remUe == 0)
    {
-      RETVOID;
+      return;
    }
    /* Allocate UEs with LCG0 data pending */
    rgSCHSc1UlSchdUeTxLst(cell, &sc1UlCell->ueTxLst[0], allocInfo, &remUe);
 
    if (remUe == 0)
    {
-      RETVOID;
+      return;
    }
    /* Allocate UEs with other LCGs data pending */
    rgSCHSc1UlSchdUeTxLst(cell, &sc1UlCell->ueTxLst[1], allocInfo, &remUe);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4588,7 +4588,7 @@ U8                    remUe;
  *     
  *  @param[in]  CmLListCp             *ueTxLst
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
- *  @param[in] U8                     *remUe 
+ *  @param[in] uint8_t                     *remUe 
  *  @return Void 
  **/
 #ifdef ANSI
@@ -4597,14 +4597,14 @@ PRIVATE Void rgSCHSc1UlSchdUeTxLst
 RgSchCellCb           *cell,
 CmLListCp             *ueTxLst,
 RgSchCmnUlRbAllocInfo *allocInfo,
-U8                    *remUe
+uint8_t                    *remUe
 )
 #else
 PRIVATE Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe)
 RgSchCellCb           *cell;
 CmLListCp             *ueTxLst;
 RgSchCmnUlRbAllocInfo *allocInfo;
-U8                    *remUe;
+uint8_t                    *remUe;
 #endif
 {
    RgSchUeCb         *ue;
@@ -4652,7 +4652,7 @@ U8                    *remUe;
       --(*remUe);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4668,7 +4668,7 @@ U8                    *remUe;
  *     
  *  @param[in]  RgSchCellCb           *cell
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
- *  @param[out] U8                    *remUe 
+ *  @param[out] uint8_t                    *remUe 
  *  @return Void 
  **/
 #ifdef ANSI
@@ -4676,13 +4676,13 @@ PRIVATE Void rgSCHSc1UlSchdForContRes
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo,
-U8                    *remUe
+uint8_t                    *remUe
 )
 #else
 PRIVATE Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
-U8                    *remUe;
+uint8_t                    *remUe;
 #endif
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
@@ -4723,7 +4723,7 @@ U8                    *remUe;
       /* Node removal deferred to ULAllocFinalization */
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4754,12 +4754,12 @@ RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   U8               remUe = cellUl->maxUeNewTxPerTti;
+   uint8_t               remUe = cellUl->maxUeNewTxPerTti;
 
 
    rgSCHSc1UlSchdForContRes(cell, allocInfo, &remUe);
    rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe);
-   RETVOID;
+   return;
 }
 
 /**
@@ -4791,7 +4791,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
 {
    rgSCHSc1UlNewTx(cell, allocInfo);
-   RETVOID;
+   return;
 }
 
 /**
@@ -4851,7 +4851,7 @@ RgSchCellCb         *cell;
       ueUl->txLnk.node = (PTR)ue;
    }
 
-   RETVOID;
+   return;
 }
 /**
  * @brief UEs Buffer Status Has changed so reposition it. 
@@ -4899,7 +4899,7 @@ RgSchUeCb           *ue;
 
    if (!RG_SCH_CMN_UL_IS_UE_ACTIVE(ue))
    {
-      RETVOID;
+      return;
    }
                      
    /* Remove the UE from its existing position */
@@ -4941,7 +4941,7 @@ RgSchUeCb           *ue;
    }
 #endif
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4956,7 +4956,7 @@ RgSchUeCb           *ue;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  RgSchLcgCb   *lcg
- *  @param[in]  U8           bsr
+ *  @param[in]  uint8_t           bsr
  *  @return  Void
  **/
 #ifdef ANSI
@@ -4965,18 +4965,18 @@ Void rgSCHSc1UpdBsrShort
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchLcgCb   *lcg,
-U8           bsr
+uint8_t           bsr
 )
 #else
 Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
-U8           bsr;
+uint8_t           bsr;
 #endif
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }  /* rgSCHSc1UpdBsrShort */
 
 /**
@@ -4992,7 +4992,7 @@ U8           bsr;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  RgSchLcgCb   *lcg
- *  @param[in]  U8           bsr
+ *  @param[in]  uint8_t           bsr
  *  @return  Void 
  **/
 #ifdef ANSI
@@ -5001,18 +5001,18 @@ Void rgSCHSc1UpdBsrTrunc
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchLcgCb   *lcg,
-U8           bsr
+uint8_t           bsr
 )
 #else
 Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
-U8           bsr;
+uint8_t           bsr;
 #endif
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }  /* rgSCHSc1UpdBsrTrunc */
 
 /**
@@ -5027,7 +5027,7 @@ U8           bsr;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @param[in]  U8 bsArr[]
+ *  @param[in]  uint8_t bsArr[]
  *  @return  Void 
  **/
 #ifdef ANSI
@@ -5035,17 +5035,17 @@ Void rgSCHSc1UpdBsrLong
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-U8           *bsArr
+uint8_t           *bsArr
 )
 #else
 Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
-U8           *bsArr;
+uint8_t           *bsArr;
 #endif
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }  /* rgSCHSc1UpdBsrLong */
 
 /**
@@ -5081,7 +5081,7 @@ RgSchUeCb    *ue;
 
    if (ueUl->contResLnk.node)
    {
-      RETVOID;
+      return;
    }
 
    /* Remove the UE from other Qs */
@@ -5093,7 +5093,7 @@ RgSchUeCb    *ue;
 
    cmLListAdd2Tail(&cellUl->contResLst, &ueUl->contResLnk);
    ueUl->contResLnk.node = (PTR)ue;
-   RETVOID;
+   return;
 }  /* rgSCHSc1ContResUlGrant */
 
 /**
@@ -5132,7 +5132,7 @@ RgSchUeCb    *ue;
       if (ulUe->qId == 0)
       {
          /* Already present in lcg0 Q */
-         RETVOID;
+         return;
       }
       cmLListDelFrm(&(ulCell->ueTxLst[ulUe->qId]), &(ulUe->txLnk));
    }
@@ -5141,7 +5141,7 @@ RgSchUeCb    *ue;
    ulUe->txLnk.node = (PTR)ue;
    ulUe->qId = 0;
 
-   RETVOID;
+   return;
 }  /* rgSCHSc1SrRcvd */
 
 /**
@@ -5174,7 +5174,7 @@ TfuUlCqiRpt          *ulCqiInfo;
 {
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
-  RETVOID;
+  return;
 
 }
 
@@ -5240,7 +5240,7 @@ RgSchUeCb      *ue;
 #endif
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }
 
 /**
@@ -5328,7 +5328,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
       rgSCHCmnUlUeResetTemp(cell, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -5397,7 +5397,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
       rgSCHCmnUlUeResetTemp(cell, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -5433,7 +5433,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
    rgSCHSc1UlContResAllocFnlz(cell, allocInfo);
    rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo);
 
-   RETVOID;
+   return;
 }
 
 
@@ -5465,7 +5465,7 @@ RgSchUeCb      *ue;
 {
 
    rgSCHSc1UlPosnUeInQ(cell, ue);
-   RETVOID;
+   return;
 }
 
 /**
@@ -5520,7 +5520,7 @@ CmLListCp             *inactvLst;
       }
       /* Do not remove UE from contResLst */
    }
-   RETVOID;
+   return;
 }
 /**
  * @brief Scheduler invocation
@@ -5557,7 +5557,7 @@ RgSchDlHqProcCb            *hqP;
    Release HqP.*/
    rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP);
    rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP);
-   RETVOID;
+   return;
 }