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 91141d9..3e1e6ff 100755 (executable)
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -63,23 +63,23 @@
 /* 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
-PUBLIC U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
-PUBLIC 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
-PUBLIC Void rgSCHCmnEmtcHdlHarqProcFail
+Void rgSCHCmnEmtcHdlHarqProcFail
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ue,
 RgSchUlHqProcCb   *hqProc,
 CmLteTimingInfo   frm
 );
-PUBLIC Void rgSCHEmtcInitUlUeHqEnt
+Void rgSCHEmtcInitUlUeHqEnt
 (
 RgSchCellCb      *cell,
 RgrUeCfg         *ueCfg,
@@ -107,33 +107,33 @@ RgSchUeCb        *ueCb
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm)
+Void rgSCHUhmProcDatInd(cell, ue, frm)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
 #endif
 #else  /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-U8                   cqi
+uint8_t                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
+Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
-U8                   cqi;
+uint8_t                   cqi;
 #endif
 #endif /* MAC_SCH_STATS */
 {
@@ -141,18 +141,16 @@ 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
 
-   TRC2(rgSCHUhmProcDatInd);
-
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
                      ue->ueId, frm.sfn, frm.slot);
-      RETVOID;
+      return;
    }
    hqProc->rcvdCrcInd = TRUE;
 
@@ -187,7 +185,7 @@ U8                   cqi;
    }
 #endif
    
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcDatInd */
 
 /**
@@ -206,20 +204,19 @@ U8                   cqi;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3DatInd
+Void rgSCHUhmProcMsg3DatInd
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3DatInd(hqProc)
+Void rgSCHUhmProcMsg3DatInd(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
-   TRC2(rgSCHUhmProcMsg3DatInd);
    hqProc->rcvdCrcInd = TRUE;
    hqProc->remTx = 0;        /*Reseting the value of rem Tx*/
    printf("\nrgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcMsg3DatInd */
 
 /**
@@ -238,16 +235,15 @@ RgSchUlHqProcCb *hqProc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3Failure
+Void rgSCHUhmProcMsg3Failure
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3Failure(hqProc)
+Void rgSCHUhmProcMsg3Failure(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
-   TRC2(rgSCHUhmProcMsg3Failure);
 #ifdef EMTC_ENABLE
    RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
 #endif  
@@ -256,7 +252,7 @@ RgSchUlHqProcCb *hqProc;
       hqProc->rcvdCrcInd = FALSE;
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmProcMsg3Failure */
 
 /**
@@ -281,37 +277,37 @@ RgSchUlHqProcCb *hqProc;
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-TknU8                rv
+TknUInt8                rv
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
+Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
-TknU8                rv;
+TknUInt8                rv;
 #endif
 #else /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm,
-TknU8                rv,
-U8                   cqi
+TknUInt8                rv,
+uint8_t                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
+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 */
 {
@@ -320,14 +316,13 @@ U8                   cqi;
    RgSchCmnUlUe   *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    S32               iTbs;
 #endif
-   TRC2(rgSCHUhmProcHqFailure);
 
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
    {
       printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
                      ue->ueId, frm.sfn, frm.slot);
-      RETVOID;
+      return;
    }
 #ifdef UL_LA
    {
@@ -344,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++;
    }
@@ -365,7 +360,7 @@ U8                   cqi;
    {
       hqProc->rvIdxPhy.val = rgRvIdxTable[rv.val];
    }
-   RETVOID;
+   return;
 } /* rgSCHUhmProcHqFailure */
 
 /**
@@ -387,21 +382,20 @@ U8                   cqi;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
-U8               idx
+uint8_t               idx
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
+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);
-   TRC2(rgSCHUhmGetUlHqProc);
 
 #if (ERRCLASS & ERRCLS_DEBUG)
    if(idx >= ueUl->hqEnt.numHqPrcs)
@@ -430,20 +424,19 @@ U8               idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmNewTx
+Void rgSCHUhmNewTx
 (
 RgSchUlHqProcCb *hqProc,
-U8              maxHqRetx,
+uint8_t              maxHqRetx,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
+Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
 RgSchUlHqProcCb *hqProc;
-U8              maxHqRetx;
+uint8_t              maxHqRetx;
 RgSchUlAlloc    *alloc;
 #endif
 {
-   TRC2(rgSCHUhmNewTx);
 
    hqProc->ndi ^= 1;
    hqProc->alloc = alloc;
@@ -457,7 +450,7 @@ RgSchUlAlloc    *alloc;
       ((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs++;
    }
 #endif
-   RETVOID;
+   return;
 }  /* rgSCHUhmNewTx */
 
 /**
@@ -477,22 +470,21 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeProc
+Void rgSCHUhmFreeProc
 (
 RgSchUlHqProcCb *hqProc,
 RgSchCellCb      *cell
 )
 #else
-PUBLIC Void rgSCHUhmFreeProc(hqProc, cell)
+Void rgSCHUhmFreeProc(hqProc, cell)
 RgSchUlHqProcCb *hqProc;
 RgSchCellCb      *cell;
 #endif
 {
 #ifdef LTE_L2_MEAS
    RgSchUeCb         *ueCb;
-   U8 qci = 1;
+   uint8_t qci = 1;
 #endif
-   TRC2(rgSCHUhmFreeProc);
 
 #ifdef LTE_L2_MEAS
    if (hqProc->alloc && hqProc->alloc->ue)
@@ -500,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--;
@@ -548,7 +540,7 @@ RgSchCellCb      *cell;
  {
      printf("\nhqEnt is NULL\n");
  }
-   RETVOID;
+   return;
 }  /* rgSCHUhmFreeProc */
 
 /**
@@ -569,24 +561,23 @@ RgSchCellCb      *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRetx
+Void rgSCHUhmRetx
 (
 RgSchUlHqProcCb *hqProc,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmRetx(hqProc, alloc) 
+Void rgSCHUhmRetx(hqProc, alloc) 
 RgSchUlHqProcCb *hqProc;
 RgSchUlAlloc    *alloc;
 #endif
 {
-   TRC2(rgSCHUhmRetx);
 
    hqProc->alloc = alloc;
    --hqProc->remTx;
    hqProc->rvIdx = (hqProc->rvIdx + 1) % 4;
    hqProc->rvIdxPhy.pres = FALSE;
-   RETVOID;
+   return;
 }  /* rgSCHUhmRetx */
 
 
@@ -609,24 +600,22 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeCfg
+Void rgSCHUhmRgrUeCfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeCfg          *ueCfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
+Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
 #endif
 {
-   U8 i;
+   uint8_t i;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
    
-   TRC2(rgSCHUhmRgrUeCfg);
-
    ueUl->hqEnt.maxHqRetx = ((ueCfg->ueUlHqCfg.maxUlHqTx) - 1);
 #ifdef TFU_UPGRADE
    /* Storing the delta HARQ offset for HARQ + PUSCH */
@@ -653,7 +642,7 @@ RgrUeCfg          *ueCfg;
 #ifdef EMTC_ENABLE
    rgSCHEmtcInitUlUeHqEnt(cellCb, ueCfg, ueCb);
 #endif
-   RETVOID;
+   return;
 }  /* rgSCHUhmRgrUeCfg */
 
 /**
@@ -675,21 +664,20 @@ RgrUeCfg          *ueCfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeRecfg
+Void rgSCHUhmRgrUeRecfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeRecfg        *ueRecfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
+Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeRecfg        *ueRecfg;
 #endif
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
-   TRC2(rgSCHUhmRgrUeRecfg);
 
    /* [ccpu00123958]-ADD- Check for HARQ Reconfig from the bit mask  */
    if(RGR_UE_ULHARQ_RECFG & ueRecfg->ueRecfgTypes)
@@ -697,7 +685,7 @@ RgrUeRecfg        *ueRecfg;
       ueUl->hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1); 
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmRgrUeRecfg */
 
 /**
@@ -716,18 +704,17 @@ RgrUeRecfg        *ueRecfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeUe
+Void rgSCHUhmFreeUe
 (
 RgSchCellCb       *cellCb,
 RgUeUlHqCb        *hqEnt
 )
 #else
-PUBLIC Void rgSCHUhmFreeUe(cellCb, hqEnt) 
+Void rgSCHUhmFreeUe(cellCb, hqEnt) 
 RgSchCellCb       *cellCb;
 RgUeUlHqCb       *hqEnt;
 #endif
 {
-   TRC2(rgSCHUhmFreeUe);
 #ifdef LTE_TDD
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
@@ -736,7 +723,7 @@ RgUeUlHqCb       *hqEnt;
                   hqEnt->numHqPrcs * sizeof(RgSchUlHqProcCb));
 #endif
 
-   RETVOID;
+   return;
 }  /* rgSCHUhmFreeUe */
 
 
@@ -758,23 +745,23 @@ RgUeUlHqCb       *hqEnt;
 *  @return  Void
 */
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmAppendPhich
+S16 rgSCHUhmAppendPhich
 (
 RgSchCellCb            *cellCb,
 CmLteTimingInfo        frm,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PUBLIC S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
+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
@@ -782,8 +769,6 @@ U8                     idx;
 #endif /* LTEMAC_HDFDD */
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cellCb);
 
-   TRC2(rgSCHUhmAppendPhich)
-
 #ifdef RG_5GTF
    return ROK;
 #endif
@@ -887,13 +872,13 @@ U8                     idx;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmHqEntInit
+S16 rgSCHUhmHqEntInit
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb           *ueCb
 )
 #else
-PUBLIC S16 rgSCHUhmHqEntInit(cellCb, ueCb)
+S16 rgSCHUhmHqEntInit(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb           *ueCb;
 #endif
@@ -902,7 +887,6 @@ RgSchUeCb           *ueCb;
 #ifdef LTE_TDD   
    Inst              inst = ueCb->cell->instIdx;
 #endif
-   TRC2(rgSCHUhmHqEntInit)
 
 #ifndef LTE_TDD
    /* Init the HARQ processes */
@@ -949,14 +933,14 @@ RgSchUeCb           *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmGetAvlHqProc
+S16 rgSCHUhmGetAvlHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
 RgSchUlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
+S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 RgSchUlHqProcCb       **hqP;
@@ -968,8 +952,6 @@ RgSchUlHqProcCb       **hqP;
    CmLList           *tmp;
    RgUeUlHqCb        *hqE;
 
-   TRC2(rgSCHUhmGetAvlHqProc);
-
    hqE = &ueUl->hqEnt;
  
    CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
@@ -1022,14 +1004,14 @@ RgSchUlHqProcCb       **hqP;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
 CmLteTimingInfo  frm
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
 CmLteTimingInfo  frm;
@@ -1040,8 +1022,6 @@ CmLteTimingInfo  frm;
    CmLList      *lnk = lst->first;
    RgSchUlHqProcCb   *proc;
 
-   TRC2(rgSCHUhmGetUlProcByTime);
-
    while (lnk)
    {
       proc = (RgSchUlHqProcCb *)(lnk->node);