[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Sun, 27 Jul 2014 18:06:37 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit d6a241862f571f3bc431aae66310de6772009847
Merge: 0e8bd9c 67ab045
Author: Tom Rondeau <address@hidden>
Date: Sun Jul 27 14:06:20 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrMiscUtils.cmake | 6 +-
cmake/Toolchains/oe-sdk_cross.cmake | 2 +
gr-digital/grc/digital_block_tree.xml | 1 -
gr-digital/grc/digital_ofdm_mod2.xml | 64 ------
gr-digital/lib/hdlc_deframer_bp_impl.cc | 24 +--
gr-digital/lib/hdlc_deframer_bp_impl.h | 1 -
.../asm/neon/volk_16i_max_star_horizontal_16i.s | 52 +++++
.../asm/neon/volk_32f_s32f_multiply_32f_neonasm.s | 57 ++++++
.../volk/asm/neon/volk_32f_x2_add_32f_a_neonasm.s | 54 ++++++
.../asm/neon/volk_32f_x2_add_32f_a_neonpipeline.s | 68 +++++++
.../asm/neon/volk_32f_x2_dot_prod_32f_neonasm.s | 58 ++++++
.../neon/volk_32f_x2_dot_prod_32f_neonasm_opts.s | 116 +++++++++++
.../neon/volk_32fc_32f_dot_prod_32fc_a_neonasm.s | 79 ++++++++
...volk_32fc_32f_dot_prod_32fc_a_neonasmpipeline.s | 86 +++++++++
.../volk_32fc_32f_dot_prod_32fc_a_neonasmvmla.s | 74 +++++++
.../neon/volk_32fc_32f_dot_prod_32fc_unrollasm.s | 146 ++++++++++++++
.../asm/neon/volk_32fc_x2_dot_prod_32fc_neonasm.s | 98 ++++++++++
.../volk_32fc_x2_dot_prod_32fc_neonasm_opttests.s | 96 +++++++++
.../asm/neon/volk_32fc_x2_multiply_32fc_neonasm.s | 45 +++++
...olk_arm_32fc_32f_dot_prod_32fc_a_neonpipeline.s | 92 +++++++++
volk/kernels/volk/volk_16i_max_star_16i.h | 38 ++++
.../volk/volk_16i_max_star_horizontal_16i.h | 34 ++++
volk/kernels/volk/volk_16i_x4_quad_max_star_16i.h | 60 ++++++
volk/kernels/volk/volk_16i_x5_add_quad_16i_x4.h | 46 +++++
volk/kernels/volk/volk_16u_byteswap.h | 30 +++
volk/kernels/volk/volk_32f_invsqrt_32f.h | 31 +++
volk/kernels/volk/volk_32f_s32f_multiply_32f.h | 31 ++-
volk/kernels/volk/volk_32f_sqrt_32f.h | 29 +++
volk/kernels/volk/volk_32f_x2_add_32f.h | 43 +++++
volk/kernels/volk/volk_32f_x2_dot_prod_32f.h | 88 +++++++++
volk/kernels/volk/volk_32f_x2_interleave_32fc.h | 33 ++++
volk/kernels/volk/volk_32f_x2_max_32f.h | 36 ++++
volk/kernels/volk/volk_32f_x2_min_32f.h | 36 ++++
volk/kernels/volk/volk_32f_x2_multiply_32f.h | 27 +++
volk/kernels/volk/volk_32f_x2_subtract_32f.h | 34 ++++
volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h | 130 +++++++++++++
volk/kernels/volk/volk_32fc_32f_dot_prod_32fc.h | 153 +++++++++++++++
volk/kernels/volk/volk_32fc_32f_multiply_32fc.h | 37 ++++
volk/kernels/volk/volk_32fc_conjugate_32fc.h | 35 ++++
volk/kernels/volk/volk_32fc_magnitude_32f.h | 106 ++++++++++
.../kernels/volk/volk_32fc_magnitude_squared_32f.h | 42 ++++
volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h | 215 +++++++++++++++++++++
volk/kernels/volk/volk_32fc_x2_multiply_32fc.h | 109 +++++++++++
.../volk/volk_32fc_x2_multiply_conjugate_32fc.h | 53 +++++
volk/kernels/volk/volk_32fc_x2_square_dist_32f.h | 30 +++
volk/kernels/volk/volk_8i_convert_16i.h | 37 ++++
volk/kernels/volk/volk_8ic_deinterleave_real_8i.h | 28 +++
volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h | 1 +
volk/lib/CMakeLists.txt | 38 +++-
49 files changed, 2743 insertions(+), 86 deletions(-)