aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard_eeprom_c.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-03-02 15:25:13 -0800
committeratrnati <54334261+atrnati@users.noreply.github.com>2020-03-03 08:51:32 -0600
commit876d4150aa3da531ddd687b48afada6e43f79146 (patch)
treefd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/usrp/dboard_eeprom_c.cpp
parent1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff)
downloaduhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.gz
uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.bz2
uhd-876d4150aa3da531ddd687b48afada6e43f79146.zip
uhd: Apply clang-format against all .cpp and .hpp files in host/
Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of files that clang-format gets applied against.
Diffstat (limited to 'host/lib/usrp/dboard_eeprom_c.cpp')
-rw-r--r--host/lib/usrp/dboard_eeprom_c.cpp122
1 files changed, 42 insertions, 80 deletions
diff --git a/host/lib/usrp/dboard_eeprom_c.cpp b/host/lib/usrp/dboard_eeprom_c.cpp
index a3ee0a2ed..b23d80689 100644
--- a/host/lib/usrp/dboard_eeprom_c.cpp
+++ b/host/lib/usrp/dboard_eeprom_c.cpp
@@ -5,115 +5,77 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
-#include <uhd/usrp/dboard_eeprom.h>
#include <uhd/error.h>
-#include <boost/format.hpp>
-
+#include <uhd/usrp/dboard_eeprom.h>
#include <string.h>
+#include <boost/format.hpp>
-uhd_error uhd_dboard_eeprom_make(
- uhd_dboard_eeprom_handle* h
-){
- UHD_SAFE_C(
- *h = new uhd_dboard_eeprom_t;
- )
+uhd_error uhd_dboard_eeprom_make(uhd_dboard_eeprom_handle* h)
+{
+ UHD_SAFE_C(*h = new uhd_dboard_eeprom_t;)
}
-uhd_error uhd_dboard_eeprom_free(
- uhd_dboard_eeprom_handle* h
-){
- UHD_SAFE_C(
- delete *h;
- *h = NULL;
- )
+uhd_error uhd_dboard_eeprom_free(uhd_dboard_eeprom_handle* h)
+{
+ UHD_SAFE_C(delete *h; *h = NULL;)
}
uhd_error uhd_dboard_eeprom_get_id(
- uhd_dboard_eeprom_handle h,
- char* id_out,
- size_t strbuffer_len
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- std::string dboard_id_cpp = h->dboard_eeprom_cpp.id.to_string();
- strncpy(id_out, dboard_id_cpp.c_str(), strbuffer_len);
- )
+ uhd_dboard_eeprom_handle h, char* id_out, size_t strbuffer_len)
+{
+ UHD_SAFE_C_SAVE_ERROR(
+ h, std::string dboard_id_cpp = h->dboard_eeprom_cpp.id.to_string();
+ strncpy(id_out, dboard_id_cpp.c_str(), strbuffer_len);)
}
-uhd_error uhd_dboard_eeprom_set_id(
- uhd_dboard_eeprom_handle h,
- const char* id
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- h->dboard_eeprom_cpp.id = uhd::usrp::dboard_id_t::from_string(id);
- )
+uhd_error uhd_dboard_eeprom_set_id(uhd_dboard_eeprom_handle h, const char* id)
+{
+ UHD_SAFE_C_SAVE_ERROR(
+ h, h->dboard_eeprom_cpp.id = uhd::usrp::dboard_id_t::from_string(id);)
}
uhd_error uhd_dboard_eeprom_get_serial(
- uhd_dboard_eeprom_handle h,
- char* id_out,
- size_t strbuffer_len
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- std::string dboard_serial_cpp = h->dboard_eeprom_cpp.serial;
- strncpy(id_out, dboard_serial_cpp.c_str(), strbuffer_len);
- )
+ uhd_dboard_eeprom_handle h, char* id_out, size_t strbuffer_len)
+{
+ UHD_SAFE_C_SAVE_ERROR(h, std::string dboard_serial_cpp = h->dboard_eeprom_cpp.serial;
+ strncpy(id_out, dboard_serial_cpp.c_str(), strbuffer_len);)
}
-uhd_error uhd_dboard_eeprom_set_serial(
- uhd_dboard_eeprom_handle h,
- const char* serial
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- h->dboard_eeprom_cpp.serial = serial;
- )
+uhd_error uhd_dboard_eeprom_set_serial(uhd_dboard_eeprom_handle h, const char* serial)
+{
+ UHD_SAFE_C_SAVE_ERROR(h, h->dboard_eeprom_cpp.serial = serial;)
}
//! Convert a string into an int. If that doesn't work, craft our own exception
// instead of using the Boost exception. We need to put this separate from the
// caller function because of macro expansion.
-int _convert_rev_with_exception(const std::string &rev_str)
+int _convert_rev_with_exception(const std::string& rev_str)
{
try {
return std::stoi(rev_str);
- } catch (const std::invalid_argument &) {
- throw uhd::lookup_error(str(
- boost::format("Error retrieving revision from string `%s`")
- % rev_str
- ));
- } catch (const std::out_of_range &) {
- throw uhd::lookup_error(str(
- boost::format("Error retrieving revision from string `%s`")
- % rev_str
- ));
+ } catch (const std::invalid_argument&) {
+ throw uhd::lookup_error(
+ str(boost::format("Error retrieving revision from string `%s`") % rev_str));
+ } catch (const std::out_of_range&) {
+ throw uhd::lookup_error(
+ str(boost::format("Error retrieving revision from string `%s`") % rev_str));
}
}
-uhd_error uhd_dboard_eeprom_get_revision(
- uhd_dboard_eeprom_handle h,
- int* revision_out
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- *revision_out = \
- _convert_rev_with_exception(h->dboard_eeprom_cpp.revision);
- )
+uhd_error uhd_dboard_eeprom_get_revision(uhd_dboard_eeprom_handle h, int* revision_out)
+{
+ UHD_SAFE_C_SAVE_ERROR(
+ h, *revision_out = _convert_rev_with_exception(h->dboard_eeprom_cpp.revision);)
}
-uhd_error uhd_dboard_eeprom_set_revision(
- uhd_dboard_eeprom_handle h,
- int revision
-){
- UHD_SAFE_C_SAVE_ERROR(h,
- h->dboard_eeprom_cpp.revision = std::to_string(revision);
- )
+uhd_error uhd_dboard_eeprom_set_revision(uhd_dboard_eeprom_handle h, int revision)
+{
+ UHD_SAFE_C_SAVE_ERROR(h, h->dboard_eeprom_cpp.revision = std::to_string(revision);)
}
uhd_error uhd_dboard_eeprom_last_error(
- uhd_dboard_eeprom_handle h,
- char* error_out,
- size_t strbuffer_len
-){
- UHD_SAFE_C(
- memset(error_out, '\0', strbuffer_len);
- strncpy(error_out, h->last_error.c_str(), strbuffer_len);
- )
+ uhd_dboard_eeprom_handle h, char* error_out, size_t strbuffer_len)
+{
+ UHD_SAFE_C(memset(error_out, '\0', strbuffer_len);
+ strncpy(error_out, h->last_error.c_str(), strbuffer_len);)
}