scheduling slots 1 to 10 with max mcs in phytest

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -451,22 +451,14 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   dlsch_in_slot_bitmap = &RC.nrmac[module_idP]->UE_list.UE_sched_ctrl[UE_id].dlsch_in_slot_bitmap;  // static bitmap signaling which slot in a tdd period contains dlsch
   ulsch_in_slot_bitmap = &RC.nrmac[module_idP]->UE_list.UE_sched_ctrl[UE_id].ulsch_in_slot_bitmap;  // static bitmap signaling which slot in a tdd period contains ulsch
 
-  // hardcoding dlsch to be in slot 1
-  if (get_softmodem_params()->phy_test) {
-    if (slot==0) {
-      *dlsch_in_slot_bitmap = 0x1FC3E; // 1 to 6 & 10 to 16
-      *ulsch_in_slot_bitmap = 0xC0300; // 8,9,18,19
+  if (!(slot%num_slots_per_tdd)) {
+    if(slot==0) {
+      *dlsch_in_slot_bitmap = 0x7E;
+      *ulsch_in_slot_bitmap = 0x380;
     }
-  } else {
-    if (!(slot%num_slots_per_tdd)) {
-      if(slot==0) {
-        *dlsch_in_slot_bitmap = 0x02;
-        *ulsch_in_slot_bitmap = 0x100;
-      }
-      else {
-        *dlsch_in_slot_bitmap = 0x00;
-        *ulsch_in_slot_bitmap = 0x00;
-      }
+    else {
+      *dlsch_in_slot_bitmap = 0x00;
+      *ulsch_in_slot_bitmap = 0x00;
     }
   }
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -123,6 +123,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
     pdsch_pdu_rel15->CyclicPrefix = 0;
     pdsch_pdu_rel15->NrOfCodewords = 1;
     int mcsIndex = 9;
+    if (get_softmodem_params()->phy_test) mcsIndex = 28;
     pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(mcsIndex,0);
     pdsch_pdu_rel15->qamModOrder[0] = 2;
     pdsch_pdu_rel15->mcsIndex[0] = mcsIndex;
@@ -310,6 +311,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
 
   pdsch_pdu_rel15->NrOfCodewords = 1;
   int mcs = (mcsIndex!=NULL) ? *mcsIndex : 9;
+  if (get_softmodem_params()->phy_test) mcs = 28;
   int current_harq_pid = UE_list->UE_sched_ctrl[UE_id].current_harq_pid;
   pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(mcs,0);
   pdsch_pdu_rel15->qamModOrder[0] = 2;
@@ -885,6 +887,7 @@ void schedule_fapi_ul_pdu(int Mod_idP,
     //pusch information always include
     //this informantion seems to be redundant. with hthe mcs_index and the modulation table, the mod_order and target_code_rate can be determined.
     pusch_pdu->mcs_index = 9;
+    if (get_softmodem_params()->phy_test) pusch_pdu->mcs_index = 28;
     pusch_pdu->mcs_table = 0; //0: notqam256 [TS38.214, table 5.1.3.1-1] - corresponds to nr_target_code_rate_table1 in PHY
     pusch_pdu->target_code_rate = nr_get_code_rate_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table) ;
     pusch_pdu->qam_mod_order = nr_get_Qm_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table) ;