Merge branch 'nr-physim-update' into runel

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -422,8 +422,8 @@ int main(int argc, char **argv)
       printf("-o CORESET offset\n");
       printf("-a Start PRB for PDSCH\n");
       printf("-b Number of PRB for PDSCH\n");
-      printf("-c Start symbol for PDSCH (fixed for now)\n");
-      printf("-j Number of symbols for PDSCH (fixed for now)\n");
+//    printf("-c Start symbol for PDSCH (2 or 1)\n");
+      printf("-j Number of symbols for PDSCH (9 or 13)\n");
       printf("-e MSC index\n");
       exit (-1);
       break;

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -126,6 +126,7 @@ openair0_config_t openair0_cfg[MAX_CARDS];
 int main(int argc, char **argv)
 {
   char c;
+  float target_error_rate = 0.1;
   int i,sf;
   double SNR, snr0 = -2.0, snr1 = 2.0;
   double sigma, sigma_dB;
@@ -655,31 +656,29 @@ int main(int argc, char **argv)
         }
 
         if (errors_decoding > 0) {
-          is_frame_in_error = 1;
           n_false_positive++;
           printf("\x1B[31m""[frame %d][trial %d]\tnumber of errors in decoding     = %d\n" "\x1B[0m", frame, trial, errors_decoding);
-        } else {
-          is_frame_in_error = 0;
-          break;
         }
         ////////////////////////////////////////////////////////////
       } // trial loop
 
-      if (is_frame_in_error == 1)
+      if((float)n_false_positive/(float)n_trials > target_error_rate) {
+        is_frame_in_error = 1;
         break;
+      } else {
+        is_frame_in_error = 0;
+      }
     } // frame loop
 
-    if(is_frame_in_error == 0 || number_of_frames==1)
+    if(is_frame_in_error == 0) {
+      printf("\n");
+      printf("*************\n");
+      printf("PUSCH test OK\n");
+      printf("*************\n");
       break;
+    }
   } // SNR loop
 
-  if(is_frame_in_error == 0) {
-    printf("\n");
-    printf("*************\n");
-    printf("PUSCH test OK\n");
-    printf("*************\n");
-  }
-
   printf("\n");
 
   free(test_input_bit);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -202,7 +202,7 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
                                      *cfg,
                                      dl_carrier_bandwidth);
   pdu_rel15->frequency_domain_assignment = get_RIV(dlsch_pdu_rel15->start_prb, dlsch_pdu_rel15->n_prb, cfg->rf_config.dl_carrier_bandwidth.value);
-  pdu_rel15->time_domain_assignment = 3; // row index used here instead of SLIV;
+  pdu_rel15->time_domain_assignment = (dlsch_pdu_rel15->nb_symbols == 13) ? 12 : 3; // row index used here instead of SLIV; for now UE supports 9 or 13 (refer the table)
   pdu_rel15->vrb_to_prb_mapping = 1;
   pdu_rel15->mcs = dlsch_pdu_rel15->mcs_idx;
   pdu_rel15->tb_scaling = 1;