Merge "O-DU High Architecture updated"
[o-du/l2.git] / src / 5gnrmac / rg_tom.c
index bb4e234..ba4d25d 100755 (executable)
@@ -63,28 +63,28 @@ invoked by PHY towards MAC
 
 /* ADD Changes for Downlink UE Timing Optimization */
 #ifndef LTEMAC_DLUE_TMGOPTMZ 
-PRIVATE S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb   *cellCb,
+static S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb   *cellCb,
                                     RgErrInfo  *err));
 #else
 S16 rgTOMUtlProcDlSf ARGS((RgDlSf *dlSf, RgCellCb *cellCb,
                                   RgErrInfo  *err));
 #endif
-PRIVATE S16 rgTOMProcCrntiCEInDatInd ARGS((
+static S16 rgTOMProcCrntiCEInDatInd ARGS((
 RgMacPdu          *pdu,
 RgUeCb            *prevUeCb,
 RgCellCb          *cellCb,
 TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
-U16               slot
+uint16_t          slot
 ));
 
-PRIVATE S16 rgTOMProcCCCHSduInDatInd ARGS((
+static S16 rgTOMProcCCCHSduInDatInd ARGS((
 RgMacPdu          *pdu,
 RgUeCb            *prevUeCb,
 RgCellCb          *cellCb,
 TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
-U16               slot
+uint16_t           slot
 ));
 
 S16 rgHndlFlowCntrl
@@ -93,27 +93,27 @@ RgCellCb       *cell,
 RgInfSfAlloc        *sfInfo
 );
 
-EXTERN S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
+S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
 #ifdef EMTC_ENABLE
-EXTERN S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc  *sfInfo);  
-EXTERN S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err);  
-EXTERN Void rgTOMEmtcRlsSf(RgDlSf *dlSf);  
+S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc  *sfInfo);  
+S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err);  
+Void rgTOMEmtcRlsSf(RgDlSf *dlSf);  
 #endif
 #ifdef LTE_L2_MEAS
-PRIVATE Void rgTOML2MCompileActiveLCs ARGS
+static Void rgTOML2MCompileActiveLCs ARGS
 ((
  RgCellCb      *cellCb, 
  RgUeCb        *ueCb,
  RgMacPdu      *pdu,
  RgInfCeInfo   *ceInfo 
  ));
-PRIVATE S16 rgTOMUtlL2MStoreBufSz ARGS
+static S16 rgTOMUtlL2MStoreBufSz ARGS
 ((
  RgUeCb      *ueCb,
  RgInfCeInfo *ceInfo
  ));
 
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS
+static S16 rgTomUtlPrepareL2MUlThrpInfo ARGS
 ((
    RgCellCb *cellCb,
    RgUeCb  *ueCb,
@@ -126,7 +126,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS
      TB, which is not guaranteed if higher Range values are used */
    /* Note: taking value 10 for BSR index 1 */
 #ifndef MAC_5GTF_UPDATE
-PRIVATE U32 rgLwrBsrTbl[64] = {
+static uint32_t rgLwrBsrTbl[64] = {
    0, 10, 10, 12, 14, 17, 19, 22, 26,
    31, 36, 42, 49, 57, 67, 78, 91,
    107, 125, 146, 171, 200, 234, 274, 321,
@@ -138,7 +138,7 @@ PRIVATE U32 rgLwrBsrTbl[64] = {
 };
 #else
 
-PRIVATE U32 rgLwrBsrTbl[64] = {
+static uint32_t rgLwrBsrTbl[64] = {
 0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181,223,274,337,414,
 509,625,769,945,1162,1429,1757,2161,2657,3267,4017,4940,6074,7469,
 9185,11294,13888,17077,20999,25822,31752,39045,48012,59039,72598,
@@ -156,9 +156,9 @@ PRIVATE U32 rgLwrBsrTbl[64] = {
 }
 
 /* global variables */
-U32 rgUlrate_tfu;
+uint32_t rgUlrate_tfu;
 #ifdef EMTC_ENABLE
-EXTERN U32 grgUlrate_tfu;
+uint32_t grgUlrate_tfu;
 #endif
 
 /** @brief This function fills the PDSCH data of a downlink subframe 
@@ -182,7 +182,7 @@ EXTERN U32 grgUlrate_tfu;
  *      -# RFAILED 
  */
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlFillDatReqPdus 
+static S16 rgTOMUtlFillDatReqPdus 
 (
  TfuDatReqInfo *datInfo,
  RgDlSf        *dlSf,
@@ -190,7 +190,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus
  RgErrInfo     *err
  )
 #else
-PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
+static S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
  TfuDatReqInfo *datInfo;
  RgDlSf        *dlSf;
  RgCellCb      *cellCb;
@@ -201,10 +201,9 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
    TfuDatReqPduInfo *datReq=NULLP;
  /* Moving node declaration to limited scope for optimization */
    RgDlHqProcCb     *hqCb;
-   U8               idx;
+   uint8_t               idx;
    Inst             inst = cellCb->macInst - RG_INST_START;
 
-   TRC2(rgTOMUtlFillDatReqPdus)
 
       /* first lets send the BCCH data down to PHY */
    if (dlSf->bcch.tb != NULLP)
@@ -373,14 +372,14 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
 /* ADD Changes for Downlink UE Timing Optimization */
 #ifndef LTEMAC_DLUE_TMGOPTMZ 
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlProcDlSf
+static S16 rgTOMUtlProcDlSf
 (
  RgDlSf     *dlSf,
  RgCellCb   *cellCb,
  RgErrInfo  *err
  )
 #else
-PRIVATE S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
+static S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
  RgDlSf     *dlSf;
  RgCellCb   *cellCb;
  RgErrInfo  *err;
@@ -405,7 +404,6 @@ S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
    TfuDatReqInfo     *datInfo;
    Inst              inst = cellCb->macInst - RG_INST_START;
 
-   TRC2(rgTOMUtlProcDlSf);
 
    /* Fill Data Request Info from scheduler to PHY */   
    if ((ret = rgAllocEventMem(inst,(Ptr *)&datInfo, 
@@ -456,7 +454,7 @@ S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
       if((datInfo->pdus.count) || (datInfo->bchDat.pres == TRUE))
       {
          /* sending the data to Phy */
-         if (rgLIMTfuDatReq(inst,datInfo) != ROK)
+         //if (rgLIMTfuDatReq(inst,datInfo) != ROK)
          {
             RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data info for cell");               
          }
@@ -470,7 +468,7 @@ S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
    return ROK;
 } /* end of */
 
-U32  rgMacGT;
+uint32_t  rgMacGT;
 
 /** @brief This function allocates the RgMacPdu that will be populated by DEMUX
  * with the SubHeaders list and the values of the Control elements.
@@ -488,23 +486,22 @@ U32  rgMacGT;
  *      -# RFAILED 
  */
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlAllocPduEvnt 
+static S16 rgTOMUtlAllocPduEvnt 
 (
 Inst             inst,
  RgMacPdu         **pdu
  )
 #else
-PRIVATE S16 rgTOMUtlAllocPduEvnt (inst,pdu)
+static S16 rgTOMUtlAllocPduEvnt (inst,pdu)
 Inst             inst;
-   RgMacPdu         **pdu;
+RgMacPdu         **pdu;
 #endif
 {
 
    Mem               evntMem;
    RgUstaDgn         dgn;      /* Alarm diagnostics structure */
-   VOLATILE U32      startTime=0;
+   volatile uint32_t startTime=0;
 
-   TRC2(rgTOMUtlAllocPduEvnt);
 
    evntMem.region = rgCb[inst].rgInit.region;
    evntMem.pool   = rgCb[inst].rgInit.pool;
@@ -547,13 +544,13 @@ Inst             inst;
  * @return 
  */
 #ifdef ANSI
-PRIVATE Void rgTOMUtlFreePduEvnt
+static Void rgTOMUtlFreePduEvnt
 (
  RgMacPdu *pdu,
  Bool      error
  )
 #else
-PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error)
+static Void rgTOMUtlFreePduEvnt (pdu, error)
    RgMacPdu *pdu;
    Bool      error;
 #endif
@@ -562,7 +559,6 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error)
    RgMacSdu       *sdu;
    CmLList        *node;
 
-   TRC2(rgTOMUtlFreePduEvnt);
    /* Steps of freeing up the PDU.
     * 1. loop through the subHdrLst and free up all the buffers.
     * 2. free up the whole event
@@ -578,7 +574,7 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error)
       }
    }
    RG_FREE_MEM(pdu);
-   RETVOID;
+   return;
 } /* end of rgTOMUtlFreePduEvnt */ 
 
 /** @brief This function allocates the RgMacPdu that will be populated by DEMUX
@@ -597,13 +593,13 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error)
  *      -# RFAILED 
  */
 #ifdef ANSI
-PRIVATE S16 rgTOMInfAllocPduEvnt 
+static S16 rgTOMInfAllocPduEvnt 
 (
 Inst           inst,
 RgInfSfDatInd **sfInfo
  )
 #else
-PRIVATE S16 rgTOMInfAllocPduEvnt (inst,sfInfo)
+static S16 rgTOMInfAllocPduEvnt (inst,sfInfo)
 Inst             inst;
 RgInfSfDatInd **sfInfo;
 #endif
@@ -611,9 +607,8 @@ RgInfSfDatInd **sfInfo;
 
    Mem               evntMem;
    RgUstaDgn         dgn;      /* Alarm diagnostics structure */
-   VOLATILE U32      startTime=0;
+   volatile uint32_t      startTime=0;
 
-   TRC2(rgTOMInfAllocPduEvnt);
 
    evntMem.region = rgCb[inst].rgInit.region;
    evntMem.pool   = rgCb[inst].rgInit.pool;
@@ -654,19 +649,18 @@ RgInfSfDatInd **sfInfo;
  * @return 
  */
 #ifdef ANSI
-PRIVATE Void rgTOMInfFreePduEvnt
+static Void rgTOMInfFreePduEvnt
 (
 RgInfSfDatInd *sfInfo
  )
 #else
-PRIVATE Void rgTOMInfFreePduEvnt (sfInfo)
+static Void rgTOMInfFreePduEvnt (sfInfo)
 RgInfSfDatInd *sfInfo;
 #endif
 {
-   TRC2(rgTOMInfFreePduEvnt);
 
    RG_FREE_MEM(sfInfo);
-   RETVOID;
+   return;
 } /* end of rgTOMUtlFreePduEvnt */
 
 #ifdef LTE_L2_MEAS
@@ -688,23 +682,22 @@ RgInfSfDatInd *sfInfo;
  * @return 
  */
 #ifdef ANSI
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo
+static S16 rgTomUtlPrepareL2MUlThrpInfo
 (
    RgCellCb *cellCb,
    RgUeCb  *ueCb,
    RgRguDedDatInd  *dDatInd
  )
 #else
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
+static S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
    RgCellCb *cellCb;
    RgUeCb *ueCb;
    RgRguDedDatInd    *dDatInd;
 #endif
 {
-   U8 lcId;
-   U8 lcgId;
-   U8 loop;
-   TRC2(rgTomUtlPrepareL2MUlThrpInfo);
+   uint8_t lcId;
+   uint8_t lcgId;
+   uint8_t loop;
 
    dDatInd->burstInd = RGU_L2M_UL_BURST_END;
    for(loop=0;loop<dDatInd->numLch;loop++)
@@ -747,7 +740,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
  * @param  [in] RgUeCb     *ueCb
  * @param  [in] CmLteRnti  rnti
  * @param  [in] RgMacPdu   *pdu
- * @param  [out] U32       *lcgBytes
+ * @param  [out] uint32_t       *lcgBytes
  *  
  *  @return  S16
  *      -# ROK 
@@ -758,45 +751,45 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
 
 #ifdef LTEMAC_SPS
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlProcMsg
+static S16 rgTOMUtlProcMsg
 (
  RgCellCb      *cellCb, 
  RgUeCb        *ueCb,
  RgMacPdu      *pdu,
  Bool          isSpsRnti,
  Bool          *spsToBeActvtd,
U16           *sduSize,
U16           slot,
U32           *lcgBytes
uint16_t      *sduSize,
uint16_t      slot,
uint32_t      *lcgBytes
  )
 #else
-PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes)
+static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes)
    RgCellCb      *cellCb; 
    RgUeCb        *ueCb;
    RgMacPdu      *pdu;
    Bool          isSpsRnti;
    Bool          *spsToBeActvtd;
-   U16           *sduSize;
-   U16           slot;
-   U32           *lcgBytes;
+   uint16_t      *sduSize;
+   uint16_t      slot;
+   uint32_t      *lcgBytes;
 #endif   
 #else /* LTEMAC_SPS */
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlProcMsg
+static S16 rgTOMUtlProcMsg
 (
  RgCellCb      *cellCb, 
  RgUeCb        *ueCb,
  RgMacPdu      *pdu,
U16           slot,
U32           *lcgBytes
uint16_t      slot,
uint32_t      *lcgBytes
  )
 #else
-PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
+static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
    RgCellCb      *cellCb; 
    RgUeCb        *ueCb;
    RgMacPdu      *pdu;
-   U16           slot;
-   U32           *lcgByes;
+   uint16_t       slot;
+   uint32_t       *lcgByes;
 #endif  
 #endif
 {
@@ -814,17 +807,17 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
 #endif
 
 #ifdef LTE_L2_MEAS
-   U8                idx1;
-   U8                idx2;
-   RgUlSf            *ulSf;
-   U16               totalBytesRcvd = 0;
-   U16               sduLen[RGU_MAX_LC] = {0};
-   U8                qciVal[RGU_MAX_LC] = {0};
-   U8                numPrb = 0;
+   uint8_t                idx1;
+   uint8_t                idx2;
+   RgUlSf                 *ulSf;
+   uint16_t               totalBytesRcvd = 0;
+   uint16_t               sduLen[RGU_MAX_LC] = {0};
+   uint8_t                qciVal[RGU_MAX_LC] = {0};
+   uint8_t                numPrb = 0;
 
 #endif
-   U8                lcgId;
-   MsgLen            bufSz;
+   uint8_t                lcgId;
+   MsgLen                 bufSz;
 
   /* Moved outside of LTE_L2_MEAS
     *          scope as this pointer will now be used to 
@@ -845,7 +838,6 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
   
    ulLcCb = NULLP;
    
-   TRC2(rgTOMUtlProcMsg)
 
 #ifndef LTE_L2_MEAS      
       UNUSED(slot);
@@ -897,7 +889,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
          return RFAILED;
       }
       dDatInd = (RgRguDedDatInd *)elem;
-      cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd));
+      memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
 #endif
       dDatInd->cellId   = cellCb->cellId;
       dDatInd->rnti     = ueCb->ueId;
@@ -936,7 +928,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
       }
 #ifdef RLC_STA_PROC_IN_MAC/* RLC Status PDU Processing */
       {
-         extern S16 rlcProcDlStatusPdu(Pst       *udxPst,SuId      suId,
+         S16 rlcProcDlStatusPdu(Pst       *udxPst,SuId      suId,
                CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu);
 
          if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst),
@@ -974,7 +966,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
          return RFAILED;
       }
       dDatInd = (RgRguDedDatInd *)elem;
-      cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd));
+      memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
 #endif
          dDatInd->cellId   = cellCb->cellId;
          dDatInd->rnti     = ueCb->ueId;
@@ -1067,7 +1059,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
          {
             ueCb->ul.explRelCntr = 0;
             /* Indicate scheduler for explicit release */
-            cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst));
+            memset(&schPst1, 0, sizeof(Pst));
             rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
            //TODO: commented for compilation without SCH 
 #if 0
@@ -1135,53 +1127,52 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
  */
 #ifdef LTEMAC_SPS
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlInsSchInfo
+static S16 rgTOMUtlInsSchInfo
 (
 RgMacPdu *pdu,
 RgInfSfDatInd *sfInfo,
-RgInfCeInfo *ceInfo,
-CmLteRnti   rnti,
-Bool        spsToBeActvtd,
-U16         sduSize,
-U32         *lcgBytes
+RgInfCeInfo   *ceInfo,
+CmLteRnti      rnti,
+Bool           spsToBeActvtd,
+uint16_t       sduSize,
+uint32_t       *lcgBytes
 )
 #else
-PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes)
+static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes)
 RgMacPdu *pdu;
-RgInfSfDatInd *sfInfo;
-RgInfCeInfo *ceInfo;
-CmLteRnti   rnti;
-Bool        spsToBeActvtd;
-U16         sduSize;
-U32         *lcgBytes;
+RgInfSfDatInd   *sfInfo;
+RgInfCeInfo    *ceInfo;
+CmLteRnti        rnti;
+Bool             spsToBeActvtd;
+uint16_t         sduSize;
+uint32_t         *lcgBytes;
 #endif
 
 #else
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlInsSchInfo
+static S16 rgTOMUtlInsSchInfo
 (
 RgMacPdu *pdu,
 RgInfSfDatInd *sfInfo,
 RgInfCeInfo *ceInfo,
 CmLteRnti   rnti,
-U32         *lcgBytes
+uint32_t    *lcgBytes
 )
 #else
-PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes)
+static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes)
 RgMacPdu *pdu;
 RgInfSfDatInd *sfInfo;
 RgInfCeInfo *ceInfo;
 CmLteRnti   rnti;
-U32         *lcgBytes;
+uint32_t    *lcgBytes;
 #endif
 #endif
 {
    S16            ret;
    RgInfUeDatInd *ueInfo;
-   U32           lcgId = 0;
-   U32           idx = 0;
+   uint32_t       lcgId = 0;
+   uint32_t       idx = 0;
 
-   TRC2(rgTOMUtlInsSchInfo);
 
    RG_TOM_INF_ALLOC(sfInfo, sizeof(RgInfUeDatInd), ueInfo, ret);
 
@@ -1271,18 +1262,17 @@ Inst             inst;
    CmLList           *node;
    TfuDatInfo        *datInfo;
    RgLowSapCb        *tfuSap;
-   U16               slot;
+   uint16_t          slot;
 #ifdef LTEMAC_SPS
    Bool              isSpsRnti=FALSE;
    Pst               schPst1;  
   // RgInfSpsRelInfo   relInfo;
-       Bool              spsToBeActvtd = FALSE;
-   U16               sduSize = 0;
+   Bool              spsToBeActvtd = FALSE;
+   uint16_t          sduSize = 0;
 #endif
-   U32               lcgBytes[RGINF_MAX_LCG_PER_UE];
+   uint32_t          lcgBytes[RGINF_MAX_LCG_PER_UE];
 
 
-   TRC2(rgTOMDatInd);
 #ifdef STUB_TTI_HANDLING_5GTF 
    node =  datInd->datIndLst.first;
    for (;node; node=node->next)
@@ -1302,7 +1292,7 @@ Inst             inst;
       return(RFAILED);
 #endif      
 
-   cmMemset((U8 *)&lcgBytes, 0, sizeof(lcgBytes));
+   memset(&lcgBytes, 0, sizeof(lcgBytes));
 
    tfuSap = &(rgCb[inst].tfuSap);
    ueCb = NULLP;
@@ -1333,7 +1323,7 @@ Inst             inst;
    {
       datInfo = (TfuDatInfo*)node->node;
       {
-         //extern U32 ulrate_tfu;
+         //uint32_t ulrate_tfu;
          MsgLen len;
          SFndLenMsg(datInfo->mBuf, &len);
 #ifdef STUB_TTI_HANDLING_5GTF         
@@ -1423,7 +1413,7 @@ Inst             inst;
                   if (ueCb->ul.implRelCntr == ueCb->ul.implRelCnt)
                   {
                      /* Indicate scheduler for implicit release */
-                     cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst));
+                     memset(&schPst1, 0, sizeof(Pst));
                      rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
 
                      ueCb->ul.implRelCntr = 0;
@@ -1459,9 +1449,9 @@ Inst             inst;
      rgTOML2MCompileActiveLCs (cellCb, ueCb, pdu, &ceInfo);
 #endif
 #ifdef LTEMAC_SPS
-         if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (U32 *)&lcgBytes)) != ROK)
+         if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (uint32_t *)&lcgBytes)) != ROK)
 #else
-         if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (U32 *)&lcgBytes)) != ROK)
+         if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (uint32_t *)&lcgBytes)) != ROK)
 #endif /* LTEMAC_SPS */
          {
             rgTOMUtlFreePduEvnt (pdu, TRUE);
@@ -1475,9 +1465,9 @@ Inst             inst;
 
       
 #ifdef LTEMAC_SPS
-      if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti,spsToBeActvtd,sduSize, (U32 *)&lcgBytes) != ROK)
+      if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti,spsToBeActvtd,sduSize, (uint32_t *)&lcgBytes) != ROK)
 #else
-      if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (U32 *)&lcgBytes) != ROK)
+      if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (uint32_t *)&lcgBytes) != ROK)
 #endif
       
       {
@@ -1500,12 +1490,12 @@ Inst             inst;
 #endif
    /* RRM_RBC_X */
    /* Update PRB used for all GBR QCIs to scheduler */
-    cmMemcpy((U8*) &sfInfo->qcisUlPrbCnt[0],
-             (U8*) &cellCb->qcisUlPrbCnt[0],
-             (RGM_MAX_QCI_REPORTS * sizeof(U32)));
+    memcpy( &sfInfo->qcisUlPrbCnt[0],
+              &cellCb->qcisUlPrbCnt[0],
+             (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
     /* clear the cellCb ul prb value */
-    cmMemset((U8*)&cellCb->qcisUlPrbCnt[0], 0, 
-             (RGM_MAX_QCI_REPORTS * sizeof(U32)));
+    memset(&cellCb->qcisUlPrbCnt[0], 0, 
+             (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
 
    /* RRM_RBC_Y */
 
@@ -1543,7 +1533,7 @@ Inst             inst;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PRIVATE S16 rgHndlCmnChnl
+static S16 rgHndlCmnChnl
 (
 RgCellCb            *cell,
 CmLteTimingInfo     timingInfo,
@@ -1551,7 +1541,7 @@ RgInfCmnLcInfo      *cmnLcInfo,
 RgErrInfo           *err
 )
 #else
-PRIVATE S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err)
+static S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err)
 RgCellCb            *cell;
 CmLteTimingInfo     timingInfo;
 RgInfCmnLcInfo      *cmnLcInfo;
@@ -1571,7 +1561,6 @@ RgErrInfo           *err;
    RgDlSf               *dlSf;
    Inst                 inst = cell->macInst - RG_INST_START;
 
-   TRC2(rgHndlCmnChnl)
 
    dlSf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
 
@@ -1735,7 +1724,7 @@ RgErrInfo           *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgHndlSchdUe
+static S16 rgHndlSchdUe
 (
 RgCellCb            *cell,
 CmLteTimingInfo     timingInfo,
@@ -1743,7 +1732,7 @@ RgInfUeInfo         *ueInfo,
 RgErrInfo           *err
 )
 #else
-PRIVATE S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */
+static S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */
 RgCellCb            *cell;
 CmLteTimingInfo     timingInfo;
 RgInfUeInfo         *ueInfo;
@@ -1751,7 +1740,6 @@ RgErrInfo           *err;
 #endif
 {
 
-   TRC2(rgHndlSchdUe);
 
    if(NULLP == ueInfo->allocInfo)
    {
@@ -1780,25 +1768,24 @@ RgErrInfo           *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgHndlUlUeInfo
+static S16 rgHndlUlUeInfo
 (
 RgCellCb            *cell,
 CmLteTimingInfo     timingInfo,
 RgInfUlUeInfo       *ueInfo
 )
 #else
-PRIVATE S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo)
+static S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo)
 RgCellCb            *cell;
 CmLteTimingInfo     timingInfo;
 RgInfUlUeInfo       *ueInfo;
 #endif
 {
    Inst           inst = cell->macInst - RG_INST_START;
-   U8             idx;
+   uint8_t        idx;
    RgUlSf         *ulSf;
    S16            ret;
 
-   TRC2(rgHndlUlUeInfo)
    
    ulSf = &cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)];
 
@@ -1873,9 +1860,8 @@ Inst                inst;
 RgDlSf              *dlSf;
 #endif
 {
-   U8               idx;
+   uint8_t          idx;
 
-   TRC2(rgTOMRlsSf)
 
    if(dlSf->txDone == FALSE)
    {
@@ -1908,18 +1894,18 @@ RgDlSf              *dlSf;
       RLC-MAC */
    dlSf->statIndDone = FALSE;
 #endif
-        if (dlSf->tbs.count)
-        {
-      U8           i;
+   if (dlSf->tbs.count)
+   {
+      uint8_t      i;
       CmLList      *node;
       RgDlHqProcCb *hqP;
-       RGDBGERRNEW(inst, (rgPBuf(inst),
+      RGDBGERRNEW(inst, (rgPBuf(inst),
                 "Error Stale TBs in Subframes TBS list\n"));
       node = dlSf->tbs.first;
-                 while(node)
-                 {
-         hqP = (RgDlHqProcCb*)node->node;
-         node = node->next;
+      while(node)
+      {
+          hqP = (RgDlHqProcCb*)node->node;
+          node = node->next;
           if (hqP)
           {
                     for(i=0;i< RG_MAX_TB_PER_UE;i++)
@@ -1939,7 +1925,7 @@ RgDlSf              *dlSf;
    cmLListInit(&dlSf->tbs);
    dlSf->txDone = FALSE;
    dlSf->numRaRsp = 0;
-   RETVOID;
+   return;
 }
 
 /**
@@ -1973,9 +1959,8 @@ RgInfSfAlloc        *sfInfo;
 {
    RguFlowCntrlInd  *flowCntrlInd;
    Pst              *pst;
-   U32              ueIdx;
-   U32              lcIdx;
-   TRC3(rgHndlFlowCntrl);
+   uint32_t         ueIdx;
+   uint32_t         lcIdx;
 
    pst = &cell->rguDlSap->sapCfg.sapPst;
    /* flowCntrlInd is alloced in cell init time and will be re-used throughout */
@@ -2043,10 +2028,9 @@ RgInfSfAlloc        *sfInfo;
    RgCellCb       *cell;
    RgDlSf         *dlSf;
    RgErrInfo      err;
-   VOLATILE U32   startTime=0;
+   volatile uint32_t   startTime=0;
    Inst           inst;
 
-   TRC2(RgSchMacSfAllocReq)
 
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
@@ -2176,23 +2160,23 @@ RgInfSfAlloc        *sfInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgTOMProcCrntiCEInDatInd
+static S16 rgTOMProcCrntiCEInDatInd
 (
 RgMacPdu          *pdu,
 RgUeCb            *prevUeCb,
 RgCellCb          *cellCb,
 TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
-U16               slot
+uint16_t               slot
 )
 #else
-PRIVATE S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
+static S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
 RgMacPdu          *pdu;
 RgUeCb            *prevUeCb;
 RgCellCb          *cellCb;
 TfuDatInfo        *datInfo;
 RgInfCeInfo       *ceInfo;
-U16               slot;
+uint16_t               slot;
 #endif
 {
    RgUeCb *ueCb = NULLP;
@@ -2201,10 +2185,9 @@ U16               slot;
 
 #ifdef LTEMAC_SPS
    Bool spsToBeActvtd;
-   U16  sduSize;
+   uint16_t  sduSize;
 #endif
 
-   TRC2(rgTOMProcCrntiCEInDatInd)
 
 #ifndef LTE_L2_MEAS      
       UNUSED(slot);
@@ -2278,23 +2261,23 @@ U16               slot;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgTOMProcCCCHSduInDatInd
+static S16 rgTOMProcCCCHSduInDatInd
 (
 RgMacPdu          *pdu,
 RgUeCb            *prevUeCb,
 RgCellCb          *cellCb,
 TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
-U16               slot 
+uint16_t               slot 
 )
 #else
-PRIVATE S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
+static S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
 RgMacPdu          *pdu;
 RgUeCb            *prevUeCb;
 RgCellCb          *cellCb;
 TfuDatInfo        *datInfo;
 RgInfCeInfo       *ceInfo;
-U16               slot;
+uint16_t               slot;
 #endif
 {
    RgUeCb *ueCb = NULLP;
@@ -2302,11 +2285,10 @@ U16               slot;
 
 #ifdef LTEMAC_SPS
    Bool spsToBeActvtd;
-   U16  sduSize;
+   uint16_t  sduSize;
 #endif
 
 
-   TRC2(rgTOMProcCCCHSduInDatInd)
 
 #ifndef LTE_L2_MEAS      
       UNUSED(slot);
@@ -2377,20 +2359,19 @@ U16               slot;
  */
 
 #ifdef ANSI
-PRIVATE S16 rgTOMUtlL2MStoreBufSz
+static S16 rgTOMUtlL2MStoreBufSz
 (
  RgUeCb      *ueCb,
  RgInfCeInfo *ceInfo
  )
 #else
-PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
+static S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
  RgUeCb      *ueCb;
  RgInfCeInfo *ceInfo;
 #endif
 {
-   U8 lcgId;
-   U8 bsr;
-   TRC2(rgTOMUtlL2MStoreBufSz);
+   uint8_t lcgId;
+   uint8_t bsr;
 
    if(ceInfo->bitMask & RG_TRUNC_BSR_CE_PRSNT)
    {
@@ -2429,7 +2410,7 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
  *      -# RFAILED 
  */
 #ifdef ANSI
-PRIVATE Void rgTOML2MCompileActiveLCs
+static Void rgTOML2MCompileActiveLCs
 (
  RgCellCb      *cellCb, 
  RgUeCb        *ueCb,
@@ -2437,7 +2418,7 @@ PRIVATE Void rgTOML2MCompileActiveLCs
  RgInfCeInfo   *ceInfo 
  )
 #else
-PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo)
+static Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo)
    RgCellCb      *cellCb; 
    RgUeCb        *ueCb;
    RgMacPdu      *pdu;
@@ -2448,7 +2429,6 @@ PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo)
    RgMacSdu          *sdu;
    RgUlLcCb          *ulLcCb;
 
-   TRC2(rgTOML2MCompileActiveLCs)
 
    node =  pdu->sduLst.first;
    while (node)