U8, U16, U32 data type changes

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

diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c
index 96cc4db..1140e3f 100755 (executable)
--- a/src/5gnrsch/rg_sch_hdfdd.c
+++ b/src/5gnrsch/rg_sch_hdfdd.c
@@ -87,27 +87,26 @@ extern "C" {
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  Bool         *hdFddEnbl
  *
- *  @RETVALUE S16
+ *  @return  S16
  *      -# ROK
  *      -# RFAILED
 */ 
 
 #ifdef ANSI
-PUBLIC S16 rgSCHHdFddUeCfg 
+S16 rgSCHHdFddUeCfg 
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb *ueCb,
 Bool hdFddEnbl
 )
 #else /* ANSI */
-PUBLIC S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl)
+S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl)
 RgSchCellCb  *cellCb;
 RgSchUeCb *ueCb;
 Bool hdFddEnbl;
 #endif /* ANSI */
 {
-   U8 sfi;
-   TRC3(rgSCHHdFddUeCfg)
+   uint8_t sfi;
 
    RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId,
                "rgSCHHdFddUeCfg(): UeId =%d hdFddEnbl=%d",
@@ -128,7 +127,7 @@ Bool hdFddEnbl;
                   "rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE"
                   "CRNTI:%d",ueCb->ueId);
       }
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef LTEMAC_SPS
@@ -140,7 +139,7 @@ Bool hdFddEnbl;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
       "rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured"
                "CRNTI:%d",ueCb->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -164,10 +163,10 @@ Bool hdFddEnbl;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
                "rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb"
                "CRNTI:%d",ueCb->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }/*rgSCHHdFddUeCfg*/
 
 
@@ -191,23 +190,22 @@ Bool hdFddEnbl;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE( S16
+ *  @return ( S16
  *      -# ROK
 *
 */
 #ifdef ANSI
-PUBLIC S16 rgSCHHdFddUeDel 
+S16 rgSCHHdFddUeDel 
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC S16 rgSCHHdFddUeDel(cellCb, ueCb)
+S16 rgSCHHdFddUeDel(cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
 {
- TRC3(rgSCHHdFddUeDel)
 
    RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId,
              " rgSCHHdFddUeDel(): UeId =%d hdFdd=%x",
@@ -223,7 +221,7 @@ RgSchUeCb   *ueCb;
        ueCb->hdFddEnbld = FALSE;
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* rgSCHHdFddUeDel */
 
 
@@ -239,22 +237,22 @@ RgSchUeCb   *ueCb;
  *               instance updates
  *               for HD FDD UEs
  *  @param[in]  RgSchCellCb *cell
- *  @RETVALUE   None
+ *  @return    None
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddPtUlMrk 
+Void rgSCHCmnHdFddPtUlMrk 
 (
 RgSchCellCb *cellCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddPtUlMrk (cellCb)
+Void rgSCHCmnHdFddPtUlMrk (cellCb)
 RgSchCellCb *cellCb;
 #endif /* ANSI */
 {
-   U16                    sfn; /* System Frame Number */
-   U32                    pti; /* Index into Periodic table */
-   U16                    sfi; /* Index into HDFDD state table */
+   uint16_t                    sfn; /* System Frame Number */
+   uint32_t                    pti; /* Index into Periodic table */
+   uint16_t                    sfi; /* Index into HDFDD state table */
    CmLListCp              *cqiLst;
    CmLListCp              *srsLst;
    CmLListCp              *srLst;
@@ -267,7 +265,6 @@ RgSchCellCb *cellCb;
    RgSchUePCqiCb          *cqiCb = NULLP;
    RgSchUePCqiCb          *riCb = NULLP;
 
-   TRC3(rgSCHCmnHdFddPtUlMrk)
 
    timeInfo = cellCb->crntTime;
 
@@ -346,7 +343,7 @@ RgSchCellCb *cellCb;
      CM_LLIST_NEXT_NODE(riLst, riNode);
    }
 
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddPtUlMrk */
 #endif /* ifdef TFU_UPGRADE */
 
@@ -372,31 +369,29 @@ RgSchCellCb *cellCb;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE   None
+ *  @return    None
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkUlAllow
+Void rgSCHCmnHdFddChkUlAllow
 ( 
  RgSchCellCb *cellCb,
  RgSchUeCb   *ueCb,
- U8          *allow
+ uint8_t          *allow
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow)
+Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
-U8          *allow;
+uint8_t          *allow;
 #endif /* ANSI */
 {
-   U16              sfn;
-   U16              sfi;
+   uint16_t              sfn;
+   uint16_t              sfi;
    CmLteTimingInfo  timeInfo;
    RgSchDlSf        *sf = NULLP; /* Dl subframe info */
-   U8               ulOffset
+   uint8_t               ulOffset
 
-   TRC3(rgSCHCmnHdFddChkUlAllow)
-   
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, 
             " rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId);
 
@@ -439,7 +434,7 @@ U8          *allow;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
                "rgSCHCmnHdFddChkUlAllow: Already marked for DL, ueId = %d ",
                ueCb->ueId);
-      RETVOID;
+      return;
    }
 
    /* Validate condition 3 */
@@ -455,7 +450,7 @@ U8          *allow;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
          "rgSCHCmnHdFddChkUlAllow: No Place for HARQ, ueId = %d ",
          ueCb->ueId);
-      RETVOID;
+      return;
 
    }
    /* Validate condition 4 */
@@ -470,7 +465,7 @@ U8          *allow;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
                " rgSCHCmnHdFddChkUlAllow: No Place for UL grant, ueId = %d ",
                ueCb->ueId);
-      RETVOID;
+      return;
 
    }
    /* Validate condition 5 */
@@ -485,7 +480,7 @@ U8          *allow;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
              " rgSCHCmnHdFddChkUlAllow: No Place for Guard time, ueId = %d ",
              ueCb->ueId);
-      RETVOID;
+      return;
 
    }
    /* Adition guard time rule check: Above check is only for PDSCH, lets check
@@ -503,13 +498,13 @@ U8          *allow;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
          "rgSCHCmnHdFddChkUlAllow: Already marked for Cmn DL, ueId = %d ",
          ueCb->ueId);
-      RETVOID;
+      return;
 
    }
 
    /* All validation done. Safe to for UL */
    *allow = TRUE;
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddChkUlAllow */
 
 
@@ -541,32 +536,30 @@ U8          *allow;
  *  @param[in]  RgSchCellCb  *cellCb
  *  @param[in]  RgSchUeCb    *ueCb
  *  @param[in]  CmLteTimingInfo    *timeInfo
- *  @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi.
+ *  @param[out] uint8_t *allow -- TRUE is allowed or FALSE if no allowedi.
  *                   Valdity of this pointer is not done in this function
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkDlAllow 
+Void rgSCHCmnHdFddChkDlAllow 
 (
 RgSchCellCb *cellCb,
 RgSchUeCb *ueCb,
 Bool *allow /* Valdity of this pointer is not done in this function */
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow)
+Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow)
 RgSchCellCb *cellCb;
 RgSchUeCb *ueCb;
 Bool *allow; /* Valdity of this pointer is not done in this function */
 #endif /* ANSI */
 {
-   U16     sfn;
-   U16     sfi;
+   uint16_t     sfn;
+   uint16_t     sfi;
    RgSchDlSf *sf = NULLP; /* Dl subframe info */
    CmLteTimingInfo timeInfo;
    CmLteTimingInfo tempTimeInfo;
 
-   TRC3(rgSCHCmnHdFddChkDlAllow)
-
    *allow = FALSE;
 
    timeInfo = cellCb->crntTime;
@@ -590,7 +583,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,  
                "rgSCHCmnHdFddChkDlAllow: sf is UL, ueId=%d ", ueCb->ueId);
       *allow = FALSE;
-      RETVOID;
+      return;
    }
 
    /* It is not validation, but BCCH/PCCH marking is done here */
@@ -612,7 +605,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
               " rgSCHCmnHdFddChkDlAllow: Guard time rule not met, ueId=%d ",
               ueCb->ueId);
       *allow = FALSE;
-      RETVOID;
+      return;
    }
 
    /* Validate condition 3 */
@@ -648,7 +641,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
 
       /* Mark this sf as DLCNTRL */
       ueCb->hdFddCb->subfrm[sfi].subFrmDir =RG_SCH_HDFDD_DLCNTRL;
-      RETVOID;
+      return;
    }
 
 
@@ -679,13 +672,13 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
              "ueId=%d ",ueCb->ueId);
 
       *allow = FALSE;
-      RETVOID;
+      return;
    }
    /* First check for any Common channel info is scheduled */
 
    *allow = TRUE;
    /* All validation done. Safe to for DL */
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddChkDlAllow */
 
 
@@ -701,12 +694,12 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
  *
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE None
+ *  @return  None
  *
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkNackAllow
+Void rgSCHCmnHdFddChkNackAllow
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb,
@@ -714,7 +707,7 @@ CmLteTimingInfo  timeInfo,
 Bool *sndNACK
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK)
+Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 CmLteTimingInfo  timeInfo;
@@ -724,8 +717,6 @@ Bool *sndNACK;
    RgSchDlSf *sf;
    CmLteTimingInfo  tempTimeInfo;
 
-   TRC3(rgSCHCmnHdFddChkNackAllow)
-
    /* Information in timeInfo contains (n+DL_DELTA) th subframe info*/
 
    *sndNACK = FALSE;
@@ -756,7 +747,7 @@ Bool *sndNACK;
       *sndNACK = TRUE;
    }
 
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddChkNackAllow */
 
 
@@ -777,31 +768,28 @@ Bool *sndNACK;
  *  @param[in]  RgSchCellCb  *cellCb
  *  @param[in]  RgSchUeCb    *ueCb
  *  @param[in]  CmLteTimingInfo    *timeInfo
- *  @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi.
+ *  @param[out] uint8_t *allow -- TRUE is allowed or FALSE if no allowedi.
  *             Valdity of this pointer is not done in this function.
  *
- *  @RETVALUE None
+ *  @return  None
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddUpdULMark
+Void rgSCHCmnHdFddUpdULMark
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb)
+Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
 {
 
-   U16 sfn;
-   U16 sfi;
+   uint16_t sfn;
+   uint16_t sfi;
    CmLteTimingInfo  timeInfo;
-   U8   ulOffset;
-
-   TRC3(rgSCHCmnHdFddUpdULMark)
-
+   uint8_t   ulOffset;
 
    ulOffset = RGSCH_PDCCH_PUSCH_DELTA - 
               TFU_CRCIND_ULDELTA + RGSCH_PDCCH_PUSCH_DELTA;
@@ -838,7 +826,7 @@ RgSchUeCb   *ueCb;
    RG_SCH_HDFDD_GETSFI(sfi, timeInfo, (ulOffset * -1));
    RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_NOSCHD, RG_SCH_HDFDD_INVSFN, sfi);
 
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddUpdULMark */
 
 
@@ -859,31 +847,29 @@ RgSchUeCb   *ueCb;
  *  @param[in]  RgSchCellCb  *cellCb
  *  @param[in]  RgSchUeCb    *ueCb
  *  @param[in]  CmLteTimingInfo    *timeInfo
- *  @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowed.
+ *  @param[out] uint8_t *allow -- TRUE is allowed or FALSE if no allowed.
  *                Valdity of this pointer is not done in this function
  *
- *  @RETVALUE None
+ *  @return  None
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddUpdDLMark
+Void rgSCHCmnHdFddUpdDLMark
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb)
+Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
 {
 
-   U16 sfn;
-   U16 sfi;
+   uint16_t sfn;
+   uint16_t sfi;
    CmLteTimingInfo  timeInfo;
 
-   TRC3(rgSCHCmnHdFddUpdDLMark)
-
    timeInfo = cellCb->crntTime;
    RGSCH_INCR_SUB_FRAME(timeInfo, RG_SCH_CMN_DL_DELTA);
 
@@ -914,7 +900,7 @@ RgSchUeCb   *ueCb;
       RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLCNTRL, sfn, sfi);
    }
 
-   RETVOID;
+   return;
 } /* rgSCHCmnHdFddUpdDLMark */
 
 
@@ -929,31 +915,30 @@ RgSchUeCb   *ueCb;
  *
  *     Processing Steps:
  *   
- *  @param[out]  *sfn U32
+ *  @param[out]  *sfn uint32_t
  *  @param[in]  timeInfo timing information subframe of interest 
  *  @param[in]  offsest  Offest with w.r.t which SFN has to be determined
  *
- *  @RETVALUE None
+ *  @return  None
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHHdFddGetSfn
+Void rgSCHHdFddGetSfn
 (
- U16 *sfn,
+ uint16_t *sfn,
  CmLteTimingInfo  timeInfo,
  S16 offset
 )
 #else /* ANSI */
-PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
- U16 *sfn;
+Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
+ uint16_t *sfn;
  CmLteTimingInfo  timeInfo;
  S16 offset;
 #endif /* ANSI */
 {
-   U16 tempSfn;
+   uint16_t tempSfn;
    S16 tempSfCount;
 
-   TRC3(rgSCHHdFddGetSfn)
    if(((S16)(timeInfo.subframe) + offset) >= RGSCH_NUM_SUB_FRAMES)
    {
       /* Increament to number of times of SFNs that can be possible
@@ -981,7 +966,7 @@ PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
    }
    *sfn = tempSfn;
 
-   RETVOID;
+   return;
 } /* End of rgSCHHdFddGetSfn */