uhd mimo: created mimo source and sink block for gr-uhd

11 files changed, 766 insertions, 6 deletions

diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index 61eb32770..cf3f77080 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -24,5 +24,7 @@ include $(top_srcdir)/Makefile.common
 grcblocksdir = $(grc_blocksdir)
 
 dist_grcblocks_DATA = \
+	uhd_mimo_source.xml \
+	uhd_mimo_sink.xml \
 	uhd_simple_source.xml \
 	uhd_simple_sink.xml
diff --git a/gr-uhd/grc/uhd_mimo_sink.xml b/gr-uhd/grc/uhd_mimo_sink.xml
new file mode 100644
index 000000000..faafbfd2f
--- /dev/null
+++ b/gr-uhd/grc/uhd_mimo_sink.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## UHD MIMO Sink
+###################################################
+ -->
+<block>
+	<name>UHD MIMO Sink</name>
+	<key>uhd_mimo_sink</key>
+	<category>UHD</category>
+	<import>from gnuradio import uhd</import>
+	<make>uhd.mimo_sink($nchan, $args, uhd.io_type_t.$type.type)
+self.$(id).set_samp_rate_all($samp_rate)
+map(lambda x: self.$(id).set_center_freq(*x), enumerate($center_freqs))
+map(lambda x: self.$(id).set_gain(*x), enumerate($gains))
+#if $ants()
+map(lambda x: self.$(id).set_antenna(*x), enumerate($ants))
+#end if</make>
+	<callback>set_samp_rate($samp_rate)</callback>
+	<param>
+		<name>Input Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>type:COMPLEX_FLOAT32</opt>
+			<opt>vlen:1</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>type:COMPLEX_INT16</opt>
+			<opt>vlen:2</opt>
+		</option>
+	</param>
+	<param>
+		<name>Num Channels</name>
+		<key>nchan</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Args</name>
+		<key>args</key>
+		<value>addr=192.168.10.2 192.168.20.2</value>
+		<type>string</type>
+	</param>
+	<param>
+		<name>Samp Rate (Sps)</name>
+		<key>samp_rate</key>
+		<value>samp_rate</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Center Freqs (Hz)</name>
+		<key>center_freqs</key>
+		<value>0, 0</value>
+		<type>real_vector</type>
+	</param>
+	<param>
+		<name>Gains (dB)</name>
+		<key>gains</key>
+		<value>0, 0</value>
+		<type>real_vector</type>
+	</param>
+	<param>
+		<name>Antennas</name>
+		<key>ants</key>
+		<value>['RX2', 'RX2']</value>
+		<type>raw</type>
+		<hide>#if not $ants() then 'part' else 'none'#</hide>
+	</param>
+	<sink>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$type.vlen</vlen>
+		<nports>$nchan</nports>
+	</sink>
+	<doc>
+The UHD Sink Block:
+
+Args:
+Args is a delimited string used to locate UHD devices on your system. \
+If left blank, the first UHD device found will be used. \
+Used args to specify a specfic device. \
+USRP2 Example: addr=192.168.10.2
+
+Sample rate:
+The sample rate is the number of samples per second input by this block. \
+The UHD device driver will try its best to match the requested sample rate. \
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Antenna:
+For subdevices/daughterboards with only one antenna, this may be left blank. \
+Otherwise, the user should specify one of the possible antenna choices. \
+See the daughterboard application notes for the possible antenna choices.
+	</doc>
+</block>
diff --git a/gr-uhd/grc/uhd_mimo_source.xml b/gr-uhd/grc/uhd_mimo_source.xml
new file mode 100644
index 000000000..1cffa62cc
--- /dev/null
+++ b/gr-uhd/grc/uhd_mimo_source.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## UHD MIMO Source
+###################################################
+ -->
+<block>
+	<name>UHD MIMO Source</name>
+	<key>uhd_mimo_source</key>
+	<category>UHD</category>
+	<import>from gnuradio import uhd</import>
+	<make>uhd.mimo_source($nchan, $args, uhd.io_type_t.$type.type)
+self.$(id).set_samp_rate_all($samp_rate)
+map(lambda x: self.$(id).set_center_freq(*x), enumerate($center_freqs))
+map(lambda x: self.$(id).set_gain(*x), enumerate($gains))
+#if $ants()
+map(lambda x: self.$(id).set_antenna(*x), enumerate($ants))
+#end if</make>
+	<callback>set_samp_rate($samp_rate)</callback>
+	<param>
+		<name>Output Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>type:COMPLEX_FLOAT32</opt>
+			<opt>vlen:1</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>type:COMPLEX_INT16</opt>
+			<opt>vlen:2</opt>
+		</option>
+	</param>
+	<param>
+		<name>Num Channels</name>
+		<key>nchan</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Args</name>
+		<key>args</key>
+		<value>addr=192.168.10.2 192.168.20.2</value>
+		<type>string</type>
+	</param>
+	<param>
+		<name>Samp Rate (Sps)</name>
+		<key>samp_rate</key>
+		<value>samp_rate</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Center Freqs (Hz)</name>
+		<key>center_freqs</key>
+		<value>0, 0</value>
+		<type>real_vector</type>
+	</param>
+	<param>
+		<name>Gains (dB)</name>
+		<key>gains</key>
+		<value>0, 0</value>
+		<type>real_vector</type>
+	</param>
+	<param>
+		<name>Antennas</name>
+		<key>ants</key>
+		<value>['RX2', 'RX2']</value>
+		<type>raw</type>
+		<hide>#if not $ants() then 'part' else 'none'#</hide>
+	</param>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$type.vlen</vlen>
+		<nports>$nchan</nports>
+	</source>
+	<doc>
+The UHD Source Block:
+
+Args:
+Args is a delimited string used to locate UHD devices on your system. \
+If left blank, the first UHD device found will be used. \
+Used args to specify a specfic device. \
+USRP2 Example: addr=192.168.10.2
+
+Sample rate:
+The sample rate is the number of samples per second output by this block. \
+The UHD device driver will try its best to match the requested sample rate. \
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Antenna:
+For subdevices/daughterboards with only one antenna, this may be left blank. \
+Otherwise, the user should specify one of the possible antenna choices. \
+See the daughterboard application notes for the possible antenna choices.
+	</doc>
+</block>
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 2ac4cc2e6..8aae63326 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -30,6 +30,8 @@ lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
 	utils.cc \
+	uhd_mimo_source.cc \
+	uhd_mimo_sink.cc \
 	uhd_simple_source.cc \
 	uhd_simple_sink.cc
 
@@ -40,6 +42,8 @@ libgnuradio_uhd_la_LIBADD = \
 libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
+	uhd_mimo_source.h \
+	uhd_mimo_sink.h \
 	uhd_simple_source.h \
 	uhd_simple_sink.h
 
diff --git a/gr-uhd/lib/uhd_mimo_sink.cc b/gr-uhd/lib/uhd_mimo_sink.cc
new file mode 100644
index 000000000..9226d6004
--- /dev/null
+++ b/gr-uhd/lib/uhd_mimo_sink.cc
@@ -0,0 +1,136 @@
+/* -*- 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_mimo_sink.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include "utils.h"
+
+/***********************************************************************
+ * UHD Sink
+ **********************************************************************/
+uhd_mimo_sink::uhd_mimo_sink(gr_io_signature_sptr sig)
+:gr_sync_block("uhd mimo sink", sig, gr_make_io_signature(0, 0, 0)){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Sink Impl
+ **********************************************************************/
+class uhd_mimo_sink_impl : public uhd_mimo_sink{
+public:
+    uhd_mimo_sink_impl(
+        size_t num_channels,
+        const std::string &args,
+        const uhd::io_type_t &type
+    ) : uhd_mimo_sink(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type)
+    {
+        _dev = uhd::usrp::mimo_usrp::make(args);
+    }
+
+    ~uhd_mimo_sink_impl(void){
+        //NOP
+    }
+
+    void set_samp_rate_all(double rate){
+        _dev->set_tx_rate_all(rate);
+        do_samp_rate_error_message(rate, get_samp_rate_all());
+    }
+
+    double get_samp_rate_all(void){
+        return _dev->get_tx_rate_all();
+    }
+
+    uhd::tune_result_t set_center_freq(size_t chan, double freq){
+        return _dev->set_tx_freq(chan, freq);
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_tx_freq_range(chan);
+    }
+
+    void set_gain(size_t chan, float gain){
+        return _dev->set_tx_gain(chan, gain);
+    }
+
+    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(size_t chan, const std::string &ant){
+        return _dev->set_tx_antenna(chan, ant);
+    }
+
+    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_time_next_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_next_pps(time_spec);
+    }
+
+    uhd::usrp::mimo_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::mimo_usrp::sptr _dev;
+    const uhd::io_type_t _type;
+};
+
+/***********************************************************************
+ * Make UHD Sink
+ **********************************************************************/
+boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink(
+    size_t num_channels,
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+){
+    return boost::shared_ptr<uhd_mimo_sink>(
+        new uhd_mimo_sink_impl(num_channels, args, type)
+    );
+}
diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h
new file mode 100644
index 000000000..280f7c0e8
--- /dev/null
+++ b/gr-uhd/lib/uhd_mimo_sink.h
@@ -0,0 +1,129 @@
+/* -*- 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_MIMO_SINK_H
+#define INCLUDED_UHD_MIMO_SINK_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/mimo_usrp.hpp>
+
+class uhd_mimo_sink;
+
+boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink(
+    size_t num_channels,
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+);
+
+class uhd_mimo_sink : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the input signature
+     */
+    uhd_mimo_sink(gr_io_signature_sptr sig);
+
+    /*!
+     * Set the sample rate for the usrp device (across all mboards).
+     * \param rate a new rate in Sps
+     */
+    virtual void set_samp_rate_all(double rate) = 0;
+
+    /*!
+     * Get the sample rate for the usrp device (across all mboards).
+     * This is the actual sample rate and may differ from the rate set.
+     * \return the actual rate in Sps
+     */
+    virtual double get_samp_rate_all(void) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * \param chan the channel number from 0 to N-1
+     * \param freq the desired frequency in Hz
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(size_t chan, double freq) = 0;
+
+    /*!
+     * Get the tunable frequency range.
+     * \param chan the channel number from 0 to N-1
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param chan the channel number from 0 to N-1
+     * \param gain the gain in dB
+     */
+    virtual void set_gain(size_t chan, float gain) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \param chan the channel number from 0 to N-1
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \param chan the channel number from 0 to N-1
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param chan the channel number from 0 to N-1
+     * \param ant the antenna string
+     */
+    virtual void set_antenna(size_t chan, const std::string &ant) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \param chan the channel number from 0 to N-1
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \param chan the channel number from 0 to N-1
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan) = 0;
+
+    /*!
+     * Set the time registers at the next pps (across all mboards).
+     * \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 mimo usrp device object
+     */
+    virtual uhd::usrp::mimo_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_MIMO_SINK_H */
diff --git a/gr-uhd/lib/uhd_mimo_source.cc b/gr-uhd/lib/uhd_mimo_source.cc
new file mode 100644
index 000000000..bcd6aa695
--- /dev/null
+++ b/gr-uhd/lib/uhd_mimo_source.cc
@@ -0,0 +1,154 @@
+/* -*- 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_mimo_source.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include "utils.h"
+
+/***********************************************************************
+ * UHD Source
+ **********************************************************************/
+uhd_mimo_source::uhd_mimo_source(gr_io_signature_sptr sig)
+:gr_sync_block("uhd mimo source", gr_make_io_signature(0, 0, 0), sig){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Source Impl
+ **********************************************************************/
+class uhd_mimo_source_impl : public uhd_mimo_source{
+public:
+    uhd_mimo_source_impl(
+        size_t num_channels,
+        const std::string &args,
+        const uhd::io_type_t &type
+    ) : uhd_mimo_source(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type)
+    {
+        _dev = uhd::usrp::mimo_usrp::make(args);
+        set_streaming(false);
+    }
+
+    ~uhd_mimo_source_impl(void){
+        //NOP
+    }
+
+    void set_samp_rate_all(double rate){
+        _dev->set_rx_rate_all(rate);
+        do_samp_rate_error_message(rate, get_samp_rate_all());
+    }
+
+    double get_samp_rate_all(void){
+        return _dev->get_rx_rate_all();
+    }
+
+    uhd::tune_result_t set_center_freq(size_t chan, double freq){
+        return _dev->set_rx_freq(chan, freq);
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_rx_freq_range(chan);
+    }
+
+    void set_gain(size_t chan, float gain){
+        return _dev->set_rx_gain(chan, gain);
+    }
+
+    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(size_t chan, const std::string &ant){
+        return _dev->set_rx_antenna(chan, ant);
+    }
+
+    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_time_next_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_next_pps(time_spec);
+    }
+
+    uhd::usrp::mimo_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
+        );
+    }
+
+protected:
+    uhd::usrp::mimo_usrp::sptr _dev;
+    const uhd::io_type_t _type;
+    bool _is_streaming;
+
+    void set_streaming(bool enb){
+        if (enb){ //FIXME TODO handle this better
+            uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
+            stream_cmd.stream_now = false;
+            stream_cmd.time_spec = uhd::time_spec_t(1, 0);
+            _dev->issue_stream_cmd(stream_cmd);
+            sleep(1);
+        }
+        else
+            _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
+        _is_streaming = enb;
+    }
+};
+
+/***********************************************************************
+ * Make UHD Source
+ **********************************************************************/
+boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source(
+    size_t num_channels,
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+){
+    return boost::shared_ptr<uhd_mimo_source>(
+        new uhd_mimo_source_impl(num_channels, args, type)
+    );
+}
diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h
new file mode 100644
index 000000000..916f50972
--- /dev/null
+++ b/gr-uhd/lib/uhd_mimo_source.h
@@ -0,0 +1,129 @@
+/* -*- 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_MIMO_SOURCE_H
+#define INCLUDED_UHD_MIMO_SOURCE_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/mimo_usrp.hpp>
+
+class uhd_mimo_source;
+
+boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source(
+    size_t num_channels,
+    const std::string &args,
+    const uhd::io_type_t::tid_t &type
+);
+
+class uhd_mimo_source : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the output signature
+     */
+    uhd_mimo_source(gr_io_signature_sptr sig);
+
+    /*!
+     * Set the sample rate for the usrp device (across all mboards).
+     * \param rate a new rate in Sps
+     */
+    virtual void set_samp_rate_all(double rate) = 0;
+
+    /*!
+     * Get the sample rate for the usrp device (across all mboards).
+     * This is the actual sample rate and may differ from the rate set.
+     * \return the actual rate in Sps
+     */
+    virtual double get_samp_rate_all(void) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * \param chan the channel number from 0 to N-1
+     * \param freq the desired frequency in Hz
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(size_t chan, double freq) = 0;
+
+    /*!
+     * Get the tunable frequency range.
+     * \param chan the channel number from 0 to N-1
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param chan the channel number from 0 to N-1
+     * \param gain the gain in dB
+     */
+    virtual void set_gain(size_t chan, float gain) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \param chan the channel number from 0 to N-1
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \param chan the channel number from 0 to N-1
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param chan the channel number from 0 to N-1
+     * \param ant the antenna string
+     */
+    virtual void set_antenna(size_t chan, const std::string &ant) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \param chan the channel number from 0 to N-1
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \param chan the channel number from 0 to N-1
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan) = 0;
+
+    /*!
+     * Set the time registers at the next pps (across all mboards).
+     * \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 mimo usrp device object
+     */
+    virtual uhd::usrp::mimo_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_MIMO_SOURCE_H */
diff --git a/gr-uhd/lib/uhd_simple_sink.cc b/gr-uhd/lib/uhd_simple_sink.cc
index 44f60a05f..1443490cd 100644
--- a/gr-uhd/lib/uhd_simple_sink.cc
+++ b/gr-uhd/lib/uhd_simple_sink.cc
@@ -29,7 +29,7 @@
  * UHD Sink
  **********************************************************************/
 uhd_simple_sink::uhd_simple_sink(gr_io_signature_sptr sig)
-:gr_sync_block("uhd sink", sig, gr_make_io_signature(0, 0, 0)){
+:gr_sync_block("uhd simple sink", sig, gr_make_io_signature(0, 0, 0)){
     /* NOP */
 }
 
@@ -119,8 +119,8 @@ public:
         metadata.start_of_burst = true;
 
         return _dev->get_device()->send(
-            boost::asio::buffer(input_items[0], noutput_items*_type.size),
-            metadata, _type, uhd::device::SEND_MODE_FULL_BUFF
+            input_items, noutput_items, metadata,
+            _type, uhd::device::SEND_MODE_FULL_BUFF
         );
     }
 
diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc
index 49e4f168a..c680aa313 100644
--- a/gr-uhd/lib/uhd_simple_source.cc
+++ b/gr-uhd/lib/uhd_simple_source.cc
@@ -29,7 +29,7 @@
  * UHD Source
  **********************************************************************/
 uhd_simple_source::uhd_simple_source(gr_io_signature_sptr sig)
-:gr_sync_block("uhd source", gr_make_io_signature(0, 0, 0), sig){
+:gr_sync_block("uhd simple source", gr_make_io_signature(0, 0, 0), sig){
     /* NOP */
 }
 
@@ -123,8 +123,8 @@ public:
         uhd::rx_metadata_t metadata; //not passed out of this block
 
         return _dev->get_device()->recv(
-            boost::asio::buffer(output_items[0], noutput_items*_type.size),
-            metadata, _type, uhd::device::RECV_MODE_FULL_BUFF
+            output_items, noutput_items, metadata,
+            _type, uhd::device::RECV_MODE_FULL_BUFF
         );
     }
 
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 5956a686c..34e140887 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -23,6 +23,8 @@
 %include "gnuradio.i"
 
 %{
+#include <uhd_mimo_source.h>
+#include <uhd_mimo_sink.h>
 #include <uhd_simple_source.h>
 #include <uhd_simple_sink.h>
 %}
@@ -34,6 +36,12 @@
 %include <uhd/types/time_spec.hpp>
 %include <uhd/types/clock_config.hpp>
 
+GR_SWIG_BLOCK_MAGIC(uhd,mimo_source)
+%include <uhd_mimo_source.h>
+
+GR_SWIG_BLOCK_MAGIC(uhd,mimo_sink)
+%include <uhd_mimo_sink.h>
+
 GR_SWIG_BLOCK_MAGIC(uhd,simple_source)
 %include <uhd_simple_source.h>