1 files changed, 0 insertions, 72 deletions
diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py
index 364c4bd1a..b0790755a 100644
--- a/host/lib/convert/gen_convert_general.py
+++ b/host/lib/convert/gen_convert_general.py
@@ -48,68 +48,6 @@ DECLARE_CONVERTER(sc16_item32_$(end), 1, item32, 1, PRIORITY_GENERAL){
 }
 """
 
-TMPL_CONV_GEN2_SC16 = """
-DECLARE_CONVERTER($(cpu_type), 1, sc16_item32_$(end), 1, PRIORITY_GENERAL){
-    const $(cpu_type)_t *input = reinterpret_cast<const $(cpu_type)_t *>(inputs[0]);
-    item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
-
-    for (size_t i = 0; i < nsamps; i++){
-        output[i] = $(to_wire)($(cpu_type)_to_item32_sc16(input[i], scale_factor));
-    }
-}
-
-DECLARE_CONVERTER(sc16_item32_$(end), 1, $(cpu_type), 1, PRIORITY_GENERAL){
-    const item32_t *input = reinterpret_cast<const item32_t *>(inputs[0]);
-    $(cpu_type)_t *output = reinterpret_cast<$(cpu_type)_t *>(outputs[0]);
-
-    for (size_t i = 0; i < nsamps; i++){
-        output[i] = item32_sc16_to_$(cpu_type)($(to_host)(input[i]), scale_factor);
-    }
-}
-"""
-
-TMPL_CONV_GEN2_SC8 = """
-DECLARE_CONVERTER(sc8_item32_$(end), 1, $(cpu_type), 1, PRIORITY_GENERAL){
-    const item32_t *input = reinterpret_cast<const item32_t *>(size_t(inputs[0]) & ~0x3);
-    $(cpu_type)_t *output = reinterpret_cast<$(cpu_type)_t *>(outputs[0]);
-    $(cpu_type)_t dummy;
-    size_t num_samps = nsamps;
-
-    if ((size_t(inputs[0]) & 0x3) != 0){
-        const item32_t item0 = $(to_host)(*input++);
-        item32_sc8_to_$(cpu_type)(item0, dummy, *output++, scale_factor);
-        num_samps--;
-    }
-
-    const size_t num_pairs = num_samps/2;
-    for (size_t i = 0, j = 0; i < num_pairs; i++, j+=2){
-        const item32_t item_i = $(to_host)(input[i]);
-        item32_sc8_to_$(cpu_type)(item_i, output[j], output[j+1], scale_factor);
-    }
-
-    if (num_samps != num_pairs*2){
-        const item32_t item_n = $(to_host)(input[num_pairs]);
-        item32_sc8_to_$(cpu_type)(item_n, output[num_samps-1], dummy, scale_factor);
-    }
-}
-
-DECLARE_CONVERTER($(cpu_type), 1, sc8_item32_$(end), 1, PRIORITY_GENERAL){
-    const $(cpu_type)_t *input = reinterpret_cast<const $(cpu_type)_t *>(inputs[0]);
-    item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
-
-    const size_t num_pairs = nsamps/2;
-    for (size_t i = 0, j = 0; i < num_pairs; i++, j+=2){
-        const item32_t item = $(cpu_type)_to_item32_sc8(input[j], input[j+1], scale_factor);
-        output[i] = $(to_wire)(item);
-    }
-
-    if (nsamps != num_pairs*2){
-        const item32_t item = $(cpu_type)_to_item32_sc8(input[nsamps-1], 0, scale_factor);
-        output[num_pairs] = $(to_wire)(item);
-    }
-}
-"""
-
 TMPL_CONV_USRP1_COMPLEX = """
 DECLARE_CONVERTER($(cpu_type), $(width), sc16_item16_usrp1, 1, PRIORITY_GENERAL){
     #for $w in range($width)
@@ -176,16 +114,6 @@ if __name__ == '__main__':
         ('be', 'uhd::ntohx', 'uhd::htonx'),
         ('le', 'uhd::wtohx', 'uhd::htowx'),
     ):
-        for cpu_type in 'fc64', 'fc32', 'sc16':
-            output += parse_tmpl(
-                TMPL_CONV_GEN2_SC16,
-                end=end, to_host=to_host, to_wire=to_wire, cpu_type=cpu_type
-            )
-        for cpu_type in 'fc64', 'fc32', 'sc16', 'sc8':
-            output += parse_tmpl(
-                TMPL_CONV_GEN2_SC8,
-                end=end, to_host=to_host, to_wire=to_wire, cpu_type=cpu_type
-            )
         output += parse_tmpl(
                 TMPL_CONV_GEN2_ITEM32,
                 end=end, to_host=to_host, to_wire=to_wire