From: Bdale Garbee Date: Fri, 8 Oct 2010 00:50:48 +0000 (-0600) Subject: Merge commit 'v3.3.0' into upstream X-Git-Url: https://git.gag.com/?p=debian%2Fgnuradio;a=commitdiff_plain;h=35e43e8d8c271e6842191cac3fc3f2f88a861183 Merge commit 'v3.3.0' into upstream Conflicts: Makefile.am Makefile.common README config/Makefile.am config/gr_fortran.m4 config/gr_pwin32.m4 config/gr_python.m4 config/gr_set_md_cpu.m4 config/grc_gcell.m4 config/grc_gnuradio_core.m4 config/grc_gnuradio_examples.m4 config/grc_gr_atsc.m4 config/grc_gr_audio_alsa.m4 config/grc_gr_audio_jack.m4 config/grc_gr_audio_oss.m4 config/grc_gr_audio_osx.m4 config/grc_gr_audio_portaudio.m4 config/grc_gr_comedi.m4 config/grc_gr_cvsd_vocoder.m4 config/grc_gr_gsm_fr_vocoder.m4 config/grc_gr_msdd6000.m4 config/grc_gr_pager.m4 config/grc_gr_qtgui.m4 config/grc_gr_trellis.m4 config/grc_gr_video_sdl.m4 config/grc_grc.m4 config/grc_gruel.m4 config/grc_usrp.m4 config/grc_usrp2.m4 config/usrp_fusb_tech.m4 config/usrp_libusb.m4 configure.ac docs/doxygen/Doxyfile.in docs/doxygen/other/Makefile.am gcell/apps/Makefile.am gcell/apps/benchmark_dma.cc gcell/apps/benchmark_nop.cc gcell/apps/benchmark_roundtrip.cc gcell/gcell.pc.in gcell/lib/Makefile.am gcell/lib/runtime/Makefile.am gcell/lib/runtime/gc_client_thread_info.h gcell/lib/runtime/gc_job_manager_impl.cc gcell/lib/runtime/gc_job_manager_impl.h gnuradio-core/Makefile.am gnuradio-core/gnuradio-core.pc.in gnuradio-core/src/Makefile.am gnuradio-core/src/gen_interpolator_taps/Makefile.am gnuradio-core/src/lib/Makefile.am gnuradio-core/src/lib/filter/Makefile.am gnuradio-core/src/lib/filter/filter.i gnuradio-core/src/lib/filter/gr_cpu.h gnuradio-core/src/lib/filter/gr_cpu_powerpc.cc gnuradio-core/src/lib/filter/gr_cpu_x86.cc gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-core/src/lib/filter/gr_fft_filter_fff.h gnuradio-core/src/lib/general/Makefile.am gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/general/gr_fmdet_cf.cc gnuradio-core/src/lib/general/gr_fmdet_cf.h gnuradio-core/src/lib/general/gr_head.cc gnuradio-core/src/lib/general/gr_head.h gnuradio-core/src/lib/general/gr_head.i gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-core/src/lib/general/gr_ofdm_sampler.cc gnuradio-core/src/lib/general/gr_remez.cc gnuradio-core/src/lib/general/gri_lfsr.h gnuradio-core/src/lib/gengen/Makefile.am gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t gnuradio-core/src/lib/gengen/gr_vector_sink_X.i.t gnuradio-core/src/lib/hier/Makefile.am gnuradio-core/src/lib/io/Makefile.am gnuradio-core/src/lib/io/gr_file_sink_base.cc gnuradio-core/src/lib/io/gr_file_sink_base.h gnuradio-core/src/lib/io/gr_histo_sink_f.cc gnuradio-core/src/lib/io/gr_histo_sink_f.h gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-core/src/lib/io/gr_message_source.h gnuradio-core/src/lib/io/gr_message_source.i gnuradio-core/src/lib/io/gr_udp_sink.cc gnuradio-core/src/lib/io/gr_udp_sink.h gnuradio-core/src/lib/io/gr_udp_sink.i gnuradio-core/src/lib/io/gr_udp_source.cc gnuradio-core/src/lib/io/gr_udp_source.h gnuradio-core/src/lib/io/gr_udp_source.i gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-core/src/lib/io/gr_wavfile_sink.h gnuradio-core/src/lib/io/gri_wavfile.cc gnuradio-core/src/lib/missing/Makefile.am gnuradio-core/src/lib/runtime/Makefile.am gnuradio-core/src/lib/runtime/gr_basic_block.cc gnuradio-core/src/lib/runtime/gr_basic_block.h gnuradio-core/src/lib/runtime/gr_block.cc gnuradio-core/src/lib/runtime/gr_block.h gnuradio-core/src/lib/runtime/gr_block_detail.cc gnuradio-core/src/lib/runtime/gr_block_detail.h gnuradio-core/src/lib/runtime/gr_block_executor.cc gnuradio-core/src/lib/runtime/gr_buffer.cc gnuradio-core/src/lib/runtime/gr_buffer.h gnuradio-core/src/lib/runtime/gr_msg_queue.cc gnuradio-core/src/lib/runtime/gr_msg_queue.h gnuradio-core/src/lib/runtime/gr_msg_queue.i gnuradio-core/src/lib/runtime/gr_sptr_magic.cc gnuradio-core/src/lib/runtime/gr_top_block_impl.cc gnuradio-core/src/lib/runtime/gr_top_block_impl.h gnuradio-core/src/lib/runtime/gr_tpb_detail.cc gnuradio-core/src/lib/runtime/gr_tpb_detail.h gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc gnuradio-core/src/lib/swig/Makefile.am gnuradio-core/src/python/gnuradio/Makefile.am gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py gnuradio-core/src/python/gnuradio/blks2impl/stream_to_vector_decimator.py gnuradio-core/src/python/gnuradio/eng_option.py gnuradio-core/src/python/gnuradio/gr/Makefile.am gnuradio-core/src/python/gnuradio/gr/prefs.py gnuradio-core/src/python/gnuradio/gr/qa_message.py gnuradio-core/src/python/gnuradio/gr/qa_scrambler.py gnuradio-core/src/python/gnuradio/gruimpl/hexint.py gnuradio-core/src/python/gnuradio/optfir.py gnuradio-core/src/python/gnuradio/packet_utils.py gnuradio-core/src/python/gnuradio/window.py gnuradio-examples/Makefile.am gnuradio-examples/python/Makefile.am gnuradio-examples/python/apps/hf_radio/input.py gnuradio-examples/python/digital/Makefile.am gnuradio-examples/python/digital/benchmark_loopback.py gnuradio-examples/python/digital/benchmark_qt_loopback.py gnuradio-examples/python/digital/benchmark_qt_rx.py gnuradio-examples/python/digital/qt_digital_window.py gnuradio-examples/python/digital/qt_digital_window.ui gnuradio-examples/python/digital/qt_rx_window.py gnuradio-examples/python/digital/qt_rx_window.ui gnuradio-examples/python/digital/receive_path.py gnuradio-examples/python/digital/transmit_path.py gnuradio-examples/python/digital/usrp_receive_path.py gnuradio-examples/python/digital/usrp_transmit_path.py gnuradio-examples/python/network/audio_sink.py gnuradio-examples/python/network/audio_source.py gnuradio-examples/python/network/dial_tone_sink.py gnuradio-examples/python/network/dial_tone_source.py gnuradio-examples/python/network/vector_sink.py gnuradio-examples/python/network/vector_source.py gnuradio-examples/python/usrp/usrp_am_mw_rcv.py gnuradio-examples/python/usrp/usrp_tv_rcv.py gnuradio-examples/python/usrp/usrp_wfm_rcv.py gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py gnuradio-examples/python/usrp/usrp_wxapt_rcv.py gnuradio-examples/python/usrp2/usrp2_wfm_qt.py gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py gr-audio-alsa/Makefile.am gr-audio-alsa/src/Makefile.am gr-audio-jack/Makefile.am gr-audio-jack/src/Makefile.am gr-audio-oss/Makefile.am gr-audio-oss/src/Makefile.am gr-audio-osx/src/Makefile.am gr-audio-osx/src/audio_osx.h gr-audio-osx/src/audio_osx_sink.cc gr-audio-osx/src/audio_osx_sink.h gr-audio-osx/src/audio_osx_source.cc gr-audio-osx/src/audio_osx_source.h gr-audio-osx/src/circular_buffer.h gr-audio-portaudio/Makefile.am gr-audio-portaudio/src/Makefile.am gr-audio-portaudio/src/audio_portaudio_sink.cc gr-audio-portaudio/src/audio_portaudio_sink.h gr-audio-portaudio/src/audio_portaudio_source.cc gr-audio-portaudio/src/audio_portaudio_source.h gr-audio-windows/src/Makefile.am gr-cvsd-vocoder/Makefile.am gr-cvsd-vocoder/src/Makefile.am gr-cvsd-vocoder/src/lib/Makefile.am gr-gcell/src/Makefile.am gr-gpio/src/Makefile.am gr-gpio/src/python/gpio.py gr-gpio/src/python/gpio_usrp_fft.py gr-gsm-fr-vocoder/Makefile.am gr-gsm-fr-vocoder/src/Makefile.am gr-gsm-fr-vocoder/src/lib/Makefile.am gr-pager/Makefile.am gr-qtgui/src/Makefile.am gr-qtgui/src/lib/ConstellationDisplayPlot.cc gr-qtgui/src/lib/ConstellationDisplayPlot.h gr-qtgui/src/lib/FrequencyDisplayPlot.cc gr-qtgui/src/lib/FrequencyDisplayPlot.h gr-qtgui/src/lib/Makefile.am gr-qtgui/src/lib/SpectrumGUIClass.cc gr-qtgui/src/lib/SpectrumGUIClass.h gr-qtgui/src/lib/TimeDomainDisplayPlot.cc gr-qtgui/src/lib/TimeDomainDisplayPlot.h gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc gr-qtgui/src/lib/Waterfall3DDisplayPlot.h gr-qtgui/src/lib/WaterfallDisplayPlot.cc gr-qtgui/src/lib/WaterfallDisplayPlot.h gr-qtgui/src/lib/qtgui.i gr-qtgui/src/lib/qtgui_sink_c.cc gr-qtgui/src/lib/qtgui_sink_c.h gr-qtgui/src/lib/qtgui_sink_f.cc gr-qtgui/src/lib/qtgui_sink_f.h gr-qtgui/src/lib/spectrumUpdateEvents.cc gr-qtgui/src/lib/spectrumUpdateEvents.h gr-qtgui/src/lib/spectrumdisplayform.cc gr-qtgui/src/lib/spectrumdisplayform.h gr-qtgui/src/lib/spectrumdisplayform.ui gr-qtgui/src/lib/waterfallGlobalData.h gr-qtgui/src/python/pyqt_example.py gr-qtgui/src/python/pyqt_example_f.py gr-qtgui/src/python/qt_digital.py gr-qtgui/src/python/qt_digital_window.py gr-qtgui/src/python/qt_digital_window.ui gr-qtgui/src/python/usrp2_display.py gr-radar-mono/src/Makefile.am gr-radio-astronomy/src/Makefile.am gr-radio-astronomy/src/lib/Makefile.am gr-radio-astronomy/src/python/usrp_psr_receiver.py gr-radio-astronomy/src/python/usrp_ra_receiver.py gr-sounder/src/Makefile.am gr-trellis/Makefile.am gr-trellis/src/Makefile.am gr-trellis/src/lib/Makefile.am gr-usrp/apps/Makefile.am gr-usrp/gnuradio-usrp.pc.in gr-usrp/src/Makefile.am gr-usrp/src/run_tests.in gr-usrp/src/usrp_base.cc gr-usrp/src/usrp_base.h gr-usrp/src/usrp_sink_base.cc gr-usrp/src/usrp_sink_base.h gr-usrp/src/usrp_sink_c.cc gr-usrp/src/usrp_sink_s.cc gr-usrp/src/usrp_source_base.cc gr-usrp/src/usrp_source_base.h gr-usrp/src/usrp_source_c.cc gr-usrp/src/usrp_source_s.cc gr-usrp/src/usrp_standard.i gr-usrp/src/usrp_swig.i gr-usrp2/gnuradio-usrp2.pc.in gr-usrp2/src/Makefile.am gr-usrp2/src/run_tests.in gr-usrp2/src/usrp2.i gr-usrp2/src/usrp2_sink_16sc.cc gr-usrp2/src/usrp2_sink_32fc.cc gr-usrp2/src/usrp2_sink_base.cc gr-usrp2/src/usrp2_sink_base.h gr-usrp2/src/usrp2_source_base.cc gr-usrp2/src/usrp2_source_base.h gr-utils/src/Makefile.am gr-utils/src/python/Makefile.am gr-utils/src/python/gr_plot_const.py gr-utils/src/python/gr_plot_fft.py gr-utils/src/python/gr_plot_iq.py gr-utils/src/python/gr_plot_psd.py gr-utils/src/python/plot_data.py gr-utils/src/python/usrp2_fft.py gr-utils/src/python/usrp_fft.py gr-utils/src/python/usrp_oscope.py gr-utils/src/python/usrp_siggen.py gr-video-sdl/Makefile.am gr-video-sdl/src/Makefile.am gr-wxgui/Makefile.am gr-wxgui/gr-wxgui.pc.in gr-wxgui/src/python/Makefile.am gr-wxgui/src/python/common.py gr-wxgui/src/python/const_window.py gr-wxgui/src/python/constants.py gr-wxgui/src/python/constsink_gl.py gr-wxgui/src/python/fft_window.py gr-wxgui/src/python/fftsink_gl.py gr-wxgui/src/python/fftsink_nongl.py gr-wxgui/src/python/forms/converters.py gr-wxgui/src/python/forms/forms.py gr-wxgui/src/python/histo_window.py gr-wxgui/src/python/histosink_gl.py gr-wxgui/src/python/number_window.py gr-wxgui/src/python/numbersink2.py gr-wxgui/src/python/plot.py gr-wxgui/src/python/plotter/channel_plotter.py gr-wxgui/src/python/plotter/common.py gr-wxgui/src/python/plotter/grid_plotter_base.py gr-wxgui/src/python/plotter/plotter_base.py gr-wxgui/src/python/plotter/waterfall_plotter.py gr-wxgui/src/python/scope_window.py gr-wxgui/src/python/scopesink_gl.py gr-wxgui/src/python/waterfall_window.py gr-wxgui/src/python/waterfallsink_gl.py gr-wxgui/src/python/waterfallsink_nongl.py grc/Makefile.am grc/base/Block.py grc/base/Element.py grc/base/FlowGraph.py grc/base/Makefile.am grc/base/Param.py grc/base/Platform.py grc/base/Port.py grc/blocks/Makefile.am grc/blocks/band_pass_filter.xml grc/blocks/band_reject_filter.xml grc/blocks/blks2_dxpsk_demod.xml grc/blocks/blks2_dxpsk_mod.xml grc/blocks/block_tree.xml grc/blocks/gr_chunks_to_symbols.xml grc/blocks/gr_delay.xml grc/blocks/gr_kludge_copy.xml grc/blocks/gr_noise_source_x.xml grc/blocks/gr_nop.xml grc/blocks/gr_not_xx.xml grc/blocks/gr_packed_to_unpacked_xx.xml grc/blocks/gr_sample_and_hold_xx.xml grc/blocks/gr_sig_source_x.xml grc/blocks/gr_udp_sink.xml grc/blocks/gr_udp_source.xml grc/blocks/gr_unpacked_to_packed_xx.xml grc/blocks/high_pass_filter.xml grc/blocks/low_pass_filter.xml grc/blocks/options.xml grc/blocks/pad_sink.xml grc/blocks/pad_source.xml grc/blocks/parameter.xml grc/blocks/usrp2_sink_xxxx.xml grc/blocks/usrp2_source_xxxx.xml grc/blocks/usrp_dual_sink_x.xml grc/blocks/usrp_dual_source_x.xml grc/blocks/usrp_simple_sink_x.xml grc/blocks/usrp_simple_source_x.xml grc/blocks/wxgui_constellationsink2.xml grc/blocks/wxgui_fftsink2.xml grc/blocks/wxgui_histosink2.xml grc/blocks/wxgui_numbersink2.xml grc/blocks/wxgui_scopesink2.xml grc/blocks/wxgui_waterfallsink2.xml grc/freedesktop/Makefile.am grc/freedesktop/grc_setup_freedesktop.in grc/grc_gnuradio/usrp/dual_usrp.py grc/grc_gnuradio/usrp/simple_usrp.py grc/grc_gnuradio/wxgui/top_block_gui.py grc/gui/ActionHandler.py grc/gui/Actions.py grc/gui/Bars.py grc/gui/Block.py grc/gui/BlockTreeWindow.py grc/gui/Connection.py grc/gui/Dialogs.py grc/gui/DrawingArea.py grc/gui/Element.py grc/gui/FlowGraph.py grc/gui/MainWindow.py grc/gui/Makefile.am grc/gui/NotebookPage.py grc/gui/Param.py grc/gui/Platform.py grc/gui/Port.py grc/gui/StateCache.py grc/gui/Utils.py grc/python/Block.py grc/python/Connection.py grc/python/Constants.py grc/python/FlowGraph.py grc/python/Generator.py grc/python/Makefile.am grc/python/Param.py grc/python/Platform.py grc/python/Port.py grc/python/convert_hier.py grc/python/extract_docs.py grc/python/flow_graph.tmpl grc/scripts/Makefile.am grc/scripts/usrp2_probe grc/scripts/usrp_probe gruel/gruel.pc.in gruel/src/Makefile.am gruel/src/include/gruel/Makefile.am gruel/src/include/gruel/inet.h.in gruel/src/include/gruel/thread_body_wrapper.h gruel/src/include/gruel/thread_group.h gruel/src/lib/Makefile.am run_tests.sh.in usrp/doc/Makefile.am usrp/firmware/include/Makefile.am usrp/firmware/include/fx2regs.h usrp/firmware/include/usrp_ids.h usrp/firmware/src/common/build_eeprom.py usrp/firmware/src/usrp2/Makefile.am usrp/fpga/Makefile.am usrp/host/Makefile.am usrp/host/apps/Makefile.am usrp/host/apps/burn-db-eeprom usrp/host/apps/test_usrp_standard_rx.cc usrp/host/apps/test_usrp_standard_tx.cc usrp/host/apps/usrp_cal_dc_offset.cc usrp/host/apps/usrper.cc usrp/host/lib/Makefile.am usrp/host/swig/Makefile.am usrp/host/swig/usrp_prims.i usrp/usrp.pc.in usrp2/firmware/Makefile.am usrp2/firmware/apps/Makefile.am usrp2/firmware/apps/app_common_v2.c usrp2/firmware/apps/app_common_v2.h usrp2/firmware/apps/app_passthru_v2.c usrp2/firmware/apps/factory_test.c usrp2/firmware/apps/gen_eth_packets.c usrp2/firmware/apps/mimo_app_common_v2.c usrp2/firmware/apps/mimo_tx.c usrp2/firmware/apps/mimo_tx_slave.c usrp2/firmware/apps/rcv_eth_packets.c usrp2/firmware/apps/serdes_txrx.c usrp2/firmware/apps/tx_standalone.c usrp2/firmware/apps/txrx.c usrp2/firmware/config/grc_usrp2_firmware.m4 usrp2/firmware/configure.gnu usrp2/firmware/include/usrp2_eth_packet.h usrp2/firmware/include/usrp2_types.h usrp2/firmware/lib/Makefile.am usrp2/firmware/lib/db.h usrp2/firmware/lib/db_base.h usrp2/firmware/lib/db_basic.c usrp2/firmware/lib/db_dbsrx.c usrp2/firmware/lib/db_init.c usrp2/firmware/lib/db_rfx.c usrp2/firmware/lib/db_tvrx.c usrp2/firmware/lib/db_xcvr2450.c usrp2/firmware/lib/dbsm.c usrp2/firmware/lib/eth_mac.c usrp2/firmware/lib/eth_mac_regs.h usrp2/firmware/lib/ethernet.c usrp2/firmware/lib/memory_map.h usrp2/host/apps/Makefile.am usrp2/host/apps/tx_samples.cc usrp2/host/include/usrp2/usrp2.h usrp2/host/lib/Makefile.am usrp2/host/lib/control.cc usrp2/host/lib/control.h usrp2/host/lib/ring.cc usrp2/host/lib/ring.h usrp2/host/lib/usrp2.cc usrp2/host/lib/usrp2_impl.cc usrp2/host/lib/usrp2_impl.h usrp2/host/usrp2.pc.in --- 35e43e8d8c271e6842191cac3fc3f2f88a861183