Merge branch 'NR_RRCConfiguragion_FR2' of...

Merge branch 'NR_RRCConfiguragion_FR2' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguragion_FR2

executables/nr-gnb.c

@@ -794,7 +794,7 @@ void kill_gNB_proc(int inst) {
   proc = &gNB->proc;
   L1_proc     = &proc->L1_proc;
   L1_proc_tx  = &proc->L1_proc_tx;
-  LOG_I(PHY, "Killing TX CC_id %d inst %d\n",inst );
+  LOG_I(PHY, "Killing TX inst %d\n",inst );
   
   if (get_thread_parallel_conf() == PARALLEL_RU_L1_SPLIT || get_thread_parallel_conf() == PARALLEL_RU_L1_TRX_SPLIT) {
     pthread_mutex_lock(&L1_proc->mutex);
@@ -871,7 +871,7 @@ void init_eNB_afterRU(void) {
   LOG_I(PHY,"%s() RC.nb_nr_inst:%d\n", __FUNCTION__, RC.nb_nr_inst);
 
   for (inst=0; inst<RC.nb_nr_inst; inst++) {
-    LOG_I(PHY,"RC.nb_nr_CC[inst:%d]:%p\n", inst, CC_id, RC.gNB[inst]);
+    LOG_I(PHY,"RC.nb_nr_CC[inst:%d]:%p\n", inst, RC.gNB[inst]);
     gNB                                  =  RC.gNB[inst];
     phy_init_nr_gNB(gNB,0,0);
 

executables/nr-ru.c

@@ -1104,6 +1104,11 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
       cfg->samples_per_frame = 1228800;
       cfg->tx_bw = 100e6;
       cfg->rx_bw = 100e6;
+    } else if(N_RB == 32) {
+      cfg->sample_rate=61.44e6;
+      cfg->samples_per_frame = 614400;
+      cfg->tx_bw = 50e6;
+      cfg->rx_bw = 50e6;
     }
   } else {
     AssertFatal(0 == 1,"Numerology %d not supported for the moment\n",mu);

openair1/PHY/INIT/nr_parms.c

@@ -200,6 +200,14 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu)
           fp->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_3];
           fp->slots_per_subframe = nr_slots_per_subframe[NR_MU_3];
           fp->ssb_type = nr_ssb_type_D;
+        case 32:
+          fp->ofdm_symbol_size = 512;
+          fp->first_carrier_offset = 320; //1024 - ( (66*12) / 2 )
+          fp->nb_prefix_samples0 = 44;
+          fp->nb_prefix_samples = 36;
+          fp->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_3];
+          fp->slots_per_subframe = nr_slots_per_subframe[NR_MU_3];
+          fp->ssb_type = nr_ssb_type_D;
       }
       break;
 

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpx300.conf → targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf

@@ -33,7 +33,7 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is pointA + 23 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 2078051;
+      absoluteFrequencySSB                                          = 2077643;
       dl_frequencyBand                                                 = 257;
       # this is 27.900 GHz
       dl_absoluteFrequencyPointA                                       = 2077499;
@@ -42,11 +42,11 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 66;
+        dl_carrierBandwidth                                            = 32;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13475;
+        initialDLBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
@@ -79,11 +79,11 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
       ul_subcarrierSpacing                                           = 3;
-      ul_carrierBandwidth                                            = 66;
+      ul_carrierBandwidth                                            = 32;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13475;
+        initialULBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
@@ -229,15 +229,16 @@ L1s = (
 RUs = (
     {		  
        local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
+         nb_tx          = 1;
+         nb_rx          = 1;
+         att_tx         = 0;
          att_rx         = 0;
          bands          = [7];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
 	 sdr_addrs = "type=x300";
+         if_freq = 3500000000;
     }
 );