aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp_e/usrp_e_iface.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-11 00:16:34 -0700
committerJosh Blum <josh@joshknows.com>2010-08-11 00:16:34 -0700
commit9e87ebda07dda14e5b0ab4c64b6adc9800358baa (patch)
tree501776cbf91375d455da48a787f5ae9987fadebe /host/lib/usrp/usrp_e/usrp_e_iface.cpp
parent293ccdccd1e111942e9cc48ab87690da5202e406 (diff)
downloaduhd-9e87ebda07dda14e5b0ab4c64b6adc9800358baa.tar.gz
uhd-9e87ebda07dda14e5b0ab4c64b6adc9800358baa.tar.bz2
uhd-9e87ebda07dda14e5b0ab4c64b6adc9800358baa.zip
usrp-e: fixed warnings and errors, missing subdev spec stuff
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_iface.cpp')
-rw-r--r--host/lib/usrp/usrp_e/usrp_e_iface.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_iface.cpp b/host/lib/usrp/usrp_e/usrp_e_iface.cpp
index 21e91452f..f00e92946 100644
--- a/host/lib/usrp/usrp_e/usrp_e_iface.cpp
+++ b/host/lib/usrp/usrp_e/usrp_e_iface.cpp
@@ -123,13 +123,13 @@ public:
boost::uint8_t mem[sizeof(usrp_e_i2c) + max_i2c_data_bytes];
//load the data struct
- usrp_e_i2c &data = reinterpret_cast<usrp_e_i2c&>(mem);
- data.addr = addr;
- data.len = bytes.size();
- std::copy(bytes.begin(), bytes.end(), data.data);
+ usrp_e_i2c *data = reinterpret_cast<usrp_e_i2c*>(mem);
+ data->addr = addr;
+ data->len = bytes.size();
+ std::copy(bytes.begin(), bytes.end(), data->data);
//call the spi ioctl
- this->ioctl(USRP_E_I2C_WRITE, &data);
+ this->ioctl(USRP_E_I2C_WRITE, data);
}
byte_vector_t read_i2c(boost::uint8_t addr, size_t num_bytes){
@@ -138,17 +138,17 @@ public:
boost::uint8_t mem[sizeof(usrp_e_i2c) + max_i2c_data_bytes];
//load the data struct
- usrp_e_i2c &data = reinterpret_cast<usrp_e_i2c&>(mem);
- data.addr = addr;
- data.len = num_bytes;
+ usrp_e_i2c *data = reinterpret_cast<usrp_e_i2c*>(mem);
+ data->addr = addr;
+ data->len = num_bytes;
//call the spi ioctl
- this->ioctl(USRP_E_I2C_READ, &data);
+ this->ioctl(USRP_E_I2C_READ, data);
//unload the data
- byte_vector_t bytes(data.len);
+ byte_vector_t bytes(data->len);
UHD_ASSERT_THROW(bytes.size() == num_bytes);
- std::copy(data.data, data.data+bytes.size(), bytes.begin());
+ std::copy(data->data, data->data+bytes.size(), bytes.begin());
return bytes;
}