diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-23 18:56:15 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-23 18:56:15 -0700 |
| commit | 5d6d25b49cc783ef012410064bc9eb0e66e50227 (patch) | |
| tree | cde46dbfc84917477d93d07440f59d7537b57e71 /host/lib/usrp/usrp1/usrp1_iface.cpp | |
| parent | 5fc96b27b9493506bd7ad60eb37f98f651de6545 (diff) | |
| parent | 188162a4dd59b47cf95d4be82e510faf9675a55d (diff) | |
| download | uhd-5d6d25b49cc783ef012410064bc9eb0e66e50227.tar.gz uhd-5d6d25b49cc783ef012410064bc9eb0e66e50227.tar.bz2 uhd-5d6d25b49cc783ef012410064bc9eb0e66e50227.zip | |
Merge branch 'libusb_win'
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.cpp | 4 |
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); } |