convert: Added converters for raw strings

- u8: Converts arbitrary-length strings from and to item32
- item32->item32 memcpy non-conversion

4 files changed, 116 insertions, 14 deletions

diff --git a/host/lib/convert/convert_common.hpp b/host/lib/convert/convert_common.hpp
index 65fdcbea2..6e73e9436 100644
--- a/host/lib/convert/convert_common.hpp
+++ b/host/lib/convert/convert_common.hpp
@@ -86,6 +86,7 @@ typedef float                        f32_t;
 typedef boost::int32_t               s32_t;
 typedef boost::int16_t               s16_t;
 typedef boost::int8_t                s8_t;
+typedef boost::uint8_t               u8_t;
 
 typedef boost::uint32_t              item32_t;
 
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp
index fd6c8497e..d90bb9c94 100644
--- a/host/lib/convert/convert_impl.cpp
+++ b/host/lib/convert/convert_impl.cpp
@@ -172,6 +172,7 @@ UHD_STATIC_BLOCK(convert_register_item_sizes){
     convert::register_bytes_per_item("s32", sizeof(boost::int32_t));
     convert::register_bytes_per_item("s16", sizeof(boost::int16_t));
     convert::register_bytes_per_item("s8", sizeof(boost::int8_t));
+    convert::register_bytes_per_item("u8", sizeof(boost::uint8_t));
 
     //register VITA types
     convert::register_bytes_per_item("item32", sizeof(boost::int32_t));
diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py
index 8090f14bd..4f9eeb747 100644
--- a/host/lib/convert/gen_convert_general.py
+++ b/host/lib/convert/gen_convert_general.py
@@ -28,26 +28,79 @@ TMPL_HEADER = """
 #include <uhd/utils/byteswap.hpp>
 
 using namespace uhd::convert;
+
+
+// item32 -> item32: Just a memcpy. No scaling possible.
+DECLARE_CONVERTER(item32, 1, item32, 1, PRIORITY_GENERAL) {
+    const item32_t *input = reinterpret_cast<const item32_t *>(inputs[0]);
+    item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
+
+    memcpy(output, input, nsamps * sizeof(item32_t));
+}
 """
 
 TMPL_CONV_GEN2_ITEM32 = """
-DECLARE_CONVERTER(item32, 1, sc16_item32_${end}, 1, PRIORITY_GENERAL){
+DECLARE_CONVERTER(item32, 1, sc16_item32_{end}, 1, PRIORITY_GENERAL) {{
     const item32_t *input = reinterpret_cast<const item32_t *>(inputs[0]);
     item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
 
-    for (size_t i = 0; i < nsamps; i++){
-        output[i] = ${to_wire}(input[i]);
-    }
-}
+    for (size_t i = 0; i < nsamps; i++) {{
+        output[i] = {to_wire}(input[i]);
+    }}
+}}
 
-DECLARE_CONVERTER(sc16_item32_${end}, 1, item32, 1, PRIORITY_GENERAL){
+DECLARE_CONVERTER(sc16_item32_{end}, 1, item32, 1, PRIORITY_GENERAL) {{
     const item32_t *input = reinterpret_cast<const item32_t *>(inputs[0]);
     item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
 
-    for (size_t i = 0; i < nsamps; i++){
-        output[i] = ${to_host}(input[i]);
-    }
-}
+    for (size_t i = 0; i < nsamps; i++) {{
+        output[i] = {to_host}(input[i]);
+    }}
+}}
+"""
+
+TMPL_CONV_U8 = """
+DECLARE_CONVERTER(u8, 1, u8_item32_{end}, 1, PRIORITY_GENERAL) {{
+    const boost::uint32_t *input = reinterpret_cast<const boost::uint32_t *>(inputs[0]);
+    boost::uint32_t *output = reinterpret_cast<boost::uint32_t *>(outputs[0]);
+
+    // 1) Copy all the 4-byte tuples
+    size_t n_words = nsamps / 4;
+    for (size_t i = 0; i < n_words; i++) {{
+        output[i] = {to_wire}(input[i]);
+    }}
+    // 2) If nsamps was not a multiple of 4, copy the rest by hand
+    size_t bytes_left = nsamps % 4;
+    if (bytes_left) {{
+        const u8_t *last_input_word  = reinterpret_cast<const u8_t *>(&input[n_words]);
+        u8_t *last_output_word = reinterpret_cast<u8_t *>(&output[n_words]);
+        for (size_t k = 0; k < bytes_left; k++) {{
+            last_output_word[k] = last_input_word[k];
+        }}
+        output[n_words] = {to_wire}(output[n_words]);
+    }}
+}}
+
+DECLARE_CONVERTER(u8_item32_{end}, 1, u8, 1, PRIORITY_GENERAL) {{
+    const boost::uint32_t *input = reinterpret_cast<const boost::uint32_t *>(inputs[0]);
+    boost::uint32_t *output = reinterpret_cast<boost::uint32_t *>(outputs[0]);
+
+    // 1) Copy all the 4-byte tuples
+    size_t n_words = nsamps / 4;
+    for (size_t i = 0; i < n_words; i++) {{
+        output[i] = {to_host}(input[i]);
+    }}
+    // 2) If nsamps was not a multiple of 4, copy the rest by hand
+    size_t bytes_left = nsamps % 4;
+    if (bytes_left) {{
+        boost::uint32_t last_input_word = {to_host}(input[n_words]);
+        const u8_t *last_input_word_ptr = reinterpret_cast<const u8_t *>(&last_input_word);
+        u8_t *last_output_word = reinterpret_cast<u8_t *>(&output[n_words]);
+        for (size_t k = 0; k < bytes_left; k++) {{
+            last_output_word[k] = last_input_word_ptr[k];
+        }}
+    }}
+}}
 """
 
 TMPL_CONV_USRP1_COMPLEX = """
@@ -116,12 +169,19 @@ if __name__ == '__main__':
         ('be', 'uhd::ntohx', 'uhd::htonx'),
         ('le', 'uhd::wtohx', 'uhd::htowx'),
     ):
-        output += parse_tmpl(
-                TMPL_CONV_GEN2_ITEM32,
+        output += TMPL_CONV_GEN2_ITEM32.format(
                 end=end, to_host=to_host, to_wire=to_wire
-            )
+        )
+    #generate raw (u8) converters:
+    for end, to_host, to_wire in (
+        ('be', 'uhd::ntohx', 'uhd::htonx'),
+        ('le', 'uhd::wtohx', 'uhd::htowx'),
+    ):
+        output += TMPL_CONV_U8.format(
+                end=end, to_host=to_host, to_wire=to_wire
+        )
 
-    #generate complex converters for usrp1 format
+    #generate complex converters for usrp1 format (requires Cheetah)
     for width in 1, 2, 4:
         for cpu_type, do_scale in (
             ('fc64', '*scale_factor'),
diff --git a/host/tests/convert_test.cpp b/host/tests/convert_test.cpp
index 8ef1e74cc..d71d756dd 100644
--- a/host/tests/convert_test.cpp
+++ b/host/tests/convert_test.cpp
@@ -415,3 +415,43 @@ BOOST_AUTO_TEST_CASE(test_convert_types_sc16_and_sc8){
         test_convert_types_sc16(nsamps, id, 256);
     }
 }
+
+/***********************************************************************
+ * Test short conversion
+ **********************************************************************/
+static void test_convert_types_u8(
+    size_t nsamps, convert::id_type &id
+){
+    //fill the input samples
+    std::vector<boost::uint8_t> input(nsamps), output(nsamps);
+    //BOOST_FOREACH(boost::uint8_t &in, input) in = boost::uint8_t(std::rand() & 0xFF);
+    boost::uint32_t d = 48;
+    BOOST_FOREACH(boost::uint8_t &in, input) in = d++;
+
+    //run the loopback and test
+    convert::id_type in_id = id;
+    convert::id_type out_id = id;
+    std::swap(out_id.input_format, out_id.output_format);
+    std::swap(out_id.num_inputs, out_id.num_outputs);
+    loopback(nsamps, in_id, out_id, input, output);
+    BOOST_CHECK_EQUAL_COLLECTIONS(input.begin(), input.end(), output.begin(), output.end());
+}
+
+BOOST_AUTO_TEST_CASE(test_convert_types_u8_and_u8){
+    convert::id_type id;
+    id.input_format = "u8";
+    id.num_inputs = 1;
+    id.num_outputs = 1;
+
+    //try various lengths to test edge cases
+    id.output_format = "u8_item32_le";
+    for (size_t nsamps = 1; nsamps < 16; nsamps++){
+        test_convert_types_u8(nsamps, id);
+    }
+
+    //try various lengths to test edge cases
+    id.output_format = "u8_item32_be";
+    for (size_t nsamps = 1; nsamps < 16; nsamps++){
+        test_convert_types_u8(nsamps, id);
+    }
+}