+++ /dev/null
-#
-# This file is machine generated. All edits will be overwritten
-#
-GENERATED_H = \
- gr_add_cc.h \
- gr_add_const_cc.h \
- gr_add_const_ff.h \
- gr_add_const_ii.h \
- gr_add_const_sf.h \
- gr_add_const_ss.h \
- gr_add_const_vcc.h \
- gr_add_const_vff.h \
- gr_add_const_vii.h \
- gr_add_const_vss.h \
- gr_add_ff.h \
- gr_add_ii.h \
- gr_add_ss.h \
- gr_add_vcc.h \
- gr_add_vff.h \
- gr_add_vii.h \
- gr_add_vss.h \
- gr_chunks_to_symbols_bc.h \
- gr_chunks_to_symbols_bf.h \
- gr_chunks_to_symbols_ic.h \
- gr_chunks_to_symbols_if.h \
- gr_chunks_to_symbols_sc.h \
- gr_chunks_to_symbols_sf.h \
- gr_divide_cc.h \
- gr_divide_ff.h \
- gr_divide_ii.h \
- gr_divide_ss.h \
- gr_multiply_cc.h \
- gr_multiply_const_cc.h \
- gr_multiply_const_ff.h \
- gr_multiply_const_ii.h \
- gr_multiply_const_ss.h \
- gr_multiply_const_vcc.h \
- gr_multiply_const_vff.h \
- gr_multiply_const_vii.h \
- gr_multiply_const_vss.h \
- gr_multiply_ff.h \
- gr_multiply_ii.h \
- gr_multiply_ss.h \
- gr_multiply_vcc.h \
- gr_multiply_vff.h \
- gr_multiply_vii.h \
- gr_multiply_vss.h \
- gr_mute_cc.h \
- gr_mute_ff.h \
- gr_mute_ii.h \
- gr_mute_ss.h \
- gr_noise_source_c.h \
- gr_noise_source_f.h \
- gr_noise_source_i.h \
- gr_noise_source_s.h \
- gr_packed_to_unpacked_bb.h \
- gr_packed_to_unpacked_ii.h \
- gr_packed_to_unpacked_ss.h \
- gr_sig_source_c.h \
- gr_sig_source_f.h \
- gr_sig_source_i.h \
- gr_sig_source_s.h \
- gr_sub_cc.h \
- gr_sub_ff.h \
- gr_sub_ii.h \
- gr_sub_ss.h \
- gr_unpacked_to_packed_bb.h \
- gr_unpacked_to_packed_ii.h \
- gr_unpacked_to_packed_ss.h \
- gr_vector_sink_b.h \
- gr_vector_sink_c.h \
- gr_vector_sink_f.h \
- gr_vector_sink_i.h \
- gr_vector_sink_s.h \
- gr_vector_source_b.h \
- gr_vector_source_c.h \
- gr_vector_source_f.h \
- gr_vector_source_i.h \
- gr_vector_source_s.h
-
-GENERATED_I = \
- gr_add_cc.i \
- gr_add_const_cc.i \
- gr_add_const_ff.i \
- gr_add_const_ii.i \
- gr_add_const_sf.i \
- gr_add_const_ss.i \
- gr_add_const_vcc.i \
- gr_add_const_vff.i \
- gr_add_const_vii.i \
- gr_add_const_vss.i \
- gr_add_ff.i \
- gr_add_ii.i \
- gr_add_ss.i \
- gr_add_vcc.i \
- gr_add_vff.i \
- gr_add_vii.i \
- gr_add_vss.i \
- gr_chunks_to_symbols_bc.i \
- gr_chunks_to_symbols_bf.i \
- gr_chunks_to_symbols_ic.i \
- gr_chunks_to_symbols_if.i \
- gr_chunks_to_symbols_sc.i \
- gr_chunks_to_symbols_sf.i \
- gr_divide_cc.i \
- gr_divide_ff.i \
- gr_divide_ii.i \
- gr_divide_ss.i \
- gr_multiply_cc.i \
- gr_multiply_const_cc.i \
- gr_multiply_const_ff.i \
- gr_multiply_const_ii.i \
- gr_multiply_const_ss.i \
- gr_multiply_const_vcc.i \
- gr_multiply_const_vff.i \
- gr_multiply_const_vii.i \
- gr_multiply_const_vss.i \
- gr_multiply_ff.i \
- gr_multiply_ii.i \
- gr_multiply_ss.i \
- gr_multiply_vcc.i \
- gr_multiply_vff.i \
- gr_multiply_vii.i \
- gr_multiply_vss.i \
- gr_mute_cc.i \
- gr_mute_ff.i \
- gr_mute_ii.i \
- gr_mute_ss.i \
- gr_noise_source_c.i \
- gr_noise_source_f.i \
- gr_noise_source_i.i \
- gr_noise_source_s.i \
- gr_packed_to_unpacked_bb.i \
- gr_packed_to_unpacked_ii.i \
- gr_packed_to_unpacked_ss.i \
- gr_sig_source_c.i \
- gr_sig_source_f.i \
- gr_sig_source_i.i \
- gr_sig_source_s.i \
- gr_sub_cc.i \
- gr_sub_ff.i \
- gr_sub_ii.i \
- gr_sub_ss.i \
- gr_unpacked_to_packed_bb.i \
- gr_unpacked_to_packed_ii.i \
- gr_unpacked_to_packed_ss.i \
- gr_vector_sink_b.i \
- gr_vector_sink_c.i \
- gr_vector_sink_f.i \
- gr_vector_sink_i.i \
- gr_vector_sink_s.i \
- gr_vector_source_b.i \
- gr_vector_source_c.i \
- gr_vector_source_f.i \
- gr_vector_source_i.i \
- gr_vector_source_s.i
-
-GENERATED_CC = \
- gr_add_cc.cc \
- gr_add_const_cc.cc \
- gr_add_const_ff.cc \
- gr_add_const_ii.cc \
- gr_add_const_sf.cc \
- gr_add_const_ss.cc \
- gr_add_const_vcc.cc \
- gr_add_const_vff.cc \
- gr_add_const_vii.cc \
- gr_add_const_vss.cc \
- gr_add_ff.cc \
- gr_add_ii.cc \
- gr_add_ss.cc \
- gr_add_vcc.cc \
- gr_add_vff.cc \
- gr_add_vii.cc \
- gr_add_vss.cc \
- gr_chunks_to_symbols_bc.cc \
- gr_chunks_to_symbols_bf.cc \
- gr_chunks_to_symbols_ic.cc \
- gr_chunks_to_symbols_if.cc \
- gr_chunks_to_symbols_sc.cc \
- gr_chunks_to_symbols_sf.cc \
- gr_divide_cc.cc \
- gr_divide_ff.cc \
- gr_divide_ii.cc \
- gr_divide_ss.cc \
- gr_multiply_cc.cc \
- gr_multiply_const_cc.cc \
- gr_multiply_const_ff.cc \
- gr_multiply_const_ii.cc \
- gr_multiply_const_ss.cc \
- gr_multiply_const_vcc.cc \
- gr_multiply_const_vff.cc \
- gr_multiply_const_vii.cc \
- gr_multiply_const_vss.cc \
- gr_multiply_ff.cc \
- gr_multiply_ii.cc \
- gr_multiply_ss.cc \
- gr_multiply_vcc.cc \
- gr_multiply_vff.cc \
- gr_multiply_vii.cc \
- gr_multiply_vss.cc \
- gr_mute_cc.cc \
- gr_mute_ff.cc \
- gr_mute_ii.cc \
- gr_mute_ss.cc \
- gr_noise_source_c.cc \
- gr_noise_source_f.cc \
- gr_noise_source_i.cc \
- gr_noise_source_s.cc \
- gr_packed_to_unpacked_bb.cc \
- gr_packed_to_unpacked_ii.cc \
- gr_packed_to_unpacked_ss.cc \
- gr_sig_source_c.cc \
- gr_sig_source_f.cc \
- gr_sig_source_i.cc \
- gr_sig_source_s.cc \
- gr_sub_cc.cc \
- gr_sub_ff.cc \
- gr_sub_ii.cc \
- gr_sub_ss.cc \
- gr_unpacked_to_packed_bb.cc \
- gr_unpacked_to_packed_ii.cc \
- gr_unpacked_to_packed_ss.cc \
- gr_vector_sink_b.cc \
- gr_vector_sink_c.cc \
- gr_vector_sink_f.cc \
- gr_vector_sink_i.cc \
- gr_vector_sink_s.cc \
- gr_vector_source_b.cc \
- gr_vector_source_c.cc \
- gr_vector_source_f.cc \
- gr_vector_source_i.cc \
- gr_vector_source_s.cc
-
gr_add_const_XX.cc.t \
gr_add_const_XX.h.t \
gr_add_const_XX.i.t \
- gr_add_vXX.cc.t \
- gr_add_vXX.h.t \
- gr_add_vXX.i.t \
gr_add_const_vXX.cc.t \
gr_add_const_vXX.h.t \
gr_add_const_vXX.i.t \
gr_multiply_const_XX.cc.t \
gr_multiply_const_XX.h.t \
gr_multiply_const_XX.i.t \
- gr_multiply_vXX.cc.t \
- gr_multiply_vXX.h.t \
- gr_multiply_vXX.i.t \
gr_multiply_const_vXX.cc.t \
gr_multiply_const_vXX.h.t \
gr_multiply_const_vXX.i.t \
gr_add_ff.h \
gr_add_ii.h \
gr_add_ss.h \
- gr_add_vcc.h \
- gr_add_vff.h \
- gr_add_vii.h \
- gr_add_vss.h \
gr_and_bb.h \
gr_and_const_bb.h \
gr_and_const_ii.h \
gr_multiply_ff.h \
gr_multiply_ii.h \
gr_multiply_ss.h \
- gr_multiply_vcc.h \
- gr_multiply_vff.h \
- gr_multiply_vii.h \
- gr_multiply_vss.h \
gr_mute_cc.h \
gr_mute_ff.h \
gr_mute_ii.h \
gr_add_ff.i \
gr_add_ii.i \
gr_add_ss.i \
- gr_add_vcc.i \
- gr_add_vff.i \
- gr_add_vii.i \
- gr_add_vss.i \
gr_and_bb.i \
gr_and_const_bb.i \
gr_and_const_ii.i \
gr_multiply_ff.i \
gr_multiply_ii.i \
gr_multiply_ss.i \
- gr_multiply_vcc.i \
- gr_multiply_vff.i \
- gr_multiply_vii.i \
- gr_multiply_vss.i \
gr_mute_cc.i \
gr_mute_ff.i \
gr_mute_ii.i \
gr_add_ff.cc \
gr_add_ii.cc \
gr_add_ss.cc \
- gr_add_vcc.cc \
- gr_add_vff.cc \
- gr_add_vii.cc \
- gr_add_vss.cc \
gr_and_bb.cc \
gr_and_const_bb.cc \
gr_and_const_ii.cc \
gr_multiply_ff.cc \
gr_multiply_ii.cc \
gr_multiply_ss.cc \
- gr_multiply_vcc.cc \
- gr_multiply_vff.cc \
- gr_multiply_vii.cc \
- gr_multiply_vss.cc \
gr_mute_cc.cc \
gr_mute_ff.cc \
gr_mute_ii.cc \
'gr_multiply_XX',
'gr_divide_XX',
'gr_mute_XX',
- 'gr_add_vXX',
- 'gr_multiply_vXX',
'gr_add_const_vXX',
'gr_multiply_const_vXX',
'gr_integrate_XX',
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
#include <gr_io_signature.h>
@SPTR_NAME@
-gr_make_@BASE_NAME@ ()
+gr_make_@BASE_NAME@ (size_t vlen)
{
- return @SPTR_NAME@ (new @NAME@ ());
+ return @SPTR_NAME@ (new @NAME@ (vlen));
}
-@NAME@::@NAME@ ()
+@NAME@::@NAME@ (size_t vlen)
: gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)))
+ gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
+ gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ d_vlen (vlen)
{
}
int ninputs = input_items.size ();
- for (int i = 0; i < noutput_items; i++){
+ for (int i = 0; i < noutput_items*d_vlen; i++){
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc += ((@I_TYPE@ *) input_items[j])[i];
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
class @NAME@;
typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
/*!
* \brief output = sum (input_0, input_1, ...)
*/
class @NAME@ : public gr_sync_block
{
- friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+ friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
- @NAME@ ();
+ @NAME@ (size_t vlen);
+
+ size_t d_vlen;
public:
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
class @NAME@ : public gr_sync_block
{
private:
- @NAME@ ();
+ @NAME@ (size_t vlen);
};
+++ /dev/null
-/* -*- 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.
- */
-
-// @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 nitems_per_block)
-{
- return @SPTR_NAME@ (new @NAME@ (nitems_per_block));
-}
-
-@NAME@::@NAME@ (size_t nitems_per_block)
- : gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*nitems_per_block),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*nitems_per_block))
-{
-}
-
-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 ();
- int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@);
-
- for (int i = 0; i < noutput_items; i++){
- for (int j = 0; j < nitems_per_block; j++){
- @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i*nitems_per_block+j];
- for (int k = 1; k < ninputs; k++)
- acc += ((@I_TYPE@ *) input_items[k])[i*nitems_per_block+j];
-
- *optr++ = (@O_TYPE@) acc;
- }
- }
- return noutput_items;
-}
+++ /dev/null
-/* -*- 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.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <gr_sync_block.h>
-
-class @NAME@;
-typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
-/*!
- * \brief output = sum (input_0, input_1, ...)
- * \ingroup math
- *
- * Add across all input vectors.
- */
-class @NAME@ : public gr_sync_block
-{
- friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
- @NAME@ (size_t nitems_per_block);
-
- public:
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-#endif
+++ /dev/null
-/* -*- 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.
- */
-
-// @WARNING@
-
-GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
-class @NAME@ : public gr_sync_block
-{
- private:
- @NAME@ (size_t nitems_per_block);
-};
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
#include <gr_io_signature.h>
@SPTR_NAME@
-gr_make_@BASE_NAME@ ()
+gr_make_@BASE_NAME@ (size_t vlen)
{
- return @SPTR_NAME@ (new @NAME@ ());
+ return @SPTR_NAME@ (new @NAME@ (vlen));
}
-@NAME@::@NAME@ ()
+@NAME@::@NAME@ (size_t vlen)
: gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)))
+ gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
+ gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ d_vlen (vlen)
{
}
int ninputs = input_items.size ();
- for (int i = 0; i < noutput_items; i++){
+ for (int i = 0; i < noutput_items*d_vlen; i++){
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc *= ((@I_TYPE@ *) input_items[j])[i];
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
class @NAME@;
typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
/*!
* \brief output = prod (input_0, input_1, ...)
*/
class @NAME@ : public gr_sync_block
{
- friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+ friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
- @NAME@ ();
+ @NAME@ (size_t vlen);
+
+ size_t d_vlen;
public:
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
class @NAME@ : public gr_sync_block
{
private:
- @NAME@ ();
+ @NAME@ (size_t vlen);
};
+++ /dev/null
-/* -*- 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.
- */
-
-// @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 nitems_per_block)
-{
- return @SPTR_NAME@ (new @NAME@ (nitems_per_block));
-}
-
-@NAME@::@NAME@ (size_t nitems_per_block)
- : gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*nitems_per_block),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*nitems_per_block))
-{
-}
-
-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 ();
- int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@);
-
- for (int i = 0; i < noutput_items; i++){
- for (int j = 0; j < nitems_per_block; j++){
- @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i*nitems_per_block+j];
- for (int k = 1; k < ninputs; k++)
- acc *= ((@I_TYPE@ *) input_items[k])[i*nitems_per_block+j];
-
- *optr++ = (@O_TYPE@) acc;
- }
- }
- return noutput_items;
-}
+++ /dev/null
-/* -*- 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.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <gr_sync_block.h>
-
-class @NAME@;
-typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
-/*!
- * \brief output = prod (input_0, input_1, ...)
- * \ingroup math
- *
- * Element-wise multiply across all input vectors.
- */
-class @NAME@ : public gr_sync_block
-{
- friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
- @NAME@ (size_t nitems_per_block);
-
- public:
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-#endif
+++ /dev/null
-/* -*- 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.
- */
-
-// @WARNING@
-
-GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
-
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block);
-
-class @NAME@ : public gr_sync_block
-{
- private:
- @NAME@ (size_t nitems_per_block);
-};
#
-# Copyright 2003,2004,2006,2008 Free Software Foundation, Inc.
+# Copyright 2003,2004,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
# Force the preference database to be initialized
from prefs import prefs
+#alias old gr_add_vXX and gr_multiply_vXX
+add_vcc = add_cc
+add_vff = add_ff
+add_vii = add_ii
+add_vss = add_ss
+multiply_vcc = multiply_cc
+multiply_vff = multiply_ff
+multiply_vii = multiply_ii
+multiply_vss = multiply_ss
</cat>
<cat>
<name>Operators</name>
- <block>gr_add_vxx</block>
+ <block>gr_add_xx</block>
<block>gr_sub_xx</block>
- <block>gr_multiply_vxx</block>
+ <block>gr_multiply_xx</block>
<block>gr_divide_xx</block>
<block>gr_nlog10_ff</block>
blks2_wfm_tx.xml \
const_source_x.xml \
gr_add_const_vxx.xml \
- gr_add_vxx.xml \
+ gr_add_xx.xml \
gr_agc2_xx.xml \
gr_agc_xx.xml \
gr_and_xx.xml \
gr_mpsk_receiver_cc.xml \
gr_mpsk_sync_cc.xml \
gr_multiply_const_vxx.xml \
- gr_multiply_vxx.xml \
+ gr_multiply_xx.xml \
gr_mute_xx.xml \
gr_nlog10_ff.xml \
gr_noise_source_x.xml \
+++ /dev/null
-<?xml version="1.0"?>
-<!--
-###################################################
-##Add Block:
-## all types, 1 output, 2 to inf inputs
-###################################################
- -->
-<block>
- <name>Add</name>
- <key>gr_add_vxx</key>
- <import>from gnuradio import gr</import>
- <make>gr.add_v$(type.fcn)($vlen)</make>
- <param>
- <name>IO Type</name>
- <key>type</key>
- <type>enum</type>
- <option>
- <name>Complex</name>
- <key>complex</key>
- <opt>fcn:cc</opt>
- </option>
- <option>
- <name>Float</name>
- <key>float</key>
- <opt>fcn:ff</opt>
- </option>
- <option>
- <name>Int</name>
- <key>int</key>
- <opt>fcn:ii</opt>
- </option>
- <option>
- <name>Short</name>
- <key>short</key>
- <opt>fcn:ss</opt>
- </option>
- </param>
- <param>
- <name>Num Inputs</name>
- <key>num_inputs</key>
- <value>2</value>
- <type>int</type>
- </param>
- <param>
- <name>Vec Length</name>
- <key>vlen</key>
- <value>1</value>
- <type>int</type>
- </param>
- <check>$num_inputs > 1</check>
- <check>$vlen > 0</check>
- <sink>
- <name>in</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- <nports>$num_inputs</nports>
- </sink>
- <source>
- <name>out</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- </source>
-</block>
--- /dev/null
+<?xml version="1.0"?>
+<!--
+###################################################
+##Add Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Add</name>
+ <key>gr_add_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.add_v$(type.fcn)($vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
+++ /dev/null
-<?xml version="1.0"?>
-<!--
-###################################################
-##Multiply Block:
-## all types, 1 output, 2 to inf inputs
-###################################################
- -->
-<block>
- <name>Multiply</name>
- <key>gr_multiply_vxx</key>
- <import>from gnuradio import gr</import>
- <make>gr.multiply_v$(type.fcn)($vlen)</make>
- <param>
- <name>IO Type</name>
- <key>type</key>
- <type>enum</type>
- <option>
- <name>Complex</name>
- <key>complex</key>
- <opt>fcn:cc</opt>
- </option>
- <option>
- <name>Float</name>
- <key>float</key>
- <opt>fcn:ff</opt>
- </option>
- <option>
- <name>Int</name>
- <key>int</key>
- <opt>fcn:ii</opt>
- </option>
- <option>
- <name>Short</name>
- <key>short</key>
- <opt>fcn:ss</opt>
- </option>
- </param>
- <param>
- <name>Num Inputs</name>
- <key>num_inputs</key>
- <value>2</value>
- <type>int</type>
- </param>
- <param>
- <name>Vec Length</name>
- <key>vlen</key>
- <value>1</value>
- <type>int</type>
- </param>
- <check>$num_inputs > 1</check>
- <check>$vlen > 0</check>
- <sink>
- <name>in</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- <nports>$num_inputs</nports>
- </sink>
- <source>
- <name>out</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- </source>
-</block>
--- /dev/null
+<?xml version="1.0"?>
+<!--
+###################################################
+##Multiply Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Multiply</name>
+ <key>gr_multiply_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.multiply_v$(type.fcn)($vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
</block>
<connection>
<source_block_id>gr_sig_source_x0</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>2</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>audio_sink</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>gr_constellation_decoder_cb</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_chunks_to_symbols_xx</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx_0</value>
+ <value>gr_add_xx_0</value>
</param>
<param>
<key>_enabled</key>
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_0</value>
+ <value>gr_multiply_xx_0</value>
</param>
<param>
<key>_enabled</key>
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_1</value>
+ <value>gr_multiply_xx_1</value>
</param>
<param>
<key>_enabled</key>
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_2</value>
+ <value>gr_multiply_xx_2</value>
</param>
<param>
<key>_enabled</key>
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_2_0</value>
+ <value>gr_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx_1</value>
+ <value>gr_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
</connection>
<connection>
<source_block_id>gr_multiply_const_vxx_0</source_block_id>
- <sink_block_id>gr_add_vxx_0</sink_block_id>
+ <sink_block_id>gr_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_0</source_block_id>
- <sink_block_id>gr_add_vxx_1</sink_block_id>
+ <source_block_id>gr_add_xx_0</source_block_id>
+ <sink_block_id>gr_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_vxx_1</sink_block_id>
+ <sink_block_id>gr_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
</connection>
<connection>
<source_block_id>gr_multiply_const_vxx_1</source_block_id>
- <sink_block_id>gr_add_vxx_0</sink_block_id>
+ <sink_block_id>gr_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_0</source_block_id>
+ <source_block_id>gr_multiply_xx_0</source_block_id>
<sink_block_id>gr_short_to_float_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_2</source_block_id>
+ <source_block_id>gr_multiply_xx_2</source_block_id>
<sink_block_id>gr_short_to_float_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>gr_sub_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_1</source_block_id>
+ <source_block_id>gr_multiply_xx_1</source_block_id>
<sink_block_id>gr_short_to_float_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+ <sink_block_id>gr_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+ <sink_block_id>gr_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_2_0</source_block_id>
+ <source_block_id>gr_multiply_xx_2_0</source_block_id>
<sink_block_id>gr_short_to_float_1_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>gr_sub_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
</block>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sig_source_x0</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>2</sink_key>
</connection>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>usrp_simple_sink_x</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>
#convert instances of gui_coordinate and gui_rotation
xml = etree.parse(file_path)
for find, replace in (
- ('gui_coordinate', '_coordinate'),
- ('gui_rotation', '_rotation'),
+ ('gr_add_vxx', 'gr_add_xx'),
+ ('gr_multiply_vxx', 'gr_multiply_xx'),
):
- keys = xml.xpath('/flow_graph/block/param[key="%s"]/key'%find)
+ keys = xml.xpath('/flow_graph/block[key="%s"]/key'%find)
for key in keys:
key.text = replace
changed = True
projects / debian / gnuradio / commitdiff