diff options
Diffstat (limited to 'gr-howto-write-a-block/include')
| -rw-r--r-- | gr-howto-write-a-block/include/howto/CMakeLists.txt (renamed from gr-howto-write-a-block/include/CMakeLists.txt) | 8 | ||||
| -rw-r--r-- | gr-howto-write-a-block/include/howto/api.h (renamed from gr-howto-write-a-block/include/howto_api.h) | 0 | ||||
| -rw-r--r-- | gr-howto-write-a-block/include/howto/square2_ff.h | 68 | ||||
| -rw-r--r-- | gr-howto-write-a-block/include/howto/square_ff.h | 68 | ||||
| -rw-r--r-- | gr-howto-write-a-block/include/howto_square2_ff.h | 78 | ||||
| -rw-r--r-- | gr-howto-write-a-block/include/howto_square_ff.h | 82 |
6 files changed, 140 insertions, 164 deletions
diff --git a/gr-howto-write-a-block/include/CMakeLists.txt b/gr-howto-write-a-block/include/howto/CMakeLists.txt index 475cc73c65..7cd6325543 100644 --- a/gr-howto-write-a-block/include/CMakeLists.txt +++ b/gr-howto-write-a-block/include/howto/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,8 +21,8 @@ # Install public header files ######################################################################## install(FILES - howto_api.h - howto_square_ff.h - howto_square2_ff.h + api.h + square_ff.h + square2_ff.h DESTINATION include/howto ) diff --git a/gr-howto-write-a-block/include/howto_api.h b/gr-howto-write-a-block/include/howto/api.h index 5263a1cf70..5263a1cf70 100644 --- a/gr-howto-write-a-block/include/howto_api.h +++ b/gr-howto-write-a-block/include/howto/api.h diff --git a/gr-howto-write-a-block/include/howto/square2_ff.h b/gr-howto-write-a-block/include/howto/square2_ff.h new file mode 100644 index 0000000000..2e22bb7997 --- /dev/null +++ b/gr-howto-write-a-block/include/howto/square2_ff.h @@ -0,0 +1,68 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2012 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_HOWTO_SQUARE2_FF_H +#define INCLUDED_HOWTO_SQUARE2_FF_H + +#include <howto/api.h> +#include <gr_sync_block.h> + +namespace gr { + namespace howto { + + /*! + * \brief square2 a stream of floats. + * \ingroup block + * + * This uses the preferred technique: subclassing gr_sync_block. + */ + class HOWTO_API square2_ff : virtual public gr_sync_block + { + public: + /* + * We use boost::shared_ptr's instead of raw pointers for all + * access to gr_blocks (and many other data structures). The + * shared_ptr gets us transparent reference counting, which + * greatly simplifies storage management issues. This is + * especially helpful in our hybrid C++ / Python system. + * + * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm + * + * gr::howto::square2_ff::sptr + */ + typedef boost::shared_ptr<square2_ff> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of howto::square2_ff. + * + * To avoid accidental use of raw pointers, howto::square2_ff's + * constructor is in a private implementation + * class. howto::square2_ff::make is the public interface for + * creating new instances. + */ + static sptr make(); + }; + + } // namespace howto +} // namespace gr + +#endif /* INCLUDED_HOWTO_SQUARE2_FF_H */ diff --git a/gr-howto-write-a-block/include/howto/square_ff.h b/gr-howto-write-a-block/include/howto/square_ff.h new file mode 100644 index 0000000000..ce971afb6b --- /dev/null +++ b/gr-howto-write-a-block/include/howto/square_ff.h @@ -0,0 +1,68 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2012 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_HOWTO_SQUARE_FF_H +#define INCLUDED_HOWTO_SQUARE_FF_H + +#include <howto/api.h> +#include <gr_block.h> + +namespace gr { + namespace howto { + + /*! + * \brief square a stream of floats. + * \ingroup block + * + * \sa howto_square2_ff for a version that subclasses gr_sync_block. + */ + class HOWTO_API square_ff : virtual public gr_block + { + public: + /* + * We use boost::shared_ptr's instead of raw pointers for all + * access to gr_blocks (and many other data structures). The + * shared_ptr gets us transparent reference counting, which + * greatly simplifies storage management issues. This is + * especially helpful in our hybrid C++ / Python system. + * + * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm + * + * gr::howto::square_ff::sptr + */ + typedef boost::shared_ptr<square_ff> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of howto::square_ff. + * + * To avoid accidental use of raw pointers, howto::square_ff's + * constructor is in a private implementation + * class. howto::square_ff::make is the public interface for + * creating new instances. + */ + static sptr make(); + }; + + } // namespace howto +} // namespace gr + +#endif /* INCLUDED_HOWTO_SQUARE_FF_H */ diff --git a/gr-howto-write-a-block/include/howto_square2_ff.h b/gr-howto-write-a-block/include/howto_square2_ff.h deleted file mode 100644 index 2d6c7938bd..0000000000 --- a/gr-howto-write-a-block/include/howto_square2_ff.h +++ /dev/null @@ -1,78 +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_HOWTO_SQUARE2_FF_H -#define INCLUDED_HOWTO_SQUARE2_FF_H - -#include <howto_api.h> -#include <gr_sync_block.h> - -class howto_square2_ff; - -/* - * We use boost::shared_ptr's instead of raw pointers for all access - * to gr_blocks (and many other data structures). The shared_ptr gets - * us transparent reference counting, which greatly simplifies storage - * management issues. This is especially helpful in our hybrid - * C++ / Python system. - * - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm - * - * As a convention, the _sptr suffix indicates a boost::shared_ptr - */ -typedef boost::shared_ptr<howto_square2_ff> howto_square2_ff_sptr; - -/*! - * \brief Return a shared_ptr to a new instance of howto_square2_ff. - * - * To avoid accidental use of raw pointers, howto_square2_ff's - * constructor is private. howto_make_square2_ff is the public - * interface for creating new instances. - */ -HOWTO_API howto_square2_ff_sptr howto_make_square2_ff (); - -/*! - * \brief square2 a stream of floats. - * \ingroup block - * - * This uses the preferred technique: subclassing gr_sync_block. - */ -class HOWTO_API howto_square2_ff : public gr_sync_block -{ -private: - // The friend declaration allows howto_make_square2_ff to - // access the private constructor. - - friend HOWTO_API howto_square2_ff_sptr howto_make_square2_ff (); - - howto_square2_ff (); // private constructor - - public: - ~howto_square2_ff (); // public destructor - - // Where all the action really happens - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_HOWTO_SQUARE2_FF_H */ diff --git a/gr-howto-write-a-block/include/howto_square_ff.h b/gr-howto-write-a-block/include/howto_square_ff.h deleted file mode 100644 index 2efc7fc714..0000000000 --- a/gr-howto-write-a-block/include/howto_square_ff.h +++ /dev/null @@ -1,82 +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_HOWTO_SQUARE_FF_H -#define INCLUDED_HOWTO_SQUARE_FF_H - -#include <howto_api.h> -#include <gr_block.h> - -class howto_square_ff; - -/* - * We use boost::shared_ptr's instead of raw pointers for all access - * to gr_blocks (and many other data structures). The shared_ptr gets - * us transparent reference counting, which greatly simplifies storage - * management issues. This is especially helpful in our hybrid - * C++ / Python system. - * - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm - * - * As a convention, the _sptr suffix indicates a boost::shared_ptr - */ -typedef boost::shared_ptr<howto_square_ff> howto_square_ff_sptr; - -/*! - * \brief Return a shared_ptr to a new instance of howto_square_ff. - * - * To avoid accidental use of raw pointers, howto_square_ff's - * constructor is private. howto_make_square_ff is the public - * interface for creating new instances. - */ -HOWTO_API howto_square_ff_sptr howto_make_square_ff (); - -/*! - * \brief square a stream of floats. - * \ingroup block - * - * \sa howto_square2_ff for a version that subclasses gr_sync_block. - */ -class HOWTO_API howto_square_ff : public gr_block -{ -private: - // The friend declaration allows howto_make_square_ff to - // access the private constructor. - - friend HOWTO_API howto_square_ff_sptr howto_make_square_ff (); - - /*! - * \brief square a stream of floats. - */ - howto_square_ff (); // private constructor - - public: - ~howto_square_ff (); // public destructor - - // Where all the action really happens - - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_HOWTO_SQUARE_FF_H */ |