Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs

# Conflicts: # executables/nr-uesoftmodem.c # executables/nr-uesoftmodem.h # executables/softmodem-common.h # openair1/PHY/MODULATION/slot_fep_nr.c # openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c # openair1/SCHED_NR/fapi_nr_l1.c # openair1/SCHED_NR_UE/phy_procedures_nr_ue.c # openair2/LAYER2/NR_MAC_UE/mac_proto.h # openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-02 17:57:48 +01:00
parent 7be39f7120 11477c7a2d
commit 5e1065e88f
123 changed files with 28582 additions and 12060 deletions
@@ -74,10 +74,10 @@ void rxAddInput( struct complex16 *input_sig, struct complex16 *after_channel_si

  for (int i=0; i<((int)nbSamples-dd); i++) {
    struct complex16 *out_ptr=after_channel_sig+dd+i;
-    struct complex rx_tmp= {0};
+    struct complexd rx_tmp= {0};

    for (int txAnt=0; txAnt < nbTx; txAnt++) {
-      const struct complex *channelModel= channelDesc->ch[rxAnt+(txAnt*channelDesc->nb_rx)];
+      const struct complexd *channelModel= channelDesc->ch[rxAnt+(txAnt*channelDesc->nb_rx)];

      //const struct complex *channelModelEnd=channelModel+channelDesc->channel_length;
      for (int l = 0; l<(int)channelDesc->channel_length; l++) {
@@ -88,14 +88,14 @@ void rxAddInput( struct complex16 *input_sig, struct complex16 *after_channel_si
        // it would be better to split out each antenna in a separate flow
        // that will allow to mix ru antennas freely
        struct complex16 tx16=input_sig[((TS+i-l)*nbTx+txAnt)%CirSize];
-        rx_tmp.x += tx16.r * channelModel[l].x - tx16.i * channelModel[l].y;
-        rx_tmp.y += tx16.i * channelModel[l].x + tx16.r * channelModel[l].y;
+        rx_tmp.r += tx16.r * channelModel[l].r - tx16.i * channelModel[l].i;
+        rx_tmp.i += tx16.i * channelModel[l].r + tx16.r * channelModel[l].i;
      } //l
    }

    // Fixme: lround(), rount(), ... is detected by valgrind as error, not found why
-    out_ptr->r += lround(rx_tmp.x*pathLossLinear + noise_per_sample*gaussZiggurat(0.0,1.0));
-    out_ptr->i += lround(rx_tmp.y*pathLossLinear + noise_per_sample*gaussZiggurat(0.0,1.0));
+    out_ptr->r += lround(rx_tmp.r*pathLossLinear + noise_per_sample*gaussZiggurat(0.0,1.0));
+    out_ptr->i += lround(rx_tmp.i*pathLossLinear + noise_per_sample*gaussZiggurat(0.0,1.0));
    out_ptr++;
  }

@@ -234,8 +234,10 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -218,8 +218,10 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -216,8 +216,10 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -235,6 +235,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -219,6 +219,7 @@ L1s = (
  num_cc = 1;
  tr_n_preference = "local_mac";
  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
  }
 );

@@ -219,6 +219,7 @@ L1s = (
  num_cc = 1;
  tr_n_preference = "local_mac";
  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
  }
 );

@@ -231,8 +231,10 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -269,6 +269,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

@@ -215,8 +215,10 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -218,6 +218,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 	}
 );

@@ -219,6 +219,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 	}
 );

@@ -230,11 +230,12 @@ MACRLCs = (
 );

 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        pusch_proc_threads = 8;
-        }  
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+    pusch_proc_threads = 8;
+    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  }
 );

 RUs = (
@@ -214,11 +214,12 @@ MACRLCs = (
 );

 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        pusch_proc_threads = 8;
-        }  
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+    pusch_proc_threads = 8;
+    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  }
 );

 RUs = (
@@ -219,6 +219,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -219,6 +219,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -219,6 +219,7 @@ L1s = (
        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
+        ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
    }
 );

@@ -214,11 +214,12 @@ MACRLCs = (
 );

 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        pusch_proc_threads = 8;
-        }  
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+    pusch_proc_threads = 8;
+    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  }
 );

 RUs = (
@@ -28,6 +28,7 @@ L1s = (
    remote_n_portc   = 50001; // vnf p5 port
    local_n_portd    = 50010; // pnf p7 port
    remote_n_portd   = 50011; // vnf p7 port
+    pusch_proc_threads = 8;
  }  
 );

@@ -42,5 +43,7 @@ RUs = (
       max_pdschReferenceSignalPower = -27;
       max_rxgain                    = 114;
       sdr_addrs = "type=x300"; // USRP type
+       clock_src = "external";
+       time_src = "external";
    }		      
 );
@@ -235,6 +235,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -251,6 +251,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
        }  
 );

@@ -241,6 +241,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
    }
 );

@@ -241,6 +241,7 @@ L1s = (
 	num_cc = 1;
 	tr_n_preference = "local_mac";
 	pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
    }
 );