diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
| commit | 52ca2e0b8045c254c2be1911e77e8bd3d94ceeab (patch) | |
| tree | c7e1a93eeadd65bb13db1aa68974da495114f046 /host/include | |
| parent | 46febf986ae5e89ebb0c350fd9aa42aaa6383997 (diff) | |
| parent | 95ff7e859d57829e428d41d7746e28c228b983ba (diff) | |
| download | uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.gz uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.bz2 uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/rfnoc/blocks/ddc.xml | 2 | ||||
| -rw-r--r-- | host/include/uhd/transport/chdr.hpp | 6 | ||||
| -rw-r--r-- | host/include/uhd/transport/vrt_if_packet.hpp | 2 |
3 files changed, 5 insertions, 5 deletions
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> 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) |