Merge remote-tracking branch 'origin/NR_UE_BWP_reworking' into integration_2022_wk02

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -434,8 +434,6 @@ int main(int argc, char **argv)
   int loglvl=OAILOG_WARNING;
 
   //float target_error_rate = 0.01;
-  int css_flag=0;
-
   cpuf = get_cpu_freq_GHz();
   int8_t enable_ptrs = 0;
   int8_t modify_dmrs = 0;
@@ -463,7 +461,7 @@ int main(int argc, char **argv)
 
   FILE *scg_fd=NULL;
 
-  while ((c = getopt(argc, argv, "f:hA:pf:g:i:n:s:S:t:v:x:y:z:M:N:F:GR:d:PI:L:Ea:b:e:m:w:T:U:q:X:Y")) != -1) {
+  while ((c = getopt(argc, argv, "f:hA:pf:g:i:n:s:S:t:v:x:y:z:M:N:F:GR:d:PI:L:a:b:e:m:w:T:U:q:X:Y")) != -1) {
     switch (c) {
     case 'f':
       scg_fd = fopen(optarg,"r");
@@ -622,12 +620,6 @@ int main(int argc, char **argv)
       loglvl = atoi(optarg);
       break;
 
-
-    case 'E':
-	css_flag=1;
-	break;
-
-
     case 'a':
       g_rbStart = atoi(optarg);
       break;
@@ -709,7 +701,6 @@ int main(int argc, char **argv)
       //printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
       printf("-f raw file containing RRC configuration (generated by gNB)\n");
       printf("-F Input filename (.txt format) for RX conformance testing\n");
-      printf("-E used CSS scheduler\n");
       printf("-o CORESET offset\n");
       printf("-a Start PRB for PDSCH\n");
       printf("-b Number of PRB for PDSCH\n");
@@ -1122,11 +1113,7 @@ int main(int argc, char **argv)
         UE_info->UE_sched_ctrl.harq_processes[harq_pid].ndi = !(trial&1);
         UE_info->UE_sched_ctrl.harq_processes[harq_pid].round = round;
 
-        if (css_flag == 0) {
-          nr_schedule_ue_spec(0, frame, slot);
-        } else {
-          nr_schedule_css_dlsch_phytest(0,frame,slot);
-        }
+        nr_schedule_ue_spec(0, frame, slot);
         Sched_INFO.module_id = 0;
         Sched_INFO.CC_id     = 0;
         Sched_INFO.frame     = frame;