From b4bc85ac972b2e4f3e8e0b092947267f9f8aeee4 Mon Sep 17 00:00:00 2001
From: Ashish Chaudhari <ashish@ettus.com>
Date: Sat, 25 May 2019 00:14:36 -0700
Subject: rfnoc: Moved chdr types/packet class out of chdr dir

- Moved chdr_packet and chdr_types from rfnoc/chdr to rfnoc and updated
  all references
- Moved non-CHDR definitions to rfnoc_common.hpp
---
 host/tests/CMakeLists.txt      | 8 ++++----
 host/tests/rfnoc_chdr_test.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'host/tests')

diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt
index 0c48ae058..bd0964def 100644
--- a/host/tests/CMakeLists.txt
+++ b/host/tests/CMakeLists.txt
@@ -229,11 +229,11 @@ UHD_ADD_NONAPI_TEST(
 UHD_ADD_NONAPI_TEST(
     TARGET rfnoc_chdr_test.cpp
     EXTRA_SOURCES
-    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr/chdr_types.cpp
-    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr/chdr_packet.cpp
+    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_types.cpp
+    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_packet.cpp
     INCLUDE_DIRS
-    ${CMAKE_BINARY_DIR}/lib/rfnoc/chdr/
-    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr/
+    ${CMAKE_BINARY_DIR}/lib/rfnoc/
+    ${CMAKE_SOURCE_DIR}/lib/rfnoc/
 )
 
 UHD_ADD_NONAPI_TEST(
diff --git a/host/tests/rfnoc_chdr_test.cpp b/host/tests/rfnoc_chdr_test.cpp
index 67993cb02..417ed2f96 100644
--- a/host/tests/rfnoc_chdr_test.cpp
+++ b/host/tests/rfnoc_chdr_test.cpp
@@ -6,8 +6,8 @@
 
 #include <uhd/types/endianness.hpp>
 #include <uhd/utils/byteswap.hpp>
-#include <uhdlib/rfnoc/chdr/chdr_packet.hpp>
-#include <uhdlib/rfnoc/chdr/chdr_types.hpp>
+#include <uhdlib/rfnoc/chdr_packet.hpp>
+#include <uhdlib/rfnoc/chdr_types.hpp>
 #include <boost/format.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
-- 
cgit v1.2.3