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

Merge branch 'develop' into feature-59-tm4

Browse Source 
Conflicts:
	openair1/PHY/TOOLS/lte_phy_scope.c
This commit is contained in:
lukashov
2016-03-21 15:31:19 +01:00
parent 6eea200c35 28dae90984
commit 978a7a627e
40 changed files with 12580 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+1
View File
@@ -1080,6 +1080,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
device->trx_set_freq_func = trx_brf_set_freq;
device->trx_set_gains_func = trx_brf_set_gains;
device->openair0_cfg = openair0_cfg;
device->priv = (void *)brf;
calibrate_rf(device);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.lmssdr.conf
+1 -1
View File
@@ -36,7 +36,7 @@ eNBs =
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
rx_gain = 107;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf
+7 -4
View File
@@ -130,10 +130,12 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( {ipv4 = "192.170.0.1";
ipv6="192:168:30::17";
active="yes";
preference="ipv4";});
mme_ip_address = ( { ipv4 = "192.170.0.1";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
@@ -141,6 +143,7 @@ eNBs =
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.170.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0:4";
ENB_IPV4_ADDRESS_FOR_S1U = "192.170.1.2/24";
ENB_IPV4_ADDRESS_FOR_S1U = "192.170.0.2/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
};