uhd: restored super packet handler functionality

1 files changed, 21 insertions, 23 deletions

diff --git a/host/tests/sph_send_test.cpp b/host/tests/sph_send_test.cpp
index ed2f54371..9a91008af 100644
--- a/host/tests/sph_send_test.cpp
+++ b/host/tests/sph_send_test.cpp
@@ -55,18 +55,18 @@ private:
  **********************************************************************/
 class dummy_send_xport_class{
 public:
-    dummy_send_xport_class(const uhd::otw_type_t &otw_type){
-        _otw_type = otw_type;
+    dummy_send_xport_class(const std::string &end){
+        _end = end;
     }
 
     void pop_front_packet(
         uhd::transport::vrt::if_packet_info_t &ifpi
     ){
         ifpi.num_packet_words32 = _lens.front()/sizeof(boost::uint32_t);
-        if (_otw_type.byteorder == uhd::otw_type_t::BO_BIG_ENDIAN){
+        if (_end == "big"){
             uhd::transport::vrt::if_hdr_unpack_be(reinterpret_cast<boost::uint32_t *>(_mems.front().get()), ifpi);
         }
-        if (_otw_type.byteorder == uhd::otw_type_t::BO_LITTLE_ENDIAN){
+        if (_end == "little"){
             uhd::transport::vrt::if_hdr_unpack_le(reinterpret_cast<boost::uint32_t *>(_mems.front().get()), ifpi);
         }
         _mems.pop_front();
@@ -85,18 +85,19 @@ private:
     std::list<boost::shared_array<char> > _mems;
     std::list<size_t> _lens;
     std::list<dummy_msb> _msbs; //list means no-realloc
-    uhd::otw_type_t _otw_type;
+    std::string _end;
 };
 
 ////////////////////////////////////////////////////////////////////////
 BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
 ////////////////////////////////////////////////////////////////////////
-    uhd::otw_type_t otw_type;
-    otw_type.width = 16;
-    otw_type.shift = 0;
-    otw_type.byteorder = uhd::otw_type_t::BO_BIG_ENDIAN;
+    uhd::convert::id_type id;
+    id.input_markup = "fc32";
+    id.num_inputs = 1;
+    id.output_markup = "sc16_item32_be";
+    id.num_outputs = 1;
 
-    dummy_send_xport_class dummy_send_xport(otw_type);
+    dummy_send_xport_class dummy_send_xport("big");
 
     static const double TICK_RATE = 100e6;
     static const double SAMP_RATE = 10e6;
@@ -108,7 +109,7 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
     handler.set_tick_rate(TICK_RATE);
     handler.set_samp_rate(SAMP_RATE);
     handler.set_xport_chan_get_buff(0, boost::bind(&dummy_send_xport_class::get_send_buff, &dummy_send_xport, _1));
-    handler.set_converter(otw_type);
+    handler.set_converter(id);
     handler.set_max_samples_per_packet(20);
 
     //allocate metadata and buffer
@@ -122,9 +123,7 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
         metadata.start_of_burst = (i == 0);
         metadata.end_of_burst = (i == NUM_PKTS_TO_TEST-1);
         const size_t num_sent = handler.send(
-            &buff.front(), 10 + i%10, metadata,
-            uhd::io_type_t::COMPLEX_FLOAT32,
-            uhd::device::SEND_MODE_ONE_PACKET, 1.0
+            &buff.front(), 10 + i%10, metadata, 1.0
         );
         BOOST_CHECK_EQUAL(num_sent, 10 + i%10);
         metadata.time_spec += uhd::time_spec_t(0, num_sent, SAMP_RATE);
@@ -150,12 +149,13 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
 ////////////////////////////////////////////////////////////////////////
 BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_full_buffer_mode){
 ////////////////////////////////////////////////////////////////////////
-    uhd::otw_type_t otw_type;
-    otw_type.width = 16;
-    otw_type.shift = 0;
-    otw_type.byteorder = uhd::otw_type_t::BO_BIG_ENDIAN;
+    uhd::convert::id_type id;
+    id.input_markup = "fc32";
+    id.num_inputs = 1;
+    id.output_markup = "sc16_item32_be";
+    id.num_outputs = 1;
 
-    dummy_send_xport_class dummy_send_xport(otw_type);
+    dummy_send_xport_class dummy_send_xport("big");
 
     static const double TICK_RATE = 100e6;
     static const double SAMP_RATE = 10e6;
@@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_full_buffer_mode){
     handler.set_tick_rate(TICK_RATE);
     handler.set_samp_rate(SAMP_RATE);
     handler.set_xport_chan_get_buff(0, boost::bind(&dummy_send_xport_class::get_send_buff, &dummy_send_xport, _1));
-    handler.set_converter(otw_type);
+    handler.set_converter(id);
     handler.set_max_samples_per_packet(20);
 
     //allocate metadata and buffer
@@ -180,9 +180,7 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_full_buffer_mode){
 
     //generate the test data
     const size_t num_sent = handler.send(
-        &buff.front(), buff.size(), metadata,
-        uhd::io_type_t::COMPLEX_FLOAT32,
-        uhd::device::SEND_MODE_FULL_BUFF, 1.0
+        &buff.front(), buff.size(), metadata, 1.0
     );
     BOOST_CHECK_EQUAL(num_sent, buff.size());