Merge branch 'calibration'

3 files changed, 71 insertions, 0 deletions

diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
index 48b8db885..5a434fd9a 100644
--- a/host/include/uhd/utils/CMakeLists.txt
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -21,10 +21,12 @@ INSTALL(FILES
     assert_has.ipp
     byteswap.hpp
     byteswap.ipp
+    csv.hpp
     gain_group.hpp
     images.hpp
     log.hpp
     msg.hpp
+    paths.hpp
     pimpl.hpp
     safe_call.hpp
     safe_main.hpp
diff --git a/host/include/uhd/utils/csv.hpp b/host/include/uhd/utils/csv.hpp
new file mode 100644
index 000000000..8dbb28377
--- /dev/null
+++ b/host/include/uhd/utils/csv.hpp
@@ -0,0 +1,35 @@
+//
+// Copyright 2011 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/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_CSV_HPP
+#define INCLUDED_UHD_UTILS_CSV_HPP
+
+#include <uhd/config.hpp>
+#include <vector>
+#include <string>
+#include <istream>
+
+namespace uhd{ namespace csv{
+    typedef std::vector<std::string> row_type;
+    typedef std::vector<row_type> rows_type;
+
+    //! Convert an input stream to csv rows.
+    UHD_API rows_type to_rows(std::istream &input);
+
+}} //namespace uhd::csv
+
+#endif /* INCLUDED_UHD_UTILS_CSV_HPP */
diff --git a/host/include/uhd/utils/paths.hpp b/host/include/uhd/utils/paths.hpp
new file mode 100644
index 000000000..2261f1b77
--- /dev/null
+++ b/host/include/uhd/utils/paths.hpp
@@ -0,0 +1,34 @@
+//
+// Copyright 2011 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/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_PATHS_HPP
+#define INCLUDED_UHD_UTILS_PATHS_HPP
+
+#include <uhd/config.hpp>
+#include <string>
+
+namespace uhd{
+
+    //! Get a string representing the system's temporary directory
+    UHD_API std::string get_tmp_path(void);
+
+    //! Get a string representing the system's appdata directory
+    UHD_API std::string get_app_path(void);
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_UTILS_PATHS_HPP */