summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-03 16:39:16 -0800
committerJosh Blum <josh@joshknows.com>2011-03-03 16:39:16 -0800
commitd2556f45c943e54d1b74afe94bff98cd81661bb2 (patch)
treee33cb98de66846a388792ed7b64cda586cde2ab8 /host/lib/usrp
parent98028b366f840efc3b289cc7051bed73aad0963c (diff)
downloaduhd-d2556f45c943e54d1b74afe94bff98cd81661bb2.tar.gz
uhd-d2556f45c943e54d1b74afe94bff98cd81661bb2.tar.bz2
uhd-d2556f45c943e54d1b74afe94bff98cd81661bb2.zip
uhd: removed mb_eeprom from mboard iface (already exposed in property)
also fixed some warnings with unused parameters
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_iface.cpp8
-rw-r--r--host/lib/usrp/usrp1/usrp1_iface.hpp3
-rw-r--r--host/lib/usrp/usrp2/usrp2_iface.hpp3
-rw-r--r--host/lib/usrp/usrp_e100/usrp_e100_iface.cpp4
-rw-r--r--host/lib/usrp/usrp_e100/usrp_e100_iface.hpp3
5 files changed, 15 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp
index 491f76cef..e90d66c82 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.cpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.cpp
@@ -94,20 +94,20 @@ public:
return uhd::ntohx(value_out);
}
- void poke16(boost::uint32_t addr, boost::uint16_t value) {
+ void poke16(boost::uint32_t, boost::uint16_t) {
throw uhd::not_implemented_error("Unhandled command poke16()");
}
- boost::uint16_t peek16(boost::uint32_t addr) {
+ boost::uint16_t peek16(boost::uint32_t) {
throw uhd::not_implemented_error("Unhandled command peek16()");
return 0;
}
- void write_uart(boost::uint8_t dev, const std::string &buf) {
+ void write_uart(boost::uint8_t, const std::string &) {
throw uhd::not_implemented_error("Unhandled command write_uart()");
}
- std::string read_uart(boost::uint8_t dev) {
+ std::string read_uart(boost::uint8_t) {
throw uhd::not_implemented_error("Unhandled command read_uart()");
}
diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp
index e808e2959..fdb7464ce 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.hpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.hpp
@@ -32,6 +32,9 @@ class usrp1_iface : public uhd::usrp::mboard_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
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp
index 75057ab96..df53ec66a 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.hpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.hpp
@@ -70,6 +70,9 @@ public:
* Register map selected from USRP2/USRP2+.
*/
usrp2_regs_t regs;
+
+ //motherboard eeprom map structure
+ uhd::usrp::mboard_eeprom_t mb_eeprom;
};
#endif /* INCLUDED_USRP2_IFACE_HPP */
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
index 6d3f41fab..45e57f301 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
@@ -258,11 +258,11 @@ public:
return data.data;
}
- void write_uart(boost::uint8_t dev, const std::string &buf) {
+ void write_uart(boost::uint8_t, const std::string &) {
throw uhd::not_implemented_error("Unhandled command write_uart()");
}
- std::string read_uart(boost::uint8_t dev) {
+ std::string read_uart(boost::uint8_t) {
throw uhd::not_implemented_error("Unhandled command read_uart()");
}
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_iface.hpp b/host/lib/usrp/usrp_e100/usrp_e100_iface.hpp
index 5e346519c..cb0ca2dd4 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_iface.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_iface.hpp
@@ -67,6 +67,9 @@ public:
//! Get the I2C interface for the I2C device node
virtual uhd::i2c_iface &get_i2c_dev_iface(void) = 0;
+
+ //motherboard eeprom map structure
+ uhd::usrp::mboard_eeprom_t mb_eeprom;
};
#endif /* INCLUDED_USRP_E100_IFACE_HPP */