diff options
| author | Philip Balister <philip@opensdr.com> | 2010-11-04 08:02:10 -0400 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-11-04 08:02:10 -0400 |
| commit | 40080e474268291c915f8d68e99506e8ae2a3f75 (patch) | |
| tree | 99581ec02c77b08a11f38af901dc9db35adcbe3a /host/lib/usrp/usrp1/usrp1_iface.cpp | |
| parent | 7f8d7b0e2fef1b2d5bb9c8047380dcf958c0c49c (diff) | |
| parent | 16351339eb6962288844cefefbdb3f6eece8aca1 (diff) | |
| download | uhd-40080e474268291c915f8d68e99506e8ae2a3f75.tar.gz uhd-40080e474268291c915f8d68e99506e8ae2a3f75.tar.bz2 uhd-40080e474268291c915f8d68e99506e8ae2a3f75.zip | |
Merge remote branch 'origin/usrp_e_next' into usrp_e_next
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp index 5fd3987d5..64ced2905 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.cpp +++ b/host/lib/usrp/usrp1/usrp1_iface.cpp @@ -49,7 +49,7 @@ public: ******************************************************************/ void poke32(boost::uint32_t addr, boost::uint32_t value) { - boost::uint32_t swapped = byteswap(value); + boost::uint32_t swapped = uhd::htonx(value); if (iface_debug) { std::cout.fill('0'); @@ -72,12 +72,6 @@ public: std::cerr << "USRP: failed memory write: " << ret << std::endl; } - void poke16(boost::uint32_t, boost::uint16_t) - { - //fpga only handles 32 bit writes - std::cerr << "USRP: unsupported operation: poke16()" << std::endl; - } - boost::uint32_t peek32(boost::uint32_t addr) { boost::uint32_t value_out; @@ -95,13 +89,7 @@ public: if (ret < 0) std::cerr << "USRP: failed memory read: " << ret << std::endl; - return byteswap(value_out); - } - - boost::uint16_t peek16(boost::uint32_t addr) - { - boost::uint32_t val = peek32(addr); - return boost::uint16_t(val & 0xff); + return uhd::ntohx(value_out); } /******************************************************************* |