octoclock: Apply clang-format

1 files changed, 70 insertions, 55 deletions

diff --git a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
index a9f91897e..349d704f3 100644
--- a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
+++ b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
@@ -5,20 +5,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
+#include "common.h"
 #include <uhd/exception.hpp>
-#include <uhd/usrp_clock/octoclock_eeprom.hpp>
 #include <uhd/transport/udp_simple.hpp>
-#include <uhd/usrp/mboard_eeprom.hpp>
 #include <uhd/types/byte_vector.hpp>
 #include <uhd/types/mac_addr.hpp>
+#include <uhd/usrp/mboard_eeprom.hpp>
+#include <uhd/usrp_clock/octoclock_eeprom.hpp>
 #include <uhd/utils/byteswap.hpp>
-#include <boost/assign/list_of.hpp>
 #include <boost/asio.hpp>
-
+#include <boost/assign/list_of.hpp>
 #include <iostream>
 
-#include "common.h"
-
 typedef boost::asio::ip::address_v4 ip_v4;
 
 using namespace uhd;
@@ -28,129 +26,146 @@ using namespace uhd::transport;
 /***********************************************************************
  * Implementation
  **********************************************************************/
-void octoclock_eeprom_t::_load(){
+void octoclock_eeprom_t::_load()
+{
     uint8_t octoclock_data[udp_simple::mtu];
-    const octoclock_packet_t *pkt_in = reinterpret_cast<const octoclock_packet_t*>(octoclock_data);
-    const octoclock_fw_eeprom_t *eeprom_in = reinterpret_cast<const octoclock_fw_eeprom_t*>(pkt_in->data);
+    const octoclock_packet_t* pkt_in =
+        reinterpret_cast<const octoclock_packet_t*>(octoclock_data);
+    const octoclock_fw_eeprom_t* eeprom_in =
+        reinterpret_cast<const octoclock_fw_eeprom_t*>(pkt_in->data);
 
     octoclock_packet_t pkt_out;
     // To avoid replicating sequence numbers between sessions
     pkt_out.sequence = uint32_t(std::rand());
-    size_t len = 0;
+    size_t len       = 0;
 
-    UHD_OCTOCLOCK_SEND_AND_RECV(xport, _proto_ver, SEND_EEPROM_CMD, pkt_out, len, octoclock_data);
-    if(UHD_OCTOCLOCK_PACKET_MATCHES(SEND_EEPROM_ACK, pkt_out, pkt_in, len)){
-        //MAC address
-        byte_vector_t mac_bytes(eeprom_in->mac_addr, eeprom_in->mac_addr+6);
+    UHD_OCTOCLOCK_SEND_AND_RECV(
+        xport, _proto_ver, SEND_EEPROM_CMD, pkt_out, len, octoclock_data);
+    if (UHD_OCTOCLOCK_PACKET_MATCHES(SEND_EEPROM_ACK, pkt_out, pkt_in, len)) {
+        // MAC address
+        byte_vector_t mac_bytes(eeprom_in->mac_addr, eeprom_in->mac_addr + 6);
         (*this)["mac-addr"] = mac_addr_t::from_bytes(mac_bytes).to_string();
 
-        //IP address
+        // IP address
         uint32_t ip_addr = uhd::htonx<uint32_t>(eeprom_in->ip_addr);
         ip_v4::bytes_type ip_addr_bytes;
         memcpy(&ip_addr_bytes, &ip_addr, 4);
         (*this)["ip-addr"] = ip_v4(ip_addr_bytes).to_string();
 
-        //Default router
+        // Default router
         uint32_t dr_addr = uhd::htonx<uint32_t>(eeprom_in->dr_addr);
         ip_v4::bytes_type dr_addr_bytes;
         memcpy(&dr_addr_bytes, &dr_addr, 4);
         (*this)["gateway"] = ip_v4(dr_addr_bytes).to_string();
 
-        //Netmask
+        // Netmask
         uint32_t netmask = uhd::htonx<uint32_t>(eeprom_in->netmask);
         ip_v4::bytes_type netmask_bytes;
         memcpy(&netmask_bytes, &netmask, 4);
         (*this)["netmask"] = ip_v4(netmask_bytes).to_string();
 
-        //Serial
+        // Serial
         std::string raw_serial((char*)eeprom_in->serial, 10);
         byte_vector_t serial_bytes(raw_serial.begin(), raw_serial.end());
         (*this)["serial"] = bytes_to_string(serial_bytes);
 
-        //Name
+        // Name
         std::string raw_name((char*)eeprom_in->name, 10);
         byte_vector_t name_bytes(raw_name.begin(), raw_name.end());
         (*this)["name"] = bytes_to_string(name_bytes);
 
-        //Revision
+        // Revision
         (*this)["revision"] = std::to_string(int(eeprom_in->revision));
-    }
-    else throw uhd::runtime_error("Error loading OctoClock EEPROM.");
+    } else
+        throw uhd::runtime_error("Error loading OctoClock EEPROM.");
 }
 
-void octoclock_eeprom_t::_store() const {
+void octoclock_eeprom_t::_store() const
+{
     uint8_t octoclock_data[udp_simple::mtu];
-    const octoclock_packet_t *pkt_in = reinterpret_cast<const octoclock_packet_t *>(octoclock_data);
+    const octoclock_packet_t* pkt_in =
+        reinterpret_cast<const octoclock_packet_t*>(octoclock_data);
 
     octoclock_packet_t pkt_out;
     // To avoid replicating sequence numbers between sessions
     pkt_out.sequence = uint32_t(std::rand());
-    pkt_out.len = sizeof(octoclock_fw_eeprom_t);
-    size_t len = 0;
+    pkt_out.len      = sizeof(octoclock_fw_eeprom_t);
+    size_t len       = 0;
 
-    octoclock_fw_eeprom_t *eeprom_out = reinterpret_cast<octoclock_fw_eeprom_t *>(&pkt_out.data);
+    octoclock_fw_eeprom_t* eeprom_out =
+        reinterpret_cast<octoclock_fw_eeprom_t*>(&pkt_out.data);
     memset(eeprom_out, 0xFF, sizeof(octoclock_fw_eeprom_t));
 
-    //MAC address
-    if((*this).has_key("mac-addr")){
-        byte_copy(mac_addr_t::from_string((*this)["mac-addr"]).to_bytes(), eeprom_out->mac_addr);
+    // MAC address
+    if ((*this).has_key("mac-addr")) {
+        byte_copy(mac_addr_t::from_string((*this)["mac-addr"]).to_bytes(),
+            eeprom_out->mac_addr);
     }
 
-    //IP address
-    if((*this).has_key("ip-addr")){
-        ip_v4::bytes_type ip_addr_bytes = ip_v4::from_string((*this)["ip-addr"]).to_bytes();
+    // IP address
+    if ((*this).has_key("ip-addr")) {
+        ip_v4::bytes_type ip_addr_bytes =
+            ip_v4::from_string((*this)["ip-addr"]).to_bytes();
         memcpy(&eeprom_out->ip_addr, &ip_addr_bytes, 4);
         eeprom_out->ip_addr = uhd::htonx<uint32_t>(eeprom_out->ip_addr);
     }
 
-    //Default router
-    if((*this).has_key("gateway")){
-        ip_v4::bytes_type dr_addr_bytes = ip_v4::from_string((*this)["gateway"]).to_bytes();
+    // Default router
+    if ((*this).has_key("gateway")) {
+        ip_v4::bytes_type dr_addr_bytes =
+            ip_v4::from_string((*this)["gateway"]).to_bytes();
         memcpy(&eeprom_out->dr_addr, &dr_addr_bytes, 4);
         eeprom_out->dr_addr = uhd::htonx<uint32_t>(eeprom_out->dr_addr);
     }
 
-    //Netmask
-    if((*this).has_key("netmask")){
-        ip_v4::bytes_type netmask_bytes = ip_v4::from_string((*this)["netmask"]).to_bytes();
+    // Netmask
+    if ((*this).has_key("netmask")) {
+        ip_v4::bytes_type netmask_bytes =
+            ip_v4::from_string((*this)["netmask"]).to_bytes();
         memcpy(&eeprom_out->netmask, &netmask_bytes, 4);
         eeprom_out->netmask = uhd::htonx<uint32_t>(eeprom_out->netmask);
     }
 
-    //Serial
-    if((*this).has_key("serial")){
-        byte_copy(byte_vector_t((*this)["serial"].begin(), (*this)["serial"].end()), eeprom_out->serial);
+    // Serial
+    if ((*this).has_key("serial")) {
+        byte_copy(byte_vector_t((*this)["serial"].begin(), (*this)["serial"].end()),
+            eeprom_out->serial);
     }
 
-    //Name
-    if((*this).has_key("name")){
-        byte_copy(byte_vector_t((*this)["name"].begin(), (*this)["name"].end()), eeprom_out->name);
+    // Name
+    if ((*this).has_key("name")) {
+        byte_copy(byte_vector_t((*this)["name"].begin(), (*this)["name"].end()),
+            eeprom_out->name);
     }
 
-    //Revision
-    if((*this).has_key("revision")){
-        eeprom_out->revision = (*this)["revision"][0]-'0';
+    // Revision
+    if ((*this).has_key("revision")) {
+        eeprom_out->revision = (*this)["revision"][0] - '0';
     }
 
-    UHD_OCTOCLOCK_SEND_AND_RECV(xport, _proto_ver, BURN_EEPROM_CMD, pkt_out, len, octoclock_data);
-    if(not UHD_OCTOCLOCK_PACKET_MATCHES(BURN_EEPROM_SUCCESS_ACK, pkt_out, pkt_in, len))
+    UHD_OCTOCLOCK_SEND_AND_RECV(
+        xport, _proto_ver, BURN_EEPROM_CMD, pkt_out, len, octoclock_data);
+    if (not UHD_OCTOCLOCK_PACKET_MATCHES(BURN_EEPROM_SUCCESS_ACK, pkt_out, pkt_in, len))
         throw uhd::runtime_error("Error writing to OctoClock EEPROM.");
 }
 
 /***********************************************************************
  * Implementation of OctoClock EEPROM
  **********************************************************************/
-octoclock_eeprom_t::octoclock_eeprom_t(void){
+octoclock_eeprom_t::octoclock_eeprom_t(void)
+{
     /* NOP */
 }
 
-octoclock_eeprom_t::octoclock_eeprom_t(udp_simple::sptr transport, uint32_t proto_ver) :
-	xport(transport), _proto_ver(proto_ver)
+octoclock_eeprom_t::octoclock_eeprom_t(udp_simple::sptr transport, uint32_t proto_ver)
+    : xport(transport), _proto_ver(proto_ver)
 {
     _load();
 }
 
-void octoclock_eeprom_t::commit() const{
-    if(!xport) throw uhd::runtime_error("There is no set device communication.");
+void octoclock_eeprom_t::commit() const
+{
+    if (!xport)
+        throw uhd::runtime_error("There is no set device communication.");
     _store();
 }