Merge branch 'usrp1_next' into usrp1

1 files changed, 5 insertions, 7 deletions

diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp
index b175ba21f..9d326d6bd 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.cpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.cpp
@@ -53,7 +53,8 @@ public:
 
         if (iface_debug) {
             std::cout.fill('0');
-            std::cout << "poke32(" << std::dec << addr << ", 0x";
+            std::cout << "poke32(";
+            std::cout << std::dec << std::setw(2) << addr << ", 0x";
             std::cout << std::hex << std::setw(8) << value << ")" << std::endl;
         }
 
@@ -129,11 +130,7 @@ public:
     {
         UHD_ASSERT_THROW(num_bytes < max_i2c_data_bytes);
 
-        byte_vector_t out_bytes;
-        byte_vector_t::iterator it = out_bytes.begin();
-
         unsigned char buff[max_i2c_data_bytes];
-
         int ret = _ctrl_transport->usrp_control_read(VRQ_I2C_READ,
                                                      addr & 0xff,
                                                      0,
@@ -142,9 +139,10 @@ public:
 
         if ((ret < 0) || (unsigned)ret < (num_bytes)) {
             std::cerr << "USRP: failed i2c read: " << ret << std::endl;
-            return out_bytes;
+            return byte_vector_t(num_bytes, 0xff); 
         }
 
+        byte_vector_t out_bytes;
         for (size_t i = 0; i < num_bytes; i++)
             out_bytes.push_back(buff[i]);
 
@@ -168,7 +166,7 @@ public:
                                  size_t num_bits,
                                  bool readback)
     {
-        UHD_ASSERT_THROW((num_bits < 32) && !(num_bits % 8));
+        UHD_ASSERT_THROW((num_bits <= 32) && !(num_bits % 8));
         size_t num_bytes = num_bits / 8;
 
         // Byteswap on num_bytes