summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2012-01-28 15:11:17 -0500
committerTom Rondeau2012-01-28 15:11:17 -0500
commit7943c197eccdb16e6c42af5544b9cb34a089b360 (patch)
tree13a91ba329d5788c80c776d0f0ebb7eda5644c7a
parentc05a75d0e1d28fe2c229a9a93ef42828929999b4 (diff)
downloadgnuradio-7943c197eccdb16e6c42af5544b9cb34a089b360.tar.gz
gnuradio-7943c197eccdb16e6c42af5544b9cb34a089b360.tar.bz2
gnuradio-7943c197eccdb16e6c42af5544b9cb34a089b360.zip
core: cleanup short_to_float.
-rw-r--r--gnuradio-core/src/lib/general/gr_short_to_float.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/general/gr_short_to_float.cc b/gnuradio-core/src/lib/general/gr_short_to_float.cc
index d11618414..9f71f52ed 100644
--- a/gnuradio-core/src/lib/general/gr_short_to_float.cc
+++ b/gnuradio-core/src/lib/general/gr_short_to_float.cc
@@ -26,7 +26,6 @@
#include <gr_short_to_float.h>
#include <gr_io_signature.h>
-#include <gri_short_to_float.h>
#include <volk/volk.h>
gr_short_to_float_sptr
@@ -66,17 +65,12 @@ gr_short_to_float::work (int noutput_items,
const short *in = (const short *) input_items[0];
float *out = (float *) output_items[0];
-#if 0
if(is_unaligned()) {
volk_16i_s32f_convert_32f_u(out, in, d_scale, d_vlen*noutput_items);
}
else {
- float d_scale = 1.0;
volk_16i_s32f_convert_32f_a(out, in, d_scale, d_vlen*noutput_items);
}
-#else
- gri_short_to_float (in, out, d_vlen*noutput_items);
-#endif
return noutput_items;
}