X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_utl.c;h=709f81cc5b69a788ff8a8fce8cf820cf49094d12;hb=0d34456980069864f19fe3090ed5a4c968fe2d45;hp=5f39b7a0e583770eef76becc25ed2f7de84d9d7d;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c
index 5f39b7a0e..709f81cc5 100755
--- a/src/5gnrsch/rg_sch_utl.c
+++ b/src/5gnrsch/rg_sch_utl.c
@@ -37,15 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=177;
 
 /* 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"
@@ -59,15 +51,6 @@ static int RLOG_FILE_ID=177;
 #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"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -236,6 +219,7 @@ PRIVATE S16 rgSCHChkBoUpdate ARGS((
          RgSchCellCb    *cell,
          RgInfCmnBoRpt  *boUpdt
          ));
+#ifdef UNUSE_FUN
 #ifdef TFU_UPGRADE
 PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS((
  RgSchCellCb    *cell,
@@ -243,6 +227,7 @@ PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS((
  U8           numTxAnt
  ));
 #endif
+#endif
 /* sorted in ascending order of tbSz */
 CONSTANT struct rgSchUtlBcchPcchTbSz
 {
@@ -615,7 +600,7 @@ RgSchPdcch                 *pdcch;
 {
    U8                   *byte;
    U8                   offset;
-   U8                   mask;
+   uint16_t             mask;
 
    TRC2(rgSCHUtlPdcchPut);
 
@@ -7126,7 +7111,7 @@ U8            status;
 #endif
 {
    Pst cfmPst;
-   Inst inst;
+   Inst inst = 0;
 
    TRC2(schSendCfgCfm)
    cmMemset((U8 *)(&cfmPst), 0, sizeof(Pst));
@@ -7137,13 +7122,13 @@ U8            status;
    cfmPst.dstEnt    = (Ent)ENTRG;
    cfmPst.dstInst   = (Inst) 0;
    cfmPst.dstProcId = SFndProcId();
-   cfmPst.selector  = RGR_SEL_LC;
+   cfmPst.selector  = ODU_SELECTOR_LC;
    cfmPst.region    = reg;
    cfmPst.pool      = pool;
 
    if(RgUiRgrCfgCfm(&cfmPst,transId, status) != ROK)
    {
-      RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed ");
+      RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed");
       printf("\nschSendCfgCfm: RgUiRgrCfgCfm Failed ");
       RETVALUE(RFAILED);
    }
@@ -11240,6 +11225,7 @@ U32           *prbReqrd;
 
    RETVOID;
 } /* rgSchUtlCalcTotalPrbReq */
+#ifdef UNUSE_FUN
 #ifdef TFU_UPGRADE
 /***********************************************************
  *
@@ -11397,6 +11383,7 @@ U8            numTxAnt;
    RETVALUE(pcqiSz);
 }
 #endif
+#endif
 /**
  * @brief  Utility function to returns the number of subbands based on the 
  *         requested bytes.