X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.h;h=e8681915484c21fcbc12012aaa85277be5126e83;hb=5ea4c59cb4dd37164953218b0bd355284e11d22c;hp=af877062690871491825e042c1cb40280baf4c37;hpb=43f9a063a851c5318a609e9966cdc0b30f0abaf5;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_cmn.h b/src/5gnrsch/rg_sch_cmn.h
index af8770626..e86819154 100755
--- a/src/5gnrsch/rg_sch_cmn.h
+++ b/src/5gnrsch/rg_sch_cmn.h
@@ -113,7 +113,7 @@ extern "C" {
  ((RgSchCmnCell *)(_ue->cell->sc.sch))->ul.schdHqProcIdx])->alloc) &&\
 ((&RG_SCH_CMN_GET_UL_UE(_ue, _ue->cell)->hqEnt.hqProcCb[\
  ((RgSchCmnCell *)(_ue->cell->sc.sch))->ul.schdHqProcIdx])->alloc->rnti == _ue->spsRnti) ? TRUE:FALSE)) || \
-  (_ue->ul.relPdcchSchdTime.sfn == _cell->crntTime.sfn && _ue->ul.relPdcchSchdTime.subframe == _cell->crntTime.subframe))
+  (_ue->ul.relPdcchSchdTime.sfn == _cell->crntTime.sfn && _ue->ul.relPdcchSchdTime.slot == _cell->crntTime.slot))
 #endif /* LTEMAC_SPS */
 
 /* RRM_SP1_START */
@@ -425,11 +425,10 @@ extern "C" {
 #define RGSCHCMNADDTOCRNTTIME(crntTime, toFill, incr) \
 {\
    U32 absoluteTime;\
-   absoluteTime = crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTime.subframe;\
+   absoluteTime = crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTime.slot;\
    absoluteTime += incr;\
    toFill.sfn = (absoluteTime /RGSCH_NUM_SUB_FRAMES_5G)% 1024;\
-   toFill.subframe = absoluteTime % RGSCH_NUM_SUB_FRAMES_5G;\
-   toFill.hSfn = 0;\
+   toFill.slot = absoluteTime % RGSCH_NUM_SUB_FRAMES_5G;\
 }
 
 #define RG_SCH_CMN_PWR_USE_CFG_MAX_PWR    (-128)
@@ -541,7 +540,7 @@ extern "C" {
 #define RG_SCH_CMN_SPS_DL_IS_SPS_TX_HQP(hqP) (((RgSchCmnDlHqProc *)((hqP)->sch))->isSpsActv)
 #define RG_SCH_CMN_IS_UE_SPS_SCHDLD(_ue, _cell,  _schdTime)\
    ((((_ue)->cellInfo[(_ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(_cell)])])->dlAllocCb.spsSchdTime.sfn == _schdTime.sfn) &&\
-    (((_ue)->cellInfo[(_ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(_cell)])])->dlAllocCb.spsSchdTime.subframe == _schdTime.subframe))
+    (((_ue)->cellInfo[(_ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(_cell)])])->dlAllocCb.spsSchdTime.slot == _schdTime.slot))
 
 #define RG_SCH_CMN_DL_COUNT_ONES(_bitMask, _size, _numOnes)\
 {\