From f97c4338458a965502d73903983ae5a3ceeebd53 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 23 Sep 2010 18:07:31 -0700
Subject: usrp1: fixes to remove warnings and errors for usrp1 + libusb windows

---
 host/lib/usrp/usrp1/usrp1_iface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')

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);
     }
 
-- 
cgit v1.2.3


From 04c74a3c74907e55e339f1568a1d5b4cdf190daf Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 30 Sep 2010 10:07:13 -0700
Subject: usrp1: replace byteswap with htonx (it was wrong to just swap)

also removed unused poke and peek 16 bit calls
---
 host/lib/usrp/usrp1/usrp1_iface.cpp | 16 ++--------------
 host/lib/usrp/usrp1/usrp1_iface.hpp | 14 --------------
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'host/lib/usrp/usrp1/usrp1_iface.cpp')

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);
     }
 
     /*******************************************************************
diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp
index 9a3fdd6bc..3f608584a 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.hpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.hpp
@@ -53,20 +53,6 @@ public:
      */
     virtual boost::uint32_t peek32(boost::uint32_t addr) = 0;
 
-    /*!
-     * Write a register (16 bits)
-     * \param addr the address
-     * \param data the 16bit data
-     */
-    virtual void poke16(boost::uint32_t addr, boost::uint16_t data) = 0;
-
-    /*!
-     * read a register (16 bits)
-     * \param addr the address
-     * \return the 16bit data
-     */
-    virtual boost::uint16_t peek16(boost::uint32_t addr) = 0;
-
     /*!
      * Perform an spi transaction.
      * \param which_slave the slave device number
-- 
cgit v1.2.3