fix for Tb Size

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

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index 6e632dc..49292d7 100755 (executable)
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-*******************************************************************************
+*******************************************************************************/
 
 /************************************************************************
  
@@ -33,15 +33,7 @@
 */
 
 /* 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 "rgm.h"
@@ -55,15 +47,6 @@
 #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 */
@@ -514,7 +497,7 @@ RgSchCellCb       *cell;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
 #ifdef LTE_TDD
-   idx = (cell->crntTime.subframe + RG_SCH_CMN_DL_DELTA) % 
+   idx = (cell->crntTime.slot + RG_SCH_CMN_DL_DELTA) % 
                   RGSCH_NUM_SUB_FRAMES;
    if(RG_SCH_CMN_CHK_DL_DATA_ALLOWED(cell, idx)) 
    {
@@ -762,7 +745,7 @@ U8 isCalrCrcInd
    {
       measCb = (RgSchL2MeasCb *)node->node;
       node = node->next;
-      if(cell->crntTime.sfn == 1023 && cell->crntTime.subframe == 9)  
+      if(cell->crntTime.sfn == 1023 && cell->crntTime.slot == 9)  
       {
          /*calculates diff between crnt time and start time*/
          meas = RGSCH_CALC_SFN_SF_DIFF(cell->crntTime, 
@@ -784,7 +767,7 @@ U8 isCalrCrcInd
          numDlSf = (meas / RGSCH_NUM_SUB_FRAMES) * rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
          numUlSf = (meas / RGSCH_NUM_SUB_FRAMES) * rgSchTddNumUlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
 
-         sfIdx = (measCb->startTime.subframe + 1) % RGSCH_NUM_SUB_FRAMES;
+         sfIdx = (measCb->startTime.slot + 1) % RGSCH_NUM_SUB_FRAMES;
 
          while(rem)
          {