X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.c;h=6ca3e47695ecc27607b93486814800f74287ec86;hb=4e803fe4bcf3a446b7082675d25d35ad102f16f6;hp=503a90bff99f278201dce4d7d8f95017d53cc81e;hpb=49dec2270f1b3c03b36a801e153bf0786edffc24;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c
index 503a90bff..6ca3e4769 100644
--- a/src/5gnrsch/sch.c
+++ b/src/5gnrsch/sch.c
@@ -31,41 +31,22 @@
 /** @file sch.c
 @brief This file implements the schedulers main access to MAC layer code.
 */
-#include "stdbool.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_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"	
+#include "du_app_mac_inf.h"
 #include "lrg.h"
-#include "rgr.h"
 #include "tfu.h"
+#include "du_log.h"
+#include "rgr.h"
 #include "rg_sch_inf.h"
 #include "rg_sch.h"
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
+
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"         /* typedefs for Scheduler */
-#include "du_app_mac_inf.h"
 #include "mac_sch_interface.h"
 #include "sch.h"
 #include "sch_utils.h"
-#include "du_log.h"
-#include "common_def.h"
 
 extern SchCb schCb[SCH_MAX_INST];
 void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm);
@@ -564,6 +545,10 @@ uint8_t      offsetPointA
    pdsch->dmrs.scid                          = 0;
    pdsch->dmrs.numDmrsCdmGrpsNoData          = 1;
    pdsch->dmrs.dmrsPorts                     = 0;
+	pdsch->dmrs.mappingType                   = DMRS_MAP_TYPE_A; /* Type-A */
+	pdsch->dmrs.nrOfDmrsSymbols               = NUM_DMRS_SYMBOLS;
+	pdsch->dmrs.dmrsAddPos                    = DMRS_ADDITIONAL_POS;
+
    pdsch->pdschFreqAlloc.resourceAllocType   = 1; /* RAT type-1 RIV format */
 	pdsch->pdschFreqAlloc.freqAlloc.startPrb  = offset + SCH_SSB_NUM_PRB; /* the RB numbering starts from coreset0,
 	and PDSCH is always above SSB */
@@ -701,7 +686,7 @@ uint8_t macSchDlRlcBoInfo(Pst *pst, DlRlcBOInfo *dlBoInfo)
 
    SchCellCb *cell = schCb[inst].cells[inst];
    SchDlSlotInfo *schDlSlotInfo = \
-      cell->schDlSlotInfo[(cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA) % SCH_NUM_SLOTS]; 
+      cell->schDlSlotInfo[(cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA + MSG4_DELAY) % SCH_NUM_SLOTS];
   
    for(lcIdx = 0; lcIdx < dlBoInfo->numLc; lcIdx++)
 	{
@@ -723,7 +708,7 @@ uint8_t macSchDlRlcBoInfo(Pst *pst, DlRlcBOInfo *dlBoInfo)
 			schDlSlotInfo->msg4Info->harqFeedbackInd = 0;
 			schDlSlotInfo->msg4Info->dciFormatId = 1;
 	   }
-   }
+	}
 
    return ROK;
 }