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

RESOLVED build errors

Browse Source
This commit is contained in:
Mahesh
2020-11-24 18:49:41 +05:30
parent 87105d77cf
commit 56db8f4915
74 changed files with 265 additions and 2350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf
-9
View File
@@ -144,11 +144,8 @@ eNBs =
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
<<<<<<< HEAD
=======
//SSB central frequency of NR secondary cell group (for ENDC NSA)
nr_scg_ssb_freq = 641272;
>>>>>>> fork_develop_new
}
);
@@ -186,10 +183,7 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
<<<<<<< HEAD
=======
port = 36412 ;
>>>>>>> fork_develop_new
active = "yes";
preference = "ipv4";
}
@@ -199,11 +193,8 @@ eNBs =
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
<<<<<<< HEAD
=======
t_dc_prep = 1000; /* unit: millisecond */
t_dc_overall = 2000; /* unit: millisecond */
>>>>>>> fork_develop_new
NETWORK_INTERFACES :
{
ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
-13
View File
@@ -74,11 +74,7 @@ gNBs =
initialDLBWPk0_3 = 0;
initialDLBWPmappingType_3 = 0;
<<<<<<< HEAD
#this is SS=1,L=4
=======
#this is SS=1,L=5
>>>>>>> fork_develop_new
initialDLBWPstartSymbolAndLength_3 = 57;
#uplinkConfigCommon
@@ -149,11 +145,6 @@ gNBs =
initialULBWPmappingType_2 = 1;
# this is SS=10 L=4
initialULBWPstartSymbolAndLength_2 = 52;
<<<<<<< HEAD
=======
>>>>>>> fork_develop_new
msg3_DeltaPreamble = 1;
p0_NominalWithGrant =-90;
@@ -258,11 +249,7 @@ RUs = (
eNB_instances = [0];
#beamforming 1x4 matrix:
bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
<<<<<<< HEAD
sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
=======
sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
>>>>>>> fork_develop_new
clock_src = "external";
}
);
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
-9
View File
@@ -201,10 +201,7 @@ gNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
<<<<<<< HEAD
=======
port = 36412 ;
>>>>>>> fork_develop_new
active = "yes";
preference = "ipv4";
}
@@ -214,11 +211,8 @@ gNBs =
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
<<<<<<< HEAD
=======
t_dc_prep = 1000; /* unit: millisecond */
t_dc_overall = 2000; /* unit: millisecond */
>>>>>>> fork_develop_new
target_enb_x2_ip_address = (
{ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR";
ipv6 = "192:168:30::17";
@@ -298,9 +292,6 @@ THREAD_STRUCT = (
rrc_log_verbosity ="medium";
};
<<<<<<< HEAD
=======
uicc: {
opc = "testopc";
};
>>>>>>> fork_develop_new
ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf
-6
View File
@@ -174,10 +174,7 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
<<<<<<< HEAD
=======
port = 36412 ;
>>>>>>> fork_develop_new
active = "yes";
preference = "ipv4";
}
@@ -189,11 +186,8 @@ eNBs =
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
<<<<<<< HEAD
=======
t_dc_prep = 1000; /* unit: millisecond */
t_dc_overall = 2000; /* unit: millisecond */
>>>>>>> fork_develop_new
////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7";
ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
-3
View File
@@ -25,11 +25,8 @@
<htmlTabName>Test-10MHz</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount>
<<<<<<< HEAD
=======
<TestUnstable>True</TestUnstable>
<TestMinId>040612</TestMinId>
>>>>>>> fork_develop_new
<TestCaseRequestedList>
030201
040101