From 7613f8ce367ed0d80d2b717821583991d3aa509a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 1 Jul 2011 11:33:03 -0700
Subject: usrp1: implemented properties interface on usrp1

---
 host/lib/usrp/usrp1/usrp1_iface.hpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'host/lib/usrp/usrp1/usrp1_iface.hpp')

diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp
index e480c22ea..3da754a87 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.hpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.hpp
@@ -18,7 +18,8 @@
 #ifndef INCLUDED_USRP1_IFACE_HPP
 #define INCLUDED_USRP1_IFACE_HPP
 
-#include <uhd/usrp/mboard_iface.hpp>
+#include "wb_iface.hpp"
+#include <uhd/types/serial.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include "../fx2/fx2_ctrl.hpp"
@@ -28,33 +29,16 @@
  * Provides a set of functions to implementation layer.
  * Including spi, peek, poke, control...
  */
-class usrp1_iface : public uhd::usrp::mboard_iface, boost::noncopyable{
+class usrp1_iface : public wb_iface, public uhd::i2c_iface, public uhd::spi_iface, boost::noncopyable{
 public:
     typedef boost::shared_ptr<usrp1_iface> sptr;
 
-    //motherboard eeprom map structure
-    uhd::usrp::mboard_eeprom_t mb_eeprom;
-
     /*!
      * Make a new usrp1 interface with the control transport.
      * \param ctrl_transport the usrp controller object
      * \return a new usrp1 interface object
      */
     static sptr make(uhd::usrp::fx2_ctrl::sptr ctrl_transport);
-
-    /*!
-     * Perform a general USB firmware OUT operation
-     * \param request 
-     * \param value
-     * \param index 
-     * \param data 
-     * \return 
-     */
-    virtual void write_firmware_cmd(boost::uint8_t request,
-                                   boost::uint16_t value,
-                                   boost::uint16_t index,
-                                   unsigned char* buff,
-                                   boost::uint16_t length) = 0;
 };
 
 #endif /* INCLUDED_USRP1_IFACE_HPP */
-- 
cgit v1.2.3