From 4e636b2b4bb29d5224aeff4ae79af121020338f1 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 2 Jul 2010 18:30:31 -0700
Subject: uhd mimo: created mimo source and sink block for gr-uhd

---
 gr-uhd/lib/uhd_mimo_source.h | 129 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 gr-uhd/lib/uhd_mimo_source.h

(limited to 'gr-uhd/lib/uhd_mimo_source.h')

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 */
-- 
cgit 


From 26cf4db8892b43ff8c085589c2fefe2a8e228dde Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 4 Jul 2010 20:22:35 -0700
Subject: uhd: added call to readback time registers, work on locking clocks in
 mimo config

---
 gr-uhd/lib/uhd_mimo_source.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gr-uhd/lib/uhd_mimo_source.h')

diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h
index 916f50972..e234779df 100644
--- a/gr-uhd/lib/uhd_mimo_source.h
+++ b/gr-uhd/lib/uhd_mimo_source.h
@@ -113,6 +113,12 @@ public:
      */
     virtual std::vector<std::string> get_antennas(size_t chan) = 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 at the next pps (across all mboards).
      * \param time_spec the new time
-- 
cgit