summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-05-20 11:01:58 -0700
committerJosh Blum <josh@joshknows.com>2011-05-20 11:01:58 -0700
commit7dbd83533974713a4d170f01cd2421378cf96ec7 (patch)
tree4430210463075fc7ed9f1b5d7ba8a874aa51a5a5
parent0f705316752a911ed031a479355e44f922222970 (diff)
downloaduhd-7dbd83533974713a4d170f01cd2421378cf96ec7.tar.gz
uhd-7dbd83533974713a4d170f01cd2421378cf96ec7.tar.bz2
uhd-7dbd83533974713a4d170f01cd2421378cf96ec7.zip
uhd: picked some minor changes from super packet handler
-rw-r--r--host/include/uhd/types/metadata.hpp2
-rwxr-xr-xhost/lib/transport/gen_vrt_if_packet.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp
index f4e084430..269c77c7c 100644
--- a/host/include/uhd/types/metadata.hpp
+++ b/host/include/uhd/types/metadata.hpp
@@ -81,6 +81,8 @@ namespace uhd{
ERROR_CODE_BROKEN_CHAIN = 0x4,
//! An internal receive buffer has filled.
ERROR_CODE_OVERFLOW = 0x8,
+ //! Multi-channel alignment failed.
+ ERROR_CODE_ALIGNMENT = 0xc,
//! The packet could not be parsed.
ERROR_CODE_BAD_PACKET = 0xf
} error_code;
diff --git a/host/lib/transport/gen_vrt_if_packet.py b/host/lib/transport/gen_vrt_if_packet.py
index 7df2092d8..7440def6a 100755
--- a/host/lib/transport/gen_vrt_if_packet.py
+++ b/host/lib/transport/gen_vrt_if_packet.py
@@ -140,6 +140,7 @@ void vrt::if_hdr_pack_$(suffix)(
//fill in complete header word
packet_buff[0] = $(XE_MACRO)(boost::uint32_t(0
+ | (if_packet_info.packet_type << 29)
| vrt_hdr_flags
| ((if_packet_info.packet_count & 0xf) << 16)
| (if_packet_info.num_packet_words32 & 0xffff)