U8, U16, U32 data type changes

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

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index eaaa884..e9cab73 100755 (executable)
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -55,7 +55,7 @@
 #include "rg_sch.x"        /* typedefs for Scheduler */
 #include "rg_sch_cmn.x"    /* typedefs for Scheduler */
 /* local defines */
-U32 dlPrbCnt;
+uint32_t dlPrbCnt;
 #ifdef LTE_L2_MEAS
 
 static const char* RLOG_MODULE_NAME="MAC";
@@ -87,28 +87,26 @@ PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC S16 rgSchFillL2MeasCfm
+S16 rgSchFillL2MeasCfm
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
 LrgSchMeasCfmInfo *cfm,
-U32               measTime   
+uint32_t               measTime   
 )
 #else
-PUBLIC S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
+S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
 RgSchCellCb       *cell;
 RgSchL2MeasCb     *measCb;
 LrgSchMeasCfmInfo *cfm;
-U32               measTime;
+uint32_t               measTime;
 #endif
 {
-   U8                 idx;
+   uint8_t                 idx;
    LrgSchMeasReqInfo  *measInfo;
-   U8                 qciVal = 0;
-   U32                 sampOc = 0;
+   uint8_t                 qciVal = 0;
+   uint32_t                 sampOc = 0;
 
-   TRC3(rgSchFillL2MeasCfm)
-   
    measInfo = &measCb->measReq;   
 
    cfm->hdr.transId  = measInfo->hdr.transId;
@@ -320,7 +318,7 @@ U32               measTime;
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC S16 rgSchL2mSndCfm
+S16 rgSchL2mSndCfm
 (
 Pst               *pst,
 RgSchL2MeasCb     *measCb,
@@ -328,7 +326,7 @@ LrgSchMeasReqInfo *measInfo,
 Bool              isErr
 )
 #else
-PUBLIC S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
+S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
 Pst               *pst;
 RgSchL2MeasCb     *measCb;
 LrgSchMeasReqInfo *measInfo;
@@ -337,9 +335,7 @@ Bool              isErr;
 {
    LrgSchMeasCfmInfo   cfm;
 
-   TRC3(rgSchL2mSndCfm)
-
-   cmMemset((U8 *)&cfm, (U8)0, sizeof(LrgSchMeasCfmInfo));
+   memset(&cfm, 0, sizeof(LrgSchMeasCfmInfo));
    cfm.hdr.transId  = measInfo->hdr.transId;
    cfm.measType     = measInfo->measType;
    cfm.cellId       = measInfo->cellId;
@@ -366,24 +362,20 @@ Bool              isErr;
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC Void rgSchL2mFillCfmPst
+Void rgSchL2mFillCfmPst
 (
 Pst    *pst,
 Pst    *cfmPst,
 LrgSchMeasReqInfo *measInfo 
 )
 #else
-PUBLIC Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
+Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
 Pst    *pst;
 Pst    *cfmPst;
 LrgSchMeasReqInfo *measInfo;
 #endif
 {
  
-
-   TRC3(rgSchL2mFillCfmPst)
-
-
    cfmPst->srcEnt    = pst->dstEnt;
    cfmPst->srcInst   = pst->dstInst;
    cfmPst->srcProcId = pst->dstProcId;
@@ -397,7 +389,7 @@ LrgSchMeasReqInfo *measInfo;
    cfmPst->region    = measInfo->hdr.response.mem.region;
    cfmPst->pool      = measInfo->hdr.response.mem.pool;
 
-   RETVOID;
+   return;
 } /* rgSchL2mFillCfmPst */
 
 /** @brief This function inserts the MeasCb in to data base
@@ -429,9 +421,8 @@ LrgSchMeasReqInfo *measInfo;
 {
    CmLList   *lnk, *node;
    RgSchL2MeasCb   *oldMeasCb;
-   U32              diffTime;
+   uint32_t              diffTime;
    
-   TRC3(rgSchL2mInsertMeasCb)
    /* 
     * 1. Check if l2mList has any entries.
     * 2. If yes 
@@ -488,11 +479,9 @@ RgSchCellCb       *cell;
    CmLteTimingInfo    frm;
    RgSchDlSf          *sf = NULLP;
 #ifdef LTE_TDD
-   U8                 idx;
+   uint8_t                 idx;
 #endif
 
-   TRC3(rgSchL2CalDlPrbCount)
-
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
@@ -507,7 +496,7 @@ RgSchCellCb       *cell;
 #else
    cell->avgPrbDl.prbCount += sf->bwAssigned;
 #endif
-   RETVOID;
+   return;
 }
 
 /** @brief This function calculates the up link prb count 
@@ -532,11 +521,9 @@ RgSchCellCb       *cell;
    RgSchUlSf        *sf = NULLP;
    RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 #ifdef LTE_TDD
-   U8                 idx;
+   uint8_t                 idx;
 #endif
 
-   TRC3(rgSchL2CalUlPrbCount)
-
 #ifdef LTE_TDD
    idx = cellUl->schdIdx;
    if(idx < cellUl->numUlSubfrms)
@@ -548,7 +535,7 @@ RgSchCellCb       *cell;
    sf = &cellUl->ulSfArr[cellUl->schdIdx];
    cell->avgPrbUl.prbCount += sf->totPrb;
 #endif
-   RETVOID;
+   return;
 }
 /** @brief This function allocates memory from the heap
  *
@@ -578,7 +565,6 @@ RgSchErrInfo      err;
    RgSchL2MeasCb       *measCb = NULLP;
    Inst                inst = cell->instIdx;
    UNUSED(err);
-   TRC3(rgSchL2mAllocMeasCb)
 
    if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb,
                    sizeof(RgSchL2MeasCb))) == RFAILED)
@@ -587,7 +573,7 @@ RgSchErrInfo      err;
                   "Allocation of RgSchL2MeasCb failed");
       return (NULLP);
    }
-   cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(LrgSchMeasReqInfo));
+   memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo));
    RGSCHCPYTIMEINFO(cell->crntTime, measCb->startTime);
 
    measCb->dlTotalBw = 0;
@@ -616,24 +602,23 @@ RgSchErrInfo      err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSchL2mMeasReq 
+S16 rgSchL2mMeasReq 
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
 #else
-PUBLIC S16 rgSchL2mMeasReq(cell, measInfo, err)
+S16 rgSchL2mMeasReq(cell, measInfo, err)
 RgSchCellCb       *cell;
 LrgSchMeasReqInfo *measInfo;
 RgSchErrInfo      err;
 #endif    
 {
    RgSchL2MeasCb *measCb;
-   U8            idx;
-   U8            qciVal;
+   uint8_t            idx;
+   uint8_t            qciVal;
 
-   TRC3(rgSchL2mMeasReq)
 
    qciVal = 0;
    if ((measCb = rgSchL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
@@ -644,7 +629,7 @@ RgSchErrInfo      err;
                 "Allocation of RgSchL2MeasCb failed");
        return RFAILED;
    }
-   /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
+   /*memcpy(&measCb->measReq, measInfo,\
              sizeof(LrgSchMeasReqInfo));*/
    rgSchL2mInsertMeasCb(cell, measCb, measInfo);
   
@@ -681,7 +666,7 @@ RgSchErrInfo      err;
    {
       RgInfL2MeasReq    measReq;
       Pst               pst;
-      cmMemset((U8 *)&measReq, 0, sizeof(RgInfL2MeasReq));
+      memset(&measReq, 0, sizeof(RgInfL2MeasReq));
       measReq.transId  = measInfo->hdr.transId;
       measReq.measType = measInfo->measType;
       measReq.timePrd  = measInfo->timePrd;
@@ -712,35 +697,34 @@ RgSchErrInfo      err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHL2Meas
+S16 rgSCHL2Meas
 (
 RgSchCellCb  *cell,
-U8 isCalrCrcInd
+uint8_t isCalrCrcInd
 )
 #else
-PUBLIC S16 rgschL2Meas(cell,isCalrCrcInd)
+S16 rgschL2Meas(cell,isCalrCrcInd)
 RgSchCellCb  *cell;
-U8 isCalrCrcInd
+uint8_t isCalrCrcInd
 #endif
 {
    CmLList           *node = NULLP;
    RgSchL2MeasCb     *measCb = NULLP;
-   U8                idx;
+   uint8_t                idx;
    LrgSchMeasCfmInfo measCfm;
-   U8                qciVal = 0;
-   U32               sfDiff;
-   U32               meas;
+   uint8_t                qciVal = 0;
+   uint32_t               sfDiff;
+   uint32_t               meas;
 #ifdef LTE_TDD
-   U8                sfIdx;
+   uint8_t                sfIdx;
    Bool              isDlDataAllowed;  
-   U8                rem;
-   U32               numDlSf;
-   U32               numUlSf;
+   uint8_t                rem;
+   uint32_t               numDlSf;
+   uint32_t               numUlSf;
 #endif
-   TRC3(rgSCHL2Meas)
 
-      node = cell->l2mList.first;
-   cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
+   node = cell->l2mList.first;
+   memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
    while(node != NULLP)
    {
       measCb = (RgSchL2MeasCb *)node->node;
@@ -809,7 +793,7 @@ U8 isCalrCrcInd
          }
          RgMiLrgSchL2MeasCfm(&(rgSchCb[cell->instIdx].rgSchInit.lmPst),
                &measCfm);
-         cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
+         memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
          
          /* Delete this measCb from the list */
          if(measCb->measReq.timePrd > 0)
@@ -823,7 +807,7 @@ U8 isCalrCrcInd
             measCb->startTime = cell->crntTime;
             measCb->sfnCycle = 0;
             measCb->cfmRcvd = FALSE;
-            cmMemset((U8 *)&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm));
+            memset(&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm));
             cell->sndL2Meas = FALSE;
          } 
          /* ccpu00117052 - MOD - Passing double pointer