X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_pwr.c;h=41faf57fbe035cf0a93d98d55e2d2eb30d1d45eb;hb=604190ac7e354996f34ebfae0cdd00962811393f;hp=497f7500af648997d5e8d66ff9e4cd58a74c53ba;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index 497f7500a..41faf57fb 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -36,16 +36,7 @@ static const char* RLOG_MODULE_NAME="MAC"; static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=188; /* 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 "cm_math.h" /* common MATH functions */ +#include "common_def.h" #include "lrg.h" #include "rgr.h" #include "rgm.h" @@ -57,16 +48,6 @@ static int RLOG_FILE_ID=188; #include "rg_sch_cmn.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 "cm_math.x" /* common MATH functions */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -1880,8 +1861,8 @@ RgSchDlSf *sf; * 10 subframes, which would have otherwise caused * the check to succeed for a possibly older process. */ - if ((proc->tbInfo[0].timingInfo.subframe == sf->sfNum) || - (proc->tbInfo[1].timingInfo.subframe == sf->sfNum)) + if ((proc->tbInfo[0].timingInfo.slot == sf->sfNum) || + (proc->tbInfo[1].timingInfo.slot == sf->sfNum)) { /* * Later, if a proc can be scheduled without having an