Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch

cmake_targets/CMakeLists.txt

@@ -1608,7 +1608,13 @@ add_library(L2
   ${ENB_APP_SRC}
   )
 
-#  ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
+add_library(MAC_NR
+  ${MAC_NR_SRC}
+  )
+
+add_library(MAC_UE_NR
+  ${MAC_NR_SRC_UE}
+  )
 
 add_library(L2_NR
   ${L2_NR_SRC}
@@ -2559,6 +2565,9 @@ target_link_libraries(nr_dlschsim  -Wl,--start-group UTIL SIMU PHY PHY_COMMON PH
 add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
 target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
+add_executable(nr_dlsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c ${T_SOURCE})
+target_link_libraries(nr_dlsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+
 
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
 

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -91,7 +91,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
     for (rb=0; rb<20; rb++) {
       j=0;
 
-      if (symbol==1 || symbol==7) {
+      if (symbol==1 || symbol==3) {
         for (i=0; i<12; i++) {
           if ((i!=nushiftmod4) &&
               (i!=(nushiftmod4+4)) &&
@@ -147,7 +147,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
     
     for (rb=0; rb<20; rb++) {
       j=0;
-      if (symbol==1 || symbol==7) {
+      if (symbol==1 || symbol==3) {
 	for (i=0; i<12; i++) {
 	  if ((i!=nushiftmod4) &&
 	      (i!=(nushiftmod4+4)) &&

openair1/PHY/phy_vars.h

@@ -59,8 +59,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/PHY/phy_vars_nr_ue.h

@@ -55,8 +55,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/PHY/phy_vars_ue.h

@@ -24,7 +24,6 @@
 
 #include "PHY/types.h"
 #include "PHY/defs_UE.h"
-#include "PHY/phy_vars_ue.h"
 
 #include "common/ran_context.h"
 
@@ -54,8 +53,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -88,6 +88,8 @@ fifo_dump_emos_UE emos_dump_UE;
 
 #define NS_PER_SLOT 500000
 
+char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
+
 extern double cpuf;
 
 

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -71,6 +71,8 @@
 
 #define NS_PER_SLOT 500000
 
+char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
+
 extern double cpuf;
 
 void Msg1_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);

openair1/SIMULATION/NR_PHY/dlsim.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include <string.h>
+#include <math.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include "common/config/config_userapi.h"
+#include "common/utils/LOG/log.h"
+#include "common/ran_context.h" 
+
+#include "SIMULATION/TOOLS/sim.h"
+#include "SIMULATION/RF/rf.h"
+#include "PHY/types.h"
+#include "PHY/defs_nr_common.h"
+#include "PHY/defs_nr_UE.h"
+#include "PHY/defs_gNB.h"
+#include "PHY/NR_REFSIG/refsig_defs_ue.h"
+#include "PHY/NR_REFSIG/nr_mod_table.h"
+#include "PHY/MODULATION/modulation_eNB.h"
+#include "PHY/MODULATION/modulation_UE.h"
+#include "PHY/INIT/phy_init.h"
+#include "PHY/NR_TRANSPORT/nr_transport.h"
+#include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
+
+#include "SCHED_NR/sched_nr.h"
+#include "SCHED_NR_UE/fapi_nr_ue_l1.h"
+
+#include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+#include "LAYER2/NR_MAC_UE/mac_defs.h"
+#include "LAYER2/NR_MAC_UE/mac_extern.h"
+
+#include "NR_PHY_INTERFACE/NR_IF_Module.h"
+#include "NR_UE_PHY_INTERFACE/NR_IF_Module.h"
+
+PHY_VARS_gNB *gNB;
+PHY_VARS_NR_UE *UE;
+RAN_CONTEXT_t RC;
+
+
+double cpuf;
+
+// dummy functions
+int nfapi_mode=0;
+int oai_nfapi_hi_dci0_req(nfapi_hi_dci0_request_t *hi_dci0_req) { return(0);}
+int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req) { return(0); }
+
+int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req) { return(0); }
+
+int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) { return(0); }
+
+int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req) {return(0);}
+
+uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn) {return(0);}
+int32_t get_uldl_offset(int eutra_bandP) {return(0);}
+
+NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}
+
+int8_t dummy_nr_ue_dl_indication(nr_downlink_indication_t *dl_info){return(0);}
+int8_t dummy_nr_ue_ul_indication(nr_uplink_indication_t *ul_info){return(0);}
+
+void exit_function(const char* file, const char* function, const int line,const char *s) { 
+   const char * msg= s==NULL ? "no comment": s;
+   printf("Exiting at: %s:%d %s(), %s\n", file, line, function, msg); 
+   exit(-1); 
+}
+
+int8_t nr_mac_rrc_data_ind_ue(const module_id_t     module_id,
+			      const int             CC_id,
+			      const uint8_t         gNB_index,
+			      const int8_t          channel,
+			      const uint8_t*        pduP,
+			      const sdu_size_t      pdu_len)
+{return(0);}
+int rlc_module_init (void) {return(0);}
+void pdcp_layer_init(void) {}
+int rrc_init_nr_global_param(void){return(0);}
+
+
+
+// needed for some functions
+PHY_VARS_NR_UE ***PHY_vars_UE_g;
+uint16_t conjugate[8]__attribute__((aligned(32))) = {-1,1,-1,1,-1,1,-1,1};
+
+int main(int argc, char **argv)
+{
+
+  char c;
+
+  int i,l,aa;
+  double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0;
+  uint8_t snr1set=0;
+  int **txdata;
+  double **s_re,**s_im,**r_re,**r_im;
+  double iqim = 0.0;
+  unsigned char pbch_pdu[6];
+  //  int sync_pos, sync_pos_slot;
+  //  FILE *rx_frame_file;
+  FILE *output_fd = NULL;
+  uint8_t write_output_file=0;
+  //int result;
+  int freq_offset;
+  //  int subframe_offset;
+  //  char fname[40], vname[40];
+  int trial,n_trials=1,n_errors,n_errors2,n_alamouti;
+  uint8_t transmission_mode = 1,n_tx=1,n_rx=1;
+  uint16_t Nid_cell=0;
+
+  channel_desc_t *gNB2UE;
+  uint32_t nsymb,tx_lev,tx_lev1 = 0,tx_lev2 = 0;
+  uint8_t extended_prefix_flag=0;
+  int8_t interf1=-21,interf2=-21;
+
+  FILE *input_fd=NULL,*pbch_file_fd=NULL;
+  char input_val_str[50],input_val_str2[50];
+
+  uint8_t frame_mod4,num_pdcch_symbols = 0;
+
+  SCM_t channel_model=AWGN;//Rayleigh1_anticorr;
+
+  double pbch_sinr;
+  int pbch_tx_ant;
+  int N_RB_DL=273,mu=1;
+
+  unsigned char frame_type = 0;
+  unsigned char pbch_phase = 0;
+
+  int frame=0,subframe=1;
+  int frame_length_complex_samples;
+  int frame_length_complex_samples_no_prefix;
+  NR_DL_FRAME_PARMS *frame_parms;
+  nfapi_nr_config_request_t *gNB_config;
+  gNB_L1_rxtx_proc_t gNB_proc;
+  UE_nr_rxtx_proc_t UE_proc;
+  NR_Sched_Rsp_t Sched_INFO;
+  gNB_MAC_INST *gNB_mac;
+  NR_UE_MAC_INST_t *UE_mac;
+
+  int ret;
+  int run_initial_sync=0;
+  int do_pdcch_flag=1;
+
+  int loglvl=OAILOG_WARNING;
+
+  float target_error_rate = 0.01;
+
+  cpuf = get_cpu_freq_GHz();
+
+  if ( load_configmodule(argc,argv) == 0) {
+    exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
+  }
+
+  randominit(0);
+
+  while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:IL:")) != -1) {
+    switch (c) {
+    case 'f':
+      write_output_file=1;
+      output_fd = fopen(optarg,"w");
+
+      if (output_fd==NULL) {
+        printf("Error opening %s\n",optarg);
+        exit(-1);
+      }
+
+      break;
+
+    case 'd':
+      frame_type = 1;
+      break;
+
+    case 'g':
+      switch((char)*optarg) {
+      case 'A':
+        channel_model=SCM_A;
+        break;
+
+      case 'B':
+        channel_model=SCM_B;
+        break;
+
+      case 'C':
+        channel_model=SCM_C;
+        break;
+
+      case 'D':
+        channel_model=SCM_D;
+        break;
+
+      case 'E':
+        channel_model=EPA;
+        break;
+
+      case 'F':
+        channel_model=EVA;
+        break;
+
+      case 'G':
+        channel_model=ETU;
+        break;
+
+      default:
+        msg("Unsupported channel model!\n");
+        exit(-1);
+      }
+
+      break;
+
+    case 'i':
+      interf1=atoi(optarg);
+      break;
+
+    case 'j':
+      interf2=atoi(optarg);
+      break;
+
+    case 'n':
+      n_trials = atoi(optarg);
+      break;
+
+    case 's':
+      snr0 = atof(optarg);
+      msg("Setting SNR0 to %f\n",snr0);
+      break;
+
+    case 'S':
+      snr1 = atof(optarg);
+      snr1set=1;
+      msg("Setting SNR1 to %f\n",snr1);
+      break;
+
+      /*
+      case 't':
+      Td= atof(optarg);
+      break;
+      */
+    case 'p':
+      extended_prefix_flag=1;
+      break;
+
+      /*
+      case 'r':
+      ricean_factor = pow(10,-.1*atof(optarg));
+      if (ricean_factor>1) {
+        printf("Ricean factor must be between 0 and 1\n");
+        exit(-1);
+      }
+      break;
+      */
+    case 'x':
+      transmission_mode=atoi(optarg);
+
+      if ((transmission_mode!=1) &&
+          (transmission_mode!=2) &&
+          (transmission_mode!=6)) {
+        msg("Unsupported transmission mode %d\n",transmission_mode);
+        exit(-1);
+      }
+
+      break;
+
+    case 'y':
+      n_tx=atoi(optarg);
+
+      if ((n_tx==0) || (n_tx>2)) {
+        msg("Unsupported number of tx antennas %d\n",n_tx);
+        exit(-1);
+      }
+
+      break;
+
+    case 'z':
+      n_rx=atoi(optarg);
+
+      if ((n_rx==0) || (n_rx>2)) {
+        msg("Unsupported number of rx antennas %d\n",n_rx);
+        exit(-1);
+      }
+
+      break;
+
+    case 'N':
+      Nid_cell = atoi(optarg);
+      break;
+
+    case 'R':
+      N_RB_DL = atoi(optarg);
+      break;
+
+    case 'F':
+      input_fd = fopen(optarg,"r");
+
+      if (input_fd==NULL) {
+        printf("Problem with filename %s\n",optarg);
+        exit(-1);
+      }
+
+      break;
+
+    case 'P':
+      pbch_phase = atoi(optarg);
+
+      if (pbch_phase>3)
+        printf("Illegal PBCH phase (0-3) got %d\n",pbch_phase);
+
+      break;
+      
+    case 'I':
+      run_initial_sync=1;
+      target_error_rate=0.1;
+      break;
+
+    case 'L':
+      loglvl = atoi(optarg);
+      break;
+
+    default:
+    case 'h':
+      printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
+             argv[0]);
+      printf("-h This message\n");
+      printf("-p Use extended prefix mode\n");
+      printf("-d Use TDD\n");
+      printf("-n Number of frames to simulate\n");
+      printf("-s Starting SNR, runs from SNR0 to SNR0 + 5 dB.  If n_frames is 1 then just SNR is simulated\n");
+      printf("-S Ending SNR, runs from SNR0 to SNR1\n");
+      printf("-t Delay spread for multipath channel\n");
+      printf("-g [A,B,C,D,E,F,G] Use 3GPP SCM (A,B,C,D) or 36-101 (E-EPA,F-EVA,G-ETU) models (ignores delay spread and Ricean factor)\n");
+      printf("-x Transmission mode (1,2,6 for the moment)\n");
+      printf("-y Number of TX antennas used in eNB\n");
+      printf("-z Number of RX antennas used in UE\n");
+      printf("-i Relative strength of first intefering eNB (in dB) - cell_id mod 3 = 1\n");
+      printf("-j Relative strength of second intefering eNB (in dB) - cell_id mod 3 = 2\n");
+      printf("-N Nid_cell\n");
+      printf("-R N_RB_DL\n");
+      printf("-O oversampling factor (1,2,4,8,16)\n");
+      printf("-A Interpolation_filname Run with Abstraction to generate Scatter plot using interpolation polynomial in file\n");
+      //    printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
+      printf("-f Output filename (.txt format) for Pe/SNR results\n");
+      printf("-F Input filename (.txt format) for RX conformance testing\n");
+      exit (-1);
+      break;
+    }
+  }
+
+  logInit();
+  set_glog(loglvl);
+  T_stdout = 1;
+
+  if (snr1set==0)
+    snr1 = snr0+10;
+
+  printf("Initializing gNodeB for mu %d, N_RB_DL %d\n",mu,N_RB_DL);
+
+  RC.gNB = (PHY_VARS_gNB***) malloc(sizeof(PHY_VARS_gNB **));
+  RC.gNB[0] = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
+  RC.gNB[0][0] = malloc(sizeof(PHY_VARS_gNB));
+  gNB = RC.gNB[0][0];
+  gNB_config = &gNB->gNB_config;
+  frame_parms = &gNB->frame_parms; //to be initialized I suppose (maybe not necessary for PBCH)
+  frame_parms->nb_antennas_tx = n_tx;
+  frame_parms->nb_antennas_rx = n_rx;
+  frame_parms->N_RB_DL = N_RB_DL;
+  frame_parms->N_RB_UL = N_RB_DL;
+
+  nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu);
+  phy_init_nr_gNB(gNB,0,0);
+
+  double fs,bw;
+
+  if (mu == 1 && N_RB_DL == 217) { 
+    fs = 122.88e6;
+    bw = 80e6;
+  }					       
+  else if (mu == 1 && N_RB_DL == 245) {
+    fs = 122.88e6;
+    bw = 90e6;
+  }
+  else if (mu == 1 && N_RB_DL == 273) {
+    fs = 122.88e6;
+    bw = 100e6;
+  }
+  else if (mu == 1 && N_RB_DL == 106) { 
+    fs = 61.44e6;
+    bw = 40e6;
+  }
+  else AssertFatal(1==0,"Unsupported numerology for mu %d, N_RB %d\n",mu, N_RB_DL);
+
+  gNB2UE = new_channel_desc_scm(n_tx,
+                                n_rx,
+                                channel_model,
+ 				fs, 
+				bw, 
+                                0,
+                                0,
+                                0);
+
+  if (gNB2UE==NULL) {
+    msg("Problem generating channel model. Exiting.\n");
+    exit(-1);
+  }
+
+  frame_length_complex_samples = frame_parms->samples_per_subframe*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
+  frame_length_complex_samples_no_prefix = frame_parms->samples_per_subframe_wCP;
+
+  s_re = malloc(2*sizeof(double*));
+  s_im = malloc(2*sizeof(double*));
+  r_re = malloc(2*sizeof(double*));
+  r_im = malloc(2*sizeof(double*));
+  txdata = malloc(2*sizeof(int*));
+
+  for (i=0; i<2; i++) {
+
+    s_re[i] = malloc(frame_length_complex_samples*sizeof(double));
+    bzero(s_re[i],frame_length_complex_samples*sizeof(double));
+    s_im[i] = malloc(frame_length_complex_samples*sizeof(double));
+    bzero(s_im[i],frame_length_complex_samples*sizeof(double));
+
+    r_re[i] = malloc(frame_length_complex_samples*sizeof(double));
+    bzero(r_re[i],frame_length_complex_samples*sizeof(double));
+    r_im[i] = malloc(frame_length_complex_samples*sizeof(double));
+    bzero(r_im[i],frame_length_complex_samples*sizeof(double));
+
+    printf("Allocating %d samples for txdata\n",frame_length_complex_samples);
+    txdata[i] = malloc(frame_length_complex_samples*sizeof(int));
+    bzero(r_re[i],frame_length_complex_samples*sizeof(int));
+  
+  }
+
+  if (pbch_file_fd!=NULL) {
+    load_pbch_desc(pbch_file_fd);
+  }
+
+
+  //configure UE
+  UE = malloc(sizeof(PHY_VARS_NR_UE));
+  PHY_vars_UE_g = malloc(sizeof(PHY_VARS_NR_UE**));
+  PHY_vars_UE_g[0] = malloc(sizeof(PHY_VARS_NR_UE*));
+  PHY_vars_UE_g[0][0] = UE;
+  memcpy(&UE->frame_parms,frame_parms,sizeof(NR_DL_FRAME_PARMS));
+  phy_init_nr_top(UE);
+  if (run_initial_sync==1)  UE->is_synchronized = 0;
+  else                      UE->is_synchronized = 1;
+                      
+  UE->perfect_ce = 0;
+
+  if (init_nr_ue_signal(UE, 1, 0) != 0)
+  {
+    printf("Error at UE NR initialisation\n");
+    exit(-1);
+  }
+
+  nr_gold_pbch(UE);
+
+  RC.nb_nr_macrlc_inst = 1;
+  mac_top_init_gNB();
+  gNB_mac = RC.nrmac[0];
+
+  nr_l2_init_ue();
+  UE_mac = get_mac_inst(0);
+
+  UE->if_inst = nr_ue_if_module_init(0);
+  UE->if_inst->scheduled_response = nr_ue_scheduled_response;
+  UE->if_inst->phy_config_request = nr_ue_phy_config_request;
+  UE->if_inst->dl_indication = dummy_nr_ue_dl_indication;
+  UE->if_inst->ul_indication = dummy_nr_ue_ul_indication;
+  
+
+  //mac->if_module = nr_ue_if_module_init(0);
+
+  
+  // generate signal
+  if (input_fd==NULL) {
+    gNB->pbch_configured = 1;
+    for (int i=0;i<4;i++) gNB->pbch_pdu[i]=i+1;
+
+    nr_schedule_css_dlsch_phytest(0,frame,subframe);
+    Sched_INFO.module_id = 0;
+    Sched_INFO.CC_id     = 0;
+    Sched_INFO.frame     = frame;
+    Sched_INFO.subframe  = subframe;
+    Sched_INFO.DL_req    = &gNB_mac->DL_req[0];
+    Sched_INFO.UL_req    = NULL;
+    Sched_INFO.HI_DCI0_req  = NULL;
+    Sched_INFO.TX_req    = &gNB_mac->TX_req[0];
+    nr_schedule_response(&Sched_INFO);
+
+    gNB_proc.frame_tx = frame;
+    gNB_proc.subframe_tx = subframe;
+    phy_procedures_gNB_TX(gNB,&gNB_proc,0);
+    
+    //nr_common_signal_procedures (gNB,frame,subframe);
+
+	LOG_M("txsigF0.m","txsF0", gNB->common_vars.txdataF[0],frame_length_complex_samples_no_prefix,1,1);
+	if (gNB->frame_parms.nb_antennas_tx>1)
+	LOG_M("txsigF1.m","txsF1", gNB->common_vars.txdataF[1],frame_length_complex_samples_no_prefix,1,1);
+
+    //TODO: loop over slots
+    for (aa=0; aa<gNB->frame_parms.nb_antennas_tx; aa++) {
+      if (gNB_config->subframe_config.dl_cyclic_prefix_type.value == 1) {
+	PHY_ofdm_mod(gNB->common_vars.txdataF[aa],
+		     txdata[aa],
+		     frame_parms->ofdm_symbol_size,
+		     12,
+		     frame_parms->nb_prefix_samples,
+		     CYCLIC_PREFIX);
+      } else {
+	nr_normal_prefix_mod(gNB->common_vars.txdataF[aa],
+			     txdata[aa],
+			     14,
+			     frame_parms);
+      }
+    }
+  } else {
+    printf("Reading %d samples from file to antenna buffer %d\n",frame_length_complex_samples,0);
+    
+    if (fread(txdata[0],
+	      sizeof(int32_t),
+	      frame_length_complex_samples,
+	      input_fd) != frame_length_complex_samples) {
+      printf("error reading from file\n");
+      exit(-1);
+    }
+  }
+
+  LOG_M("txsig0.m","txs0", txdata[0],frame_length_complex_samples,1,1);
+  if (gNB->frame_parms.nb_antennas_tx>1)
+    LOG_M("txsig1.m","txs1", txdata[1],frame_length_complex_samples,1,1);
+
+  if (output_fd) 
+    fwrite(txdata[0],sizeof(int32_t),frame_length_complex_samples,output_fd);
+
+  int txlev = signal_energy(&txdata[0][5*frame_parms->ofdm_symbol_size + 4*frame_parms->nb_prefix_samples + frame_parms->nb_prefix_samples0],
+			    frame_parms->ofdm_symbol_size + frame_parms->nb_prefix_samples);
+
+  //  printf("txlev %d (%f)\n",txlev,10*log10(txlev));
+
+  for (i=0; i<frame_length_complex_samples; i++) {
+    for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+      r_re[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)]);
+      r_im[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)+1]);
+    }
+  }
+
+  //Configure UE
+  fapi_nr_dl_config_request_t dl_config; 
+  //  Type0 PDCCH search space
+  dl_config.number_pdus =  1;
+  dl_config.dl_config_list[0].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.rnti = 3;	//	to be set
+  
+  uint64_t mask = 0x0;
+  uint16_t num_rbs=24;
+  uint16_t rb_offset=0;
+  uint16_t cell_id=0;
+  uint16_t num_symbols=2;
+  for(i=0; i<(num_rbs/6); ++i){   //  38.331 Each bit corresponds a group of 6 RBs
+    mask = mask >> 1;
+    mask = mask | 0x100000000000;
+  }
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.frequency_domain_resource = mask;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.rb_offset = rb_offset;  //  additional parameter other than coreset
+  
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.duration = num_symbols;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.cce_reg_mapping_type =CCE_REG_MAPPING_TYPE_INTERLEAVED;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.cce_reg_interleaved_reg_bundle_size = 6;   //  L 38.211 7.3.2.2
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.cce_reg_interleaved_interleaver_size = 2;  //  R 38.211 7.3.2.2
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.cce_reg_interleaved_shift_index = cell_id;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.precoder_granularity = PRECODER_GRANULARITY_SAME_AS_REG_BUNDLE;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.pdcch_dmrs_scrambling_id = cell_id;
+  
+  uint32_t number_of_search_space_per_slot=1;
+  uint32_t first_symbol_index=0;
+  uint32_t search_space_duration;  //  element of search space
+  uint32_t coreset_duration;  //  element of coreset
+  
+  coreset_duration = num_symbols * number_of_search_space_per_slot;
+  
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.number_of_candidates[0] = table_38213_10_1_1_c2[0];
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.number_of_candidates[1] = table_38213_10_1_1_c2[1];
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.number_of_candidates[2] = table_38213_10_1_1_c2[2];   //  CCE aggregation level = 4
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.number_of_candidates[3] = table_38213_10_1_1_c2[3];   //  CCE aggregation level = 8
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.number_of_candidates[4] = table_38213_10_1_1_c2[4];   //  CCE aggregation level = 16
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.duration = search_space_duration;
+  dl_config.dl_config_list[0].dci_config_pdu.dci_config_rel15.monitoring_symbols_within_slot = (0x3fff << first_symbol_index) & (0x3fff >> (14-coreset_duration-first_symbol_index)) & 0x3fff;
+  	
+  
+  for (SNR=snr0; SNR<snr1; SNR+=.2) {
+
+    n_errors = 0;
+    n_errors2 = 0;
+    n_alamouti = 0;
+
+    for (trial=0; trial<n_trials; trial++) {
+
+      // multipath channel
+      //multipath_channel(gNB2UE,s_re,s_im,r_re,r_im,frame_length_complex_samples,0);
+      
+      //AWGN
+      sigma2_dB = 10*log10((double)txlev)-SNR;
+      sigma2 = pow(10,sigma2_dB/10);
+      //      printf("sigma2 %f (%f dB)\n",sigma2,sigma2_dB);
+
+      for (i=0; i<frame_length_complex_samples; i++) {
+	for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+	  
+	  ((short*) UE->common_vars.rxdata[aa])[2*i]   = (short) ((r_re[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
+	  ((short*) UE->common_vars.rxdata[aa])[2*i+1] = (short) ((r_im[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
+	}
+      }
+
+      if (n_trials==1) {
+	LOG_M("rxsig0.m","rxs0", UE->common_vars.rxdata[0],frame_length_complex_samples,1,1);
+	if (gNB->frame_parms.nb_antennas_tx>1)
+	  LOG_M("rxsig1.m","rxs1", UE->common_vars.rxdata[1],frame_length_complex_samples,1,1);
+      }
+      if (UE->is_synchronized == 0) {
+	ret = nr_initial_sync(UE, normal_txrx);
+	printf("nr_initial_sync1 returns %d\n",ret);
+	if (ret<0) n_errors++;
+      }
+      else {
+	UE->rx_offset=0;
+
+	UE_proc.frame_rx = frame;
+	UE_proc.nr_tti_rx= subframe;
+	UE_proc.subframe_rx = subframe;
+	
+	UE_mac->scheduled_response.dl_config = &dl_config;
+	nr_ue_scheduled_response(&UE_mac->scheduled_response);
+
+	phy_procedures_nrUE_RX(UE,
+			       &UE_proc,
+			       0,
+			       0,
+			       do_pdcch_flag,
+			       normal_txrx,
+			       no_relay);
+		
+	if (UE->dci_ind.number_of_dcis==0) n_errors++;
+      }
+    } //noise trials
+
+    printf("SNR %f : n_errors (negative CRC) = %d/%d\n", SNR,n_errors,n_trials);
+
+    if ((float)n_errors/(float)n_trials <= target_error_rate) {
+      printf("PDCCH test OK\n");
+      break;
+    }
+      
+    if (n_trials==1)
+      break;
+
+  } // NSR
+
+  for (i=0; i<2; i++) {
+    free(s_re[i]);
+    free(s_im[i]);
+    free(r_re[i]);
+    free(r_im[i]);
+    free(txdata[i]);
+  }
+
+  free(s_re);
+  free(s_im);
+  free(r_re);
+  free(r_im);
+  free(txdata);
+
+  if (output_fd)
+    fclose(output_fd);
+
+  if (input_fd)
+    fclose(input_fd);
+
+  return(n_errors);
+
+}
+
+
+

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -181,6 +181,8 @@ int8_t nr_ue_if_module_kill(uint32_t module_id);
    \param dl_info including dci_ind and rx_request messages*/
 int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
 
+int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
+
 //  TODO check
 /**\brief handle BCCH-BCH message from dl_indication
    \param pduP            pointer to bch pdu

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -259,6 +259,15 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_DISABLE";
+  }
+);
+
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";