Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

Conflicts:
	host/lib/usrp/usrp2/io_impl.cpp

1 files changed, 3 insertions, 15 deletions

diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp
index 4bc18dd16..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,15 +72,9 @@ 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)
     {
-        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;
@@ -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)
-    {
-        uint32_t val = peek32(addr);
-        return boost::uint16_t(val & 0xff);
+        return uhd::ntohx(value_out);
     }
 
     /*******************************************************************