From 8678be1692c64ec3f04fc9be62c3cb459b405cf4 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Fri, 2 Dec 2016 05:36:23 +0100
Subject: [PATCH] fixed IF5 timing
---
openair2/ENB_APP/enb_config.c | 2 +-
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c | 1 +
.../GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf | 8 ++++----
.../CONF/rru.band7.tm1.if4p5.25PRB.usrpb210.conf | 2 +-
targets/RT/USER/lte-enb.c | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index d4c6a81c4fd..7d90c194a6b 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2369,7 +2369,7 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
enb_properties.properties[enb_properties_index]->rrh_gw_config[j].rawif5_mobipass = 1;
} else {//if (strcmp(preference, "no") == 0)
enb_properties.properties[enb_properties_index]->rrh_gw_config[j].udp = 1;
- enb_properties.properties[enb_properties_index]->rrh_gw_config[j].raw = 1;
+ enb_properties.properties[enb_properties_index]->rrh_gw_config[j].raw = 1;
}
if (strcmp(rf_preference, "exmimo") == 0) {
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index 67ad93f0449..7991e6a240b 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -101,6 +101,7 @@ int trx_eth_start(openair0_device *device) {
printf("Setting ETHERNET to RAW_IF5_MODE\n");
if (eth_socket_init_raw(device)!=0) return -1;
} else {
+ printf("Setting ETHERNET to UDP_IF5_MODE\n");
if (eth_socket_init_udp(device)!=0) return -1;
/* RRH gets openair0 device configuration - BBU sets openair0 device configuration*/
if (device->host_type == BBU_HOST) {
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf
index 7890736e5ea..fe7719f8521 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf
@@ -157,13 +157,13 @@ eNBs =
rrh_gw_config = (
{
- local_if_name = "eth2";
- remote_address = "00:13:95:1f:a0:af";
- local_address = "90:e2:ba:c5:fc:04";
+ local_if_name = "eth0";
+ remote_address = "10.10.10.60";
+ local_address = "10.10.10.215";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
rrh_gw_active = "yes";
- tr_preference = "raw_if4p5";
+ tr_preference = "udp_if4p5";
rf_preference = "usrp_b200";
iq_txshift = 4;
tx_sample_advance = 80;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.usrpb210.conf
index 7f92dff947a..c97b215c77b 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.usrpb210.conf
@@ -160,7 +160,7 @@ eNBs =
{
local_if_name = "eth0";
remote_address = "10.10.10.155";
- local_address = "10.10.10.58";
+ local_address = "10.10.10.60";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
rrh_gw_active = "yes";
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index ee92a580c21..418c0d6a670 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -717,7 +717,7 @@ void fh_if5_asynch_DL(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
openair0_timestamp timestamp_tx;
recv_IF5(eNB, ×tamp_tx, *subframe, IF5_RRH_GW_DL);
- // printf("Received subframe %d (TS %llu) from RCC\n",subframe_tx,timestamp_tx);
+ //printf("Received subframe %d (TS %llu) from RCC\n",subframe_tx,timestamp_tx);
subframe_tx = (timestamp_tx/fp->samples_per_tti)%10;
frame_tx = (timestamp_tx/(fp->samples_per_tti*10))&1023;
--
GitLab