U8, U16, U32 data type changes
[o-du/l2.git] / src / 5gnrmac / rg_l2m.c
index 1f37aa1..bce34a3 100755 (executable)
@@ -86,7 +86,7 @@ PRIVATE RgL2MeasCb * rgL2mAllocMeasCb ARGS((
  *
  * @param  [in] RgCellCb       *cell
  * @param  [in] RgInfL2MeasReq *measInfo
- * @param  [in] U8             measType
+ * @param  [in] uint8_t             measType
  * @param  [out] RgErrInfo      *err
  * @return  S16
  *      -# ROK 
@@ -94,38 +94,36 @@ PRIVATE RgL2MeasCb * rgL2mAllocMeasCb ARGS((
  *
  */
 #ifdef ANSI
-PUBLIC S16 rgL2mCreateMeasCb 
+S16 rgL2mCreateMeasCb 
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo, 
-U8              measType,
+uint8_t        measType,
 RgErrInfo      *err
 )
 #else
-PUBLIC S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
+S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
 RgCellCb       *cell;
 RgInfL2MeasReq *measInfo; 
-U8              measType;
+uint8_t        measType;
 RgErrInfo      *err;
 #endif    
 {
   // Inst    inst = cell->macInst - RG_INST_START;
-   U32     idx;
-   RgL2MeasCb       *measCb = NULLP;
-   U8            qciVal = 0;
+   uint32_t     idx;
+   RgL2MeasCb   *measCb = NULLP;
+   uint8_t      qciVal = 0;
 
    UNUSED(measType);
    UNUSED(err);
 
-   TRC3(rgL2mCreateMeasCb)
-
-      if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
-      {
-         RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
-         return RFAILED;
-      }
+   if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
+   {
+      RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
+      return RFAILED;
+   }
    //Memcpy is already done in rgL2mAllocMeasCb
-   /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
+   /*memcpy(&measCb->measReq, (CONSTANT uint8_t *)measInfo,\
      sizeof(RgInfL2MeasReq));*/
    rgL2mInsertMeasCb(cell, measCb, measInfo);
    measCb->measReq.timePrd = measInfo->timePrd;
@@ -167,14 +165,14 @@ RgErrInfo      *err;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgL2mMeasReq 
+S16 rgL2mMeasReq 
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo,
 RgErrInfo      *err
 )
 #else
-PUBLIC S16 rgL2mMeasReq(cell, measInfo, err)
+S16 rgL2mMeasReq(cell, measInfo, err)
 RgCellCb       *cell;
 RgInfL2MeasReq *measInfo; 
 RgErrInfo      *err;
@@ -182,7 +180,6 @@ RgErrInfo      *err;
 {
    S16  ret=RFAILED;
 
-   TRC3(rgL2mMeasReq)
    /* Creaet MeasCb Insert in cell->l2mList and return*/
    if ( (ret = rgL2mCreateMeasCb(cell, measInfo,
                LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK)
@@ -216,13 +213,12 @@ RgInfL2MeasCfm    *measCfm;
 {
    Pst             pst;
    Inst            macInst = cell->macInst - RG_INST_START;
-   TRC3(rgSndL2MeasCfm)
 
-      cmMemset((U8 *)&pst, 0, sizeof(Pst));
+   memset(&pst, 0, sizeof(Pst));
    rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst);
    RgMacSchL2Meas(&pst, measCfm);
 
-   RETVOID;
+   return;
 }/* rgSndL2MeasCfm */
 
 /** @brief This function sends the measurement stop confirm
@@ -250,12 +246,11 @@ RgInfL2MeasCfm    *measCfm;
    Pst             pst;
    Inst            macInst = cell->macInst - RG_INST_START;
 
-   TRC3(rgSndL2MeasStopCfm)
-      cmMemset((U8 *)&pst, 0, sizeof(Pst));
+   memset(&pst, 0, sizeof(Pst));
    rgGetPstToInst(&pst,macInst, cell->schInstMap.schInst);
    RgMacSchL2MeasStop(&pst, measCfm);
 
-   RETVOID;
+   return;
 }/* rgSndL2MeasStopCfm */
 
 /**
@@ -273,13 +268,13 @@ RgInfL2MeasCfm    *measCfm;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasReq
+S16 RgSchMacL2MeasReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasReq    *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasReq(pst, measInfo)
+S16 RgSchMacL2MeasReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
 #endif    
@@ -290,9 +285,6 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
    S16             ret = ROK;
    RgInfL2MeasCfm   measCfm;
 
-   TRC3(RgSchMacL2MeasReq)
-
-
    RG_IS_INST_VALID(pst->dstInst);
    inst   = pst->dstInst - RG_INST_START;
    cellCb = rgCb[inst].cell;
@@ -307,7 +299,7 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
    ret = rgL2mMeasReq(cellCb, measInfo, &err);
    if (ret != ROK)
    {
-      cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+      memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
       measCfm.transId     = measInfo->transId;
       measCfm.cellId      = measInfo->cellId;
       measCfm.measType    = measInfo->measType;
@@ -337,30 +329,26 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasStopReq
+S16 RgSchMacL2MeasStopReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasStopReq *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasStopReq(pst, measInfo)
+S16 RgSchMacL2MeasStopReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
 #endif
 {
-   S16             ret = ROK;   
-   CmLList         *node   = NULLP;
-   RgL2MeasCb      *measCb = NULLP;
-   U8               idx;
-   U8               qciVal;
-   Inst             inst;
-   RgCellCb        *cellCb = NULLP;
-
+   S16            ret = ROK;   
+   CmLList        *node   = NULLP;
+   RgL2MeasCb     *measCb = NULLP;
+   uint8_t        idx;
+   uint8_t        qciVal;
+   Inst           inst;
+   RgCellCb       *cellCb = NULLP;
    RgInfL2MeasCfm  measCfm;
 
-   TRC3(RgSchMacL2MeasStopReq)
-
-
    RG_IS_INST_VALID(pst->dstInst);
    inst   = pst->dstInst - RG_INST_START;
    cellCb = rgCb[inst].cell;
@@ -387,7 +375,7 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
       cmLListDelFrm(&cellCb->l2mList, &measCb->measLnk);
       rgFreeSBuf(inst,(Data**)&measCb, sizeof(RgL2MeasCb));
    }
-   cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+   memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
    measCfm.transId     = measInfo->transId;
    measCfm.cellId      = measInfo->cellId;
    measCfm.measType    = measInfo->measType;
@@ -411,13 +399,13 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasSendReq
+S16 RgSchMacL2MeasSendReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasSndReq *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasSendReq(pst, measInfo)
+S16 RgSchMacL2MeasSendReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
 #endif
@@ -426,9 +414,6 @@ RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
    RgCellCb       *cellCb = NULLP;
    S16             ret    = ROK;
 
-   TRC3(RgSchMacL2MeasSendReq)
-
-
    RG_IS_INST_VALID(pst->dstInst);
    inst   = pst->dstInst - RG_INST_START;
    cellCb = rgCb[inst].cell;
@@ -474,11 +459,9 @@ RgL2MeasCb     *measCb;
 RgInfL2MeasReq *measInfo;
 #endif
 {
-   CmLList   *lnk, *node;
-   RgL2MeasCb  *oldMeasCb;
-   U16         diffTime;
-
-   TRC3(rgL2mInsertMeasCb)
+   CmLList    *lnk, *node;
+   RgL2MeasCb *oldMeasCb;
+   uint16_t   diffTime;
 
       /* 
        * 1. Check if l2mList has any entries.
@@ -544,7 +527,6 @@ RgErrInfo      *err;
    RgL2MeasCb       *measCb = NULLP;
    Inst             inst = cell->macInst - RG_INST_START;
 
-   TRC3(rgL2mAllocMeasCb)
 
       if((rgAllocSBuf(inst,(Data **)&(measCb),
                   sizeof(RgL2MeasCb))) == RFAILED)
@@ -555,7 +537,7 @@ RgErrInfo      *err;
          err->errCause = RGERR_RAM_MEM_EXHAUST;
          return (NULLP);
       }
-   cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq));
+   memcpy(&measCb->measReq, measInfo, sizeof(RgInfL2MeasReq));
    RGCPYTIMEINFO(cell->crntTime, measCb->startTime);
 
    return (measCb);
@@ -577,26 +559,24 @@ RgErrInfo      *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgL2Meas
+S16 rgL2Meas
 (
 RgCellCb  *cell
 )
 #else
-PUBLIC S16 rgL2Meas(cell)
+S16 rgL2Meas(cell)
 RgCellCb  *cell;
 #endif
 {
    CmLList         *node   = NULLP;
    RgL2MeasCb      *measCb = NULLP;
-   RgInfL2MeasCfm  measCfm;
-   U8              idx = 0;
-   U8              qciVal = 0;
-   U32             measPrd; /*LTE_L2_MEAS_PHASE2*/
+   RgInfL2MeasCfm   measCfm;
+   uint8_t          idx = 0;
+   uint8_t          qciVal = 0;
+   uint32_t         measPrd; /*LTE_L2_MEAS_PHASE2*/
    CmLteTimingInfo  crntTime;
-   Inst           inst = cell->macInst - RG_INST_START;
+   Inst             inst = cell->macInst - RG_INST_START;
    
-   TRC3(rgL2Meas)
-
    node = cell->l2mList.first;
 
    while(node != NULLP)
@@ -616,7 +596,7 @@ RgCellCb  *cell;
       /*LTE_L2_MEAS_PHASE2*/
       if (cell->sndL2Meas || measPrd == measCb->measReq.timePrd)
       {
-         cmMemset((U8 *)&measCfm, 0, sizeof(RgInfL2MeasCfm));
+         memset(&measCfm, 0, sizeof(RgInfL2MeasCfm));
          for(idx = 0; idx < measCb->measReq.t.prbReq.numQci; idx++)
          {
             qciVal = measCb->measReq.t.prbReq.qci[idx];