Commit adc5e5cb authored by Raymond Knopp's avatar Raymond Knopp

reverted to regular memcpy. This change was only valid for earlier gcc version (e.g. centos/rhel7)

parent 3a7ac982
...@@ -2951,6 +2951,7 @@ else (CUDA_FOUND) ...@@ -2951,6 +2951,7 @@ else (CUDA_FOUND)
add_executable(ldpctest add_executable(ldpctest
${PHY_NR_CODINGIF} ${PHY_NR_CODINGIF}
${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
${OPENAIR_DIR}/common/utils/utils.c
${T_SOURCE} ${T_SOURCE}
${SHLIB_LOADER_SOURCES} ${SHLIB_LOADER_SOURCES}
) )
......
...@@ -193,7 +193,7 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input ...@@ -193,7 +193,7 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input
/*for (j=0; j<fftsize ; j++) { /*for (j=0; j<fftsize ; j++) {
output_ptr[j] = temp_ptr[j]; output_ptr[j] = temp_ptr[j];
}*/ }*/
memcpy1((void*)output_ptr,(void*)temp_ptr,fftsize<<2); memcpy((void*)output_ptr,(void*)temp_ptr,fftsize<<2);
} }
j=fftsize; j=fftsize;
......
...@@ -472,11 +472,11 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms, ...@@ -472,11 +472,11 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms,
rxdata_offset = slot_offset + nb_prefix_samples0 + (symbol * (frame_parms->ofdm_symbol_size + nb_prefix_samples)) - SOFFSET; rxdata_offset = slot_offset + nb_prefix_samples0 + (symbol * (frame_parms->ofdm_symbol_size + nb_prefix_samples)) - SOFFSET;
if(sample_offset>rxdata_offset) { if(sample_offset>rxdata_offset) {
memcpy1((void *)tmp_dft_in, memcpy((void *)tmp_dft_in,
(void *) &rxdata[frame_parms->samples_per_frame-sample_offset+rxdata_offset], (void *) &rxdata[frame_parms->samples_per_frame-sample_offset+rxdata_offset],
(sample_offset-rxdata_offset)*sizeof(int)); (sample_offset-rxdata_offset)*sizeof(int));
memcpy1((void *)&tmp_dft_in[sample_offset-rxdata_offset], memcpy((void *)&tmp_dft_in[sample_offset-rxdata_offset],
(void *) &rxdata[0], (void *) &rxdata[0],
(frame_parms->ofdm_symbol_size-sample_offset+rxdata_offset)*sizeof(int)); (frame_parms->ofdm_symbol_size-sample_offset+rxdata_offset)*sizeof(int));
......
...@@ -273,17 +273,17 @@ void nr_ulsch_extract_rbs_single(int32_t **rxdataF, ...@@ -273,17 +273,17 @@ void nr_ulsch_extract_rbs_single(int32_t **rxdataF,
// //
//rxF[ ((start_re + re)*2) % (frame_parms->ofdm_symbol_size*2)]); //rxF[ ((start_re + re)*2) % (frame_parms->ofdm_symbol_size*2)]);
if (start_re + nb_re_pusch < frame_parms->ofdm_symbol_size) { if (start_re + nb_re_pusch < frame_parms->ofdm_symbol_size) {
memcpy1((void*)rxF_ext, memcpy((void*)rxF_ext,
(void*)&rxF[start_re*2], (void*)&rxF[start_re*2],
nb_re_pusch*sizeof(int32_t)); nb_re_pusch*sizeof(int32_t));
} else { } else {
int neg_length = frame_parms->ofdm_symbol_size-start_re; int neg_length = frame_parms->ofdm_symbol_size-start_re;
int pos_length = nb_re_pusch-neg_length; int pos_length = nb_re_pusch-neg_length;
memcpy1((void*)rxF_ext,(void*)&rxF[start_re*2],neg_length*sizeof(int32_t)); memcpy((void*)rxF_ext,(void*)&rxF[start_re*2],neg_length*sizeof(int32_t));
memcpy1((void*)&rxF_ext[2*neg_length],(void*)rxF,pos_length*sizeof(int32_t)); memcpy((void*)&rxF_ext[2*neg_length],(void*)rxF,pos_length*sizeof(int32_t));
} }
memcpy1((void*)ul_ch0_ext,(void*)ul_ch0,nb_re_pusch*sizeof(int32_t)); memcpy((void*)ul_ch0_ext,(void*)ul_ch0,nb_re_pusch*sizeof(int32_t));
} }
else { else {
for (re = 0; re < nb_re_pusch; re++) { for (re = 0; re < nb_re_pusch; re++) {
......
...@@ -56,7 +56,7 @@ void nr_ulsch_qpsk_llr(int32_t *rxdataF_comp, ...@@ -56,7 +56,7 @@ void nr_ulsch_qpsk_llr(int32_t *rxdataF_comp,
rxF++; rxF++;
llr32++; llr32++;
}*/ }*/
memcpy1((void*)llr32,(void*)rxF,nb_re<<2); memcpy((void*)llr32,(void*)rxF,nb_re<<2);
} }
//---------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment