aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/usrp1_iface.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-09-23 18:07:31 -0700
committerJosh Blum <josh@joshknows.com>2010-09-23 18:07:31 -0700
commitf97c4338458a965502d73903983ae5a3ceeebd53 (patch)
tree7f0434c764749868ef24e347bde6e9b7238434fc /host/lib/usrp/usrp1/usrp1_iface.cpp
parent1826421cd428f795b4b8cd0acdad4fea92262f72 (diff)
downloaduhd-f97c4338458a965502d73903983ae5a3ceeebd53.tar.gz
uhd-f97c4338458a965502d73903983ae5a3ceeebd53.tar.bz2
uhd-f97c4338458a965502d73903983ae5a3ceeebd53.zip
usrp1: fixes to remove warnings and errors for usrp1 + libusb windows
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_iface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp
index 4bc18dd16..5fd3987d5 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.cpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.cpp
@@ -80,7 +80,7 @@ public:
boost::uint32_t peek32(boost::uint32_t addr)
{
- uint32_t value_out;
+ boost::uint32_t value_out;
boost::uint8_t w_index_h = SPI_ENABLE_FPGA & 0xff;
boost::uint8_t w_index_l = (SPI_FMT_MSB | SPI_FMT_HDR_1) & 0xff;
@@ -100,7 +100,7 @@ public:
boost::uint16_t peek16(boost::uint32_t addr)
{
- uint32_t val = peek32(addr);
+ boost::uint32_t val = peek32(addr);
return boost::uint16_t(val & 0xff);
}