diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 21:45:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 21:45:31 -0400 |
| commit | e6005dc98cd3baebab80af94d60d73a2dfbc1bef (patch) | |
| tree | fb4931c4110e510766593daca7580e576edba201 /gnuradio-core | |
| parent | d7c39796926f1e285d36c938c37e93d120638393 (diff) | |
core: removing gri_add_const_ss -- this should be handled in VOLK.
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_add_const_ss.h | 36 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_add_const_ss_generic.cc | 49 |
3 files changed, 0 insertions, 87 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt index 0eaf551675..e3dc18520b 100644 --- a/gnuradio-core/src/lib/general/CMakeLists.txt +++ b/gnuradio-core/src/lib/general/CMakeLists.txt @@ -53,7 +53,6 @@ list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/gr_misc.cc ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.cc ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.cc - ${CMAKE_CURRENT_SOURCE_DIR}/gri_add_const_ss_generic.cc ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.cc ${CMAKE_CURRENT_SOURCE_DIR}/malloc16.c ) @@ -80,7 +79,6 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.h ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.h ${CMAKE_CURRENT_SOURCE_DIR}/gr_test_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/gri_add_const_ss.h ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.h ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_15_1_0.h ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_32k.h diff --git a/gnuradio-core/src/lib/general/gri_add_const_ss.h b/gnuradio-core/src/lib/general/gri_add_const_ss.h deleted file mode 100644 index 7433ee41bc..0000000000 --- a/gnuradio-core/src/lib/general/gri_add_const_ss.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_GRI_ADD_CONST_SS_H -#define INCLUDED_GRI_ADD_CONST_SS_H - -/*! - * \brief Low-level, high-speed add_const_ss primitive - * - * copy src to dst adding konst - */ - -void -gri_add_const_ss (short *dst, const short *src, int nshorts, short konst); - - -#endif /* _INCLUDED_GRI_ADD_CONST_SS_H_ */ diff --git a/gnuradio-core/src/lib/general/gri_add_const_ss_generic.cc b/gnuradio-core/src/lib/general/gri_add_const_ss_generic.cc deleted file mode 100644 index 3b5ee18247..0000000000 --- a/gnuradio-core/src/lib/general/gri_add_const_ss_generic.cc +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <gri_add_const_ss.h> - -void -gri_add_const_ss (short *dst, const short *src, int nshorts, short konst) -{ - static const int STRIDE = 8; - - int i; - - for (i = 0; i < nshorts - (STRIDE - 1); i += STRIDE){ - dst[i + 0] = src[i + 0] + konst; - dst[i + 1] = src[i + 1] + konst; - dst[i + 2] = src[i + 2] + konst; - dst[i + 3] = src[i + 3] + konst; - dst[i + 4] = src[i + 4] + konst; - dst[i + 5] = src[i + 5] + konst; - dst[i + 6] = src[i + 6] + konst; - dst[i + 7] = src[i + 7] + konst; - } - - for (; i < nshorts; i++) - dst[i] = src[i] + konst; -} |