X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_dhm.c;h=6f64f98e92ca678289fc1c679bf78db71e8d90a3;hb=6b44407d464a5a4e060999255233a7cfe78bb0fa;hp=f6c8c59a753a98f7f40a271bbca8605290fd36fd;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c
index f6c8c59a7..6f64f98e9 100755
--- a/src/5gnrsch/rg_sch_dhm.c
+++ b/src/5gnrsch/rg_sch_dhm.c
@@ -37,17 +37,7 @@ static int RLOG_FILE_ID=242;
 static int RLOG_MODULE_ID=4096;
 
 /* 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 "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#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"
@@ -61,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "rgr.x"
 #include "rgm.x"
@@ -1203,7 +1184,7 @@ CmLteTimingInfo         timingInfo;
       RETVALUE(NULLP);
    }
 
-   idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.subframe)/
+   idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.slot)/
          ue->dl.dlSpsCfg.dlSpsPrdctyEnum) % ue->dl.dlSpsCfg.numSpsHqProc;
 
 
@@ -1445,7 +1426,7 @@ RgSchCellCb             *cell;
           RETVALUE(ROK);
       }
    }
-   ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.subframe];
+   ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.slot];
    noFdbks = ascIdx.numFdbkSubfrms;
 
    for(idx=0; idx<noFdbks; idx++)
@@ -2019,7 +2000,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
          statsCnt = statsCnt % 10000;
          dlHqStats[statsCnt].cellId = hqP->hqE->cell->cellId;
          dlHqStats[statsCnt].sfn = hqP->tbInfo[tbIdx].timingInfo.sfn; 
-         dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.subframe; 
+         dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.slot; 
          dlHqStats[statsCnt].ack = *isAck;
          dlHqStats[statsCnt].fdbkIdx = fdbkIdx;
          dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;;
@@ -2177,7 +2158,7 @@ RgSchErrInfo            *err;
    }
    
 #if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV))
-   ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.subframe];
+   ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.slot];
    noFdbks = ascIdx.numFdbkSubfrms;
 #endif
 #ifdef LTEMAC_SPS_AN_MUX
@@ -2647,7 +2628,7 @@ RgSchErrInfo            *err;
          ulDlCfgIdx  = cellCb->ulDlCfgIdx;
 
          maxFdbks = rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx]
-            [timeInfo.subframe].
+            [timeInfo.slot].
             numFdbkSubfrms;
 
          for(itr=0; itr< maxFdbks; itr++)
@@ -2659,12 +2640,12 @@ RgSchErrInfo            *err;
             if(ue->uciFrmtTyp == RG_SCH_UCI_FORMAT1B_CS)
             {/* Using the sorted K table */
                RGSCHDECRFRMCRNTTIME (timeInfo, txTime, 
-                     rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.subframe].subfrmNum[itr]);
+                     rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.slot].subfrmNum[itr]);
             }else
 #endif
             {
                RGSCHDECRFRMCRNTTIME (timeInfo, txTime, 
-                     rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.subframe].subfrmNum[itr]);
+                     rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.slot].subfrmNum[itr]);
             }
 
             if (RGSCH_TIMEINFO_SAME (txTime, ue->relPdcchTxTime))
@@ -2719,8 +2700,8 @@ RgSchErrInfo            *err;
          {
          RGSCH_NULL_CHECK(cellCb->instIdx, ue);
          RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId,"CRNTI:%d"
-         " NO HARQ proc available for feedback:timeInfo:snf %d,subframe %d",
-         ue->ueId,timeInfo.sfn, timeInfo.subframe);
+         " NO HARQ proc available for feedback:timeInfo:snf %d,slot %d",
+         ue->ueId,timeInfo.sfn, timeInfo.slot);
          err->errType   = RGSCHERR_DHM_FDBK_IND;
          err->errCause  = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
          RETVALUE(RFAILED);
@@ -3529,8 +3510,8 @@ RgSchErrInfo            *err;
             {
                RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, 
                   "CRNTI:%d NO HARQ proc available for feedback: TimingInfo: "
-                  "sfn %d subframe %d", ue->ueId, timingInfo.sfn,
-                  timingInfo.subframe);
+                  "sfn %d slot %d", ue->ueId, timingInfo.sfn,
+                  timingInfo.slot);
                RETVALUE(RFAILED);
             }
 
@@ -4108,7 +4089,7 @@ CmLteTimingInfo      uciTimingInfo;
    TRC2(rgSCHDhmTddRlsSubFrm)
 
    ascIdx = 
-      rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.subframe];
+      rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
    noFdbks = ascIdx.numFdbkSubfrms;
    for(i=0; i < noFdbks; i++)
    {
@@ -4176,7 +4157,7 @@ CmLteTimingInfo      uciTimingInfo;
    TRC2(rgSCHDhmRlsDlsfHqProc)
 
    ascIdx = 
-      rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.subframe];
+      rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
    noFdbks = ascIdx.numFdbkSubfrms;
    for(i=0; i < noFdbks; i++)
    {
@@ -4277,9 +4258,9 @@ CmLteTimingInfo      uciTimingInfo;
                      if(anInfo == NULLP)
                      {
                         RGSCHDBGERR(cellCb->instIdx, (rgSchPBuf(cellCb->instIdx), 
-                                 "Ack/Nack Info is NULL, Processing %dth feedback subframe for DTX" 
+                                 "Ack/Nack Info is NULL, Processing %dth feedback slot for DTX" 
                                  "received on SFN [%d] and SF [%d]\n",i, uciTimingInfo.sfn, 
-                                 uciTimingInfo.subframe));
+                                 uciTimingInfo.slot));
                      }
                      else  if (tbCb->fbkRepCntr == 0)
                      {