From 9bd28ec1376277eba625381f2afff360d1748703 Mon Sep 17 00:00:00 2001
From: lukashov <elena.lukashova@eurecom.fr>
Date: Tue, 24 Nov 2015 20:40:35 +0100
Subject: [PATCH] merge with master
---
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c | 4 ++--
openair1/PHY/LTE_TRANSPORT/dci_tools.c | 6 +++---
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c | 14 ++++++++------
openair1/SIMULATION/LTE_PHY/dlsim.c | 3 ++-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
index 7c19fef9660..d131d524dba 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
@@ -428,8 +428,8 @@ void lte_ue_measurements(PHY_VARS_UE *phy_vars_ue,
phy_vars_ue->PHY_measurements.rank[eNB_id] = 0;
else
phy_vars_ue->PHY_measurements.rank[eNB_id] = 1;
- printf ("tx mode %d\n", phy_vars_ue->transmission_mode[eNB_id]);
- printf ("rank %d\n", phy_vars_ue->PHY_measurements.rank[eNB_id]);
+ // printf ("tx mode %d\n", phy_vars_ue->transmission_mode[eNB_id]);
+ // printf ("rank %d\n", phy_vars_ue->PHY_measurements.rank[eNB_id]);
switch (N_RB_DL) {
case 6:
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index b2e93c8b1de..7d6069b6dc9 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -4631,7 +4631,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
}
}
else {
- LOG_E(PHY,"UE: Format2A DCI: unsupported number of TX antennas %d\n",frame_parms->nb_antennas_tx_eNB);
+ LOG_E(PHY,"UE: Format2 DCI: unsupported number of TX antennas %d\n",frame_parms->nb_antennas_tx_eNB);
}
break;
@@ -4694,7 +4694,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
}
}
else {
- LOG_E(PHY,"UE: Format2A DCI: unsupported number of TX antennas %d\n",frame_parms->nb_antennas_tx_eNB);
+ LOG_E(PHY,"UE: Format2 DCI: unsupported number of TX antennas %d\n",frame_parms->nb_antennas_tx_eNB);
}
break;
@@ -4921,7 +4921,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch1_harq->mcs = mcs2;
if (dlsch1_harq->nb_rb>1) {
- dlsch1_harq->TBS = TBStable[dlsch1_harq->mcs][dlsch1_harq->nb_rb-1];
+ dlsch1_harq->TBS = TBStable[get_I_TBS(dlsch1_harq->mcs)][dlsch1_harq->nb_rb-1];
if (mcs2 <= 28)
dlsch1_harq->Qm = get_Qm(mcs2);
else if (mcs1<=31)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index bc5887a7260..5bac69f8da6 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -344,7 +344,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
frame_parms,
symbol,
first_symbol_flag,
- get_Qm(dlsch0_harq->mcs),
+ dlsch0_harq->Qm,
nb_rb,
lte_ue_pdsch_vars[eNB_id]->log2_maxh,
phy_measurements); // log2_maxh+I0_shift
@@ -407,16 +407,18 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
// effective channel of desired user is always stronger than interfering eff. channel
dlsch_channel_level_TM34(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
frame_parms,
- avg, symbol, nb_rb,
+ avg,
+ symbol,
+ nb_rb,
dlsch0_harq->mimo_mode);
- /*
+
if (rx_type>rx_standard) {
// LOG_D(PHY,"llr_offset = %d\n",offset_mumimo_llr_drange[dlsch0_harq->mcs][(dlsch1_harq->mcs>>1)-1]);
lte_ue_pdsch_vars[eNB_id]->log2_maxh = log2_approx(avg[0]) - 13 + offset_mumimo_llr_drange[dlsch0_harq->mcs][(get_Qm(dlsch1_harq->mcs)>>1)-1];
}
else
- */
+
lte_ue_pdsch_vars[eNB_id]->log2_maxh = log2_approx(avg[0])/2;
}
@@ -426,8 +428,8 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
phy_measurements,
eNB_id,
symbol,
- get_Qm(dlsch0_harq->mcs),
- get_Qm(dlsch1_harq->mcs),
+ dlsch0_harq->Qm,
+ dlsch1_harq->Qm,
harq_pid,
dlsch0_harq->round,
dlsch0_harq->mimo_mode,
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index f636be51044..3d4c140ce50 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -410,6 +410,7 @@ int main(int argc, char **argv)
case 'M':
mcs2 = atoi(optarg);
+ i_mod = get_Qm(mcs2); /// think here again!!!
break;
case 't':
@@ -1782,7 +1783,7 @@ n(tikz_fname,"w");
((DCI2_20MHz_2A_FDD_t *)&DLSCH_alloc_pdu_1[k])->ndi2 = 1;
((DCI2_20MHz_2A_FDD_t *)&DLSCH_alloc_pdu_1[k])->rv2 = 0;
((DCI2_20MHz_2A_FDD_t *)&DLSCH_alloc_pdu_1[k])->tb_swap = 0;
- ((DCI2_20MHz_2A_TDD_t *)&DLSCH_alloc_pdu_1[k])->tpmi = 0;
+ ((DCI2_20MHz_2A_TDD_t *)&DLSCH_alloc_pdu_1[k])->tpmi = 0;
break;
}
}
--
GitLab