Fixing merge with develop

openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c

@@ -687,7 +687,7 @@ int dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
 
 int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
                            int32_t **rxdataF_comp,
-		       mod_sym_t **sic_buffer,  //Q15
+		                       int32_t **sic_buffer,  //Q15
 		                       int32_t **rho_i,
                            short *dlsch_llr,
 		                       uint8_t num_pdcch_symbols,
@@ -929,7 +929,7 @@ void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
 
 void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
                           int32_t **rxdataF_comp,
-			  mod_sym_t **sic_buffer,  //Q15
+			                    int32_t **sic_buffer,  //Q15
 		                      int32_t **rho_i,
 			                    int16_t *dlsch_llr,
 			                    uint8_t num_pdcch_symbols,
@@ -1184,7 +1184,7 @@ void dlsch_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
 //#if 0
 void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
                          int32_t **rxdataF_comp,
-			  mod_sym_t **sic_buffer,  //Q15
+			                   int32_t **sic_buffer,  //Q15
 		                     int32_t **rho_i,
 			                   int16_t *dlsch_llr,
 			                   uint8_t num_pdcch_symbols,

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -1611,9 +1611,8 @@ int dlsch_modulation(int32_t **txdataF,
   return (re_allocated);
 }
 
-<<<<<<< HEAD
 
-int dlsch_modulation_SIC(mod_sym_t **sic_buffer,
+int dlsch_modulation_SIC(int32_t **sic_buffer,
                          int16_t amp,
                          uint32_t subframe_offset,
                          LTE_DL_FRAME_PARMS *frame_parms,

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -211,7 +211,7 @@ int32_t dlsch_modulation(int32_t **txdataF,
                          LTE_eNB_DLSCH_t *dlsch0,
                          LTE_eNB_DLSCH_t *dlsch1);
 
-int32_t dlsch_modulation_SIC(mod_sym_t **sic_buffer,
+int32_t dlsch_modulation_SIC(int32_t **sic_buffer,
                          int16_t amp,
                          uint32_t sub_frame_offset,
                          LTE_DL_FRAME_PARMS *frame_parms,
@@ -721,7 +721,7 @@ int32_t dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
 
 int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
                        int **rxdataF_comp,
-		       mod_sym_t **sic_buffer,
+		                   int32_t **sic_buffer,
 		                   int **rho_i,
                        short *dlsch_llr,
 		                   uint8_t num_pdcch_symbols,
@@ -753,7 +753,7 @@ void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
 */
 void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
                           int32_t **rxdataF_comp,
-			  mod_sym_t **sic_buffer,  //Q15
+			                    int32_t **sic_buffer,  //Q15
 		                      int32_t **rho_i,
 			                    int16_t *dlsch_llr,
 			                    uint8_t num_pdcch_symbols,
@@ -765,7 +765,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
 
 void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
                          int32_t **rxdataF_comp,
-			  mod_sym_t **sic_buffer,  //Q15
+			                   int32_t **sic_buffer,  //Q15
 		                     int32_t **rho_i,
 			                   int16_t *dlsch_llr,
 			                   uint8_t num_pdcch_symbols,

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -256,7 +256,7 @@ int main(int argc, char **argv)
  LTE_DL_eNB_HARQ_t *dlsch0_eNB_harq;
   uint8_t Kmimo;
 
-  mod_sym_t **sic_buffer;
+  int32_t **sic_buffer;
   int8_t cw_to_decode_interf;
   int8_t cw_to_decode_interf_free;
   int8_t  cw_non_sic;
@@ -1029,9 +1029,9 @@ n(tikz_fname,"w");
   }
 
 
-  sic_buffer = (mod_sym_t **) malloc16(frame_parms->nb_antennas_tx*sizeof(mod_sym_t*) );
+  sic_buffer = (int32_t **) malloc16(frame_parms->nb_antennas_tx*sizeof(int32_t *) );
   for (i=0; i<frame_parms->nb_antennas_tx; i++) {
-    sic_buffer[i] = malloc16_clear(FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(mod_sym_t));
+    sic_buffer[i] = malloc16_clear(FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(int32_t));
   }
 
   if (input_fd==NULL) {
@@ -2119,7 +2119,7 @@ n(tikz_fname,"w");
 	fflush(stdout);
 	round=0;
 	for (i=0; i<frame_parms->nb_antennas_tx; i++) {
-	memset(sic_buffer[i], 0, FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(mod_sym_t));
+	memset(sic_buffer[i], 0, FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(int32_t));
 	}
 	//if (trials%100==0)
 	eNB2UE[0]->first_run = 1;
@@ -2148,7 +2148,7 @@ n(tikz_fname,"w");
 	
 	  //  printf("Trial %d : Round %d, pmi_feedback %d \n",trials,round,pmi_feedback);
 	  for (aa=0; aa<PHY_vars_eNB->lte_frame_parms.nb_antennas_tx;aa++) {
-	    memset(&PHY_vars_eNB->lte_eNB_common_vars.txdataF[eNB_id][aa][0],0,FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(mod_sym_t));
+	    memset(&PHY_vars_eNB->lte_eNB_common_vars.txdataF[eNB_id][aa][0],0,FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(int32_t));
 	  }
 	
 	  if (input_fd==NULL) {