aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2013-07-22 19:35:15 -0700
committerJosh Blum <josh@joshknows.com>2013-07-22 19:35:15 -0700
commit4a6e30a40fd48704432fc4410b06684cedea2ef6 (patch)
tree1015d3b03c1f2edfd227b47829a494e76f0c9348
parentea418a8507a363633541aa7554a030b56a476d85 (diff)
downloaduhd-4a6e30a40fd48704432fc4410b06684cedea2ef6.tar.gz
uhd-4a6e30a40fd48704432fc4410b06684cedea2ef6.tar.bz2
uhd-4a6e30a40fd48704432fc4410b06684cedea2ef6.zip
b200: removed header redundancy interface
-rw-r--r--host/lib/usrp/b200/b200_iface.hpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/host/lib/usrp/b200/b200_iface.hpp b/host/lib/usrp/b200/b200_iface.hpp
index bf2e006a9..6eb20a459 100644
--- a/host/lib/usrp/b200/b200_iface.hpp
+++ b/host/lib/usrp/b200/b200_iface.hpp
@@ -25,7 +25,7 @@
#include <boost/utility.hpp>
#include "ad9361_ctrl.hpp"
-class b200_iface: boost::noncopyable, public uhd::i2c_iface,
+class b200_iface: boost::noncopyable, public virtual uhd::i2c_iface,
public ad9361_ctrl_iface_type {
public:
typedef boost::shared_ptr<b200_iface> sptr;
@@ -61,17 +61,6 @@ public:
//! load an FPGA image
virtual void load_fpga(const std::string filestring) = 0;
- //! Read and Write to/from the EEPROM on the motherboard
- virtual void write_i2c(boost::uint8_t addr, const uhd::byte_vector_t &bytes) = 0;
- virtual uhd::byte_vector_t read_i2c(boost::uint8_t addr, size_t num_bytes) = 0;
-
- //! Overload the virtual read_eeprom function from i2c_iface, which won't
- // work on the B200 since the i2c controller is actually the FX3.
- virtual void write_eeprom(boost::uint8_t addr, boost::uint8_t offset,
- const uhd::byte_vector_t &bytes) = 0;
- virtual uhd::byte_vector_t read_eeprom(boost::uint8_t addr, boost::uint8_t offset,
- size_t num_bytes) = 0;
-
//! send SPI through the FX3
virtual void transact_spi( unsigned char *tx_data, size_t num_tx_bits, \
unsigned char *rx_data, size_t num_rx_bits) = 0;