compilation of NR executables with MAC

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -171,6 +171,7 @@ int main(int argc, char **argv)
   //int pbch_tx_ant;
   int N_RB_DL=106,mu=1;
   nfapi_nr_dl_tti_pdsch_pdu_rel15_t dlsch_config;
+  NR_sched_pucch pucch_sched;
 
   //unsigned char frame_type = 0;
 
@@ -706,7 +707,7 @@ int main(int argc, char **argv)
 
       memset(RC.nrmac[0]->cce_list[1][0],0,MAX_NUM_CCE*sizeof(int));
       clear_nr_nfapi_information(RC.nrmac[0], 0, frame, slot);
-      if (css_flag == 0) nr_schedule_uss_dlsch_phytest(0,frame,slot,&dlsch_config);
+      if (css_flag == 0) nr_schedule_uss_dlsch_phytest(0,frame,slot,&pucch_sched,&dlsch_config);
       else               nr_schedule_css_dlsch_phytest(0,frame,slot);
       
       

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -542,6 +542,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
   TBS_bytes = configure_fapi_dl_pdu(module_idP,
                                     CCEIndices,
                                     dl_req,
+				    pucch_sched, 
                                     dlsch_config!=NULL ? dlsch_config->mcsIndex : NULL,
                                     dlsch_config!=NULL ? &dlsch_config->rbSize : NULL,
                                     dlsch_config!=NULL ? &dlsch_config->rbStart : NULL);

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -123,7 +123,7 @@ typedef struct {
 
   DLSCH_PDU DLSCH_pdu[4][MAX_MOBILES_PER_GNB];
   /// scheduling control info
-  UE_sched_ctrl_t UE_sched_ctrl[MAX_MOBILES_PER_GNB];
+  NR_UE_sched_ctrl_t UE_sched_ctrl[MAX_MOBILES_PER_GNB];
   int next[MAX_MOBILES_PER_GNB];
   int head;
   int next_ul[MAX_MOBILES_PER_GNB];