diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-03-12 12:11:15 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-03-12 12:11:15 -0700 |
commit | 04f71c29d27b16ec6a9b37ad18317bf8a3a83112 (patch) | |
tree | 2ca698516141844352e35b1eed5b292298d39c8e /host/lib/usrp/e300/e300_spi.cpp | |
parent | cc0af39a2234c433ff12d02a7d0f58db3e48b10c (diff) | |
parent | d1ca5a10a1c79092ca5b20f52989d6e8b81306c0 (diff) | |
download | uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.tar.gz uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.tar.bz2 uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/e300/e300_spi.cpp')
-rw-r--r-- | host/lib/usrp/e300/e300_spi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_spi.cpp b/host/lib/usrp/e300/e300_spi.cpp index 9a2daf4a7..2722d7f53 100644 --- a/host/lib/usrp/e300/e300_spi.cpp +++ b/host/lib/usrp/e300/e300_spi.cpp @@ -82,13 +82,13 @@ public: int ret(0); struct spi_ioc_transfer tr; - uint8_t *tx_data = reinterpret_cast<uint8_t *>(&data); + boost::uint8_t *tx_data = reinterpret_cast<boost::uint8_t *>(&data); UHD_ASSERT_THROW(num_bits == 24); - uint8_t tx[] = {tx_data[2], tx_data[1], tx_data[0]}; + boost::uint8_t tx[] = {tx_data[2], tx_data[1], tx_data[0]}; - uint8_t rx[3]; + boost::uint8_t rx[3]; tr.tx_buf = (unsigned long) &tx[0]; tr.rx_buf = (unsigned long) &rx[0]; tr.len = num_bits >> 3; |