Introdducing dlsch_64qam_llr_SIC.

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -762,6 +762,19 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
 			  uint32_t rb_alloc,
 			  LTE_UE_DLSCH_t *dlsch0);
 
+void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
+                          int32_t **rxdataF_comp,
+			  mod_sym_t **sic_buffer,  //Q15
+		          int32_t **rho_i,
+			  int16_t *dlsch_llr,
+			  uint8_t num_pdcch_symbols,
+			  int32_t **dl_ch_mag,
+			  int32_t **dl_ch_magb,
+			  uint16_t nb_rb,
+			  uint8_t subframe,
+			  uint32_t rb_alloc,
+			  LTE_UE_DLSCH_t *dlsch0);
+
 
 void dlsch_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                      int32_t **rxdataF_comp,
@@ -774,16 +787,6 @@ void dlsch_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
                      uint16_t pbch_pss_sss_adjust,
                      short **llr_save);
 
-void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
-                         int32_t **rxdataF_comp,
-                         int16_t *dlsch_llr,
-                         int32_t **dl_ch_mag,
-                         int32_t **dl_ch_magb,
-                         uint8_t symbol,
-                         uint8_t first_symbol_flag,
-                         uint16_t nb_rb,
-                         uint16_t pbch_pss_sss_adjust,
-                         short **llr_save);
 
 /** \fn dlsch_siso(LTE_DL_FRAME_PARMS *frame_parms,
     int32_t **rxdataF_comp,

openair1/PHY/TOOLS/cadd_sv.c

@@ -65,7 +65,7 @@ int add_cpx_vector(short *x,
 int add_vector32_scalar(short *x,
                         int alpha,
                         short *y,
-                        unsigned int 
+                        unsigned int N)
 {
   unsigned int i;                 // loop counter
 

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -3743,8 +3743,21 @@ n(tikz_fname,"w");
 			  dlsch0_eNB_harq->rb_alloc[0],
 			  PHY_vars_UE->dlsch_ue[eNB_id][0]);
 	      break;
-	    }
-	       // }// round
+	      case 6:
+		dlsch_64qam_llr_SIC(&PHY_vars_UE->lte_frame_parms,
+                          PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->rxdataF_comp1[PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid][round],
+			  sic_buffer,
+		          PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->dl_ch_rho_ext[PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid][round],
+			  PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->llr[1],
+			  num_pdcch_symbols,
+			  PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->dl_ch_mag1,
+			  PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->dl_ch_magb1,
+			  dlsch0_eNB_harq->nb_rb,
+			  subframe,
+			  dlsch0_eNB_harq->rb_alloc[0],
+			  PHY_vars_UE->dlsch_ue[eNB_id][0]);
+	      break;
+	        }// round
 	
           //  write_output("rxdata_llr1.m","llr1", PHY_vars_UE->lte_ue_pdsch_vars[eNB_id]->llr[1],re_allocated*2,1,0);