summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-28 23:05:12 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-28 23:05:12 -0500
commit682b7c7c601446b64670f5041fa995ecffa06542 (patch)
treea642e64b1ed1aabab5fc61119f4e7f6c57ae835e /gnuradio-core/src/lib
parentff9e66ad7c9f22bf2741e760940bb6609848ede8 (diff)
parent4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (diff)
Merge branch 'master' into next
Conflicts: gr-blocks/python/qa_argmax.py gr-blocks/python/qa_max.py
Diffstat (limited to 'gnuradio-core/src/lib')
-rw-r--r--gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t79
-rw-r--r--gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t52
-rw-r--r--gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t34
-rw-r--r--gnuradio-core/src/lib/gengen/gr_max_XX.cc.t71
-rw-r--r--gnuradio-core/src/lib/gengen/gr_max_XX.h.t52
-rw-r--r--gnuradio-core/src/lib/gengen/gr_max_XX.i.t34
6 files changed, 0 insertions, 322 deletions
diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t
deleted file mode 100644
index f780bd811f..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <@NAME@.h>
-#include <gr_io_signature.h>
-
-@SPTR_NAME@
-gr_make_@BASE_NAME@ ( size_t vlen )
-{
- return @SPTR_NAME@ ( new @NAME@(vlen));
-}
-
-@NAME@::@NAME@( size_t vlen)
- : gr_sync_block ( "@BASE_NAME@",
- gr_make_io_signature (1, -1, vlen*sizeof (@I_TYPE@)),
- gr_make_io_signature (2, 2, sizeof (@O_TYPE@))),
- d_vlen(vlen)
-{
-}
-
-
-int
-@NAME@::work( int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
-
- int ninputs = input_items.size ();
-
- @O_TYPE@ *x_optr = (@O_TYPE@ *) output_items[0];
- @O_TYPE@ *y_optr = (@O_TYPE@ *) output_items[1];
-
- for (int i=0; i<noutput_items; i++) {
-
- @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen];
- int x = 0;
- int y = 0;
-
- for (int j=0; j < (int) d_vlen; j++ ) {
- for (int k=0; k<ninputs; k++) {
- if ( ((@I_TYPE@ *) input_items[k])[i*d_vlen + j] > max) {
- max = ((@I_TYPE@ *) input_items[k])[i*d_vlen + j];
- x = j;
- y = k;
- }
- }
- }
-
- *x_optr++ = (@O_TYPE@) x;
- *y_optr++ = (@O_TYPE@) y;
- }
- return noutput_items;
-}
-
diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t b/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
deleted file mode 100644
index a706221fb9..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class @NAME@;
-typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-
-GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
-
-class GR_CORE_API @NAME@ : public gr_sync_block
-{
- friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
- @NAME@ (size_t vlen);
- size_t d_vlen;
-
- public:
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-
-#endif
diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t b/gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t
deleted file mode 100644
index 233551ad93..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
-class @NAME@ : public gr_sync_block
-{
- private:
- @NAME@ (size_t vlen);
- size_t d_vlen;
-};
diff --git a/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
deleted file mode 100644
index c53820cd60..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <@NAME@.h>
-#include <gr_io_signature.h>
-
-@SPTR_NAME@
-gr_make_@BASE_NAME@ ( size_t vlen )
-{
- return @SPTR_NAME@ ( new @NAME@(vlen));
-}
-
-@NAME@::@NAME@( size_t vlen)
- : gr_sync_block ( "@BASE_NAME@",
- gr_make_io_signature (1, -1, vlen*sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
- d_vlen(vlen)
-{
-}
-
-int
-@NAME@::work( int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
-
- int ninputs = input_items.size ();
-
- for (int i=0; i<noutput_items; i++) {
-
- @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen];
-
- for (int j=0; j < (int) d_vlen; j++ ) {
- for (int k=0; k<ninputs; k++) {
- if ( ((@I_TYPE@ *) input_items[k])[i*d_vlen + j] > max) {
- max = ((@I_TYPE@*) input_items[k])[i*d_vlen + j];
- }
- }
- }
-
- *optr++ = (@O_TYPE@) max;
- }
- return noutput_items;
-}
-
diff --git a/gnuradio-core/src/lib/gengen/gr_max_XX.h.t b/gnuradio-core/src/lib/gengen/gr_max_XX.h.t
deleted file mode 100644
index a706221fb9..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_max_XX.h.t
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class @NAME@;
-typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-
-GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
-
-class GR_CORE_API @NAME@ : public gr_sync_block
-{
- friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
- @NAME@ (size_t vlen);
- size_t d_vlen;
-
- public:
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-
-#endif
diff --git a/gnuradio-core/src/lib/gengen/gr_max_XX.i.t b/gnuradio-core/src/lib/gengen/gr_max_XX.i.t
deleted file mode 100644
index 233551ad93..0000000000
--- a/gnuradio-core/src/lib/gengen/gr_max_XX.i.t
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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.
- */
-
-// @WARNING@
-
-GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
-
-class @NAME@ : public gr_sync_block
-{
- private:
- @NAME@ (size_t vlen);
- size_t d_vlen;
-};
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 12:13:59 +0000