1 files changed, 45 insertions, 58 deletions

diff --git a/host/lib/usrp/b100/mb_eeprom.cpp b/host/lib/usrp/b100/mb_eeprom.cpp
index 3e46d7d1f..2be09891f 100644
--- a/host/lib/usrp/b100/mb_eeprom.cpp
+++ b/host/lib/usrp/b100/mb_eeprom.cpp
@@ -5,21 +5,22 @@
 //
 
 #include "b100_impl.hpp"
-#include <uhdlib/utils/eeprom_utils.hpp>
 #include <uhd/usrp/mboard_eeprom.hpp>
+#include <uhdlib/utils/eeprom_utils.hpp>
 
 namespace {
-    const uint8_t B100_EEPROM_ADDR = 0x50;
+const uint8_t B100_EEPROM_ADDR = 0x50;
 
-    //use char array so we dont need to attribute packed
-    struct b100_eeprom_map{
-        unsigned char _r[220];
-        unsigned char revision[2];
-        unsigned char product[2];
-        unsigned char name[NAME_MAX_LEN];
-        unsigned char serial[SERIAL_LEN];
-    };
-}
+// use char array so we dont need to attribute packed
+struct b100_eeprom_map
+{
+    unsigned char _r[220];
+    unsigned char revision[2];
+    unsigned char product[2];
+    unsigned char name[NAME_MAX_LEN];
+    unsigned char serial[SERIAL_LEN];
+};
+} // namespace
 
 using namespace uhd;
 using uhd::usrp::mboard_eeprom_t;
@@ -28,64 +29,50 @@ mboard_eeprom_t b100_impl::get_mb_eeprom(uhd::i2c_iface::sptr iface)
 {
     mboard_eeprom_t mb_eeprom;
 
-    //extract the revision number
+    // extract the revision number
     mb_eeprom["revision"] = uint16_bytes_to_string(
-        iface->read_eeprom(
-            B100_EEPROM_ADDR,
-            offsetof(b100_eeprom_map, revision),
-            2
-        )
-    );
+        iface->read_eeprom(B100_EEPROM_ADDR, offsetof(b100_eeprom_map, revision), 2));
 
-    //extract the product code
+    // extract the product code
     mb_eeprom["product"] = uint16_bytes_to_string(
-        iface->read_eeprom(
-            B100_EEPROM_ADDR,
-            offsetof(b100_eeprom_map, product),
-            2
-        )
-    );
+        iface->read_eeprom(B100_EEPROM_ADDR, offsetof(b100_eeprom_map, product), 2));
 
-    //extract the serial
+    // extract the serial
     mb_eeprom["serial"] = bytes_to_string(iface->read_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, serial), SERIAL_LEN
-    ));
+        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, serial), SERIAL_LEN));
 
-    //extract the name
+    // extract the name
     mb_eeprom["name"] = bytes_to_string(iface->read_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, name), NAME_MAX_LEN
-    ));
+        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, name), NAME_MAX_LEN));
 
     return mb_eeprom;
 }
 
-void b100_impl::set_mb_eeprom(
-    const uhd::usrp::mboard_eeprom_t &mb_eeprom
-) {
-    auto &iface = _fx2_ctrl;
-
-    //parse the revision number
-    if (mb_eeprom.has_key("revision")) iface->write_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, revision),
-        string_to_uint16_bytes(mb_eeprom["revision"])
-    );
-
-    //parse the product code
-    if (mb_eeprom.has_key("product")) iface->write_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, product),
-        string_to_uint16_bytes(mb_eeprom["product"])
-    );
+void b100_impl::set_mb_eeprom(const uhd::usrp::mboard_eeprom_t& mb_eeprom)
+{
+    auto& iface = _fx2_ctrl;
 
-    //store the serial
-    if (mb_eeprom.has_key("serial")) iface->write_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, serial),
-        string_to_bytes(mb_eeprom["serial"], SERIAL_LEN)
-    );
+    // parse the revision number
+    if (mb_eeprom.has_key("revision"))
+        iface->write_eeprom(B100_EEPROM_ADDR,
+            offsetof(b100_eeprom_map, revision),
+            string_to_uint16_bytes(mb_eeprom["revision"]));
 
-    //store the name
-    if (mb_eeprom.has_key("name")) iface->write_eeprom(
-        B100_EEPROM_ADDR, offsetof(b100_eeprom_map, name),
-        string_to_bytes(mb_eeprom["name"], NAME_MAX_LEN)
-    );
+    // parse the product code
+    if (mb_eeprom.has_key("product"))
+        iface->write_eeprom(B100_EEPROM_ADDR,
+            offsetof(b100_eeprom_map, product),
+            string_to_uint16_bytes(mb_eeprom["product"]));
+
+    // store the serial
+    if (mb_eeprom.has_key("serial"))
+        iface->write_eeprom(B100_EEPROM_ADDR,
+            offsetof(b100_eeprom_map, serial),
+            string_to_bytes(mb_eeprom["serial"], SERIAL_LEN));
+
+    // store the name
+    if (mb_eeprom.has_key("name"))
+        iface->write_eeprom(B100_EEPROM_ADDR,
+            offsetof(b100_eeprom_map, name),
+            string_to_bytes(mb_eeprom["name"], NAME_MAX_LEN));
 }
-