From b0cb065111dc3f40b89bdda76e9bd98f3e70b72e Mon Sep 17 00:00:00 2001
From: Samuel O'Brien <sam.obrien@ni.com>
Date: Fri, 26 Jun 2020 08:26:25 -0500
Subject: rfnoc: Rename chdr_packet to chdr_packet_writer

It would be confusing to have two classes named chdr_packet. As it makes
more sense to name the new public chdr parser class chdr_packet, the
internal uhd::rfnoc::chdr::chdr_packet class is being renamed to
chdr_packet_writer to better represent its functionality.

Signed-off-by: Samuel O'Brien <sam.obrien@ni.com>
---
 host/tests/CMakeLists.txt      |  4 ++--
 host/tests/rfnoc_chdr_test.cpp | 33 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'host/tests')

diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt
index 819eb2b46..78e4d3539 100644
--- a/host/tests/CMakeLists.txt
+++ b/host/tests/CMakeLists.txt
@@ -202,7 +202,7 @@ UHD_ADD_NONAPI_TEST(
 UHD_ADD_NONAPI_TEST(
     TARGET "streamer_benchmark.cpp"
     EXTRA_SOURCES
-    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_packet.cpp
+    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_packet_writer.cpp
     ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_types.cpp
     ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_ctrl_xport.cpp
     ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_rx_data_xport.cpp
@@ -260,7 +260,7 @@ UHD_ADD_NONAPI_TEST(
     TARGET rfnoc_chdr_test.cpp
     EXTRA_SOURCES
     ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_types.cpp
-    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_packet.cpp
+    ${CMAKE_SOURCE_DIR}/lib/rfnoc/chdr_packet_writer.cpp
     INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/lib/rfnoc/
     ${CMAKE_SOURCE_DIR}/lib/rfnoc/
diff --git a/host/tests/rfnoc_chdr_test.cpp b/host/tests/rfnoc_chdr_test.cpp
index 27b883543..31640325c 100644
--- a/host/tests/rfnoc_chdr_test.cpp
+++ b/host/tests/rfnoc_chdr_test.cpp
@@ -6,7 +6,7 @@
 
 #include <uhd/types/endianness.hpp>
 #include <uhd/utils/byteswap.hpp>
-#include <uhdlib/rfnoc/chdr_packet.hpp>
+#include <uhdlib/rfnoc/chdr_packet_writer.hpp>
 #include <uhdlib/rfnoc/chdr_types.hpp>
 #include <boost/format.hpp>
 #include <boost/test/unit_test.hpp>
@@ -237,27 +237,28 @@ BOOST_AUTO_TEST_CASE(chdr_strc_packet_no_swap_64)
 BOOST_AUTO_TEST_CASE(chdr_generic_packet_calculate_pyld_offset_64)
 {
     // Check calculation without timestamp
-    auto test_pyld_offset =
-        [](chdr_packet::uptr& pkt, const packet_type_t pkt_type, const size_t num_mdata) {
-            uint64_t buff[MAX_BUF_SIZE_WORDS];
-            chdr_header header;
-            header.set_pkt_type(pkt_type);
-            header.set_num_mdata(num_mdata);
+    auto test_pyld_offset = [](chdr_packet_writer::uptr& pkt,
+                                const packet_type_t pkt_type,
+                                const size_t num_mdata) {
+        uint64_t buff[MAX_BUF_SIZE_WORDS];
+        chdr_header header;
+        header.set_pkt_type(pkt_type);
+        header.set_num_mdata(num_mdata);
 
-            pkt->refresh(reinterpret_cast<void*>(buff), header, 0);
+        pkt->refresh(reinterpret_cast<void*>(buff), header, 0);
 
-            const size_t pyld_offset = pkt->calculate_payload_offset(pkt_type, num_mdata);
+        const size_t pyld_offset = pkt->calculate_payload_offset(pkt_type, num_mdata);
 
-            void* pyld_ptr = pkt->get_payload_ptr();
+        void* pyld_ptr = pkt->get_payload_ptr();
 
-            const size_t non_pyld_bytes = static_cast<size_t>(
-                reinterpret_cast<uint8_t*>(pyld_ptr) - reinterpret_cast<uint8_t*>(buff));
+        const size_t non_pyld_bytes = static_cast<size_t>(
+            reinterpret_cast<uint8_t*>(pyld_ptr) - reinterpret_cast<uint8_t*>(buff));
 
-            BOOST_CHECK(pyld_offset == non_pyld_bytes);
-        };
+        BOOST_CHECK(pyld_offset == non_pyld_bytes);
+    };
 
     {
-        chdr_packet::uptr pkt = chdr64_be_factory.make_generic();
+        chdr_packet_writer::uptr pkt = chdr64_be_factory.make_generic();
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 0);
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 1);
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 2);
@@ -266,7 +267,7 @@ BOOST_AUTO_TEST_CASE(chdr_generic_packet_calculate_pyld_offset_64)
         test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 2);
     }
     {
-        chdr_packet::uptr pkt = chdr256_be_factory.make_generic();
+        chdr_packet_writer::uptr pkt = chdr256_be_factory.make_generic();
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 0);
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 1);
         test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 2);
-- 
cgit v1.2.3