Making use of vrt lib in the usrp2 io_impl.

Added a packet size param to the vrt pack and unpack.

8 files changed, 76 insertions, 80 deletions

diff --git a/host/apps/discover_usrps.cpp b/host/apps/discover_usrps.cpp
index 20ac1f9ed..448095726 100644
--- a/host/apps/discover_usrps.cpp
+++ b/host/apps/discover_usrps.cpp
@@ -63,6 +63,7 @@ int main(int argc, char *argv[]){
         std::cout << "-- USRP Device " << i << std::endl;
         std::cout << "--------------------------------------------------" << std::endl;
         std::cout << device_addrs[i] << std::endl << std::endl;
+        //uhd::device::make(device_addrs[i]); //test make
     }
 
     return 0;
diff --git a/host/include/uhd/transport/vrt.hpp b/host/include/uhd/transport/vrt.hpp
index b56da4077..2fb90a497 100644
--- a/host/include/uhd/transport/vrt.hpp
+++ b/host/include/uhd/transport/vrt.hpp
@@ -33,6 +33,7 @@ namespace vrt{
      * \param header_buff memory to write the packed vrt header
      * \param num_header_words32 number of words in the vrt header
      * \param num_payload_words32 the length of the payload
+     * \param num_packet_words32 the length of the packet
      * \param packet_count the packet count sequence number
      */
     void pack(
@@ -40,6 +41,7 @@ namespace vrt{
         uint32_t *header_buff,      //output
         size_t &num_header_words32, //output
         size_t num_payload_words32, //input
+        size_t &num_packet_words32, //output
         size_t packet_count         //input
     );
 
@@ -49,6 +51,7 @@ namespace vrt{
      * \param header_buff memory to read the packed vrt header
      * \param num_header_words32 number of words in the vrt header
      * \param num_payload_words32 the length of the payload
+     * \param num_packet_words32 the length of the packet
      * \param packet_count the packet count sequence number
      */
     void unpack(
@@ -56,6 +59,7 @@ namespace vrt{
         const uint32_t *header_buff,     //input
         size_t &num_header_words32,      //output
         size_t &num_payload_words32,     //output
+        size_t num_packet_words32,       //input
         size_t &packet_count             //output
     );
 
diff --git a/host/lib/transport/vrt.cpp b/host/lib/transport/vrt.cpp
index 40b26d31f..19bfc1d19 100644
--- a/host/lib/transport/vrt.cpp
+++ b/host/lib/transport/vrt.cpp
@@ -26,6 +26,7 @@ void vrt::pack(
     uint32_t *header_buff,      //output
     size_t &num_header_words32, //output
     size_t num_payload_words32, //input
+    size_t &num_packet_words32, //output
     size_t packet_count         //input
 ){
     uint32_t vrt_hdr_flags = 0;
@@ -47,10 +48,12 @@ void vrt::pack(
     vrt_hdr_flags |= (metadata.start_of_burst)? (0x1 << 25) : 0;
     vrt_hdr_flags |= (metadata.end_of_burst)?   (0x1 << 24) : 0;
 
+    num_packet_words32 = num_header_words32 + num_payload_words32;
+
     //fill in complete header word
     header_buff[0] = htonl(vrt_hdr_flags |
         ((packet_count & 0xf) << 16) |
-        ((num_header_words32 + num_payload_words32) & 0xffff)
+        (num_packet_words32 & 0xffff)
     );
 }
 
@@ -59,6 +62,7 @@ void vrt::unpack(
     const uint32_t *header_buff,     //input
     size_t &num_header_words32,      //output
     size_t &num_payload_words32,     //output
+    size_t num_packet_words32,       //input
     size_t &packet_count             //output
 ){
     //clear the metadata
@@ -70,8 +74,8 @@ void vrt::unpack(
     packet_count = (vrt_hdr_word >> 16) & 0xf;
 
     //failure cases
-    if (packet_words32 == 0) //FIXME check the packet length before we continue
-        throw std::runtime_error("bad vrt header");
+    if (packet_words32 == 0 or num_packet_words32 < packet_words32)
+        throw std::runtime_error("bad vrt header or packet fragment");
     if (vrt_hdr_word & (0x7 << 29))
         throw std::runtime_error("unsupported vrt packet type");
 
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 8fdfd685f..a32f68872 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -82,7 +82,7 @@ void usrp2_impl::update_ddc_enabled(void){
     out_data.data.streaming.enabled = (_ddc_enabled)? 1 : 0;
     out_data.data.streaming.secs =  htonl(_ddc_stream_at.secs);
     out_data.data.streaming.ticks = htonl(_ddc_stream_at.ticks);
-    out_data.data.streaming.samples = htonl(_max_samples_per_packet);
+    out_data.data.streaming.samples = htonl(_max_rx_samples_per_packet);
 
     //send and recv
     usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data);
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 6969e0a89..9299bb04a 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -21,6 +21,7 @@
 
 using namespace uhd;
 using namespace uhd::usrp;
+using namespace uhd::transport;
 namespace asio = boost::asio;
 
 /***********************************************************************
@@ -116,79 +117,43 @@ static inline void usrp2_items_to_host_items(
 }
 
 /***********************************************************************
- * Send Raw Data
- **********************************************************************/
-size_t usrp2_impl::send_raw(const uhd::metadata_t &metadata){
-    size_t num_items = asio::buffer_size(_tx_copy_buff)/sizeof(uint32_t);
-    const uint32_t *items = asio::buffer_cast<const uint32_t *>(_tx_copy_buff);
-
-    uint32_t vrt_hdr[_tx_vrt_max_offset_words32];
-    uint32_t vrt_hdr_flags = 0;
-    size_t num_vrt_hdr_words = 1;
-
-    //load the vrt header and flags
-    if(metadata.has_stream_id){
-        vrt_hdr_flags |= (0x1 << 28); //IF Data packet with Stream Identifier
-        vrt_hdr[num_vrt_hdr_words++] = htonl(metadata.stream_id);
-    }
-    if(metadata.has_time_spec){
-        vrt_hdr_flags |= (0x3 << 22) | (0x1 << 20); //TSI: Other, TSF: Sample Count Timestamp
-        vrt_hdr[num_vrt_hdr_words++] = htonl(metadata.time_spec.secs);
-        vrt_hdr[num_vrt_hdr_words++] = htonl(metadata.time_spec.ticks);
-        vrt_hdr[num_vrt_hdr_words++] = 0; //unused part of fractional seconds
-    }
-    vrt_hdr_flags |= (metadata.start_of_burst)? (0x1 << 25) : 0;
-    vrt_hdr_flags |= (metadata.end_of_burst)?   (0x1 << 24) : 0;
-
-    //fill in complete header word
-    vrt_hdr[0] = htonl(vrt_hdr_flags |
-        ((_tx_stream_id_to_packet_seq[metadata.stream_id]++ & 0xf) << 16) |
-        ((num_vrt_hdr_words + num_items) & 0xffff)
-    );
-
-    //copy in the vrt header (yes we left space)
-    std::memcpy(((uint32_t *)items) - num_vrt_hdr_words, vrt_hdr, num_vrt_hdr_words);
-    asio::const_buffer buff(items - num_vrt_hdr_words, (num_vrt_hdr_words + num_items)*sizeof(uint32_t));
-
-    //send and return number of samples
-    return (_data_transport->send(buff) - num_vrt_hdr_words*sizeof(uint32_t))/sizeof(sc16_t);
-}
-
-/***********************************************************************
  * Receive Raw Data
  **********************************************************************/
 void usrp2_impl::recv_raw(uhd::metadata_t &metadata){
     //do a receive
     _rx_smart_buff = _data_transport->recv();
 
-    ////////////////////////////////////////////////////////////////////
-    // !!!! FIXME this is very flawed, use a proper vrt unpacker !!!!!!!
-    ////////////////////////////////////////////////////////////////////
-
     //unpack the vrt header
     const uint32_t *vrt_hdr = asio::buffer_cast<const uint32_t *>(_rx_smart_buff->get());
-    metadata = uhd::metadata_t();
-    uint32_t vrt_header = ntohl(vrt_hdr[0]);
-    metadata.has_stream_id = true;
-    metadata.stream_id = ntohl(vrt_hdr[1]);
-    metadata.has_time_spec = true;
-    metadata.time_spec.secs = ntohl(vrt_hdr[2]);
-    metadata.time_spec.ticks = ntohl(vrt_hdr[3]);
-
-    size_t my_seq = (vrt_header >> 16) & 0xf;
-    //std::cout << "seq " << my_seq << std::endl;
-    if (my_seq != ((_rx_stream_id_to_packet_seq[metadata.stream_id]+1) & 0xf)) std::cout << "bad seq " << my_seq << std::endl;
-    _rx_stream_id_to_packet_seq[metadata.stream_id] = my_seq;
+    size_t num_packet_words32 = asio::buffer_size(_rx_smart_buff->get())/sizeof(uint32_t);
+    size_t num_header_words32_out;
+    size_t num_payload_words32_out;
+    size_t packet_count_out;
+    try{
+        vrt::unpack(
+            metadata,                //output
+            vrt_hdr,                 //input
+            num_header_words32_out,  //output
+            num_payload_words32_out, //output
+            num_packet_words32,      //input
+            packet_count_out         //output
+        );
+    }catch(const std::exception &e){
+        std::cerr << "bad vrt header: " << e.what() << std::endl;
+        _rx_copy_buff = boost::asio::buffer("", 0);
+    }
 
-    //extract the number of bytes received
-    size_t num_words = (vrt_header & 0xffff) -
-        USRP2_HOST_RX_VRT_HEADER_WORDS32 -
-        USRP2_HOST_RX_VRT_TRAILER_WORDS32;
+    //handle the packet count / sequence number
+    size_t last_packet_count = _rx_stream_id_to_packet_seq[metadata.stream_id];
+    if (packet_count_out != (last_packet_count+1)%16){
+        std::cerr << "bad packet count: " << packet_count_out << std::endl;
+    }
+    _rx_stream_id_to_packet_seq[metadata.stream_id] = packet_count_out;
 
     //setup the rx buffer to point to the data
     _rx_copy_buff = boost::asio::buffer(
-        vrt_hdr + USRP2_HOST_RX_VRT_HEADER_WORDS32,
-        num_words*sizeof(uint32_t)
+        vrt_hdr + num_header_words32_out,
+        num_payload_words32_out*sizeof(uint32_t)
     );
 }
 
@@ -200,8 +165,9 @@ size_t usrp2_impl::send(
     const uhd::metadata_t &metadata,
     const std::string &type
 ){
-    uint32_t *items = _tx_mem + _tx_vrt_max_offset_words32; //offset for data
-    size_t num_samps = _max_samples_per_packet;
+    uint32_t tx_mem[_mtu/sizeof(uint32_t)];
+    uint32_t *items = tx_mem + vrt::max_header_words32; //offset for data
+    size_t num_samps = _max_tx_samples_per_packet;
 
     //calculate the number of samples to be copied
     //and copy the samples into the send buffer
@@ -217,9 +183,26 @@ size_t usrp2_impl::send(
         throw std::runtime_error(str(boost::format("usrp2 send: cannot handle type \"%s\"") % type));
     }
 
-    //send the samples (this line seems silly, will be better with vrt lib)
-    _tx_copy_buff = asio::buffer(items, num_samps*sizeof(uint32_t));
-    return send_raw(metadata); //return num_samps;
+    uint32_t vrt_hdr[vrt::max_header_words32];
+    size_t num_header_words32, num_packet_words32;
+    size_t packet_count = _tx_stream_id_to_packet_seq[metadata.stream_id]++;
+
+    //pack metadata into a vrt header
+    vrt::pack(
+        metadata,            //input
+        vrt_hdr,             //output
+        num_header_words32,  //output
+        num_samps,           //input
+        num_packet_words32,  //output
+        packet_count         //input
+    );
+
+    //copy in the vrt header (yes we left space)
+    std::memcpy(items - num_header_words32, vrt_hdr, num_header_words32);
+    asio::const_buffer send_buff(items - num_header_words32, num_packet_words32*sizeof(uint32_t));
+
+    //send and return number of samples
+    _data_transport->send(send_buff); return num_samps;
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 51082df15..752feb05b 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -209,11 +209,11 @@ void usrp2_impl::get(const wax::obj &key_, wax::obj &val){
         return;
 
     case DEVICE_PROP_MAX_RX_SAMPLES:
-        val = size_t(_max_samples_per_packet);
+        val = size_t(_max_rx_samples_per_packet);
         return;
 
     case DEVICE_PROP_MAX_TX_SAMPLES:
-        val = size_t(_max_samples_per_packet);
+        val = size_t(_max_tx_samples_per_packet);
         return;
 
     }
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index a58bf8471..083ad7096 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -22,6 +22,7 @@
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
+#include <uhd/transport/vrt.hpp>
 #include <uhd/transport/udp_simple.hpp>
 #include <uhd/transport/udp_zero_copy.hpp>
 #include <uhd/usrp/dboard_manager.hpp>
@@ -104,20 +105,20 @@ public:
 
 private:
     //the raw io interface (samples are in the usrp2 native format)
-    size_t send_raw(const uhd::metadata_t &);
     void recv_raw(uhd::metadata_t &);
     uhd::dict<uint32_t, size_t> _tx_stream_id_to_packet_seq;
     uhd::dict<uint32_t, size_t> _rx_stream_id_to_packet_seq;
     static const size_t _mtu = 1500; //FIXME we have no idea
-    static const size_t _max_samples_per_packet =
-        _mtu/sizeof(uint32_t) -
+    static const size_t _hdrs = (2 + 14 + 20 + 8); //size of headers (pad, eth, ip, udp)
+    static const size_t _max_rx_samples_per_packet =
+        (_mtu - _hdrs)/sizeof(uint32_t) -
         USRP2_HOST_RX_VRT_HEADER_WORDS32 -
-        USRP2_HOST_RX_VRT_TRAILER_WORDS32 -
-        ((2 + 14 + 20 + 8)/sizeof(uint32_t)) //size of headers (pad, eth, ip, udp)
+        USRP2_HOST_RX_VRT_TRAILER_WORDS32
+    ;
+    static const size_t _max_tx_samples_per_packet =
+        (_mtu - _hdrs)/sizeof(uint32_t) -
+        uhd::transport::vrt::max_header_words32
     ;
-    static const size_t _tx_vrt_max_offset_words32 = 7; //TODO move to future vrt lib
-    uint32_t _tx_mem[_mtu/sizeof(uint32_t)];
-    boost::asio::const_buffer _tx_copy_buff;
     uhd::transport::smart_buffer::sptr _rx_smart_buff;
     boost::asio::const_buffer _rx_copy_buff;
     void io_init(void);
diff --git a/host/test/vrt_test.cpp b/host/test/vrt_test.cpp
index 9b2d43430..a4fad78fc 100644
--- a/host/test/vrt_test.cpp
+++ b/host/test/vrt_test.cpp
@@ -27,6 +27,7 @@ static void pack_and_unpack(
 ){
     uint32_t header_buff[vrt::max_header_words32];
     size_t num_header_words32;
+    size_t num_packet_words32;
 
     //pack metadata into a vrt header
     vrt::pack(
@@ -34,6 +35,7 @@ static void pack_and_unpack(
         header_buff,         //output
         num_header_words32,  //output
         num_payload_words32, //input
+        num_packet_words32,  //output
         packet_count         //input
     );
 
@@ -48,6 +50,7 @@ static void pack_and_unpack(
         header_buff,             //input
         num_header_words32_out,  //output
         num_payload_words32_out, //output
+        num_packet_words32,      //input
         packet_count_out         //output
     );