X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_hdfdd.c;h=e13fd9155e9c951cb5f1e1318f1f883b653ea0a1;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=df02c21ab1b09a675a6947b37d7a5243731856c3;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c
index df02c21ab..e13fd9155 100755
--- a/src/5gnrsch/rg_sch_hdfdd.c
+++ b/src/5gnrsch/rg_sch_hdfdd.c
@@ -39,15 +39,7 @@ static int RLOG_FILE_ID=165;
 #endif
 
 /* 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_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 "rgr.h"
 #include "tfu.h"
@@ -62,15 +54,6 @@ static int RLOG_FILE_ID=165;
 #include "rl_common.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 "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -104,7 +87,7 @@ extern "C" {
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  Bool         *hdFddEnbl
  *
- *  @RETVALUE S16
+ *  @return  S16
  *      -# ROK
  *      -# RFAILED
 */ 
@@ -145,7 +128,7 @@ Bool hdFddEnbl;
                   "rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE"
                   "CRNTI:%d",ueCb->ueId);
       }
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef LTEMAC_SPS
@@ -157,7 +140,7 @@ Bool hdFddEnbl;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
       "rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured"
                "CRNTI:%d",ueCb->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -181,10 +164,10 @@ Bool hdFddEnbl;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
                "rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb"
                "CRNTI:%d",ueCb->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }/*rgSCHHdFddUeCfg*/
 
 
@@ -208,7 +191,7 @@ Bool hdFddEnbl;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE( S16
+ *  @return ( S16
  *      -# ROK
 *
 */
@@ -240,7 +223,7 @@ RgSchUeCb   *ueCb;
        ueCb->hdFddEnbld = FALSE;
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* rgSCHHdFddUeDel */
 
 
@@ -256,7 +239,7 @@ RgSchUeCb   *ueCb;
  *               instance updates
  *               for HD FDD UEs
  *  @param[in]  RgSchCellCb *cell
- *  @RETVALUE   None
+ *  @return    None
  */
 
 #ifdef ANSI
@@ -389,7 +372,7 @@ RgSchCellCb *cellCb;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE   None
+ *  @return    None
  *
  */
 #ifdef ANSI
@@ -718,7 +701,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
  *
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE None
+ *  @return  None
  *
  */
 
@@ -797,7 +780,7 @@ Bool *sndNACK;
  *  @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi.
  *             Valdity of this pointer is not done in this function.
  *
- *  @RETVALUE None
+ *  @return  None
  */
 #ifdef ANSI
 PUBLIC Void rgSCHCmnHdFddUpdULMark
@@ -879,7 +862,7 @@ RgSchUeCb   *ueCb;
  *  @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowed.
  *                Valdity of this pointer is not done in this function
  *
- *  @RETVALUE None
+ *  @return  None
  */
 
 #ifdef ANSI
@@ -950,7 +933,7 @@ RgSchUeCb   *ueCb;
  *  @param[in]  timeInfo timing information subframe of interest 
  *  @param[in]  offsest  Offest with w.r.t which SFN has to be determined
  *
- *  @RETVALUE None
+ *  @return  None
  */
 
 #ifdef ANSI