X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg.c;h=8527728665fdb00e93b6c9995a7c9b0221f35949;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=b4d3f9cfb95e22b1b884139cace8bedac3c4b92b;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c
index b4d3f9cfb..852772866 100755
--- a/src/5gnrmac/rg_prg.c
+++ b/src/5gnrmac/rg_prg.c
@@ -29,16 +29,7 @@
   
 **********************************************************************/
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
@@ -50,21 +41,13 @@
 #include "rg_err.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"           /* layer management typedefs for MAC */
 #include "rg_prg.x"           /* Prg(MAC-MAC)interface includes */
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV
@@ -100,18 +83,18 @@ RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -148,11 +131,11 @@ Buffer               *mBuf;
    if(SRemPreMsgMult((Data *)&ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &ueSCellCfgInfo));
+   return ((*func)(pst, &ueSCellCfgInfo));
 }
 
 /** 
@@ -186,13 +169,13 @@ RgPrgCfgCfmInfo    *cfgCfm;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    switch(cfgCfm->event)
    {
@@ -217,7 +200,7 @@ RgPrgCfgCfmInfo    *cfgCfm;
       }
       break;
    }
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -255,11 +238,11 @@ Buffer              *mBuf;
    if(SRemPreMsgMult((Data *)&cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &cfgCfm));
+   return ((*func)(pst, &cfgCfm));
 }
 
 /** 
@@ -293,18 +276,18 @@ RgPrgUeSCellDelInfo    *ueSCellDelInfo;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo), mBuf)\
          != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLDELREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -343,11 +326,11 @@ Buffer           *mBuf;
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &ueSCellDelInfo));
+   return ((*func)(pst, &ueSCellDelInfo));
 }
 
 /** 
@@ -381,18 +364,18 @@ RgPrgUeSCellLchAddInfo    *lchCfgInfo;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHADDREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -430,11 +413,11 @@ Buffer                       *mBuf;
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 /** 
@@ -468,18 +451,18 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)delLcCb, sizeof(RgPrgUeSCellLchDelInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHDELREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 
@@ -514,18 +497,18 @@ RgPrgUeSCellLchModInfo    *lchCfgInfo;
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHMODREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 
@@ -564,11 +547,11 @@ Buffer                  *mBuf;
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 
@@ -607,11 +590,11 @@ Buffer                  *mBuf;
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchDelInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 #endif /*LCPRG*/