Changing the buildPlmnId function

[o-du/l2.git] / src / 5gnrsch / rg_sch_hdfdd.c

diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c
index df02c21..aab1b4d 100755 (executable)
--- 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,20 +87,20 @@ extern "C" {
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  Bool         *hdFddEnbl
  *
- *  @RETVALUE S16
+ *  @return  S16
  *      -# ROK
  *      -# RFAILED
 */ 
 
 #ifdef ANSI
-PUBLIC S16 rgSCHHdFddUeCfg 
+S16 rgSCHHdFddUeCfg 
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb *ueCb,
 Bool hdFddEnbl
 )
 #else /* ANSI */
-PUBLIC S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl)
+S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl)
 RgSchCellCb  *cellCb;
 RgSchUeCb *ueCb;
 Bool hdFddEnbl;
@@ -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,18 +191,18 @@ Bool hdFddEnbl;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE( S16
+ *  @return ( S16
  *      -# ROK
 *
 */
 #ifdef ANSI
-PUBLIC S16 rgSCHHdFddUeDel 
+S16 rgSCHHdFddUeDel 
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC S16 rgSCHHdFddUeDel(cellCb, ueCb)
+S16 rgSCHHdFddUeDel(cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
@@ -240,7 +223,7 @@ RgSchUeCb   *ueCb;
        ueCb->hdFddEnbld = FALSE;
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* rgSCHHdFddUeDel */
 
 
@@ -256,16 +239,16 @@ RgSchUeCb   *ueCb;
  *               instance updates
  *               for HD FDD UEs
  *  @param[in]  RgSchCellCb *cell
- *  @RETVALUE   None
+ *  @return    None
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddPtUlMrk 
+Void rgSCHCmnHdFddPtUlMrk 
 (
 RgSchCellCb *cellCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddPtUlMrk (cellCb)
+Void rgSCHCmnHdFddPtUlMrk (cellCb)
 RgSchCellCb *cellCb;
 #endif /* ANSI */
 {
@@ -389,18 +372,18 @@ RgSchCellCb *cellCb;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE   None
+ *  @return    None
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkUlAllow
+Void rgSCHCmnHdFddChkUlAllow
 ( 
  RgSchCellCb *cellCb,
  RgSchUeCb   *ueCb,
  U8          *allow
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow)
+Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 U8          *allow;
@@ -563,14 +546,14 @@ U8          *allow;
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkDlAllow 
+Void rgSCHCmnHdFddChkDlAllow 
 (
 RgSchCellCb *cellCb,
 RgSchUeCb *ueCb,
 Bool *allow /* Valdity of this pointer is not done in this function */
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow)
+Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow)
 RgSchCellCb *cellCb;
 RgSchUeCb *ueCb;
 Bool *allow; /* Valdity of this pointer is not done in this function */
@@ -718,12 +701,12 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
  *
  *  @param[in]  RgSchUeCb    *ue
  *
- *  @RETVALUE None
+ *  @return  None
  *
  */
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdFddChkNackAllow
+Void rgSCHCmnHdFddChkNackAllow
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb,
@@ -731,7 +714,7 @@ CmLteTimingInfo  timeInfo,
 Bool *sndNACK
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK)
+Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 CmLteTimingInfo  timeInfo;
@@ -797,16 +780,16 @@ 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
+Void rgSCHCmnHdFddUpdULMark
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb)
+Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
@@ -879,17 +862,17 @@ 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
-PUBLIC Void rgSCHCmnHdFddUpdDLMark
+Void rgSCHCmnHdFddUpdDLMark
 (
 RgSchCellCb *cellCb,
 RgSchUeCb   *ueCb
 )
 #else /* ANSI */
-PUBLIC Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb)
+Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb)
 RgSchCellCb *cellCb;
 RgSchUeCb   *ueCb;
 #endif /* ANSI */
@@ -950,18 +933,18 @@ 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
-PUBLIC Void rgSCHHdFddGetSfn
+Void rgSCHHdFddGetSfn
 (
  U16 *sfn,
  CmLteTimingInfo  timeInfo,
  S16 offset
 )
 #else /* ANSI */
-PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
+Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
  U16 *sfn;
  CmLteTimingInfo  timeInfo;
  S16 offset;