Merge branch 'tx_report'

Conflicts:
	host/lib/usrp/usrp2/io_impl.cpp

1 files changed, 21 insertions, 14 deletions

diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index cf9d649dd..7e0588f03 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -35,15 +35,25 @@
 
 namespace vrt_packet_handler{
 
+template <typename T> UHD_INLINE T get_context_code(
+    const boost::uint32_t *vrt_hdr,
+    const uhd::transport::vrt::if_packet_info_t &if_packet_info
+){
+    //extract the context word (we dont know the endianness so mirror the bytes)
+    boost::uint32_t word0 = vrt_hdr[if_packet_info.num_header_words32] |
+              uhd::byteswap(vrt_hdr[if_packet_info.num_header_words32]);
+    return T(word0 & 0xff);
+}
+
 /***********************************************************************
  * vrt packet handler for recv
  **********************************************************************/
     typedef std::vector<uhd::transport::managed_recv_buffer::sptr> managed_recv_buffs_t;
     typedef boost::function<bool(managed_recv_buffs_t &)> get_recv_buffs_t;
-    typedef boost::function<void(size_t /*which channel*/)> handle_overrun_t;
+    typedef boost::function<void(size_t /*which channel*/)> handle_overflow_t;
     typedef boost::function<void(const boost::uint32_t *, uhd::transport::vrt::if_packet_info_t &)> vrt_unpacker_t;
 
-    static inline void handle_overrun_nop(size_t){}
+    static inline void handle_overflow_nop(size_t){}
 
     struct recv_state{
         //width of the receiver in channels
@@ -75,7 +85,7 @@ namespace vrt_packet_handler{
         uhd::rx_metadata_t &metadata,
         double tick_rate,
         const vrt_unpacker_t &vrt_unpacker,
-        const handle_overrun_t &handle_overrun,
+        const handle_overflow_t &handle_overflow,
         size_t vrt_header_offset_words32
     ){
         //vrt unpack each managed buffer
@@ -92,22 +102,19 @@ namespace vrt_packet_handler{
             const boost::uint32_t *vrt_hdr = state.managed_buffs[i]->cast<const boost::uint32_t *>() + vrt_header_offset_words32;
             if_packet_info.num_packet_words32 = num_packet_words32 - vrt_header_offset_words32;
             vrt_unpacker(vrt_hdr, if_packet_info);
-            const boost::uint32_t *vrt_data = vrt_hdr + if_packet_info.num_header_words32;
 
             //handle the non-data packet case and parse its contents
             if (if_packet_info.packet_type != uhd::transport::vrt::if_packet_info_t::PACKET_TYPE_DATA){
 
-                //extract the context word (we dont know the endianness so mirror the bytes)
-                boost::uint32_t word0 = vrt_data[0] | uhd::byteswap(vrt_data[0]);
-                if (word0 & uhd::rx_metadata_t::ERROR_CODE_OVERRUN) handle_overrun(i);
-                metadata.error_code = uhd::rx_metadata_t::error_code_t(word0 & 0xf);
+                metadata.error_code = get_context_code<uhd::rx_metadata_t::error_code_t>(vrt_hdr, if_packet_info);
+                if (metadata.error_code == uhd::rx_metadata_t::ERROR_CODE_OVERFLOW) handle_overflow(i);
 
                 //break to exit loop and store metadata below
                 state.size_of_copy_buffs = 0; break;
             }
 
             //setup the buffer to point to the data
-            state.copy_buffs[i] = reinterpret_cast<const boost::uint8_t *>(vrt_data);
+            state.copy_buffs[i] = reinterpret_cast<const boost::uint8_t *>(vrt_hdr + if_packet_info.num_header_words32);
 
             //store the minimum payload length into the copy buffer length
             size_t num_payload_bytes = if_packet_info.num_payload_words32*sizeof(boost::uint32_t);
@@ -142,7 +149,7 @@ namespace vrt_packet_handler{
         double tick_rate,
         const vrt_unpacker_t &vrt_unpacker,
         const get_recv_buffs_t &get_recv_buffs,
-        const handle_overrun_t &handle_overrun,
+        const handle_overflow_t &handle_overflow,
         size_t vrt_header_offset_words32
     ){
         metadata.error_code = uhd::rx_metadata_t::ERROR_CODE_NONE;
@@ -157,7 +164,7 @@ namespace vrt_packet_handler{
             try{
                 _recv1_helper(
                     state, metadata, tick_rate,
-                    vrt_unpacker, handle_overrun,
+                    vrt_unpacker, handle_overflow,
                     vrt_header_offset_words32
                 );
             }catch(const std::exception &e){
@@ -216,7 +223,7 @@ namespace vrt_packet_handler{
         double tick_rate,
         const vrt_unpacker_t &vrt_unpacker,
         const get_recv_buffs_t &get_recv_buffs,
-        const handle_overrun_t &handle_overrun = &handle_overrun_nop,
+        const handle_overflow_t &handle_overflow = &handle_overflow_nop,
         size_t vrt_header_offset_words32 = 0
     ){
         switch(recv_mode){
@@ -233,7 +240,7 @@ namespace vrt_packet_handler{
                 tick_rate,
                 vrt_unpacker,
                 get_recv_buffs,
-                handle_overrun,
+                handle_overflow,
                 vrt_header_offset_words32
             );
         }
@@ -253,7 +260,7 @@ namespace vrt_packet_handler{
                     tick_rate,
                     vrt_unpacker,
                     get_recv_buffs,
-                    handle_overrun,
+                    handle_overflow,
                     vrt_header_offset_words32
                 );
                 if (num_samps == 0) break; //had a recv timeout or error, break loop