diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
| commit | 450abc5b213fc477ae0f2d648405a8b6a55a7b03 (patch) | |
| tree | 01820d898ecd6541f988378413b4c55f16ebad6d /host/lib/usrp/usrp1/usrp1_iface.cpp | |
| parent | 7cb95203f8d7173e3d7070d24f68358be67d0b29 (diff) | |
| parent | b70d4430d4a898fe99b54740a1c4821ed9a1077b (diff) | |
| download | uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.gz uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.bz2 uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into tvrx_uhd
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); } |