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

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/PHY/NR_TRANSPORT/pucch_rx.c openair1/SCHED_NR/fapi_nr_l1.c openair1/SCHED_NR_UE/phy_procedures_nr_ue.c openair1/SIMULATION/TOOLS/abstraction.c openair1/SIMULATION/TOOLS/random_channel.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-05 15:37:11 +02:00
parent efed5abbfe 11477c7a2d
commit c834f40186
126 changed files with 28726 additions and 12170 deletions
@@ -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
    }
 );