undoing canges from commit 3782, which commented out the dlsch_scale_channel
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4145 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -234,14 +234,12 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
|
|||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
// DL power control: Scaling of Channel estimates for PDSCH
|
// DL power control: Scaling of Channel estimates for PDSCH
|
||||||
dlsch_scale_channel(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
|
dlsch_scale_channel(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
|
||||||
frame_parms,
|
frame_parms,
|
||||||
dlsch_ue,
|
dlsch_ue,
|
||||||
symbol,
|
symbol,
|
||||||
nb_rb);
|
nb_rb);
|
||||||
*/
|
|
||||||
|
|
||||||
if (first_symbol_flag==1) {
|
if (first_symbol_flag==1) {
|
||||||
dlsch_channel_level(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
|
dlsch_channel_level(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
|
||||||
@@ -263,7 +261,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
|
|||||||
// avgs = cmax(avgs,avg[(aarx<<1)+aatx]);
|
// avgs = cmax(avgs,avg[(aarx<<1)+aatx]);
|
||||||
|
|
||||||
|
|
||||||
lte_ue_pdsch_vars[eNB_id]->log2_maxh = (log2_approx(avgs)/2) + 2;// + 2
|
lte_ue_pdsch_vars[eNB_id]->log2_maxh = (log2_approx(avgs)/2);// + 2
|
||||||
// + log2_approx(frame_parms->nb_antennas_tx_eNB-1) //-1 because log2_approx counts the number of bits
|
// + log2_approx(frame_parms->nb_antennas_tx_eNB-1) //-1 because log2_approx counts the number of bits
|
||||||
// + log2_approx(frame_parms->nb_antennas_rx-1);
|
// + log2_approx(frame_parms->nb_antennas_rx-1);
|
||||||
|
|
||||||
@@ -354,11 +352,11 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
|
|||||||
|
|
||||||
// Scale the channel estimates for interfering stream
|
// Scale the channel estimates for interfering stream
|
||||||
|
|
||||||
/* dlsch_scale_channel(lte_ue_pdsch_vars[eNB_id_i]->dl_ch_estimates_ext,
|
dlsch_scale_channel(lte_ue_pdsch_vars[eNB_id_i]->dl_ch_estimates_ext,
|
||||||
frame_parms,
|
frame_parms,
|
||||||
dlsch_ue,
|
dlsch_ue,
|
||||||
symbol,
|
symbol,
|
||||||
nb_rb); */
|
nb_rb);
|
||||||
|
|
||||||
/* compute new log2_maxh for effective channel */
|
/* compute new log2_maxh for effective channel */
|
||||||
if (first_symbol_flag==1) {
|
if (first_symbol_flag==1) {
|
||||||
|
|||||||
Reference in New Issue
Block a user