From 5b42b774d9ac1e74fb2916bf58085fe19ecb6720 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 16 Jan 2010 16:29:31 -0800
Subject: Created device interface for discovery, access, configuration...

---
 include/usrp_uhd.hpp | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

(limited to 'include/usrp_uhd.hpp')

diff --git a/include/usrp_uhd.hpp b/include/usrp_uhd.hpp
index 1cbd064b7..deaf6e0c6 100644
--- a/include/usrp_uhd.hpp
+++ b/include/usrp_uhd.hpp
@@ -5,39 +5,7 @@
 #ifndef INCLUDED_USRP_UHD_HPP
 #define INCLUDED_USRP_UHD_HPP
 
-#include <usrp_uhd/device_addr.hpp>
-#include <usrp_uhd/wax.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <vector>
-#include <sys/uio.h>
-
-namespace usrp_uhd{
-
-    class usrp_uhd{
-
-    public:
-        typedef boost::shared_ptr<usrp_uhd> sptr;
-        typedef boost::function<bool(void *data, size_t len)> recv_hdlr_t;
-        usrp_uhd(device_addr_t device_addr);
-        ~usrp_uhd(void);
-
-        //the io interface
-        void send(const std::vector<iovec> &iovs);
-        void send(void* data, size_t len); //wrapper
-        void recv(const recv_hdlr_t &recv_hdlr);
-        void recv(void* &data, size_t &len); //wrapper
-
-        //connect dsps and subdevs
-        void connect(const wax::type &src, const wax::type &sink);
-
-        //the properties interface
-        wax::proxy props(void);
-
-    private:
-        wax::type d_mboard;
-    };
-
-} //namespace usrp_uhd
+//include convenience headers
+#include <usrp_uhd/device.hpp>
 
 #endif /* INCLUDED_USRP_UHD_HPP */
-- 
cgit v1.2.3