From 069a7ce0570001ea3d9512a11d238ea4d6773f1d Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 21 Jan 2010 19:05:30 -0800
Subject: Added more to the mboard test and the usrp device.

---
 include/usrp_uhd/device.hpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'include/usrp_uhd/device.hpp')

diff --git a/include/usrp_uhd/device.hpp b/include/usrp_uhd/device.hpp
index ad2d3b368..32d58b21f 100644
--- a/include/usrp_uhd/device.hpp
+++ b/include/usrp_uhd/device.hpp
@@ -26,9 +26,15 @@ public:
     typedef boost::shared_ptr<device> sptr;
 
     //argument types for send and recv raw methods
-    typedef std::vector<boost::asio::const_buffer> send_args_t;
+    //the send args is an array of buffers
+    //the recv args is a callback that takes a buffer
+    typedef std::vector<boost::asio::const_buffer>                   send_args_t;
     typedef boost::function<bool(const boost::asio::const_buffer &)> recv_args_t;
 
+    //structors
+    device(void);
+    virtual ~device(void);
+
     /*!
      * \brief Discover usrp devices attached to the host.
      *
@@ -53,16 +59,6 @@ public:
      */
     static sptr make(const device_addr_t & hint, size_t which = 0);
 
-    /*!
-     * Constructor: Called in derived classes.
-     */
-    device(void);
-
-    /*!
-     * Deconstructor: called automatically by the shared pointer.
-     */
-    virtual ~device(void);
-
     /*!
      * Get the device address for this board.
      */
@@ -74,8 +70,6 @@ public:
 
     //connect dsps and subdevs
     void connect(const wax::type &src, const wax::type &sink);
-
-private:
 };
 
 } //namespace usrp_uhd
-- 
cgit v1.2.3