X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.h;h=847c7ed4875fbdb82955bc91cc7b5ab1cab2c573;hb=8133a1985d2c53074af88c44edfb9231af64b433;hp=af877062690871491825e042c1cb40280baf4c37;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_cmn.h b/src/5gnrsch/rg_sch_cmn.h
index af8770626..847c7ed48 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 */
@@ -306,7 +306,7 @@ extern "C" {
       } \
       else { \
          if (tb->dlGrnt.iMcs < 29) {\
-            U8 _iTbs;\
+            uint8_t _iTbs;\
             RG_SCH_CMN_DL_MCS_TO_TBS(tb->dlGrnt.iMcs, _iTbs);\
             RG_SCH_CMN_ITBS_TO_RETX_IMCS(_iTbs, retxMcs); \
          } \
@@ -424,12 +424,11 @@ extern "C" {
 
 #define RGSCHCMNADDTOCRNTTIME(crntTime, toFill, incr) \
 {\
-   U32 absoluteTime;\
-   absoluteTime = crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTime.subframe;\
+   uint32_t absoluteTime;\
+   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,11 +540,11 @@ 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)\
 {\
-   U8 _pos = 0;\
+   uint8_t _pos = 0;\
    *_numOnes = 0;\
    for (_pos = 0; _pos < _size; ++_pos)\
    {\
@@ -555,7 +554,7 @@ extern "C" {
 
 #define RG_SCH_CMN_DL_GET_START_POS(_allocedBitmask, _size, _startPos)\
 {\
-   U8 _pos = 0;\
+   uint8_t _pos = 0;\
    for (_pos = 0; _pos < _size; ++_pos)\
    {\
       if ((_allocedBitmask & (1 << (31 -_pos))))\
@@ -738,7 +737,7 @@ extern "C" {
    
 #define RG_SCH_CMN_UPD_RBS_TO_ADD(_CELL,_DLSF,_ALLCINFO,_RBSREQ,_RBSTOADD) \
 {\
-          U8  addtlRbsAvl;\
+          uint8_t  addtlRbsAvl;\
           addtlRbsAvl = rgSCHCmnFindNumAddtlRbsAvl(_CELL,_DLSF,_ALLCINFO);\
           if(_RBSREQ > addtlRbsAvl)\
           {\
@@ -794,7 +793,7 @@ extern "C" {
 /* LTE_ADV_FLAG_REMOVED_START */
 #define RG_SCH_CMN_SFR_UPD_RBS_TO_ADD_IN_POOL(_CELL,_DLSF,_POOLINFO,_ALLCINFO,_RBSREQ,_RBSTOADD) \
 {\
-   U8  addtlRbsAvl;\
+   uint8_t  addtlRbsAvl;\
    addtlRbsAvl = rgSCHCmnSFRFindNumAddtlRbsAvl(_CELL,_DLSF,_POOLINFO,_ALLCINFO);\
    if(_RBSREQ > addtlRbsAvl)\
    {\