1.Fixing the bug in lte_ue_measuments.c for rank indicator.

2. Fixing the arguments in the dump_dlsch2.

openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c

@@ -719,7 +719,7 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
       }
     }
 
-    ue->measurements.rank[eNB_id] = 0;
+    //ue->measurements.rank[eNB_id] = 0;
 
     for (i=0; i<nb_subbands; i++) {
       ue->measurements.selected_rx_antennas[eNB_id][i] = 0;

openair1/SCHED/defs.h

@@ -477,7 +477,7 @@ int get_ue_active_harq_pid(uint8_t Mod_id,uint8_t CC_id,uint16_t rnti,int frame,
 void dump_dlsch(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe,uint8_t harq_pid);
 void dump_dlsch_SI(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe);
 void dump_dlsch_ra(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe);
-void dump_dlsch2(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint16_t coded_bits_per_codeword,int round);
+void dump_dlsch2(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint16_t coded_bits_per_codeword,int round, unsigned char harq_pid);
 
 /*@}*/
 

openair1/SIMULATION/LTE_PHY/dlsim_tm4.c

@@ -3914,7 +3914,7 @@ n(tikz_fname,"w");
               }
 
 
-              if (n_frames==2) {
+              if (n_frames==1) {
           //if ((n_frames==1) || (SNR>=30)) {
           printf("cw %d, round %d: DLSCH errors found, uncoded ber %f\n",cw_non_sic,round,uncoded_ber);
       #ifdef PRINT_BYTES
@@ -3938,7 +3938,7 @@ n(tikz_fname,"w");
 
           stop_meas(&UE->phy_proc_rx);
 
-          if (n_frames==2) {
+          if (n_frames==1) {
 
             //rxsig
             sprintf(fname,"rxsig0_r%d.m",round);
@@ -3998,7 +3998,7 @@ n(tikz_fname,"w");
                UE->frame_parms.ofdm_symbol_size*nsymb,1,1);
             }
             //pdsch_vars
-            //dump_dlsch2(UE,eNB_id,coded_bits_per_codeword[0],round,UE->dlsch[0][0]->current_harq_pid);
+            dump_dlsch2(UE,eNB_id,coded_bits_per_codeword[0],round,UE->dlsch[0][0]->current_harq_pid);
             /*
               write_output("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
               write_output("dlsch_ber_bit.m","ber_bit",uncoded_ber_bit,coded_bits_per_codeword,1,0);