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, 183 deletions

diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc
deleted file mode 100644
index d74c8414d..000000000
--- a/gr-uhd/lib/uhd_simple_source.cc
+++ /dev/null
@@ -1,183 +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.
- */
-
-#include <uhd_simple_source.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <iostream>
-#include <boost/format.hpp>
-//#include "utils.h"
-
-/***********************************************************************
- * UHD Source
- **********************************************************************/
-uhd_simple_source::uhd_simple_source(gr_io_signature_sptr sig)
-:gr_sync_block("uhd simple source", gr_make_io_signature(0, 0, 0), sig){
-    /* NOP */
-}
-
-/***********************************************************************
- * UHD Source Impl
- **********************************************************************/
-class uhd_simple_source_impl : public uhd_simple_source{
-public:
-    uhd_simple_source_impl(
-        const std::string &args,
-        const uhd::io_type_t &type
-    ) : uhd_simple_source(gr_make_io_signature(1, 1, type.size)), _type(type)
-    {
-        _dev = uhd::usrp::simple_usrp::make(args);
-        set_streaming(false);
-    }
-
-    ~uhd_simple_source_impl(void){
-        set_streaming(false);
-    }
-
-    void set_subdev_spec(const std::string &spec){
-        return _dev->set_rx_subdev_spec(spec);
-    }
-
-    void set_samp_rate(double rate){
-        _dev->set_rx_rate(rate);
-        //do_samp_rate_error_message(rate, get_samp_rate(), "RX");
-    }
-
-    double get_samp_rate(void){
-        return _dev->get_rx_rate();
-    }
-
-    uhd::tune_result_t set_center_freq(double freq){
-        uhd::tune_result_t tr = _dev->set_rx_freq(freq);
-        //do_tune_freq_error_message(freq, _dev->get_rx_freq(), "RX");
-        return tr;
-    }
-
-    uhd::freq_range_t get_freq_range(void){
-        return _dev->get_rx_freq_range();
-    }
-
-    void set_gain(float gain){
-        return _dev->set_rx_gain(gain);
-    }
-
-    float get_gain(void){
-        return _dev->get_rx_gain();
-    }
-
-    uhd::gain_range_t get_gain_range(void){
-        return _dev->get_rx_gain_range();
-    }
-
-    void set_antenna(const std::string &ant){
-        return _dev->set_rx_antenna(ant);
-    }
-
-    std::string get_antenna(void){
-        return _dev->get_rx_antenna();
-    }
-
-    std::vector<std::string> get_antennas(void){
-        return _dev->get_rx_antennas();
-    }
-
-    void set_clock_config(const uhd::clock_config_t &clock_config){
-        return _dev->set_clock_config(clock_config);
-    }
-
-    uhd::time_spec_t get_time_now(void){
-        return _dev->get_time_now();
-    }
-
-    void set_time_now(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_now(time_spec);
-    }
-
-    void set_time_next_pps(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_next_pps(time_spec);
-    }
-
-    uhd::usrp::simple_usrp::sptr get_device(void){
-        return _dev;
-    }
-
-/***********************************************************************
- * Work
- **********************************************************************/
-    int work(
-        int noutput_items,
-        gr_vector_const_void_star &input_items,
-        gr_vector_void_star &output_items
-    ){
-        //conditionally start streaming in the work call
-        //this prevents streaming before the runtime is ready
-        if (not _is_streaming) set_streaming(true);
-
-        uhd::rx_metadata_t metadata; //not passed out of this block
-
-        size_t num_samps = _dev->get_device()->recv(
-            output_items, noutput_items, metadata,
-            _type, uhd::device::RECV_MODE_FULL_BUFF
-        );
-
-        switch(metadata.error_code){
-        case uhd::rx_metadata_t::ERROR_CODE_NONE:
-            return num_samps;
-
-        case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
-            //ignore overflows and try work again
-            return work(noutput_items, input_items, output_items);
-
-        default:
-            std::cout << boost::format(
-                "UHD source block got error code 0x%x"
-            ) % metadata.error_code << std::endl;
-            return num_samps;
-        }
-    }
-
-private:
-    uhd::usrp::simple_usrp::sptr _dev;
-    const uhd::io_type_t _type;
-    bool _is_streaming;
-
-    void set_streaming(bool enb){
-        if (enb)
-            _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
-        else
-            _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
-        _is_streaming = enb;
-    }
-};
-
-
-/***********************************************************************
- * Make UHD Source
- **********************************************************************/
-boost::shared_ptr<uhd_simple_source> uhd_make_simple_source(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type
-){
-    return boost::shared_ptr<uhd_simple_source>(
-        new uhd_simple_source_impl(args, type)
-    );
-}