C API: feature additions, bugfixes

* Wrapped uhd::device_addrs_t, added find functions for multi_usrp, multi_usrp_clock
* Replaced getopt with public domain implementation
* Minor bugfixes

4 files changed, 107 insertions, 0 deletions

diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt
index d8938c8a8..891977065 100644
--- a/host/lib/types/CMakeLists.txt
+++ b/host/lib/types/CMakeLists.txt
@@ -97,6 +97,7 @@ 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
diff --git a/host/lib/types/device_addrs_c.cpp b/host/lib/types/device_addrs_c.cpp
new file mode 100644
index 000000000..3a24551d3
--- /dev/null
+++ b/host/lib/types/device_addrs_c.cpp
@@ -0,0 +1,78 @@
+//
+// 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 <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/types/device_addrs.h>
+
+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/usrp/usrp_c.cpp b/host/lib/usrp/usrp_c.cpp
index 3eaf70405..829014829 100644
--- a/host/lib/usrp/usrp_c.cpp
+++ b/host/lib/usrp/usrp_c.cpp
@@ -249,6 +249,20 @@ uhd_error uhd_tx_streamer_last_error(
 /****************************************************************************
  * Generate / Destroy API calls
  ***************************************************************************/
+static boost::mutex _usrp_find_mutex;
+uhd_error uhd_usrp_find(
+    uhd_device_addrs_handle h,
+    const char* args,
+    size_t *num_found
+){
+    UHD_SAFE_C_SAVE_ERROR(h,
+        boost::mutex::scoped_lock _lock(_usrp_find_mutex);
+
+        h->device_addrs_cpp = uhd::device::find(std::string(args), uhd::device::USRP);
+        *num_found = h->device_addrs_cpp.size();
+    )
+}
+
 static boost::mutex _usrp_make_mutex;
 uhd_error uhd_usrp_make(
     uhd_usrp_handle *h,
diff --git a/host/lib/usrp_clock/usrp_clock_c.cpp b/host/lib/usrp_clock/usrp_clock_c.cpp
index b55abc852..dc5913534 100644
--- a/host/lib/usrp_clock/usrp_clock_c.cpp
+++ b/host/lib/usrp_clock/usrp_clock_c.cpp
@@ -54,6 +54,20 @@ UHD_SINGLETON_FCN(usrp_clock_ptrs, get_usrp_clock_ptrs);
 /****************************************************************************
  * Generate / Destroy API calls
  ***************************************************************************/
+static boost::mutex _usrp_clock_find_mutex;
+uhd_error uhd_usrp_clock_find(
+    uhd_device_addrs_handle h,
+    const char* args,
+    size_t *num_found
+){
+    UHD_SAFE_C_SAVE_ERROR(h,
+        boost::mutex::scoped_lock lock(_usrp_clock_find_mutex);
+
+        h->device_addrs_cpp = uhd::device::find(std::string(args), uhd::device::CLOCK);
+        *num_found = h->device_addrs_cpp.size();
+    )
+}
+
 static boost::mutex _usrp_clock_make_mutex;
 uhd_error uhd_usrp_clock_make(
     uhd_usrp_clock_handle *h,