U8, U16, U32 data type changes

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

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index e357e8f..3e1e6ff 100755 (executable)
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -63,13 +63,13 @@
 /* forward references */
 
 #ifdef EMTC_ENABLE
-   U32 gUlRetxPassCntr = 0;
-   /*EXTERN U32 gUlRetxFailCntr;
-   EXTERN U32 gUlCrcPassCounter;
-   EXTERN U32 gUlCrcFailCounter;*/
+   uint32_t gUlRetxPassCntr = 0;
+   /*EXTERN uint32_t gUlRetxFailCntr;
+   EXTERN uint32_t gUlCrcPassCounter;
+   EXTERN uint32_t gUlCrcFailCounter;*/
 #endif
-U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
-U8 rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
+uint8_t rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
+uint8_t rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
 
 #ifdef EMTC_ENABLE
 Void rgSCHCmnEmtcHdlHarqProcFail
@@ -126,14 +126,14 @@ Void rgSCHUhmProcDatInd
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-U8                   cqi
+uint8_t                   cqi
 )
 #else
 Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
-U8                   cqi;
+uint8_t                   cqi;
 #endif
 #endif /* MAC_SCH_STATS */
 {
@@ -141,7 +141,7 @@ U8                   cqi;
 #ifdef UL_LA
    RgSchCmnUlUe   *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    S32            iTbs;
-   U8             maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
+   uint8_t             maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
                                                  [ueUl->maxUlCqi];
 #endif
 
@@ -150,7 +150,7 @@ U8                   cqi;
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
                      ue->ueId, frm.sfn, frm.slot);
-      RETVOID;
+      return;
    }
    hqProc->rcvdCrcInd = TRUE;
 
@@ -185,7 +185,7 @@ U8                   cqi;
    }
 #endif
    
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcDatInd */
 
 /**
@@ -216,7 +216,7 @@ RgSchUlHqProcCb *hqProc;
    hqProc->rcvdCrcInd = TRUE;
    hqProc->remTx = 0;        /*Reseting the value of rem Tx*/
    printf("\nrgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcMsg3DatInd */
 
 /**
@@ -252,7 +252,7 @@ RgSchUlHqProcCb *hqProc;
       hqProc->rcvdCrcInd = FALSE;
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcMsg3Failure */
 
 /**
@@ -282,14 +282,14 @@ Void rgSCHUhmProcHqFailure
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-TknU8                rv
+TknUInt8                rv
 )
 #else
 Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
-TknU8                rv;
+TknUInt8                rv;
 #endif
 #else /* MAC_SCH_STATS */
 #ifdef ANSI
@@ -298,16 +298,16 @@ Void rgSCHUhmProcHqFailure
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-TknU8                rv,
-U8                   cqi
+TknUInt8                rv,
+uint8_t                   cqi
 )
 #else
 Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
-TknU8                rv;
-U8                   cqi;
+TknUInt8                rv;
+uint8_t                   cqi;
 #endif
 #endif /* MAC_SCH_STATS */
 {
@@ -322,7 +322,7 @@ U8                   cqi;
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
                      ue->ueId, frm.sfn, frm.slot);
-      RETVOID;
+      return;
    }
 #ifdef UL_LA
    {
@@ -339,7 +339,7 @@ U8                   cqi;
 #ifdef MAC_SCH_STATS
    /** Stats update over here */
    {
-      static U32 retxCnt = 0;
+      static uint32_t retxCnt = 0;
       ++retxCnt;
       hqFailStats.ulCqiStat[cqi - 1].numOfNacks++;
    }
@@ -360,7 +360,7 @@ U8                   cqi;
    {
       hqProc->rvIdxPhy.val = rgRvIdxTable[rv.val];
    }
-   RETVOID;
+   return;
 } /* rgSCHUhmProcHqFailure */
 
 /**
@@ -386,13 +386,13 @@ RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
-U8               idx
+uint8_t               idx
 )
 #else
 RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
-U8               idx;
+uint8_t               idx;
 #endif
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@ -427,13 +427,13 @@ U8               idx;
 Void rgSCHUhmNewTx
 (
 RgSchUlHqProcCb *hqProc,
-U8              maxHqRetx,
+uint8_t              maxHqRetx,
 RgSchUlAlloc    *alloc
 )
 #else
 Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
 RgSchUlHqProcCb *hqProc;
-U8              maxHqRetx;
+uint8_t              maxHqRetx;
 RgSchUlAlloc    *alloc;
 #endif
 {
@@ -450,7 +450,7 @@ RgSchUlAlloc    *alloc;
       ((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs++;
    }
 #endif
-   RETVOID;
+   return;
 }  /* rgSCHUhmNewTx */
 
 /**
@@ -483,7 +483,7 @@ RgSchCellCb      *cell;
 {
 #ifdef LTE_L2_MEAS
    RgSchUeCb         *ueCb;
-   U8 qci = 1;
+   uint8_t qci = 1;
 #endif
 
 #ifdef LTE_L2_MEAS
@@ -492,7 +492,7 @@ RgSchCellCb      *cell;
       ueCb = hqProc->alloc->ue;
       if (ueCb && cell)
       {
-         U32 nonLcg0ReportedBs = ((RgSchCmnLcg *)(ueCb->ul.lcgArr[1].sch))->reportedBs + \
+         uint32_t nonLcg0ReportedBs = ((RgSchCmnLcg *)(ueCb->ul.lcgArr[1].sch))->reportedBs + \
                                ((RgSchCmnLcg *)(ueCb->ul.lcgArr[2].sch))->reportedBs + \
                                ((RgSchCmnLcg *)(ueCb->ul.lcgArr[3].sch))->reportedBs;
          ((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs--;
@@ -540,7 +540,7 @@ RgSchCellCb      *cell;
  {
      printf("\nhqEnt is NULL\n");
  }
-   RETVOID;
+   return;
 }  /* rgSCHUhmFreeProc */
 
 /**
@@ -577,7 +577,7 @@ RgSchUlAlloc    *alloc;
    --hqProc->remTx;
    hqProc->rvIdx = (hqProc->rvIdx + 1) % 4;
    hqProc->rvIdxPhy.pres = FALSE;
-   RETVOID;
+   return;
 }  /* rgSCHUhmRetx */
 
 
@@ -613,7 +613,7 @@ RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
 #endif
 {
-   U8 i;
+   uint8_t i;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
    
    ueUl->hqEnt.maxHqRetx = ((ueCfg->ueUlHqCfg.maxUlHqTx) - 1);
@@ -642,7 +642,7 @@ RgrUeCfg          *ueCfg;
 #ifdef EMTC_ENABLE
    rgSCHEmtcInitUlUeHqEnt(cellCb, ueCfg, ueCb);
 #endif
-   RETVOID;
+   return;
 }  /* rgSCHUhmRgrUeCfg */
 
 /**
@@ -685,7 +685,7 @@ RgrUeRecfg        *ueRecfg;
       ueUl->hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1); 
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmRgrUeRecfg */
 
 /**
@@ -723,7 +723,7 @@ RgUeUlHqCb       *hqEnt;
                   hqEnt->numHqPrcs * sizeof(RgSchUlHqProcCb));
 #endif
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmFreeUe */
 
 
@@ -749,19 +749,19 @@ S16 rgSCHUhmAppendPhich
 (
 RgSchCellCb            *cellCb,
 CmLteTimingInfo        frm,
-U8                     idx
+uint8_t                     idx
 )
 #else
 S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
 RgSchCellCb            *cellCb;
 CmLteTimingInfo        frm;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
-   U8              nDmrs;
-   U8              rbStart;
+   uint8_t              nDmrs;
+   uint8_t              rbStart;
 #ifdef LTE_TDD
-   U8              iPhich;
+   uint8_t              iPhich;
 #endif
    RgSchUlAlloc    *ulAlloc;
 #ifdef LTEMAC_HDFDD