1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-19 01:27:41 +00:00

Merge branch 'next' of ssh://carlesfernandez@git.code.sf.net/p/gnss-sdr/cttc into next

This commit is contained in:
Carles Fernandez
2014-09-07 19:51:36 +02:00
9 changed files with 178 additions and 164 deletions

View File

@@ -159,8 +159,7 @@ void Correlator::Carrier_wipeoff_and_EPL_volk_IQ(int signal_length_samples ,cons
gr_complex* bb_signal;
//gr_complex* input_aligned;
//todo: do something if posix_memalign fails
if (posix_memalign((void**)&bb_signal, 16, signal_length_samples * sizeof(gr_complex)) == 0) {};
bb_signal=(gr_complex*)volk_malloc(signal_length_samples * sizeof(gr_complex),volk_get_alignment());
if (input_vector_unaligned == true)
{
@@ -202,8 +201,7 @@ void Correlator::Carrier_wipeoff_and_VEPL_volk(int signal_length_samples, const
gr_complex* bb_signal;
//gr_complex* input_aligned;
//todo: do something if posix_memalign fails
if (posix_memalign((void**)&bb_signal, 16, signal_length_samples * sizeof(gr_complex)) == 0) {};
bb_signal=(gr_complex*)volk_malloc(signal_length_samples * sizeof(gr_complex),volk_get_alignment());
if (input_vector_unaligned == false)
{
@@ -218,7 +216,6 @@ void Correlator::Carrier_wipeoff_and_VEPL_volk(int signal_length_samples, const
//use directly the input vector
volk_32fc_x2_multiply_32fc_u(bb_signal, input, carrier, signal_length_samples);
}
volk_32fc_x2_dot_prod_32fc_a(VE_out, bb_signal, VE_code, signal_length_samples);
volk_32fc_x2_dot_prod_32fc_a(E_out, bb_signal, E_code, signal_length_samples);
volk_32fc_x2_dot_prod_32fc_a(P_out, bb_signal, P_code, signal_length_samples);