Fixing new modulation tables for TM4 and TM6. Now all modulation orders and...

Fixing new modulation tables for TM4 and TM6. Now all modulation orders and combinations work and the maginutes are at  appropriate level.

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c

@@ -600,37 +600,34 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
                                     lte_ue_pdsch_vars[eNB_id]->dl_ch_rho_ext[harq_pid][round], 
                                     lte_ue_pdsch_vars[eNB_id]->log2_maxh);
 
-    } else if (dlsch0_harq->dl_power_off==1)  {
+    } 
+    else if (dlsch0_harq->dl_power_off==1)  {
       
         dlsch_scale_channel(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
-                          frame_parms,
-                          dlsch_ue,
-                          symbol,
-                          nb_rb);     
-
-      /* compute new log2_maxh for effective channel */
+			  frame_parms,
+			  dlsch_ue,
+			  symbol,
+			  nb_rb);
+  
       if (first_symbol_flag==1) {
+	dlsch_channel_level(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
+                        frame_parms,
+                        avg,
+                        symbol,
+                        nb_rb);
+#ifdef DEBUG_PHY
+    LOG_D(PHY,"[DLSCH] avg[0] %d\n",avg[0]);
+#endif
 
-        // effective channel of desired user is always stronger than interfering eff. channel
-       dlsch_channel_level_TM56(lte_ue_pdsch_vars[eNB_id]->dl_ch_estimates_ext,
-				frame_parms,
-				lte_ue_pdsch_vars[eNB_id]->pmi_ext,
-				avg,
-				symbol,
-				nb_rb);
-       avgs = 0;
+    avgs = 0;
 
     for (aatx=0;aatx<frame_parms->nb_antennas_tx_eNB;aatx++)
       for (aarx=0;aarx<frame_parms->nb_antennas_rx;aarx++)
         avgs = cmax(avgs,avg[(aatx<<1)+aarx]);
+    //  avgs = cmax(avgs,avg[(aarx<<1)+aatx]);
 
-        //    LOG_D(PHY,"llr_offset = %d\n",offset_mumimo_llr_drange[dlsch0_harq->mcs][(i_mod>>1)-1]);
-        lte_ue_pdsch_vars[eNB_id]->log2_maxh = (log2_approx(avgs)/2) + interf_unaw_shift_tm1_mcs[dlsch0_harq->mcs];
-
-        lte_ue_pdsch_vars[eNB_id]->log2_maxh = cmax(avg[0],0);
-	lte_ue_pdsch_vars[eNB_id]->log2_maxh++;
-	
-        //printf("log1_maxh =%d\n",lte_ue_pdsch_vars[eNB_id]->log2_maxh);
+   lte_ue_pdsch_vars[eNB_id]->log2_maxh = (log2_approx(avgs)/2) + interf_unaw_shift_tm1_mcs[dlsch0_harq->mcs];
+    
       }
       
       

openair1/PHY/LTE_TRANSPORT/power_control.c

@@ -29,7 +29,7 @@
 #include "PHY/defs.h"
 #include "PHY/impl_defs_lte.h"
 
-#define DEBUG_PC 1
+//#define DEBUG_PC 
 
 /*
 double ratioPB[2][4]={{ 1.0,4.0/5.0,3.0/5.0,2.0/5.0},
@@ -63,7 +63,7 @@ double computeRhoA_eNB(PDSCH_CONFIG_DEDICATED *pdsch_config_dedicated,
 	
   dlsch_eNB->sqrt_rho_a= (short) (sqrt_rho_a_lin*pow(2,13));
 
-#ifdef DEBUG_PC
+#if DEBUG_PC
   printf("eNB: p_a=%d, value=%f, sqrt_rho_a=%d\n",pdsch_config_dedicated->p_a,pa_values[ pdsch_config_dedicated->p_a],dlsch_eNB->sqrt_rho_a);
 #endif
 

openair1/PHY/impl_defs_top.h

@@ -207,7 +207,7 @@
 
 
 #define ONE_OVER_SQRT2_Q15 23170
-
+#define ONE_OVER_2_Q15 16384
 
 // QAM amplitude definitions