uhd: forgot burst flags, tweaks to vrt info -> metadata

2 files changed, 6 insertions, 5 deletions

diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py
index ad87b9972..06182bd39 100755
--- a/host/lib/transport/gen_vrt.py
+++ b/host/lib/transport/gen_vrt.py
@@ -109,10 +109,11 @@ void vrt::if_hdr_pack_$(suffix)(
         #end if
         ########## Trailer ##########
         #if $pred & $tlr_p
-            packet_buff[$num_header_words+if_packet_info.num_payload_words32] = $(XE_MACRO)(if_packet_info.tlr);
+            //packet_buff[$num_header_words+if_packet_info.num_payload_words32] = $(XE_MACRO)(if_packet_info.tlr);
             #set $flags |= (0x1 << 26);
             #set $num_trailer_words = 1;
         #else
+            //packet_buff[$num_header_words+if_packet_info.num_payload_words32] = 0;
             #set $num_trailer_words = 0;
         #end if
         ########## Variables ##########
diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index 01cccd81e..63bf95204 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -111,11 +111,9 @@ namespace vrt_packet_handler{
         }
 
         //store the last vrt info into the metadata
-        metadata.has_time_spec = if_packet_info.has_tsi or if_packet_info.has_tsf;
+        metadata.has_time_spec = if_packet_info.has_tsi and if_packet_info.has_tsf;
         metadata.time_spec = uhd::time_spec_t(
-            time_t((if_packet_info.has_tsi)? if_packet_info.tsi : 0),
-            size_t((if_packet_info.has_tsf)? if_packet_info.tsf : 0),
-            tick_rate
+            time_t(if_packet_info.tsi), size_t(if_packet_info.tsf), tick_rate
         );
     }
 
@@ -292,6 +290,8 @@ namespace vrt_packet_handler{
         if_packet_info.has_tlr = false;
         if_packet_info.num_payload_words32 = (num_samps*io_type.size)/sizeof(boost::uint32_t);
         if_packet_info.packet_count = state.next_packet_seq++;
+        if_packet_info.sob = metadata.start_of_burst;
+        if_packet_info.eob = metadata.end_of_burst;
 
         //get send buffers for each channel
         managed_send_buffs_t send_buffs(buffs.size());