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

@@ -199,7 +199,7 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
 
 	      rxF_sss = (int16_t *)&ue->common_vars.rxdataF[aarx][(5*ue->frame_parms.ofdm_symbol_size)];
 	      rxF_pss = (int16_t *)&ue->common_vars.rxdataF[aarx][(6*ue->frame_parms.ofdm_symbol_size)];
-	      
+
 
               //-ve spectrum from SSS
 	      //	      printf("slot %d: SSS DTX: %d,%d, non-DTX %d,%d\n",slot,rxF_pss[-72],rxF_pss[-71],rxF_pss[-36],rxF_pss[-35]);
@@ -249,7 +249,7 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
 	      // note this is a dummy pointer, the pss is not really there!
 	      // in FDD the pss is in the symbol after the sss, but not in TDD
 	      rxF_pss = (int16_t *)&ue->common_vars.rxdataF[aarx][(7*ue->frame_parms.ofdm_symbol_size)];
-	      
+
 	      //-ve spectrum from SSS
 	      //              ue->measurements.n0_power[aarx] = (((int32_t)rxF_pss[-72]*rxF_pss[-72])+((int32_t)rxF_pss[-71]*rxF_pss[-71]));
               ue->measurements.n0_power[aarx] = (((int32_t)rxF_pss[-70]*rxF_pss[-70])+((int32_t)rxF_pss[-69]*rxF_pss[-69]));
@@ -262,14 +262,14 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
 	      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[2+68]*rxF_sss[2+68])+((int32_t)rxF_sss[2+67]*rxF_sss[2+67]));
 	      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[2+66]*rxF_sss[2+66])+((int32_t)rxF_sss[2+65]*rxF_sss[2+65]));
 	      //	      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[2+64]*rxF_sss[2+64])+((int32_t)rxF_sss[2+63]*rxF_sss[2+63]));
-	      
+
 	      ue->measurements.n0_power_dB[aarx] = (unsigned short) dB_fixed(ue->measurements.n0_power[aarx]/(6));
-	      ue->measurements.n0_power_tot +=  ue->measurements.n0_power[aarx];	  
-	    }	      
+	      ue->measurements.n0_power_tot +=  ue->measurements.n0_power[aarx];
+	    }
 	    ue->measurements.n0_power_tot_dB = (unsigned short) dB_fixed(ue->measurements.n0_power_tot/(6*aarx));
 	    ue->measurements.n0_power_tot_dBm = ue->measurements.n0_power_tot_dB - ue->rx_total_gain_dB - dB_fixed(ue->frame_parms.ofdm_symbol_size);
-	      
-	    
+
+
 	  }
 	}
       }
@@ -312,7 +312,7 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
 	      //	      if ((ue->frame_rx&0x3ff) == 0)
 	      //                printf("rb %d, off %d : %d\n",rb,off,((rxF[off]*rxF[off])+(rxF[off+1]*rxF[off+1])));
 
-              
+
               off+=12;
 
               if (off>=(ue->frame_parms.ofdm_symbol_size<<1))
@@ -423,10 +423,10 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
   int nb_subbands,subband_size,last_subband_size;
   int N_RB_DL = frame_parms->N_RB_DL;
   ue->measurements.nb_antennas_rx = frame_parms->nb_antennas_rx;
-    
+
     if (ue->transmission_mode[eNB_id]!=4)
      ue->measurements.rank[eNB_id] = 0;
-    else 
+    else
     ue->measurements.rank[eNB_id] = 1;
   //  printf ("tx mode %d\n", ue->transmission_mode[eNB_id]);
   //  printf ("rank %d\n", ue->PHY_measurements.rank[eNB_id]);
@@ -597,7 +597,7 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
 
           // pmi
 #if defined(__x86_64__) || defined(__i386__)
-       
+
 	  pmi128_re = _mm_xor_si128(pmi128_re,pmi128_re);
           pmi128_im = _mm_xor_si128(pmi128_im,pmi128_im);
 #elif defined(__arm__)
@@ -613,8 +613,8 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
             limit = last_subband_size>>2;
 
           for (i=0; i<limit; i++) {
-	    
-#if defined(__x86_64__) || defined(__i386__)	    
+
+#if defined(__x86_64__) || defined(__i386__)
 	      mmtmpPMI0 = _mm_xor_si128(mmtmpPMI0,mmtmpPMI0);
               mmtmpPMI1 = _mm_xor_si128(mmtmpPMI1,mmtmpPMI1);
 
@@ -638,10 +638,10 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
 	     //   print_ints(" pmi128_re 0",&pmi128_re);
             pmi128_im = _mm_add_epi32(pmi128_im,mmtmpPMI1);
 	       //   print_ints(" pmi128_im 0 ",&pmi128_im);
-	    
+
 	  /*  mmtmpPMI0 = _mm_xor_si128(mmtmpPMI0,mmtmpPMI0);
             mmtmpPMI1 = _mm_xor_si128(mmtmpPMI1,mmtmpPMI1);
-	    
+
 	    mmtmpPMI0 = _mm_madd_epi16(dl_ch0_128[1],dl_ch1_128[1]);
 	         //  print_ints("re",&mmtmpPMI0);
             mmtmpPMI1 = _mm_shufflelo_epi16(dl_ch1_128[1],_MM_SHUFFLE(2,3,0,1));
@@ -657,7 +657,7 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
 	        //  print_ints(" pmi128_re 1",&pmi128_re);
             pmi128_im = _mm_add_epi32(pmi128_im,mmtmpPMI1);
 	    //print_ints(" pmi128_im 1 ",&pmi128_im);*/
-	    
+
 #elif defined(__arm__)
 
             mmtmpPMI0 = vmull_s16(((int16x4_t*)dl_ch0_128)[0], ((int16x4_t*)dl_ch1_128)[0]);
@@ -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

@@ -199,7 +199,7 @@ void phy_procedures_eNB_S_TX(PHY_VARS_eNB *phy_vars_eNB,relaying_type_t r_type);
 */
 void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *proc,relaying_type_t r_type);
 
-/*! \brief Scheduling for eNB PRACH RX procedures 
+/*! \brief Scheduling for eNB PRACH RX procedures
   @param phy_vars_eNB Pointer to eNB variables on which to act
   @param proc Pointer to RXn-TXnp4 proc information
 */
@@ -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);
 
 /*@}*/