aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/usrp1_iface.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-09-30 10:07:13 -0700
committerJosh Blum <josh@joshknows.com>2010-09-30 10:07:13 -0700
commit04c74a3c74907e55e339f1568a1d5b4cdf190daf (patch)
tree647ba2fbcd4838f83276b2a662126d9f72cd5626 /host/lib/usrp/usrp1/usrp1_iface.cpp
parentb8e62bb9bf86d4804defe738b2a7140cd9417a6f (diff)
downloaduhd-04c74a3c74907e55e339f1568a1d5b4cdf190daf.tar.gz
uhd-04c74a3c74907e55e339f1568a1d5b4cdf190daf.tar.bz2
uhd-04c74a3c74907e55e339f1568a1d5b4cdf190daf.zip
usrp1: replace byteswap with htonx (it was wrong to just swap)
also removed unused poke and peek 16 bit calls
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_iface.cpp16
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);
}
/*******************************************************************