uhd: work on uhd single usrp wrapper

5 files changed, 608 insertions, 2 deletions

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 8aae63326..1260201a5 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -33,7 +33,9 @@ libgnuradio_uhd_la_SOURCES = \
 	uhd_mimo_source.cc \
 	uhd_mimo_sink.cc \
 	uhd_simple_source.cc \
-	uhd_simple_sink.cc
+	uhd_simple_sink.cc \
+	uhd_single_usrp_source.cc \
+	uhd_single_usrp_sink.cc
 
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
@@ -45,7 +47,9 @@ grinclude_HEADERS = \
 	uhd_mimo_source.h \
 	uhd_mimo_sink.h \
 	uhd_simple_source.h \
-	uhd_simple_sink.h
+	uhd_simple_sink.h \
+	uhd_single_usrp_source.h \
+	uhd_single_usrp_sink.h
 
 noinst_HEADERS = \
 	utils.h
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.cc b/gr-uhd/lib/uhd_single_usrp_sink.cc
new file mode 100644
index 000000000..1cd5afc87
--- /dev/null
+++ b/gr-uhd/lib/uhd_single_usrp_sink.cc
@@ -0,0 +1,151 @@
+/*
+ * 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_single_usrp_sink.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include "utils.h"
+
+/***********************************************************************
+ * UHD Single USPR Sink
+ **********************************************************************/
+uhd_single_usrp_sink::uhd_single_usrp_sink(gr_io_signature_sptr sig)
+:gr_sync_block("uhd single usrp sink", sig, gr_make_io_signature(0, 0, 0)){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Single USPR Sink Impl
+ **********************************************************************/
+class uhd_single_usrp_sink_impl : public uhd_single_usrp_sink{
+public:
+    uhd_single_usrp_sink_impl(
+        const std::string &args,
+        const uhd::io_type_t &type
+    ) : uhd_single_usrp_sink(gr_make_io_signature(1, 1, type.size)), _type(type)
+    {
+        _dev = uhd::usrp::single_usrp::make(args);
+    }
+
+    ~uhd_single_usrp_sink_impl(void){
+        //NOP
+    }
+
+    void set_subdev_spec(const std::string &spec){
+        return _dev->set_tx_subdev_spec(spec);
+    }
+
+    void set_samp_rate(double rate){
+        _dev->set_tx_rate(rate);
+        do_samp_rate_error_message(rate, get_samp_rate(), "TX");
+    }
+
+    double get_samp_rate(void){
+        return _dev->get_tx_rate();
+    }
+
+    uhd::tune_result_t set_center_freq(double freq, size_t chan){
+        uhd::tune_result_t tr = _dev->set_tx_freq(freq, chan);
+        do_tune_freq_error_message(freq, _dev->get_tx_freq(chan), "TX");
+        return tr;
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_tx_freq_range(chan);
+    }
+
+    void set_gain(float gain, size_t chan){
+        return _dev->set_tx_gain(gain, chan);
+    }
+
+    float get_gain(size_t chan){
+        return _dev->get_tx_gain(chan);
+    }
+
+    uhd::gain_range_t get_gain_range(size_t chan){
+        return _dev->get_tx_gain_range(chan);
+    }
+
+    void set_antenna(const std::string &ant, size_t chan){
+        return _dev->set_tx_antenna(ant, chan);
+    }
+
+    std::string get_antenna(size_t chan){
+        return _dev->get_tx_antenna(chan);
+    }
+
+    std::vector<std::string> get_antennas(size_t chan){
+        return _dev->get_tx_antennas(chan);
+    }
+
+    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::single_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
+    ){
+        uhd::tx_metadata_t metadata;
+        metadata.start_of_burst = true;
+
+        return _dev->get_device()->send(
+            input_items, noutput_items, metadata,
+            _type, uhd::device::SEND_MODE_FULL_BUFF
+        );
+    }
+
+protected:
+    uhd::usrp::single_usrp::sptr _dev;
+    const uhd::io_type_t _type;
+};
+
+/***********************************************************************
+ * Make UHD Single USPR Sink
+ **********************************************************************/
+boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+){
+    return boost::shared_ptr<uhd_single_usrp_sink>(
+        new uhd_single_usrp_sink_impl(args, type)
+    );
+}
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.h b/gr-uhd/lib/uhd_single_usrp_sink.h
new file mode 100644
index 000000000..61417168a
--- /dev/null
+++ b/gr-uhd/lib/uhd_single_usrp_sink.h
@@ -0,0 +1,143 @@
+/*
+ * 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_SINGLE_USRP_SINK_H
+#define INCLUDED_UHD_SINGLE_USRP_SINK_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/single_usrp.hpp>
+
+class uhd_single_usrp_sink;
+
+boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+);
+
+class uhd_single_usrp_sink : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the input signature
+     */
+    uhd_single_usrp_sink(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, size_t chan = 0) = 0;
+
+    /*!
+     * Get the tunable frequency range.
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan = 0) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param gain the gain in dB
+     */
+    virtual void set_gain(float gain, size_t chan = 0) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan = 0) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param ant the antenna string
+     */
+    virtual void set_antenna(const std::string &ant, size_t chan = 0) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan = 0) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan = 0) = 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 single usrp device object
+     */
+    virtual uhd::usrp::single_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_SINGLE_USRP_SINK_H */
diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc
new file mode 100644
index 000000000..13e4d6d43
--- /dev/null
+++ b/gr-uhd/lib/uhd_single_usrp_source.cc
@@ -0,0 +1,165 @@
+/*
+ * 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_single_usrp_source.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include "utils.h"
+
+/***********************************************************************
+ * UHD Single USPR Source
+ **********************************************************************/
+uhd_single_usrp_source::uhd_single_usrp_source(gr_io_signature_sptr sig)
+:gr_sync_block("uhd single_usrp source", gr_make_io_signature(0, 0, 0), sig){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Single USPR Source Impl
+ **********************************************************************/
+class uhd_single_usrp_source_impl : public uhd_single_usrp_source{
+public:
+    uhd_single_usrp_source_impl(
+        const std::string &args,
+        const uhd::io_type_t &type
+    ) : uhd_single_usrp_source(gr_make_io_signature(1, 1, type.size)), _type(type)
+    {
+        _dev = uhd::usrp::single_usrp::make(args);
+        set_streaming(false);
+    }
+
+    ~uhd_single_usrp_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, size_t chan){
+        uhd::tune_result_t tr = _dev->set_rx_freq(freq, chan);
+        do_tune_freq_error_message(freq, _dev->get_rx_freq(chan), "RX");
+        return tr;
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_rx_freq_range(chan);
+    }
+
+    void set_gain(float gain, size_t chan){
+        return _dev->set_rx_gain(gain, chan);
+    }
+
+    float get_gain(size_t chan){
+        return _dev->get_rx_gain(chan);
+    }
+
+    uhd::gain_range_t get_gain_range(size_t chan){
+        return _dev->get_rx_gain_range(chan);
+    }
+
+    void set_antenna(const std::string &ant, size_t chan){
+        return _dev->set_rx_antenna(ant, chan);
+    }
+
+    std::string get_antenna(size_t chan){
+        return _dev->get_rx_antenna(chan);
+    }
+
+    std::vector<std::string> get_antennas(size_t chan){
+        return _dev->get_rx_antennas(chan);
+    }
+
+    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::single_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
+
+        return _dev->get_device()->recv(
+            output_items, noutput_items, metadata,
+            _type, uhd::device::RECV_MODE_FULL_BUFF
+        );
+    }
+
+private:
+    uhd::usrp::single_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 Single USPR Source
+ **********************************************************************/
+boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+){
+    return boost::shared_ptr<uhd_single_usrp_source>(
+        new uhd_single_usrp_source_impl(args, type)
+    );
+}
diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h
new file mode 100644
index 000000000..6634a9c2a
--- /dev/null
+++ b/gr-uhd/lib/uhd_single_usrp_source.h
@@ -0,0 +1,143 @@
+/*
+ * 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_SINGLE_USRP_SOURCE_H
+#define INCLUDED_UHD_SINGLE_USRP_SOURCE_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/single_usrp.hpp>
+
+class uhd_single_usrp_source;
+
+boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_source(
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+);
+
+class uhd_single_usrp_source : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the output signature
+     */
+    uhd_single_usrp_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, size_t chan = 0) = 0;
+
+    /*!
+     * Get the tunable frequency range.
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan = 0) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param gain the gain in dB
+     */
+    virtual void set_gain(float gain, size_t chan = 0) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan = 0) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param ant the antenna string
+     */
+    virtual void set_antenna(const std::string &ant, size_t chan = 0) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan = 0) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan = 0) = 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 single usrp device object
+     */
+    virtual uhd::usrp::single_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_SINGLE_USRP_SOURCE_H */