[Commit-gnuradio] [gnuradio] 88/148: revered dumb change to vrt expanded header

[git]

This is an automated email from the git hooks/post-receive script.

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit 63514770ddcb2b99b486e88f31f2177ba81b1a94
Author: Josh Blum <address@hidden>
Date:   Wed Dec 16 15:13:35 2009 -0800

    revered dumb change to vrt expanded header
---
 vrt/lib/expanded_header.cc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/vrt/lib/expanded_header.cc b/vrt/lib/expanded_header.cc
index 71d2a42..bd1d92e 100644
--- a/vrt/lib/expanded_header.cc
+++ b/vrt/lib/expanded_header.cc
@@ -91,20 +91,7 @@ namespace vrt {
       return false;
     }
 
-    /*
-     * Load vrt header entries into the expanded_header h.
-     * Check h to see if the entry exists, then load and handle byte ordering.
-     */
-    size_t word_offset = 0;
-    if (true)                   h->header          = ntohx(p[word_offset++]);
-    if (h->stream_id_p())       h->stream_id       = ntohx(p[word_offset++]);
-    if (h->class_id_p())        h->class_id        = ntohx(p[word_offset++]);
-    if (h->integer_secs_p())    h->integer_secs    = ntohx(p[word_offset++]);
-    if (h->fractional_secs_p()){
-        h->fractional_secs = ntohx(*((uint64_t*)p+word_offset));
-        word_offset+=2;
-    }
-    if (h->trailer_p())         h->trailer         = 
ntohx(p[n32_bit_words_packet-1]);
+    h->header = ntohl(p[0]);
 
     if (h->pkt_size() > len)
       return false;            // VRT header says packet is bigger than what 
we've got