blocks: removing vco_f from core; now in gr-blocks.

This cleans up the last revert where we want to keep the vco/nco primitives in core but actualy gr_blocks are not.
author: Tom Rondeau <trondeau@vt.edu> 2013-03-18 12:51:22 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2013-03-18 12:51:22 -0400
commit: d26514b07a5d15206687b636a2a0c51ad10684c1 (patch)
tree: 56de041f419adfa7d6c2f6727813e9a350f7559b /gnuradio-core/src
parent: 435b1d166f0c7092bbd5e1f788e75dbb6ade3a4b (diff)
3 files changed, 0 insertions, 171 deletions
diff --git a/gnuradio-core/src/lib/general/gr_vco_f.cc b/gnuradio-core/src/lib/general/gr_vco_f.cc
deleted file mode 100644
index 0899bc77e0..0000000000
--- a/gnuradio-core/src/lib/general/gr_vco_f.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2010 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 <gr_vco_f.h>
-#include <gr_io_signature.h>
-#include <math.h>
-
-gr_vco_f_sptr
-gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude)
-{
-  return gnuradio::get_initial_sptr(new gr_vco_f(sampling_rate, sensitivity, amplitude));
-}
-
-
-gr_vco_f::gr_vco_f(double sampling_rate, double sensitivity, double amplitude)
-  : gr_sync_block("vco_f",
-		  gr_make_io_signature(1, 1, sizeof(float)),
-		  gr_make_io_signature(1, 1, sizeof(float))),
-    d_sampling_rate(sampling_rate), d_sensitivity(sensitivity), d_amplitude(amplitude),
-    d_k(d_sensitivity/d_sampling_rate)
-{
-}
-
-int
-gr_vco_f::work (int noutput_items,
-		gr_vector_const_void_star &input_items,
-		gr_vector_void_star &output_items)
-{
-  const float *input = (const float *)input_items[0];
-  float *output = (float *)output_items[0];
-
-  d_vco.cos(output, input, noutput_items, d_k, d_amplitude);
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_vco_f.h b/gnuradio-core/src/lib/general/gr_vco_f.h
deleted file mode 100644
index 83f6a9773e..0000000000
--- a/gnuradio-core/src/lib/general/gr_vco_f.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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_GR_VCO_F_H
-#define INCLUDED_GR_VCO_F_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gr_fxpt_vco.h>
-
-/*!
- * \brief VCO - Voltage controlled oscillator
- * \ingroup misc
- *
- * \param sampling_rate		sampling rate (Hz)
- * \param sensitivity		units are radians/sec/volt
- * \param amplitude		output amplitude
- */
-class gr_vco_f;
-typedef boost::shared_ptr<gr_vco_f> gr_vco_f_sptr;
-
-
-GR_CORE_API gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
-
-/*!
- * \brief VCO - Voltage controlled oscillator
- * \ingroup modulator_blk
- *
- * input: float stream of control voltages; output: float oscillator output
- */
-class GR_CORE_API gr_vco_f : public gr_sync_block
-{
-  friend GR_CORE_API gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
-
-  /*!
-   * \brief VCO - Voltage controlled oscillator
-   *
-   * \param sampling_rate	sampling rate (Hz)
-   * \param sensitivity		units are radians/sec/volt
-   * \param amplitude		output amplitude
-   */
-  gr_vco_f(double sampling_rate, double sensitivity, double amplitude);
-
-  double	d_sampling_rate;
-  double	d_sensitivity;
-  double	d_amplitude;
-  double	d_k;
-  gr_fxpt_vco	d_vco;
-
-public:
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_GR_VCO_F_H */
diff --git a/gnuradio-core/src/lib/general/gr_vco_f.i b/gnuradio-core/src/lib/general/gr_vco_f.i
deleted file mode 100644
index 8ecf314116..0000000000
--- a/gnuradio-core/src/lib/general/gr_vco_f.i
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,vco_f);
-
-/*!
- * \brief VCO - Voltage controlled oscillator
- *
- * \param sampling_rate		sampling rate (Hz)
- * \param sensitivity		units are radians/sec/volt
- * \param amplitude		output amplitude
- */
-gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
-
-
-class gr_vco_f : public gr_sync_block {
- private:
-  gr_vco_f(double sampling_rate, double sensitivity, double amplitude);
-};
author	Tom Rondeau <trondeau@vt.edu>	2013-03-18 12:51:22 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2013-03-18 12:51:22 -0400
commit	d26514b07a5d15206687b636a2a0c51ad10684c1 (patch)
tree	56de041f419adfa7d6c2f6727813e9a350f7559b /gnuradio-core/src
parent	435b1d166f0c7092bbd5e1f788e75dbb6ade3a4b (diff)