maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Sakthivel Velumani
2021-08-17 16:10:40 +05:30
parent a87dca8691
commit cdbdba5631
3 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
-6
View File
@@ -231,16 +231,10 @@ 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
} }
); );
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
-6
View File
@@ -215,16 +215,10 @@ 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
} }
); );
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
-6
View File
@@ -215,16 +215,10 @@ 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
} }
); );