usrp1: multi-channel tx working, modified vrt handler to interleave

2 files changed, 5 insertions, 3 deletions

diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index a813a0462..146038bd9 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -226,7 +226,9 @@ size_t usrp1_impl::send(
         _clock_ctrl->get_master_clock_freq(),      //master clock tick rate
         &usrp1_bs_vrt_packer,
         boost::bind(&usrp1_impl::io_impl::get_send_buffs, _io_impl.get(), _1),
-        get_max_send_samps_per_packet()
+        get_max_send_samps_per_packet(),
+        0,                                         //vrt header offset
+        _tx_subdev_spec.size()                     //num channels
     );
 
     //Don't honor sob because it is normal to be always bursting...
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 3ea35f970..20ae3c02a 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -94,11 +94,11 @@ public:
     static const size_t BYTES_PER_PACKET = 512*4; //under the transfer size
 
     size_t get_max_send_samps_per_packet(void) const {
-        return BYTES_PER_PACKET/_tx_otw_type.get_sample_size();
+        return BYTES_PER_PACKET/_tx_otw_type.get_sample_size()/_tx_subdev_spec.size();
     }
 
     size_t get_max_recv_samps_per_packet(void) const {
-        return BYTES_PER_PACKET/_rx_otw_type.get_sample_size();
+        return BYTES_PER_PACKET/_rx_otw_type.get_sample_size()/_rx_subdev_spec.size();
     }
 
     bool recv_async_msg(uhd::async_metadata_t &, size_t);