Commit 9bd28ec1 authored by Elena Lukashova's avatar Elena Lukashova
Browse files

merge with master

parent 4e9670b5
...@@ -428,8 +428,8 @@ void lte_ue_measurements(PHY_VARS_UE *phy_vars_ue, ...@@ -428,8 +428,8 @@ void lte_ue_measurements(PHY_VARS_UE *phy_vars_ue,
phy_vars_ue->PHY_measurements.rank[eNB_id] = 0; phy_vars_ue->PHY_measurements.rank[eNB_id] = 0;
else else
phy_vars_ue->PHY_measurements.rank[eNB_id] = 1; phy_vars_ue->PHY_measurements.rank[eNB_id] = 1;
printf ("tx mode %d\n", phy_vars_ue->transmission_mode[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]); // printf ("rank %d\n", phy_vars_ue->PHY_measurements.rank[eNB_id]);
switch (N_RB_DL) { switch (N_RB_DL) {
case 6: case 6:
......
...@@ -4631,7 +4631,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4631,7 +4631,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
} }
} }
else { 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; break;
...@@ -4694,7 +4694,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4694,7 +4694,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
} }
} }
else { 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; break;
...@@ -4921,7 +4921,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4921,7 +4921,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch1_harq->mcs = mcs2; dlsch1_harq->mcs = mcs2;
if (dlsch1_harq->nb_rb>1) { 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) if (mcs2 <= 28)
dlsch1_harq->Qm = get_Qm(mcs2); dlsch1_harq->Qm = get_Qm(mcs2);
else if (mcs1<=31) else if (mcs1<=31)
......
...@@ -344,7 +344,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue, ...@@ -344,7 +344,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
frame_parms, frame_parms,
symbol, symbol,
first_symbol_flag, first_symbol_flag,
get_Qm(dlsch0_harq->mcs), dlsch0_harq->Qm,
nb_rb, nb_rb,
lte_ue_pdsch_vars[eNB_id]->log2_maxh, lte_ue_pdsch_vars[eNB_id]->log2_maxh,
phy_measurements); // log2_maxh+I0_shift phy_measurements); // log2_maxh+I0_shift
...@@ -407,16 +407,18 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue, ...@@ -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 // 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, dlsch_channel_level_TM34(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
frame_parms, frame_parms,
avg, symbol, nb_rb, avg,
symbol,
nb_rb,
dlsch0_harq->mimo_mode); dlsch0_harq->mimo_mode);
/*
if (rx_type>rx_standard) { if (rx_type>rx_standard) {
// LOG_D(PHY,"llr_offset = %d\n",offset_mumimo_llr_drange[dlsch0_harq->mcs][(dlsch1_harq->mcs>>1)-1]); // 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]; 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 else
*/
lte_ue_pdsch_vars[eNB_id]->log2_maxh = log2_approx(avg[0])/2; 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, ...@@ -426,8 +428,8 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
phy_measurements, phy_measurements,
eNB_id, eNB_id,
symbol, symbol,
get_Qm(dlsch0_harq->mcs), dlsch0_harq->Qm,
get_Qm(dlsch1_harq->mcs), dlsch1_harq->Qm,
harq_pid, harq_pid,
dlsch0_harq->round, dlsch0_harq->round,
dlsch0_harq->mimo_mode, dlsch0_harq->mimo_mode,
......
...@@ -410,6 +410,7 @@ int main(int argc, char **argv) ...@@ -410,6 +410,7 @@ int main(int argc, char **argv)
case 'M': case 'M':
mcs2 = atoi(optarg); mcs2 = atoi(optarg);
i_mod = get_Qm(mcs2); /// think here again!!!
break; break;
case 't': case 't':
...@@ -1782,7 +1783,7 @@ n(tikz_fname,"w"); ...@@ -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])->ndi2 = 1;
((DCI2_20MHz_2A_FDD_t *)&DLSCH_alloc_pdu_1[k])->rv2 = 0; ((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_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; break;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment