Added base classes for the usrp dboards to inherit.

Added a manager class for the subdevs that will create devices,
and give out proxies to handle them.

3 files changed, 130 insertions, 1 deletions

diff --git a/include/usrp_uhd/usrp/dboard/Makefile.am b/include/usrp_uhd/usrp/dboard/Makefile.am
index 19777b11a..d8c240351 100644
--- a/include/usrp_uhd/usrp/dboard/Makefile.am
+++ b/include/usrp_uhd/usrp/dboard/Makefile.am
@@ -8,4 +8,6 @@ SUBDIRS =
 
 this_includedir = $(includedir)/usrp_uhd/usrp/dboard
 this_include_HEADERS = \
-	interface.hpp
+	base.hpp \
+	interface.hpp \
+	manager.hpp
diff --git a/include/usrp_uhd/usrp/dboard/base.hpp b/include/usrp_uhd/usrp/dboard/base.hpp
new file mode 100644
index 000000000..23ae4a4fe
--- /dev/null
+++ b/include/usrp_uhd/usrp/dboard/base.hpp
@@ -0,0 +1,80 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_BASE_H
+#define INCLUDED_USRP_UHD_USRP_DBOARD_BASE_H
+
+#include <usrp_uhd/wax.hpp>
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+#include <usrp_uhd/usrp/dboard/interface.hpp>
+
+namespace usrp_uhd{ namespace usrp{ namespace dboard{
+
+/*!
+ * A daughter board base class for all dboards.
+ * Sub classes for xcvr boards should inherit this.
+ */
+class xcvr_base : boost::noncopyable{
+public:
+    typedef boost::shared_ptr<xcvr_base> sptr;
+
+    //structors
+    xcvr_base(size_t subdev_index, interface::sptr dboard_interface);
+    ~xcvr_base(void);
+
+    //interface
+    virtual void rx_get(const wax::type &key, wax::type &val) = 0;
+    virtual void rx_set(const wax::type &key, const wax::type &val) = 0;
+    virtual void tx_get(const wax::type &key, wax::type &val) = 0;
+    virtual void tx_set(const wax::type &key, const wax::type &val) = 0;
+
+protected:
+    size_t get_subdev_index(void);
+    interface::sptr get_interface(void);
+
+private:
+    size_t             _subdev_index;
+    interface::sptr    _dboard_interface;
+};
+
+/*!
+ * A rx daughter board only implements rx methods.
+ * Sub classes for rx-only boards should inherit this.
+ */
+class rx_base : public xcvr_base{
+public:
+    /*!
+     * Create a new rx dboard object, override in subclasses.
+     */
+    rx_base(size_t subdev_index, interface::sptr sptr_interface);
+
+    virtual ~rx_base(void);
+
+    //override here so the derived classes cannot
+    void tx_get(const wax::type &key, wax::type &val);
+    void tx_set(const wax::type &key, const wax::type &val);
+};
+
+/*!
+ * A tx daughter board only implements tx methods.
+ * Sub classes for rx-only boards should inherit this.
+ */
+class tx_base : public xcvr_base{
+public:
+    /*!
+     * Create a new rx dboard object, override in subclasses.
+     */
+    tx_base(size_t subdev_index, interface::sptr sptr_interface);
+
+    virtual ~tx_base(void);
+
+    //override here so the derived classes cannot
+    void rx_get(const wax::type &key, wax::type &val);
+    void rx_set(const wax::type &key, const wax::type &val);
+};
+
+}}} //namespace
+
+#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_BASE_H */
diff --git a/include/usrp_uhd/usrp/dboard/manager.hpp b/include/usrp_uhd/usrp/dboard/manager.hpp
new file mode 100644
index 000000000..565411371
--- /dev/null
+++ b/include/usrp_uhd/usrp/dboard/manager.hpp
@@ -0,0 +1,47 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_H
+#define INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_H
+
+#include <vector>
+#include <usrp_uhd/wax.hpp>
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+#include <usrp_uhd/usrp/dboard/base.hpp>
+
+namespace usrp_uhd{ namespace usrp{ namespace dboard{
+
+/*!
+ * A daughter board subdev manager class.
+ * Create subdev instances for each subdev on a dboard.
+ * Provide wax::obj access to the subdevs inside.
+ */
+class manager : boost::noncopyable{
+public:
+    typedef boost::shared_ptr<manager> sptr;
+    //structors
+    manager(
+        uint16_t rx_dboard_id,
+        uint16_t tx_dboard_id,
+        interface::sptr dboard_interface
+    );
+    ~manager(void);
+
+    //interface
+    size_t get_num_rx_subdevs(void);
+    size_t get_num_tx_subdevs(void);
+    wax::obj::sptr get_rx_subdev(size_t subdev_index);
+    wax::obj::sptr get_tx_subdev(size_t subdev_index);
+
+private:
+    //list of rx and tx dboards in this manager
+    //each dboard here is actually a subdevice
+    std::vector<xcvr_base::sptr> _rx_dboards;
+    std::vector<xcvr_base::sptr> _tx_dboards;
+};
+
+}}} //namespace
+
+#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_H */