Skip to content

O
OpenXG-RAN
Commit cdbdba56 authored by Sakthivel Velumani's avatar Sakthivel Velumani
Browse files
Options

fixed merge

parent a87dca86
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 36 deletions
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @ cdbdba56
...@@ -230,18 +230,12 @@ MACRLCs = ( ...@@ -230,18 +230,12 @@ MACRLCs = (
); );
L1s = ( L1s = (
{ {
<<<<<<< HEAD num_cc = 1;
num_cc = 1; tr_n_preference = "local_mac";
tr_n_preference = "local_mac"; pusch_proc_threads = 8;
pusch_proc_threads = 8; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 }
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
); );
RUs = ( RUs = (
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
View file @ cdbdba56
...@@ -214,18 +214,12 @@ MACRLCs = ( ...@@ -214,18 +214,12 @@ MACRLCs = (
); );
L1s = ( L1s = (
{ {
<<<<<<< HEAD num_cc = 1;
num_cc = 1; tr_n_preference = "local_mac";
tr_n_preference = "local_mac"; pusch_proc_threads = 8;
pusch_proc_threads = 8; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 }
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
); );
RUs = ( RUs = (
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
View file @ cdbdba56
...@@ -214,18 +214,12 @@ MACRLCs = ( ...@@ -214,18 +214,12 @@ MACRLCs = (
); );
L1s = ( L1s = (
{ {
<<<<<<< HEAD num_cc = 1;
num_cc = 1; tr_n_preference = "local_mac";
tr_n_preference = "local_mac"; pusch_proc_threads = 8;
pusch_proc_threads = 8; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 }
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
); );
RUs = ( RUs = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment