Merge branch 'master' into next

3 files changed, 94 insertions, 19 deletions

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index c27682f7f..c322c6124 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -31,7 +31,8 @@ lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
 	gr_uhd_usrp_source.cc \
-	gr_uhd_usrp_sink.cc
+	gr_uhd_usrp_sink.cc \
+	gr_uhd_amsg_source.cc
 
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
diff --git a/gr-uhd/lib/gr_uhd_amsg_source.cc b/gr-uhd/lib/gr_uhd_amsg_source.cc
new file mode 100644
index 000000000..f2958f115
--- /dev/null
+++ b/gr-uhd/lib/gr_uhd_amsg_source.cc
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2011 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 <gr_uhd_amsg_source.h>
+#include <boost/bind.hpp>
+#include <gruel/thread.h>
+
+/***********************************************************************
+ * UHD Asynchronous Message Source Impl
+ **********************************************************************/
+class uhd_amsg_source_impl : public uhd_amsg_source{
+public:
+    uhd_amsg_source_impl(
+        const uhd::device_addr_t &device_addr,
+        gr_msg_queue_sptr msgq
+    ):
+        _msgq(msgq), _running(true)
+    {
+        _dev = uhd::usrp::multi_usrp::make(device_addr);
+        _amsg_thread =
+            gruel::thread(boost::bind(&uhd_amsg_source_impl::recv_loop, this));
+    }
+
+    ~uhd_amsg_source_impl()
+    {
+        _running = false;
+        _amsg_thread.join();
+    }
+
+    void recv_loop()
+    {
+        gr_message_sptr msg;
+        uhd::async_metadata_t *md;
+
+        while (_running) {
+            msg = gr_make_message(0, 0.0, 0.0, sizeof(uhd::async_metadata_t));
+            md = (uhd::async_metadata_t *) msg->msg();
+
+            while (!_dev->get_device()->recv_async_msg(*md, 0.1)) {
+                if (!_running)
+                    return;
+            }
+
+            post(msg);
+        }
+    }
+
+    void post(gr_message_sptr msg)
+    {
+        _msgq->insert_tail(msg);
+    }
+
+protected:
+    uhd::usrp::multi_usrp::sptr _dev;
+    gruel::thread _amsg_thread;
+    gr_msg_queue_sptr _msgq;
+    bool _running;
+};
+
+/***********************************************************************
+ * Make UHD Asynchronous Message Source
+ **********************************************************************/
+boost::shared_ptr<uhd_amsg_source> uhd_make_amsg_source(
+    const uhd::device_addr_t &device_addr,
+    gr_msg_queue_sptr msgq
+){
+    return boost::shared_ptr<uhd_amsg_source>(
+        new uhd_amsg_source_impl(device_addr, msgq)
+    );
+}
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 2987d528c..669f890ea 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -33,8 +33,7 @@ public:
     uhd_usrp_source_impl(
         const uhd::device_addr_t &device_addr,
         const uhd::io_type_t &io_type,
-        size_t num_channels,
-	gr_msg_queue_sptr async_queue
+        size_t num_channels
     ):
         gr_sync_block(
             "gr uhd usrp source",
@@ -44,8 +43,7 @@ public:
         _type(io_type),
         _nchan(num_channels),
         _stream_now(_nchan == 1),
-        _tmp_buffs(_nchan),
-	_async_queue(async_queue)
+        _tmp_buffs(_nchan)
     {
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
@@ -224,15 +222,6 @@ public:
             return num_samps;
         }
 
-	// Scan queue and post async events
-	while (_dev->get_device()->recv_async_msg(_asyncdata, 0.0)) {
-	  if (_async_queue) {
-	    gr_message_sptr m = gr_make_message(0, 0.0, 0.0, sizeof(_asyncdata));
-	    memcpy(m->msg(), &_asyncdata, sizeof(_asyncdata));
-	    _async_queue->insert_tail(m);
-	  }
-	}
-
         return num_samps;
     }
 
@@ -258,8 +247,6 @@ private:
     bool _stream_now;
     gr_vector_void_star _tmp_buffs;
     uhd::rx_metadata_t _metadata;
-    uhd::async_metadata_t _asyncdata;
-    gr_msg_queue_sptr _async_queue;
 };
 
 
@@ -269,10 +256,9 @@ private:
 boost::shared_ptr<uhd_usrp_source> uhd_make_usrp_source(
     const uhd::device_addr_t &device_addr,
     const uhd::io_type_t &io_type,
-    size_t num_channels,
-    gr_msg_queue_sptr async_queue
+    size_t num_channels
 ){
     return boost::shared_ptr<uhd_usrp_source>(
-      new uhd_usrp_source_impl(device_addr, io_type, num_channels, async_queue)
+        new uhd_usrp_source_impl(device_addr, io_type, num_channels)
     );
 }