From cf34a754406dd514c5ca734394f156a45b1294a5 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 11 Jan 2017 12:24:40 -0800
Subject: docs: Purged references to CVITA, replaced with CHDR

---
 host/include/uhd/transport/chdr.hpp          | 6 +++---
 host/include/uhd/transport/vrt_if_packet.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'host/include')

diff --git a/host/include/uhd/transport/chdr.hpp b/host/include/uhd/transport/chdr.hpp
index fa2ae074e..3c85056d7 100644
--- a/host/include/uhd/transport/chdr.hpp
+++ b/host/include/uhd/transport/chdr.hpp
@@ -22,9 +22,9 @@
 
 namespace uhd{ namespace transport{ namespace vrt{
 
-/*! \brief CVITA/CHDR related function
+/*! \brief CHDR related function
  *
- * See \ref rtp_chdr for details on the CVITA/CHDR protocol.
+ * See \ref rtp_chdr for details on the CHDR protocol.
  *
  * All packers take the host format into account. Choose the _le functions
  * if the transport uses little endian format (e.g. PCIe) and the _be
@@ -46,7 +46,7 @@ namespace uhd{ namespace transport{ namespace vrt{
  */
 namespace chdr{
 
-    //! The maximum number of 64-bit words in a CVITA header
+    //! The maximum number of 64-bit words in a CHDR header
     static const size_t max_if_hdr_words64 = 2; // CHDR + tsf (fractional timestamp)
 
     /*!
diff --git a/host/include/uhd/transport/vrt_if_packet.hpp b/host/include/uhd/transport/vrt_if_packet.hpp
index 7d0123c42..1e0f4b2e0 100644
--- a/host/include/uhd/transport/vrt_if_packet.hpp
+++ b/host/include/uhd/transport/vrt_if_packet.hpp
@@ -57,7 +57,7 @@ namespace vrt{
             PACKET_TYPE_IF_EXT    = 0x1,
             PACKET_TYPE_CONTEXT   = 0x2, //extension context: has_sid = true
 
-            // CVITA language:
+            // CHDR language:
             //PACKET_TYPE_DATA      = 0x0, // Data
             PACKET_TYPE_FC        = 0x1, // Flow control
             PACKET_TYPE_ACK       = 0x1, // Flow control (ack)
-- 
cgit v1.2.3


From fba670a3c7d45847e48fc9dc8a3bdb6da0b1b948 Mon Sep 17 00:00:00 2001
From: Jonathon Pendlum <jonathon.pendlum@ettus.com>
Date: Wed, 11 Jan 2017 20:47:15 -0600
Subject: rfnoc: Changed DDC XML to use full noc id

---
 host/include/uhd/rfnoc/blocks/ddc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'host/include')

diff --git a/host/include/uhd/rfnoc/blocks/ddc.xml b/host/include/uhd/rfnoc/blocks/ddc.xml
index a88616117..13b9414bd 100644
--- a/host/include/uhd/rfnoc/blocks/ddc.xml
+++ b/host/include/uhd/rfnoc/blocks/ddc.xml
@@ -5,7 +5,7 @@
   <key>DDC</key>
   <!--There can be several of these:-->
   <ids>
-    <id revision="0">DDC0</id>
+    <id revision="0">DDC0000000000000</id>
   </ids>
   <!-- Registers -->
   <registers>
-- 
cgit v1.2.3