From 56c660dbe9a3086178a373d4ad2acef8d4e36c19 Mon Sep 17 00:00:00 2001
From: lukashov <elena.lukashova@eurecom.fr>
Date: Mon, 18 Jan 2016 22:55:47 +0100
Subject: [PATCH] Undoing previos commit. Previous commit is kept to generate
 TM4 PCE AWGN plots with the right precoder.

---
 openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c | 13 ++++++-------
 openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c   |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index 893a00adcb..7846aa284c 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -1963,11 +1963,11 @@ void dlsch_channel_compensation_TM34(LTE_DL_FRAME_PARMS *frame_parms,
       }
       
         else if (mimo_mode==DUALSTREAM_PUSCH_PRECODING) {
-        prec2A_TM4_128(0,&dl_ch0_128[0],&dl_ch1_128[0]);
-        prec2A_TM4_128(0,&dl_ch0_128[1],&dl_ch1_128[1]);
+        prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128[0],&dl_ch1_128[0]);
+        prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128[1],&dl_ch1_128[1]);
         
         if (pilots==0) {
-          prec2A_TM4_128(0,&dl_ch0_128[2],&dl_ch1_128[2]); 
+          prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128[2],&dl_ch1_128[2]); 
         }
       }
       
@@ -3238,7 +3238,6 @@ void dlsch_channel_level_TM34(int **dl_ch_estimates_ext,
     avg_0_128D = _mm_setzero_si128();
     avg_1_128D = _mm_setzero_si128();
     for (rb=0; rb<nb_rb; rb++) {
-     // printf("pmi[rb%d] =%d \n", rb, pmi_ext[rb]);
               // printf("rb %d : \n",rb);
               // print_shorts("ch0\n",&dl_ch0_128[0]);
 	       //print_shorts("ch1\n",&dl_ch1_128[0]);
@@ -3252,7 +3251,7 @@ void dlsch_channel_level_TM34(int **dl_ch_estimates_ext,
       else if (mimo_mode==DUALSTREAM_UNIFORM_PRECODINGj)
         prec2A_TM4_128(1,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
       else if (mimo_mode==DUALSTREAM_PUSCH_PRECODING)
-        prec2A_TM4_128(0,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
+        prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128_tmp,&dl_ch1_128_tmp);
 
       //      mmtmpD0 = _mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp);          
       avg_0_128D = _mm_add_epi32(avg_0_128D,_mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp));
@@ -3269,7 +3268,7 @@ void dlsch_channel_level_TM34(int **dl_ch_estimates_ext,
       else if (mimo_mode==DUALSTREAM_UNIFORM_PRECODINGj)
         prec2A_TM4_128(1,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
       else if (mimo_mode==DUALSTREAM_PUSCH_PRECODING)
-        prec2A_TM4_128(0,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
+        prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128_tmp,&dl_ch1_128_tmp);
 
       //      mmtmpD1 = _mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp);          
       avg_0_128D = _mm_add_epi32(avg_0_128D,_mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp));
@@ -3291,7 +3290,7 @@ void dlsch_channel_level_TM34(int **dl_ch_estimates_ext,
         else if (mimo_mode==DUALSTREAM_UNIFORM_PRECODINGj)
           prec2A_TM4_128(1,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
 	else if (mimo_mode==DUALSTREAM_PUSCH_PRECODING)
-	  prec2A_TM4_128(0,&dl_ch0_128_tmp,&dl_ch1_128_tmp);
+	  prec2A_TM4_128(pmi_ext[rb],&dl_ch0_128_tmp,&dl_ch1_128_tmp);
         //      mmtmpD2 = _mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp);
 	
         avg_0_128D = _mm_add_epi32(avg_0_128D,_mm_madd_epi16(dl_ch0_128_tmp,dl_ch0_128_tmp));
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
index a48de89ae1..dd6d26668b 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
@@ -1574,9 +1574,8 @@ int dlsch_modulation(mod_sym_t **txdataF,
                            (dlsch1==NULL) ? NULL : dlsch1->harq_processes[harq_pid],
                            pilots,
                            ((pilots) ? amp_rho_b : amp_rho_a),
-                           //get_pmi(frame_parms->N_RB_DL,dlsch0->harq_processes[harq_pid]->mimo_mode,dlsch0->harq_processes[harq_pid]->pmi_alloc,rb),
-                           0,
-			   qam_table_s0,
+                           get_pmi(frame_parms->N_RB_DL,dlsch0->harq_processes[harq_pid]->mimo_mode,dlsch0->harq_processes[harq_pid]->pmi_alloc,rb),
+                           qam_table_s0,
                            qam_table_s1,
                            &re_allocated,
                            skip_dc,