Minor corrections

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

@@ -454,9 +454,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
     for (int i=0;i<sib1_sdu_length;i++) LOG_I(MAC,"byte %d : %x\n",i,((uint8_t*)sib1_payload)[i]);
 
     // Configure sched_ctrlCommon for SIB1
-    //schedule_control_sib1(module_idP, CC_id, time_domain_allocation, mcsTableIdx, mcs, numDmrsCdmGrpsNoData, sib1_sdu_length);
-
-    gNB_mac->pre_processor_sib1(module_idP, CC_id, time_domain_allocation, mcsTableIdx, mcs, numDmrsCdmGrpsNoData, sib1_sdu_length);;
+    schedule_control_sib1(module_idP, CC_id, time_domain_allocation, mcsTableIdx, mcs, numDmrsCdmGrpsNoData, sib1_sdu_length);
 
     // Calculate number of symbols
     int startSymbolIndex, nrOfSymbols;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -628,8 +628,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
   gNB_MAC_INST *gNB_mac = RC.nrmac[module_id];
 
   /* PREPROCESSOR */
-  //gNB_mac->pre_processor_dl(module_id, frame, slot, num_slots_per_tdd);
-  nr_simple_dlsch_preprocessor(module_id, frame, slot, num_slots_per_tdd);
+  gNB_mac->pre_processor_dl(module_id, frame, slot, num_slots_per_tdd);
 
   NR_UE_info_t *UE_info = &gNB_mac->UE_info;
 

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -87,8 +87,6 @@ void mac_top_init_gNB(void)
       else
         RC.nrmac[i]->pre_processor_dl = nr_simple_dlsch_preprocessor;
 
-      RC.nrmac[i]->pre_processor_sib1 = schedule_control_sib1;
-
     }//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
 
     AssertFatal(rlc_module_init(1) == 0,"Could not initialize RLC layer\n");

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -442,14 +442,6 @@ typedef void (*nr_pp_impl_dl)(module_id_t mod_id,
                               sub_frame_t slot,
                               int num_slots_per_tdd);
 
-typedef void (*nr_pp_impl_sib1)(module_id_t module_id,
-                                int CC_id,
-                                int time_domain_allocation,
-                                uint8_t mcsTableIdx,
-                                uint8_t mcs,
-                                uint8_t numDmrsCdmGrpsNoData,
-                                int num_total_bytes);
-
 /*! \brief top level eNB MAC structure */
 typedef struct gNB_MAC_INST_s {
   /// Ethernet parameters for northbound midhaul interface
@@ -519,7 +511,6 @@ typedef struct gNB_MAC_INST_s {
   NR_UE_sched_ctrl_t *sched_ctrlCommon;
   NR_CellGroupConfig_t *secondaryCellGroupCommon;
   NR_Type0_PDCCH_CSS_config_t type0_PDCCH_CSS_config;
-  nr_pp_impl_sib1 pre_processor_sib1;
 
 } gNB_MAC_INST;