Code Review / o-du / l2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
UL data path changes at Phy stub, RLC UL UM and DU APP [Issue-ID: ODUHIGH-262]
[o-du/l2.git] / src / 5gnrmac / rg_cfg.c
diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c
index 15cea81..c389d65 100755 (executable)
--- a/src/5gnrmac/rg_cfg.c
+++ b/src/5gnrmac/rg_cfg.c
@@ -61,23 +61,23 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_pom_scell.x"
 #endif
 /* LTE-MAC Control Block Structure */
-PUBLIC RgCb rgCb[RG_MAX_INST];
+RgCb rgCb[RG_MAX_INST];
 
 /* local defines */
-PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
          RgUeCb **ue, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
          RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
+static S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
          CrgLchCfg *lcCfg, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
+static S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
          RgErrInfo *errInfo));
 
-PRIVATE Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
-PRIVATE Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
 /* Added support for SPS*/
 #ifdef LTEMAC_SPS
-PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
 #endif /* LTEMAC_SPS */
 
 
@@ -112,22 +112,13 @@ PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgCellCfg
+S16 rgCFGVldtCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
-Inst        inst;
-CrgCellCfg  *cellCfg;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgCellCfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
    if ((rgCb[inst].cell != NULLP)
          || rgCb[inst].inactiveCell != NULLP)
@@ -190,24 +181,14 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeCfg
+S16 rgCFGVldtCrgUeCfg
 (
 Inst      inst,
 CrgUeCfg  *ueCfg,
 RgCellCb  **cell,
 RgErrInfo *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
-Inst      inst;
-CrgUeCfg  *ueCfg;
-RgCellCb  **cell;
-RgErrInfo *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgUeCfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
    if ((ueCfg->txMode.pres == PRSNT_NODEF) && 
        (ueCfg->txMode.tm == CRG_UE_TM_5))
@@ -280,8 +261,7 @@ RgErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgLcCfg
+S16 rgCFGVldtCrgLcCfg
 (
 Inst       inst, 
 CrgLchCfg  *lcCfg,
@@ -289,18 +269,8 @@ RgCellCb   **cell,
 RgUeCb     **ue,
 RgErrInfo  *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst       inst;
-CrgLchCfg  *lcCfg;
-RgCellCb   **cell;
-RgUeCb     **ue;
-RgErrInfo  *errInfo;
-#endif
 {
 
-   TRC2(rgCFGVldtCrgLcCfg);
-
    if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
    {
       /* Dedicated logical channels */
@@ -368,24 +338,14 @@ RgErrInfo  *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgCellRecfg
+S16 rgCFGVldtCrgCellRecfg
 (
 Inst          inst,
 CrgCellRecfg  *cellRecfg,
 RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
-Inst          inst;
-CrgCellRecfg  *cellRecfg;
-RgCellCb      **cell;
-RgErrInfo     *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgCellRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
    
    if (((*cell = rgCb[inst].cell) == NULLP)
@@ -438,8 +398,7 @@ RgErrInfo     *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeRecfg
+S16 rgCFGVldtCrgUeRecfg
 (
 Inst        inst,
 CrgUeRecfg  *ueRecfg,
@@ -447,17 +406,7 @@ RgCellCb    **cell,
 RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
-Inst        inst;
-CrgUeRecfg  *ueRecfg;
-RgCellCb    **cell;
-RgUeCb      **ue;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgUeRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
    
    if ((ueRecfg->txMode.pres == PRSNT_NODEF) && 
@@ -524,8 +473,7 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgLcRecfg
+S16 rgCFGVldtCrgLcRecfg
 (
 Inst        inst,
 CrgLchRecfg *lcRecfg,
@@ -534,18 +482,7 @@ RgUeCb      **ue,
 RgUlLcCb    **ulLc,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
-Inst        inst;
-CrgLchRecfg  *lcRecfg;
-RgCellCb     **cell;
-RgUeCb       **ue;
-RgUlLcCb     **ulLc;
-RgErrInfo    *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgLcRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
 
    /* Fetch the cell */
@@ -604,26 +541,15 @@ RgErrInfo    *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeReset
+S16 rgCFGVldtCrgUeReset
 (
-Inst       inst,
-CrgRst     *reset,
+Inst        inst,
+CrgRst      *reset,
 RgCellCb    **cell,
 RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
-Inst       inst;
-CrgRst     *reset;
-RgCellCb    **cell;
-RgUeCb      **ue;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGVldtCrgUeReset);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
    
    /* Fetch the Active cell */
@@ -671,30 +597,21 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgCellCfg
+S16 rgCFGCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
-Inst        inst;
-CrgCellCfg  *cellCfg;
-RgErrInfo   *errInfo;
-#endif
 {
    S16        ret;
    RgCellCb   *cell = NULLP;
-   U8         idx;
+   uint8_t    idx;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
    /* RLC SAP to allocate flowCntrlInd buffer*/
    Pst        *pst ;
 
-   TRC2(rgCFGCrgCellCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_CELL_CFG;
    
    /* Allocate the cell control block */
@@ -767,10 +684,10 @@ RgErrInfo   *errInfo;
    cmLListInit(&cell->l2mList);
    for(idx = 0; idx < RG_NUM_UL_SUB_FRAMES; idx++)
    {
-      cmMemset((U8 *)&cell->ulSf[idx], 0, sizeof(RgUlSf));
+      memset(&cell->ulSf[idx], 0, sizeof(RgUlSf));
    }
 
-   cell->ttiCycle = (U32)RG_TTI_CYCLE_INVLD;   
+   cell->ttiCycle = (uint32_t)RG_TTI_CYCLE_INVLD;   
 #endif
    /* Update Statistics */
    rgUpdtCellCnt(inst,RG_CFG_ADD);
@@ -806,28 +723,19 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCfgAddUeSCellCfg
+S16 rgCfgAddUeSCellCfg
 (
 Inst        dstMacInst,    
 RgPrgUeSCellCfgInfo *ueSCellCb,
 RgCellCb    *cell
 )
-#else
-PUBLIC S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
-Inst        dstMacInst;    
-RgPrgUeSCellCfgInfo *ueSCellCb;
-RgCellCb    *cell;
-#endif
 {
    RgUeCb     *ueCb = NULLP;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
-   U8       idx;
+   uint8_t    idx;
    RgErrInfo  errInfo;
 
-   TRC2(rgCfgAddUeSCellCfg);
-   
 #ifdef LTE_ADV
    rguDlSapId              = ueSCellCb->rguDlSapId;
    rguUlSapId              = ueSCellCb->rguUlSapId;
@@ -920,8 +828,7 @@ RgCellCb    *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgFillAndAddSCellCfg
+S16 rgFillAndAddSCellCfg
 (
 Inst            inst,
 RgCellCb        *cell,
@@ -929,23 +836,13 @@ CrgUeRecfg      *ueRecfg,
 CrgCfgTransId   transId,
 Bool            *isCfmRqrd
 )
-#else
-PUBLIC S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
-Inst            inst;
-RgCellCb        *cell;
-CrgUeRecfg      *ueRecfg;
-CrgCfgTransId   transId;
-Bool            *isCfmRqrd;
-#endif
 {
    RgUeCb     *ue = NULLP;
-   U8          idx = 0;
+   uint8_t     idx = 0;
    Inst        dstMacInst;
    RgPrgUeSCellCfgInfo ueSCellCb;
    Pst          dstInstPst;
 
-   TRC2(rgFillAndAddSCellCfg);
-  
   /* Fetch the Active cell */
    if(((cell = rgCb[inst].cell) == NULLP) ||
        (cell->cellId != ueRecfg->cellId))
@@ -973,13 +870,13 @@ Bool            *isCfmRqrd;
    ue->cfgCfmInfo.cfgCfgCount = 0;
    ue->cfgCfmInfo.mask = 0x0;
 
-   cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+   memcpy(&(ue->cfgCfmInfo.transId), &transId,
          sizeof(CrgCfgTransId));
    ueSCellCb.ueId = ueRecfg->oldCrnti;
    ueSCellCb.txMode = ue->txMode;
    ueSCellCb.maxUlHqRetx = ue->ul.hqEnt.maxHqRetx;
-   cmMemcpy((U8 *)ueSCellCb.ulLcInfo, (U8 *)ue->ul.lcCb, sizeof(ue->ul.lcCb));
-   cmMemcpy((U8 *)ueSCellCb.dlLcInfo, (U8 *)ue->dl.lcCb, sizeof(ue->dl.lcCb));
+   memcpy(ueSCellCb.ulLcInfo, ue->ul.lcCb, sizeof(ue->ul.lcCb));
+   memcpy(ueSCellCb.dlLcInfo, ue->dl.lcCb, sizeof(ue->dl.lcCb));
    for (idx =0; idx < RG_MAX_LCG_PER_UE; idx++)
    {
       ueSCellCb.lcgInfo[idx].lcgId = ue->ul.lcgArr[idx].lcgId;
@@ -1033,29 +930,19 @@ Bool            *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgUeCfg
+S16 rgCFGCrgUeCfg
 (
 Inst      inst,
 RgCellCb  *cell,
 CrgUeCfg  *ueCfg,
 RgErrInfo *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
-Inst      inst;
-RgCellCb  *cell;
-CrgUeCfg  *ueCfg;
-RgErrInfo *errInfo;
-#endif
 {
    RgUeCb    *ue = NULLP;
    Bool      handover = FALSE;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
 
-   TRC2(rgCFGCrgUeCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_UE_CFG;
 
 /* Start: LTEMAC_2.1_DEV_CFG */
@@ -1138,8 +1025,7 @@ RgErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgLcCfg
+S16 rgCFGCrgLcCfg
 (
 Inst            inst,
 RgCellCb        *cell,
@@ -1149,20 +1035,8 @@ RgErrInfo       *errInfo,
 Bool            *isCfmRqrd,
 CrgCfgTransId   transId
 )
-#else
-PUBLIC S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgLchCfg   *lcCfg;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-CrgCfgTransId   transId;
-#endif
 {
 
-   TRC2(rgCFGCrgLcCfg);
-   
    /* Handle Config for dedicated/common logical channels */
    if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
    {
@@ -1175,7 +1049,7 @@ CrgCfgTransId   transId;
       }
 #ifdef LTE_ADV
       /*ERAB Multl Cell fix*/
-       cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+       memcpy(&(ue->cfgCfmInfo.transId), &transId,
             sizeof(CrgCfgTransId));
        rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lcCfg,isCfmRqrd);
 #endif
@@ -1217,24 +1091,14 @@ CrgCfgTransId   transId;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgCellRecfg
+S16 rgCFGCrgCellRecfg
 (
 Inst          inst,
 RgCellCb      *cell,
 CrgCellRecfg  *cellRecfg,
 RgErrInfo     *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
-Inst          inst;
-RgCellCb      *cell;
-CrgCellRecfg  *cellRecfg;
-RgErrInfo     *errInfo;
-#endif
 {
-   TRC2(rgCFGCrgCellRecfg);
-
    /* Store the given rachCfg */
    cell->rachCfg = cellRecfg->rachRecfg;
 
@@ -1270,8 +1134,7 @@ RgErrInfo     *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgUeRecfg
+S16 rgCFGCrgUeRecfg
 (
 Inst        inst,
 RgCellCb    *cell,
@@ -1279,17 +1142,7 @@ RgUeCb      *ue,
 CrgUeRecfg  *ueRecfg,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgUeRecfg  *ueRecfg;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGCrgUeRecfg);
-
    errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
 
    /* Fix : syed UE ID change at MAC will now be controlled
@@ -1328,8 +1181,7 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgLcRecfg
+S16 rgCFGCrgLcRecfg
 (
 Inst        inst,
 RgCellCb    *cell,
@@ -1339,18 +1191,7 @@ CrgLchRecfg *lcRecfg,
 RgErrInfo   *errInfo,
 Bool        *isCfmRqrd
 )
-#else
-PUBLIC S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-RgUlLcCb    *ulLc;
-CrgLchRecfg *lcRecfg;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-#endif
 {
-   TRC2(rgCFGCrgLcRecfg);
 
    if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
    {
@@ -1383,23 +1224,14 @@ Bool        *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgUeReset
+S16 rgCFGCrgUeReset
 (
 RgCellCb    *cell,
 RgUeCb      *ue,
-CrgRst     *reset,
+CrgRst      *reset,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgRst     *reset;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGCrgUeReset);
 
    RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
    rgDHMUeReset(cell, &ue->dl.hqEnt);
@@ -1430,24 +1262,16 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgCellDel
+S16 rgCFGCrgCellDel
 (
 Inst        inst,
 CrgDel      *cellDelInfo,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
-Inst        inst,
-CrgDel      *cellDelInfo;
-RgErrInfo   *errInfo;
-#endif
 {
-   RgCellCb      *cell;
-   U8 idx;
+   RgCellCb *cell;
+   uint8_t  idx;
 
-   TRC2(rgCFGCrgCellDel);
 
    errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
    if (((cell = rgCb[inst].cell) == NULLP)
@@ -1510,21 +1334,13 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgUeDel
+S16 rgCFGCrgUeDel
 (
 Inst        inst,
 CrgDel      *ueDelInfo,
 RgErrInfo   *errInfo
 )
-#else
-PUBLIC S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
-Inst        inst;
-CrgDel      *ueDelInfo;
-RgErrInfo   *errInfo;
-#endif
 {
-   TRC2(rgCFGCrgUeDel);
 
    errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
 
@@ -1564,8 +1380,7 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-PUBLIC S16 rgCFGCrgLcDel
+S16 rgCFGCrgLcDel
 (
 Inst        inst,
 CrgDel      *lcDelInfo,
@@ -1573,13 +1388,6 @@ RgErrInfo   *errInfo,
 Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
-#else
-PUBLIC S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
-Inst        inst;
-CrgDel      *lcDelInfo;
-RgErrInfo   *errInfo;
-CrgCfgTransId transId;
-#endif
 {
    Bool      dirVld = FALSE;
    RgCellCb  *cell;
@@ -1587,8 +1395,6 @@ CrgCfgTransId transId;
    RgUlLcCb  *ulLc;
    RgDlLcCb  *dlLc;
 
-   TRC2(rgCFGCrgLcDel);
-
    errInfo->errCause = RGERR_CFG_CRG_LC_DEL;
 
    /* Fetch the Active cell */
@@ -1644,7 +1450,7 @@ CrgCfgTransId transId;
    }
 #ifdef LTE_ADV
    /*ERAB - multicell fix*/
-   cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+   memcpy( &(ue->cfgCfmInfo.transId), &transId,
          sizeof(CrgCfgTransId));
    rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd);
 #endif
@@ -1668,8 +1474,7 @@ CrgCfgTransId transId;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgDedLcCfg
+static S16 rgCFGVldtCrgDedLcCfg
 (
 Inst          inst, 
 CrgLchCfg     *lcCfg,
@@ -1677,17 +1482,8 @@ RgCellCb      **cell,
 RgUeCb        **ue,
 RgErrInfo     *errInfo
 )
-#else
-PRIVATE S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst          inst;
-CrgLchCfg     *lcCfg;
-RgCellCb      **cell;
-RgUeCb        **ue;
-RgErrInfo     *errInfo;
-#endif
 {
-   U8         dirVld   = FALSE;
-   TRC2(rgCFGVldtCrgDedLcCfg);
+   uint8_t         dirVld   = FALSE;
 
    errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
 
@@ -1774,25 +1570,15 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg
+static S16 rgCFGVldtCrgCmnLcCfg
 (
 Inst          inst,
 CrgLchCfg     *lcCfg,
 RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
-#else
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
-Inst          inst;
-CrgLchCfg     *lcCfg;
-RgCellCb      **cell;
-RgErrInfo     *errInfo;
-#endif
 {
-   U8         dirVld  = FALSE;
-
-   TRC2(rgCFGVldtCrgCmnLcCfg);
+   uint8_t dirVld  = FALSE;
 
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
 
@@ -1901,25 +1687,15 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGCrgDedLcCfg
+static S16 rgCFGCrgDedLcCfg
 (
 RgCellCb      *cell,
 RgUeCb        *ue,
 CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
-#else
-PRIVATE S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
-RgCellCb      *cell;
-RgUeCb        *ue;
-CrgLchCfg     *lcCfg;
-RgErrInfo     *errInfo;
-#endif
 {
    //Inst     inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGCrgDedLcCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
 
    /* Uplink/Bi-directional logical channel */
@@ -1963,24 +1739,14 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGCrgCmnLcCfg
+static S16 rgCFGCrgCmnLcCfg
 (
 Inst          inst,
 RgCellCb      *cell,
 CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
-#else
-PRIVATE S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
-Inst          inst;
-RgCellCb      *cell;
-CrgLchCfg     *lcCfg;
-RgErrInfo     *errInfo;
-#endif
 {
-   TRC2(rgCFGCrgCmnLcCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
 
    /* Handle configuration for CCCH/BCCH/PCCH */
@@ -2058,21 +1824,11 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeUeUlAlloc
-(
-RgCellCb      *cell
-)
-#else
-PRIVATE Void rgCFGFreeUeUlAlloc(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeUeUlAlloc(RgCellCb *cell)
 {
-   U8    sfIdx;
+   uint8_t    sfIdx;
    Inst inst = cell->macInst - RG_INST_START;
    
-   TRC2(rgCFGFreeUeUlAlloc);
-
    for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
    {
       if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP)
@@ -2101,18 +1857,9 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PUBLIC Void rgCFGFreeCellCb
-(
-RgCellCb      *cell
-)
-#else
-PUBLIC Void rgCFGFreeCellCb(cell)
-RgCellCb      *cell;
-#endif
+Void rgCFGFreeCellCb(RgCellCb  *cell)
 {
    Inst inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGFreeCellCb);
 
 #ifdef LTE_ADV
    RgLaaCellCbDeInit(cell);
@@ -2142,7 +1889,7 @@ RgCellCb      *cell;
    RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeCellCb */
 
 
@@ -2162,19 +1909,9 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PUBLIC Void rgCFGFreeInactvCellCb
-(
-RgCellCb      *cell
-)
-#else
-PUBLIC Void rgCFGFreeInactvCellCb(cell)
-RgCellCb      *cell;
-#endif
+Void rgCFGFreeInactvCellCb(RgCellCb *cell)
 {
    Inst      inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGFreeInactvCellCb);
-   
    /* De-initialize the Ue list */
    rgDBMDeInitUeCbLst(cell);
 #ifdef LTEMAC_SPS
@@ -2194,7 +1931,7 @@ RgCellCb      *cell;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeInactvCellCb */
 
 
@@ -2214,22 +1951,10 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PUBLIC Void rgCFGFreeUeCb
-(
-RgCellCb    *cell,
-RgUeCb      *ue
-)
-#else
-PUBLIC Void rgCFGFreeUeCb(cell, ue)
-RgCellCb    *cell;
-RgUeCb      *ue;
-#endif
+Void rgCFGFreeUeCb(RgCellCb *cell,RgUeCb *ue)
 {
    Inst inst = cell->macInst - RG_INST_START;
 
-   TRC2(rgCFGFreeUeCb);
-
    rgDHMFreeUe(inst,&ue->dl.hqEnt);
 
    /* ccpu00117052 - MOD - Passing double pointer for proper NULLP
@@ -2242,7 +1967,7 @@ RgUeCb      *ue;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeUeCb */
 
 /***********************************************************
@@ -2261,23 +1986,13 @@ RgUeCb      *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeCmnLcLst
-(
-RgCellCb      *cell
-)
-#else
-PRIVATE Void rgCFGFreeCmnLcLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeCmnLcLst(RgCellCb *cell)
 {
-   TRC2(rgCFGFreeCmnLcLst);
-
    rgDBMFreeCmnLcLst(cell);
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeCmnLcLst */
 
 
@@ -2297,20 +2012,10 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeUeLst
-(
-RgCellCb      *cell
-)
-#else
-PRIVATE Void rgCFGFreeUeLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeUeLst(RgCellCb *cell)
 {
    RgUeCb     *ue;
 
-   TRC2(rgCFGFreeUeLst);
-
    /* Free Ues in the list */
    while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP)
    {
@@ -2326,7 +2031,7 @@ RgCellCb      *cell;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeUeLst */
 
 #ifdef LTEMAC_SPS
@@ -2346,20 +2051,10 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeSpsUeLst
-(
-RgCellCb      *cell
-)
-#else
-PRIVATE Void rgCFGFreeSpsUeLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeSpsUeLst(RgCellCb *cell)
 {
    RgUeCb     *ue;
 
-   TRC2(rgCFGFreeSpsUeLst);
-
    /* Free Ues in the list */
    while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
    {
@@ -2394,23 +2089,11 @@ RgCellCb      *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-PUBLIC S16 RgSchMacCellRegReq
-(
-Pst*                pst,
-RgInfCellReg*       regReq 
-)
-#else
-PUBLIC S16 RgSchMacCellRegReq(pst, regReq)
-Pst*                pst;
-RgInfCellReg*       regReq;
-#endif
+S16 RgSchMacCellRegReq(Pst*  pst,RgInfCellReg* regReq)
 {
    Inst      inst;
    RgCellCb *cell = NULLP;
 
-   TRC3(RgSchMacCellRegReq)
-
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
    cell = rgCb[inst].cell;
@@ -2440,38 +2123,38 @@ RgInfCellReg*       regReq;
 /*Added Ue for Onging L2 Meas*/
 #ifdef LTE_L2_MEAS
 /*LTE_L2_MEAS_PHASE2*/
-PUBLIC S16 rgAddToL2MeasPerQci(RgCellCb  *cell,U8 qci)
+S16 rgAddToL2MeasPerQci(RgCellCb  *cell,uint8_t qci)
 {
- S16      ret = ROK;   
- CmLList   *lnk;
- RgL2MeasCb  *measCb;
- U16          idx;
- 
- lnk = cell->l2mList.first;
-  while(lnk != NULLP )
+   S16        ret = ROK;       
+   CmLList    *lnk;
+   RgL2MeasCb *measCb;
+   uint16_t   idx;
+
+   lnk = cell->l2mList.first;
+   while(lnk != NULLP )
    {
       measCb = (RgL2MeasCb *)lnk->node;
       if(measCb->measReq.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL)
       {
-             for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
-             {
-                     if(measCb->measReq.t.prbReq.qci[idx] == qci)
-                     {
-                             break; /*exit from for loop*/
-                     } 
-             } 
-             if(idx == measCb->measReq.t.prbReq.numQci)
-             {
-                     cell->qciArray[qci].mask = TRUE; 
-                     measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
-             }         
+        for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
+        {
+           if(measCb->measReq.t.prbReq.qci[idx] == qci)
+           {
+              break; /*exit from for loop*/
+           } 
+        }      
+        if(idx == measCb->measReq.t.prbReq.numQci)
+        {
+           cell->qciArray[qci].mask = TRUE; 
+           measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
+        }              
       }          
       lnk = lnk->next;
    }  /* End of While*/
- 
-                
-       
- return (ret);
+
+
+
+   return (ret);
 }
 
 
O-RAN DU Layer 2