loading all dl slots in phytest mode

cmd line option added to change mcs

executables/nr-softmodem.c

@@ -164,7 +164,7 @@ int otg_enabled;
 
 //static NR_DL_FRAME_PARMS      *frame_parms[MAX_NUM_CCs];
 //static nfapi_nr_config_request_t *config[MAX_NUM_CCs];
-uint32_t target_dl_mcs = 28; //maximum allowed mcs
+uint32_t target_dl_mcs = 9;
 uint32_t target_ul_mcs = 20;
 uint32_t timing_advance = 0;
 uint64_t num_missed_slots=0; // counter for the number of missed slots

executables/nr-softmodem.h

@@ -27,7 +27,7 @@
     {"d" ,                    CONFIG_HLP_SOFTS,       PARAMFLAG_BOOL,   uptr:(uint32_t *)&do_forms,         defintval:0,                   TYPE_INT8,   0},        \
     {"E" ,                    CONFIG_HLP_TQFS,        PARAMFLAG_BOOL,   i8ptr:&threequarter_fs,             defintval:0,                   TYPE_INT8,   0},        \
     {"K" ,                    CONFIG_HLP_ITTIL,       PARAMFLAG_NOFREE, strptr:&itti_dump_file,             defstrval:"/tmp/itti.dump",    TYPE_STRING, 0},        \
-    {"m" ,                    CONFIG_HLP_DLMCS,       0,                uptr:&target_dl_mcs,                defintval:0,                   TYPE_UINT,   0},        \
+    {"m" ,                    CONFIG_HLP_DLMCS,       0,                uptr:&target_dl_mcs,                defintval:9,                   TYPE_UINT,   0},        \
     {"t" ,                    CONFIG_HLP_ULMCS,       0,                uptr:&target_ul_mcs,                defintval:0,                   TYPE_UINT,   0},        \
     {"q" ,                    CONFIG_HLP_STMON,       PARAMFLAG_BOOL,   iptr:&opp_enabled,                  defintval:0,                   TYPE_INT,    0},        \
     {"numerology" ,           CONFIG_HLP_NUMEROLOGY,  PARAMFLAG_BOOL,   iptr:&numerology,                   defintval:0,                   TYPE_INT,    0},        \
@@ -63,4 +63,6 @@ void init_gNB_afterRU(void);
 extern int stop_L1L2(module_id_t gnb_id);
 extern int restart_L1L2(module_id_t gnb_id);
 
+extern uint32_t target_dl_mcs;
+extern uint32_t target_ul_mcs;
 #endif

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -399,7 +399,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
 
   // hardcoding dlsch to be in slot 1
   if (!(slot_txP%num_slots_per_tdd)) {
-    if(slot_txP==0)
+    if(get_softmodem_params()->phy_test && (slot_txP%num_slots_per_tdd)==0)
+      *dlsch_in_slot_bitmap = 0x7E;
+    else if(slot_txP==0)
       *dlsch_in_slot_bitmap = 0x02;
     else
       *dlsch_in_slot_bitmap = 0x00;
@@ -473,6 +475,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
 
     if (UE_list->fiveG_connected[UE_id] && (is_xlsch_in_slot(*dlsch_in_slot_bitmap,slot_txP%num_slots_per_tdd))) {
       ue_sched_ctl->current_harq_pid = slot_txP % num_slots_per_tdd;
+      if (!get_softmodem_params()->phy_test)
         nr_update_pucch_scheduling(module_idP, UE_id, frame_txP, slot_txP, num_slots_per_tdd,&pucch_sched);
       nr_schedule_uss_dlsch_phytest(module_idP, frame_txP, slot_txP, &UE_list->UE_sched_ctrl[UE_id].sched_pucch[pucch_sched], NULL);
       // resetting ta flag

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -119,7 +119,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
     pdsch_pdu_rel15->SubcarrierSpacing = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.subcarrierSpacing;
     pdsch_pdu_rel15->CyclicPrefix = 0;
     pdsch_pdu_rel15->NrOfCodewords = 1;
-    int mcsIndex = 9;
+    int mcsIndex = target_dl_mcs;
     pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(mcsIndex,0);
     pdsch_pdu_rel15->qamModOrder[0] = 2;
     pdsch_pdu_rel15->mcsIndex[0] = mcsIndex;
@@ -308,7 +308,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
   else pdsch_pdu_rel15->CyclicPrefix=0;
 
   pdsch_pdu_rel15->NrOfCodewords = 1;
-  int mcs = (mcsIndex!=NULL) ? *mcsIndex : 9;
+  int mcs = (mcsIndex!=NULL) ? *mcsIndex : target_dl_mcs;
   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;
@@ -368,6 +368,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
   // harq pid
   dci_pdu_rel15[0].harq_pid = current_harq_pid;
   dci_pdu_rel15[0].ndi = UE_list->UE_sched_ctrl[UE_id].harq_processes[current_harq_pid].ndi;
+  if (get_softmodem_params()->phy_test==1) UE_list->UE_sched_ctrl[UE_id].harq_processes[current_harq_pid].ndi ^= 1;
   // DAI
   dci_pdu_rel15[0].dai[0].val = (pucch_sched->dai_c-1)&3;
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -65,6 +65,7 @@
 
 
 #include "common/ran_context.h"
+#include "executables/softmodem-common.h"
 
 extern RAN_CONTEXT_t RC;