From 2774702108039d24cb3ae2644a4f28ec56f28ef5 Mon Sep 17 00:00:00 2001
From: "Raymond.Knopp" <raymond.knopp@eurecom.fr>
Date: Thu, 1 Dec 2016 21:36:33 +0100
Subject: [PATCH] IF5 timing for RCC
---
.../GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.if4p5.conf | 8 ++++----
.../GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.conf | 9 +++++----
targets/RT/USER/lte-enb.c | 5 ++++-
3 files changed, 13 insertions(+), 9 deletions(-)
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 7890736e5e..fe7719f852 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/rcc.band7.tm1.if4p5.25PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.conf
index e8ffde20b6..1d1c51c137 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.conf
@@ -36,6 +36,7 @@ eNBs =
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
@@ -100,7 +101,7 @@ eNBs =
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
-
+ ue_TransmissionMode = 1;
}
);
@@ -156,12 +157,12 @@ eNBs =
rrh_gw_config = (
{
local_if_name = "eth0";
- remote_address = "74:d4:35:cc:8d:15";
- local_address = "34:e6:d7:3c:ae:fc";
+ 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/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index ee92a580c2..24f52a69db 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -969,6 +969,8 @@ void rx_fh_if5(PHY_VARS_eNB *eNB,int *frame, int *subframe) {
*frame = proc->frame_rx;
*subframe = proc->subframe_rx;
}
+
+ proc->timestamp_tx = proc->timestamp_rx + (4*fp->samples_per_tti);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
@@ -1504,7 +1506,8 @@ static void* eNB_thread_single( void* param ) {
subframe++;
}
- if (eNB->CC_id==1) LOG_I(PHY,"eNB thread single %p (proc %p, CC_id %d), frame %d (%p), subframe %d (%p)\n",
+ if (eNB->CC_id==1)
+ LOG_I(PHY,"eNB thread single %p (proc %p, CC_id %d), frame %d (%p), subframe %d (%p)\n",
pthread_self(), proc, eNB->CC_id, frame,&frame,subframe,&subframe);
// synchronization on FH interface, acquire signals/data and block
--
GitLab