X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=0de1281b04c124c1a5275453296a1489215d0caa;hb=604190ac7e354996f34ebfae0cdd00962811393f;hp=6e78ce53677561ccb8ee9fee4b1cab1f9ca29427;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index 6e78ce536..0de1281b0 100755
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -37,19 +37,7 @@ static int RLOG_FILE_ID=184;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-  
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgu.h"           /* RGU Interface defines */
@@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* Timer */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE */
 
 #include "crg.x"           /* CRG Interface includes */
 #include "rgu.x"           /* RGU Interface includes */
@@ -686,17 +665,19 @@ RgRguDedStaRsp *staRsp;
    if(((cell = rgCb[inst].cell) != NULLP)
       && (cell->cellId == staRsp->cellId))
    {
-            RgInfDedBoRpt boRpt;
             Pst        schPst;
-            boRpt.cellSapId  = cell->schInstMap.cellSapId;
-            boRpt.cellId  = staRsp->cellId;
-            boRpt.rnti    = staRsp->rnti; 
-            boRpt.lcId    = staRsp->lcId; 
-            boRpt.bo      = staRsp->boReport.bo;
-            boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
-            boRpt.staPduBo = staRsp->boReport.staPduBo;
-   			boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
-            rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
+#ifdef UNUSED_VAR
+    RgInfDedBoRpt boRpt
+	 boRpt.cellSapId  = cell->schInstMap.cellSapId;
+    boRpt.cellId  = staRsp->cellId;
+	 boRpt.rnti    = staRsp->rnti; 
+    boRpt.lcId    = staRsp->lcId; 
+	 boRpt.bo      = staRsp->boReport.bo;
+    boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+    boRpt.staPduBo = staRsp->boReport.staPduBo;
+    boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+#endif
+				rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
             schPst.event = 0;
             //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
             RETVALUE(ROK);
@@ -715,18 +696,21 @@ CmLteLcId lcId,
 S32 bo 
 )
 {
-  RgInfDedBoRpt  boRpt;
+
   RgCellCb   *cell;
   //if ((cell = rgDBMGetCellCb(cellId)) != NULLP)
   if (((cell = rgCb[inst].cell) != NULLP) &&
         (cell->cellId == cellId))
-  {
+ {
      Pst        schPst;
-     boRpt.cellSapId  = cell->schInstMap.cellSapId;
-     boRpt.cellId     = cellId;
-     boRpt.rnti       = rnti; 
-     boRpt.lcId       = lcId; 
-     boRpt.bo         = bo;
+#ifdef UNUSED_VAR
+    RgInfDedBoRpt  boRpt;
+    boRpt.cellSapId  = cell->schInstMap.cellSapId;
+    boRpt.cellId     = cellId;
+    boRpt.rnti       = rnti; 
+    boRpt.lcId       = lcId; 
+    boRpt.bo         = bo;
+#endif
      rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
      schPst.event = 0;
      //TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt);
@@ -895,17 +879,18 @@ RgErrInfo      *err;
 {
    Pst      schPst;
    Inst     macInst = cell->macInst - RG_INST_START;
-   RgInfCmnBoRpt boRpt;
+   //RgInfCmnBoRpt boRpt;
 
    TRC2(rgROMHndlCcchStaRsp);
-
-
+#ifdef UNUSED_VAR
+   RgInfCmnBoRpt boRpt;
    boRpt.cellSapId  = cell->schInstMap.cellSapId;
    boRpt.cellId  = staRsp->cellId;
    boRpt.u.rnti    = staRsp->u.rnti; 
    boRpt.lcId    = staRsp->lcId; 
    boRpt.lcType  = staRsp->lcType; 
    boRpt.bo      = staRsp->bo;
+#endif
    rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst);
    //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt);
 
@@ -945,7 +930,7 @@ RgErrInfo      *err;
 #endif
 {
    Pst      schPst;
-   RgInfCmnBoRpt boRpt;
+   //RgInfCmnBoRpt boRpt;
    Inst     macInst = cell->macInst - RG_INST_START;
 
    TRC2(rgROMHndlBcchPcchStaRsp);
@@ -971,13 +956,13 @@ RgErrInfo      *err;
         RETVALUE(ROK);
       }
    }
-
+/*
    boRpt.cellSapId     = cell->schInstMap.cellSapId;
    boRpt.cellId     = staRsp->cellId;
    boRpt.u.timeToTx = staRsp->u.timeToTx; 
    boRpt.lcId       = staRsp->lcId; 
    boRpt.lcType     = staRsp->lcType; 
-   boRpt.bo         = staRsp->bo;
+   boRpt.bo         = staRsp->bo;*/	
 #ifdef EMTC_ENABLE
   if(cell->emtcEnable)
   {