Merge branch 'next' into guile-next

* next: (116 commits)
  Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
  Modifying blsk2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
  uhd: reverting tag changes on uhd single usrp source, there seems to be issues with the work() logic
  uhd: removed default value chan=0 in the cc files
  WITH_INCLUDES _must_ be last
  uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
  uhd: default channel params to zero for single source and sink blocks
  Revert "Removed usrp2-firmware from being automatically built."
  Remove generated file from repo
  Removed usrp2-firmware from being automatically built.
  uhd: added libdir to UHD CFLAGS (shared by lib and swig)
  Swapping out preset keys until I work out some of their issues.
  Modifying QA tests for the sample tags. By default, it only checks the sizes of the tags since order is not specified or guarenteed.
  Block is a gr_block, so this sets its relative rate. Was required for using in the QA of the sample tags code.
  Removing global pmt constants. Were causing segfaults during make check. Must fix this later.
  Fixing up the UHD sample tag example to take command line options.
  Swapping order of testing rrate.
  Changing propagation policy enum type name and making a few other minor edits.
  Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
  Adding typedef for uint64_t and int64_t so we can use them through SWIG.
  ...

Passes make distcheck.

1 files changed, 0 insertions, 147 deletions

diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
deleted file mode 100644
index d9f8d252a..000000000
--- a/gr-uhd/lib/uhd_simple_source.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_UHD_SIMPLE_SOURCE_H
-#define INCLUDED_UHD_SIMPLE_SOURCE_H
-
-#include <gr_sync_block.h>
-#include <uhd/usrp/simple_usrp.hpp>
-
-class uhd_simple_source;
-
-boost::shared_ptr<uhd_simple_source> uhd_make_simple_source(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type
-);
-
-/***********************************************************************
- * DEPRECATED
- **********************************************************************/
-class /*UHD_DEPRECATED*/ uhd_simple_source : public gr_sync_block{
-public:
-
-    /*!
-     * Set the IO signature for this block.
-     * \param sig the output signature
-     */
-    uhd_simple_source(gr_io_signature_sptr sig);
-
-    /*!
-     * Set the subdevice specification.
-     * \param spec the subdev spec markup string
-     */
-    virtual void set_subdev_spec(const std::string &spec) = 0;
-
-    /*!
-     * Set the sample rate for the usrp device.
-     * \param rate a new rate in Sps
-     */
-    virtual void set_samp_rate(double rate) = 0;
-
-    /*!
-     * Get the sample rate for the usrp device.
-     * This is the actual sample rate and may differ from the rate set.
-     * \return the actual rate in Sps
-     */
-    virtual double get_samp_rate(void) = 0;
-
-    /*!
-     * Tune the usrp device to the desired center frequency.
-     * \param freq the desired frequency in Hz
-     * \return a tune result with the actual frequencies
-     */
-    virtual uhd::tune_result_t set_center_freq(double freq) = 0;
-
-    /*!
-     * Get the tunable frequency range.
-     * \return the frequency range in Hz
-     */
-    virtual uhd::freq_range_t get_freq_range(void) = 0;
-
-    /*!
-     * Set the gain for the dboard.
-     * \param gain the gain in dB
-     */
-    virtual void set_gain(float gain) = 0;
-
-    /*!
-     * Get the actual dboard gain setting.
-     * \return the actual gain in dB
-     */
-    virtual float get_gain(void) = 0;
-
-    /*!
-     * Get the settable gain range.
-     * \return the gain range in dB
-     */
-    virtual uhd::gain_range_t get_gain_range(void) = 0;
-
-    /*!
-     * Set the antenna to use.
-     * \param ant the antenna string
-     */
-    virtual void set_antenna(const std::string &ant) = 0;
-
-    /*!
-     * Get the antenna in use.
-     * \return the antenna string
-     */
-    virtual std::string get_antenna(void) = 0;
-
-    /*!
-     * Get a list of possible antennas.
-     * \return a vector of antenna strings
-     */
-    virtual std::vector<std::string> get_antennas(void) = 0;
-
-    /*!
-     * Set the clock configuration.
-     * \param clock_config the new configuration
-     */
-    virtual void set_clock_config(const uhd::clock_config_t &clock_config) = 0;
-
-    /*!
-     * Get the current time registers.
-     * \return the current usrp time
-     */
-    virtual uhd::time_spec_t get_time_now(void) = 0;
-
-    /*!
-     * Set the time registers asap.
-     * \param time_spec the new time
-     */
-    virtual void set_time_now(const uhd::time_spec_t &time_spec) = 0;
-
-    /*!
-     * Set the time registers at the next pps.
-     * \param time_spec the new time
-     */
-    virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0;
-
-    /*!
-     * Get access to the underlying uhd device object.
-     * \return the simple usrp device object
-     */
-    virtual uhd::usrp::simple_usrp::sptr get_device(void) = 0;
-};
-
-#endif /* INCLUDED_UHD_SIMPLE_SOURCE_H */