Merge branch 'maint'

1 files changed, 23 insertions, 23 deletions

diff --git a/host/lib/usrp/e300/e300_i2c.hpp b/host/lib/usrp/e300/e300_i2c.hpp
index 6cca7ab70..98a1f80aa 100644
--- a/host/lib/usrp/e300/e300_i2c.hpp
+++ b/host/lib/usrp/e300/e300_i2c.hpp
@@ -19,7 +19,7 @@
 #define INCLUDED_E300_I2C_HPP
 
 #include <boost/noncopyable.hpp>
-#include <boost/cstdint.hpp>
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 
 #include <uhd/transport/zero_copy.hpp>
@@ -27,10 +27,10 @@
 namespace uhd { namespace usrp { namespace e300 {
 
 struct i2c_transaction_t {
-    boost::uint16_t reg;
-    boost::uint8_t  addr;
-    boost::uint8_t  data;
-    boost::uint8_t  type;
+    uint16_t reg;
+    uint8_t  addr;
+    uint8_t  data;
+    uint8_t  type;
 };
 
 class i2c : public boost::noncopyable
@@ -44,32 +44,32 @@ public:
         const std::string &ip_addr,
         const std::string &port);
 
-    virtual boost::uint8_t get_i2c_reg8(
-        const boost::uint8_t addr,
-        const boost::uint8_t reg) = 0;
+    virtual uint8_t get_i2c_reg8(
+        const uint8_t addr,
+        const uint8_t reg) = 0;
 
-    virtual boost::uint8_t get_i2c_reg16(
-        const boost::uint8_t addr,
-        const boost::uint16_t reg) = 0;
+    virtual uint8_t get_i2c_reg16(
+        const uint8_t addr,
+        const uint16_t reg) = 0;
 
     virtual void set_i2c_reg8(
-        const boost::uint8_t addr,
-        const boost::uint8_t reg,
-        const boost::uint8_t value) = 0;
+        const uint8_t addr,
+        const uint8_t reg,
+        const uint8_t value) = 0;
 
     virtual void set_i2c_reg16(
-        const boost::uint8_t addr,
-        const boost::uint16_t reg,
-        const boost::uint8_t value) = 0;
+        const uint8_t addr,
+        const uint16_t reg,
+        const uint8_t value) = 0;
 
 
-    static const boost::uint8_t DB_EEPROM_ADDR = 0x50;
-    static const boost::uint8_t MB_EEPROM_ADDR = 0x51;
+    static const uint8_t DB_EEPROM_ADDR = 0x50;
+    static const uint8_t MB_EEPROM_ADDR = 0x51;
 
-    static const boost::uint8_t WRITE          = 0x1;
-    static const boost::uint8_t READ           = 0x0;
-    static const boost::uint8_t TWOBYTE        = 0x4;
-    static const boost::uint8_t ONEBYTE        = 0x2;
+    static const uint8_t WRITE          = 0x1;
+    static const uint8_t READ           = 0x0;
+    static const uint8_t TWOBYTE        = 0x4;
+    static const uint8_t ONEBYTE        = 0x2;
 };
 
 }}};