From cf33e1e5f75c627907811e07e4c3c7a6b6175e8a Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 5 Jan 2011 16:22:47 -0800
Subject: uhd: added export macros (not used now) and updated copyright dates

---
 gr-uhd/lib/uhd_multi_usrp_source.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/gr-uhd/lib/uhd_multi_usrp_source.h b/gr-uhd/lib/uhd_multi_usrp_source.h
index b3cbdae1f..841f8fb44 100644
--- a/gr-uhd/lib/uhd_multi_usrp_source.h
+++ b/gr-uhd/lib/uhd_multi_usrp_source.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,18 +22,19 @@
 #ifndef INCLUDED_UHD_MULTI_USRP_SOURCE_H
 #define INCLUDED_UHD_MULTI_USRP_SOURCE_H
 
+#include <gr_uhd_api.h>
 #include <gr_sync_block.h>
 #include <uhd/usrp/multi_usrp.hpp>
 
 class uhd_multi_usrp_source;
 
-boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
+GR_UHD_API boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
     const std::string &device_addr,
     const uhd::io_type_t::tid_t &io_type,
     size_t num_channels
 );
 
-class uhd_multi_usrp_source : public gr_sync_block{
+class GR_UHD_API uhd_multi_usrp_source : public gr_sync_block{
 public:
 
     /*!
-- 
cgit 


From dfcc8cc28d8e5d0ca1de62b1622438be2439ebd1 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 5 Jan 2011 19:08:26 -0800
Subject: uhd: use the actual device and io types, do hacks in the init.py,
 also use clock config convenience

---
 gr-uhd/lib/uhd_multi_usrp_source.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/gr-uhd/lib/uhd_multi_usrp_source.h b/gr-uhd/lib/uhd_multi_usrp_source.h
index 841f8fb44..ff77d9d9e 100644
--- a/gr-uhd/lib/uhd_multi_usrp_source.h
+++ b/gr-uhd/lib/uhd_multi_usrp_source.h
@@ -29,8 +29,8 @@
 class uhd_multi_usrp_source;
 
 GR_UHD_API boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
-    const std::string &device_addr,
-    const uhd::io_type_t::tid_t &io_type,
+    const uhd::device_addr_t &device_addr,
+    const uhd::io_type_t &io_type,
     size_t num_channels
 );
 
-- 
cgit 


From b5556476aee35c5a77d1e255eb54d60028d8490e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 12 Jan 2011 14:24:13 -0800
Subject: uhd: replace gain floats with doubles to reflect new uhd api

---
 gr-uhd/lib/uhd_multi_usrp_source.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/gr-uhd/lib/uhd_multi_usrp_source.h b/gr-uhd/lib/uhd_multi_usrp_source.h
index ff77d9d9e..9cbec52aa 100644
--- a/gr-uhd/lib/uhd_multi_usrp_source.h
+++ b/gr-uhd/lib/uhd_multi_usrp_source.h
@@ -97,14 +97,14 @@ public:
      * \param gain the gain in dB
      * \param chan the channel index 0 to N-1
      */
-    virtual void set_gain(float gain, size_t chan) = 0;
+    virtual void set_gain(double gain, size_t chan) = 0;
 
     /*!
      * Get the actual dboard gain setting.
      * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */
-    virtual float get_gain(size_t chan) = 0;
+    virtual double get_gain(size_t chan) = 0;
 
     /*!
      * Get the settable gain range.
-- 
cgit