lib: Move all transport/nirio files into lib/

These header files (previously in include/uhd/transport) were not part
of the API. They weren't even being installed. They were created before
the `uhdlib/` subdirectory existed. Moving them here makes more sense.

host/lib/include/uhdlib/transport/nirio/nifpga_lvbitx.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_resource_manager.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/nirio_resource_manager.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
 
 namespace uhd { namespace niusrprio {
 

host/lib/include/uhdlib/transport/nirio/nirio_driver_iface.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <uhd/config.hpp>
-#include <uhd/transport/nirio/status.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string>

host/lib/include/uhdlib/transport/nirio/nirio_fifo.h

@@ -9,10 +9,10 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/status.h>
 #include <uhd/utils/noncopyable.hpp>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <atomic>
 #include <chrono>
 #include <cstdint>
@@ -232,6 +232,6 @@ private: // Members
     static const uint32_t FIFO_LOCK_TIMEOUT_IN_MS = 5000;
 };
 
-#include <uhd/transport/nirio/nirio_fifo.ipp>
+#include <uhdlib/transport/nirio/nirio_fifo.ipp>
 
 }} // namespace uhd::niusrprio

host/lib/include/uhdlib/transport/nirio/nirio_resource_manager.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_fifo.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/nirio_fifo.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
 #include <stdint.h>
 #include <map>
 #include <string>

host/lib/include/uhdlib/transport/nirio/niriok_proxy.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
-#include <uhd/transport/nirio/nirio_quirks.h>
 #include <uhd/utils/noncopyable.hpp>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_quirks.h>
 #include <stdint.h>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>

host/lib/include/uhdlib/transport/nirio/niriok_proxy_impl_v1.h

@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
-#include <uhd/transport/nirio/nirio_quirks.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/utils/noncopyable.hpp>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_quirks.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
 
 namespace uhd { namespace niusrprio {
 /*

host/lib/include/uhdlib/transport/nirio/niriok_proxy_impl_v2.h

@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
-#include <uhd/transport/nirio/nirio_quirks.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/utils/noncopyable.hpp>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_quirks.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
 
 namespace uhd { namespace niusrprio {
 /*

host/lib/include/uhdlib/transport/nirio/niusrprio_session.h

@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nifpga_lvbitx.h>
-#include <uhd/transport/nirio/nirio_resource_manager.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/rpc/usrprio_rpc_client.hpp>
 #include <uhd/utils/noncopyable.hpp>
+#include <uhdlib/transport/nirio/nifpga_lvbitx.h>
+#include <uhdlib/transport/nirio/nirio_resource_manager.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/rpc/usrprio_rpc_client.hpp>
 #include <cstdint>
 #include <mutex>
 #include <string>

host/lib/include/uhdlib/transport/nirio/rpc/usrprio_rpc_client.hpp

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/rpc/rpc_client.hpp>
-#include <uhd/transport/nirio/rpc/rpc_common.hpp>
-#include <uhd/transport/nirio/rpc/usrprio_rpc_common.hpp>
-#include <uhd/transport/nirio/status.h>
+#include <uhdlib/transport/nirio/rpc/rpc_client.hpp>
+#include <uhdlib/transport/nirio/rpc/rpc_common.hpp>
+#include <uhdlib/transport/nirio/rpc/usrprio_rpc_common.hpp>
+#include <uhdlib/transport/nirio/status.h>
 
 namespace uhd { namespace usrprio_rpc {
 

host/lib/include/uhdlib/transport/nirio/rpc/usrprio_rpc_common.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/rpc/rpc_common.hpp>
+#include <uhdlib/transport/nirio/rpc/rpc_common.hpp>
 
 namespace uhd { namespace usrprio_rpc {
 

host/lib/include/uhdlib/transport/nirio_link.hpp

@@ -8,13 +8,13 @@
 
 #include <uhd/config.hpp>
 #include <uhd/transport/buffer_pool.hpp>
-#include <uhd/transport/nirio/nirio_fifo.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/niusrprio_session.h>
 #include <uhd/types/device_addr.hpp>
 #include <uhdlib/transport/adapter_info.hpp>
 #include <uhdlib/transport/link_base.hpp>
 #include <uhdlib/transport/links.hpp>
+#include <uhdlib/transport/nirio/nirio_fifo.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
 #include <memory>
 #include <vector>
 

host/lib/include/uhdlib/transport/nirio_zero_copy.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 #include <uhd/config.hpp>
-#include <uhd/transport/nirio/niusrprio_session.h>
 #include <uhd/transport/zero_copy.hpp>
 #include <uhd/types/device_addr.hpp>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
 #include <stdint.h>
 #include <memory>
 

host/lib/transport/nirio/lvbitx/template_lvbitx.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <uhd/transport/nirio/nifpga_lvbitx.h>
+#include <uhdlib/transport/nirio/nifpga_lvbitx.h>
 
 namespace uhd {{ namespace niusrprio {{
 

host/lib/transport/nirio/nifpga_lvbitx.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/nifpga_lvbitx.h>
+#include <uhdlib/transport/nirio/nifpga_lvbitx.h>
 #include <boost/algorithm/string.hpp>
 #include <cstdlib>
 #include <fstream>

host/lib/transport/nirio/nirio_driver_iface_linux.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp

@@ -4,7 +4,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-#include <uhd/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
 
 namespace nirio_driver_iface {
 

host/lib/transport/nirio/nirio_driver_iface_win.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/nirio_driver_iface.h>
+#include <uhdlib/transport/nirio/nirio_driver_iface.h>
 #include <process.h>
 
 #define NIRIO_IOCTL_MAP_MEMORY    \

host/lib/transport/nirio/nirio_resource_manager.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/nirio_resource_manager.h>
+#include <uhdlib/transport/nirio/nirio_resource_manager.h>
 
 // "push" and "pop" introduced in GCC 4.6; works with all clang
 #if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC_MINOR__ > 5)

host/lib/transport/nirio/niriok_proxy.cpp

@@ -5,9 +5,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/niriok_proxy_impl_v1.h>
-#include <uhd/transport/nirio/niriok_proxy_impl_v2.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/niriok_proxy_impl_v1.h>
+#include <uhdlib/transport/nirio/niriok_proxy_impl_v2.h>
 #include <cstring>
 
 // "push" and "pop" introduced in GCC 4.6; works with all clang

host/lib/transport/nirio/niriok_proxy_impl_v1.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/niriok_proxy_impl_v1.h>
+#include <uhdlib/transport/nirio/niriok_proxy_impl_v1.h>
 #include <cstring>
 
 // "push" and "pop" introduced in GCC 4.6; works with all clang

host/lib/transport/nirio/niriok_proxy_impl_v2.cpp

@@ -6,7 +6,7 @@
 //
 
 
-#include <uhd/transport/nirio/niriok_proxy_impl_v2.h>
+#include <uhdlib/transport/nirio/niriok_proxy_impl_v2.h>
 #include <cstring>
 
 // "push" and "pop" introduced in GCC 4.6; works with all clang

host/lib/transport/nirio/niusrprio_session.cpp

@@ -8,9 +8,9 @@
 
 //@TODO: Move the register defs required by the class to a common location
 #include "../../usrp/x300/x300_regs.hpp"
-#include <uhd/transport/nirio/nirio_fifo.h>
-#include <uhd/transport/nirio/niusrprio_session.h>
-#include <uhd/transport/nirio/status.h>
+#include <uhdlib/transport/nirio/nirio_fifo.h>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <stdio.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>

host/lib/transport/nirio/rpc/rpc_client.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/rpc/rpc_client.hpp>
+#include <uhdlib/transport/nirio/rpc/rpc_client.hpp>
 #include <uhdlib/utils/narrow.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/format.hpp>

host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp

@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/rpc/usrprio_rpc_client.hpp>
 #include <uhd/utils/platform.hpp>
+#include <uhdlib/transport/nirio/rpc/usrprio_rpc_client.hpp>
 
 namespace {
 constexpr int64_t DEFAULT_TIMEOUT_IN_MS = 5000;

host/lib/transport/nirio/status.cpp

@@ -6,7 +6,7 @@
 //
 
 
-#include <uhd/transport/nirio/status.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <boost/format.hpp>
 
 namespace uhd { namespace niusrprio {
@@ -14,7 +14,7 @@ namespace uhd { namespace niusrprio {
 #define NIRIO_ERR_INFO(CONST_NAME, ERR_CODE, ERR_MSG) nirio_err_info(ERR_CODE, ERR_MSG),
 
 const nirio_err_info nirio_err_info::NIRIO_ERROR_TABLE[] = {
-#include "../../../include/uhd/transport/nirio/nirio_err_template.h"
+#include "../../../include/uhdlib/transport/nirio/nirio_err_template.h"
 };
 
 #undef NIRIO_ERR_INFO

host/lib/transport/nirio_zero_copy.cpp

@@ -5,9 +5,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/transport/nirio/nirio_fifo.h>
-#include <uhd/transport/nirio_zero_copy.hpp>
 #include <uhd/utils/log.hpp>
+#include <uhdlib/transport/nirio/nirio_fifo.h>
+#include <uhdlib/transport/nirio_zero_copy.hpp>
 #include <uhdlib/utils/atomic.hpp>
 #include <stdio.h>
 #include <boost/date_time/posix_time/posix_time.hpp>

host/lib/usrp/x300/x300_fw_ctrl.cpp

@@ -8,12 +8,12 @@
 #include "x300_fw_common.h"
 #include "x300_regs.hpp"
 #include <uhd/exception.hpp>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/status.h>
 #include <uhd/transport/udp_simple.hpp>
 #include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/log.hpp>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/format.hpp>
 #include <chrono>

host/lib/usrp/x300/x300_image_loader.cpp

@@ -12,12 +12,12 @@
 #include <uhd/device.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/image_loader.hpp>
-#include <uhd/transport/nirio/niusrprio_session.h>
-#include <uhd/transport/nirio/status.h>
 #include <uhd/transport/udp_simple.hpp>
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/paths.hpp>
 #include <uhd/utils/static.hpp>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
+#include <uhdlib/transport/nirio/status.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/ptree.hpp>

host/lib/usrp/x300/x300_pcie_mgr.hpp

@@ -11,10 +11,10 @@
 #include "x300_device_args.hpp"
 #include "x300_mboard_type.hpp"
 #include <uhd/property_tree.hpp>
-#include <uhd/transport/nirio/niusrprio_session.h>
 #include <uhd/types/direction.hpp>
 #include <uhdlib/rfnoc/rfnoc_common.hpp>
 #include <uhdlib/transport/links.hpp>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
 #include <mutex>
 
 namespace uhd { namespace usrp { namespace x300 {

tools/nirio_programmer/CMakeLists.txt

@@ -45,6 +45,7 @@ include(UHDBoost)
 ### Configure Compiler ########################################################
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/../../host/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../host/lib/include"
     ${Boost_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
 )

tools/nirio_programmer/nirio_programmer.cpp

@@ -15,9 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/transport/nirio/niusrprio_session.h>
-#include <uhd/transport/nirio/niriok_proxy.h>
-#include <uhd/transport/nirio/nifpga_lvbitx.h>
+#include <uhdlib/transport/nirio/niusrprio_session.h>
+#include <uhdlib/transport/nirio/niriok_proxy.h>
+#include <uhdlib/transport/nirio/nifpga_lvbitx.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>