From bc9dd05988454428de1b6efd235d980b8eaa9afe Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 12 Aug 2015 12:19:20 -0700 Subject: C API cleanup, feature additions * Cleaned up usage of handles vs. handle pointers * Store global string for last error thrown * Removed uhd::device_addr_t handle, added std::vector handle --- host/lib/types/CMakeLists.txt | 2 +- host/lib/types/device_addrs_c.cpp | 78 ------------------------------------- host/lib/types/string_vector_c.cpp | 80 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 79 deletions(-) delete mode 100644 host/lib/types/device_addrs_c.cpp create mode 100644 host/lib/types/string_vector_c.cpp (limited to 'host/lib/types') diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt index 891977065..ebb788183 100644 --- a/host/lib/types/CMakeLists.txt +++ b/host/lib/types/CMakeLists.txt @@ -97,10 +97,10 @@ LIBUHD_APPEND_SOURCES( IF(ENABLE_C_API) LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/device_addrs_c.cpp ${CMAKE_CURRENT_SOURCE_DIR}/metadata_c.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ranges_c.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sensors_c.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/string_vector_c.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tune_c.cpp ${CMAKE_CURRENT_SOURCE_DIR}/usrp_info_c.cpp ) diff --git a/host/lib/types/device_addrs_c.cpp b/host/lib/types/device_addrs_c.cpp deleted file mode 100644 index 3a24551d3..000000000 --- a/host/lib/types/device_addrs_c.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// -// Copyright 2015 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include - -uhd_error uhd_device_addrs_make( - uhd_device_addrs_handle *h -){ - UHD_SAFE_C( - (*h) = new uhd_device_addrs_t; - ) -} - -uhd_error uhd_device_addrs_free( - uhd_device_addrs_handle *h -){ - UHD_SAFE_C( - delete (*h); - (*h) = NULL; - ) -} - -uhd_error uhd_device_addrs_push_back( - uhd_device_addrs_handle h, - const char* value -){ - UHD_SAFE_C_SAVE_ERROR(h, - h->device_addrs_cpp.push_back(uhd::device_addr_t(value)); - ) -} - -uhd_error uhd_device_addrs_at( - uhd_device_addrs_handle h, - size_t index, - char* value_out, - size_t strbuffer_len -){ - UHD_SAFE_C_SAVE_ERROR(h, - memset(value_out, '\0', strbuffer_len); - - std::string value_cpp = h->device_addrs_cpp.at(index).to_string(); - strncpy(value_out, value_cpp.c_str(), strbuffer_len); - ) -} - -uhd_error uhd_device_addrs_size( - uhd_device_addrs_handle h, - size_t *size_out -){ - UHD_SAFE_C_SAVE_ERROR(h, - *size_out = h->device_addrs_cpp.size(); - ) -} - -uhd_error uhd_device_addrs_last_error( - uhd_device_addrs_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); - ) -} diff --git a/host/lib/types/string_vector_c.cpp b/host/lib/types/string_vector_c.cpp new file mode 100644 index 000000000..b50c7cdff --- /dev/null +++ b/host/lib/types/string_vector_c.cpp @@ -0,0 +1,80 @@ +// +// Copyright 2015 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include + +#include + +uhd_error uhd_string_vector_make( + uhd_string_vector_handle *h +){ + UHD_SAFE_C( + (*h) = new uhd_string_vector_t; + ) +} + +uhd_error uhd_string_vector_free( + uhd_string_vector_handle *h +){ + UHD_SAFE_C( + delete (*h); + (*h) = NULL; + ) +} + +uhd_error uhd_string_vector_push_back( + uhd_string_vector_handle *h, + const char* value +){ + UHD_SAFE_C_SAVE_ERROR((*h), + (*h)->string_vector_cpp.push_back(value); + ) +} + +uhd_error uhd_string_vector_at( + uhd_string_vector_handle h, + size_t index, + char* value_out, + size_t strbuffer_len +){ + UHD_SAFE_C_SAVE_ERROR(h, + memset(value_out, '\0', strbuffer_len); + + const std::string& value_cpp = h->string_vector_cpp.at(index); + strncpy(value_out, value_cpp.c_str(), strbuffer_len); + ) +} + +uhd_error uhd_string_vector_size( + uhd_string_vector_handle h, + size_t *size_out +){ + UHD_SAFE_C_SAVE_ERROR(h, + *size_out = h->string_vector_cpp.size(); + ) +} + +uhd_error uhd_string_vector_last_error( + uhd_string_vector_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); + ) +} -- cgit v1.2.3