From 04a16055ff4058f9c3133c099e0138f4ac798240 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 16 Aug 2016 21:18:24 +0200 Subject: [PATCH] Revert wrong commit --- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc | 2 +- .../acquisition/gnuradio_blocks/pcps_acquisition_cc.cc | 4 +++- .../acquisition/gnuradio_blocks/pcps_acquisition_sc.cc | 4 +++- .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc | 2 +- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc | 2 +- .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 3662ee8bb..13a0be91b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -369,7 +369,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, d_state = 3; // Negative acquisition } - consume_each(ninput_items[0]); + consume_each(1); break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc index 944ff0b27..c48d79c3c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc @@ -431,7 +431,9 @@ int pcps_acquisition_cc::general_work(int noutput_items, } } - consume_each(ninput_items[0]); + consume_each(1); + + DLOG(INFO) << "Done. Consumed 1 item."; break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc index af116f361..855ec01ae 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc @@ -431,7 +431,9 @@ int pcps_acquisition_sc::general_work(int noutput_items, } } - consume_each(ninput_items[0]); + consume_each(1); + + DLOG(INFO) << "Done. Consumed 1 item."; break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index a089af577..23457b42e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -393,7 +393,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, d_state = 3; // Negative acquisition } - consume_each(ninput_items[0]); + consume_each(1); break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index 0c6cd8602..60fd66896 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -521,7 +521,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, volk_free(in_temp_folded); volk_free(in_1code); volk_free(corr_output); - consume_each(ninput_items[0]); + consume_each(1); break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index a698eb82b..15d69010d 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -391,7 +391,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items, { d_state = 3; // Negative acquisition } - consume_each(ninput_items[0]); + consume_each(1); break; }