digital: moved newly added CPM and GMSK hier blocks to gr-digital.

7 files changed, 0 insertions, 326 deletions

diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc
deleted file mode 100644
index 24c25e22f..000000000
--- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- * 
- * 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_cpmmod_bc.h>
-#include <gr_io_signature.h>
-
-
-// Shared pointer constructor
-gr_cpmmod_bc_sptr
-gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta)
-{
-  return gnuradio::get_initial_sptr(new gr_cpmmod_bc((gr_cpm::cpm_type)type, h, samples_per_sym, L, beta));
-}
-
-
-gr_cpmmod_bc::gr_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_sym,
-							unsigned L, double beta)
-  : gr_hier_block2("gr_cpmmod_bc",
-		   gr_make_io_signature(1, 1, sizeof(char)),
-		   gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))),
-	d_taps(gr_cpm::phase_response(type, samples_per_sym, L, beta)),
-	d_char_to_float(gr_make_char_to_float()),
-	d_pulse_shaper(gr_make_interp_fir_filter_fff(samples_per_sym, d_taps)),
-	d_fm(gr_make_frequency_modulator_fc(M_PI * h))
-{
-  switch (type) {
-	  case gr_cpm::LRC:
-	  case gr_cpm::LSRC:
-	  case gr_cpm::LREC:
-	  case gr_cpm::TFM:
-	  case gr_cpm::GAUSSIAN:
-		  break;
-
-	  default:
-		  throw std::invalid_argument("invalid CPM type");
-  }
-
-  connect(self(), 0, d_char_to_float, 0);
-  connect(d_char_to_float, 0, d_pulse_shaper, 0);
-  connect(d_pulse_shaper, 0, d_fm, 0);
-  connect(d_fm, 0, self(), 0);
-}
-
diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h
deleted file mode 100644
index 210b30612..000000000
--- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 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.
- */
-
-#ifndef INCLUDED_GR_CPMMOD_BC_H
-#define INCLUDED_GR_CPMMOD_BC_H
-
-#include <gr_hier_block2.h>
-#include <gr_char_to_float.h>
-#include <gr_interp_fir_filter_fff.h>
-#include <gr_frequency_modulator_fc.h>
-#include <gr_cpm.h>
-
-
-class gr_cpmmod_bc;
-typedef boost::shared_ptr<gr_cpmmod_bc> gr_cpmmod_bc_sptr;
-
-
-gr_cpmmod_bc_sptr
-gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta=0.3);
-
-
-/*!
- * \brief Generic CPM modulator
- *
- * \ingroup modulation_blk
- *
- * \param type The modulation type. Can be one of LREC, LRC, LSRC, TFM or GAUSSIAN. See
- *             gr_cpm::phase_response() for a detailed description.
- * \param h The modulation index. \f$ h \cdot \pi\f$ is the maximum phase change that can occur
- *          between two symbols, i.e., if you only send ones, the phase will increase
- *          by \f$ h \cdot \pi\f$ every \p samples_per_sym samples. Set this to 0.5 for Minimum Shift
- *          Keying variants.
- * \param samples_per_sym Samples per symbol.
- * \param L The length of the phase duration in symbols. For L=1, this yields full-
- *          response CPM symbols, for L > 1, partial-response.
- * \param beta For LSRC, this is the rolloff factor. For Gaussian pulses, this is the 3 dB
- *             time-bandwidth product.
- *
- * Examples:
- * - Setting h = 0.5, L = 1, type = LREC yields MSK.
- * - Setting h = 0.5, type = GAUSSIAN and beta = 0.3 yields GMSK as used in GSM.
- *
- * The input of this block are symbols from an M-ary alphabet
- * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the
- * valid inputs are +/-1.
- * The modulator will silently accept any other inputs, though.
- * The output is the phase-modulated signal.
- */
-class gr_cpmmod_bc : public gr_hier_block2
-{
-	friend gr_cpmmod_bc_sptr gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta);
-
-	std::vector<float> d_taps;
-	gr_char_to_float_sptr d_char_to_float;
-	gr_interp_fir_filter_fff_sptr d_pulse_shaper;
-	gr_frequency_modulator_fc_sptr d_fm;
-
- protected:
-	gr_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_sym, unsigned L, double beta);
-
- public:
-	//! Return the phase response FIR taps
-	 std::vector<float> get_taps() { return d_taps; };
-};
-
-#endif /* INCLUDED_GR_CPMMOD_BC_H */
-
diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i
deleted file mode 100644
index 55116cda7..000000000
--- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr, cpmmod_bc)
-
-gr_cpmmod_bc_sptr
-gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta=0.3);
-
-class gr_cpmmod_bc : public gr_hier_block2
-{
- private:
-  gr_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta);
-
- public:
-  std::vector<float> get_taps();
-};
-
diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc
deleted file mode 100644
index 37128d99c..000000000
--- a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- * 
- * 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_gmskmod_bc.h>
-#include <gr_io_signature.h>
-
-
-// Shared pointer constructor
-gr_gmskmod_bc_sptr
-gr_make_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L)
-{
-  return gnuradio::get_initial_sptr(new gr_gmskmod_bc(samples_per_sym, bt, L));
-}
-
-
-gr_gmskmod_bc::gr_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L)
-	: gr_cpmmod_bc(gr_cpm::GAUSSIAN, 0.5, samples_per_sym, L, bt)
-{
-}
-
diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h
deleted file mode 100644
index 39bd576e2..000000000
--- a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 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.
- */
-
-#ifndef INCLUDED_GR_GMSKMOD_BC_H
-#define INCLUDED_GR_GMSKMOD_BC_H
-
-#include <gr_cpmmod_bc.h>
-
-class gr_gmskmod_bc;
-typedef boost::shared_ptr<gr_gmskmod_bc> gr_gmskmod_bc_sptr;
-
-
-gr_gmskmod_bc_sptr
-gr_make_gmskmod_bc(unsigned samples_per_sym=2, double bt=0.3, unsigned L=4);
-
-
-/*!
- * \brief GMSK modulator
- *
- * \ingroup modulation_blk
- *
- * \param samples_per_sym Samples per symbol.
- * \param bt The 3 dB time-bandwidth product.
- * \param L The length of the phase duration in symbols. The Gaussian pulse is truncated
- *          after L symbols.
- *
- * The input of this block are symbols from an M-ary alphabet
- * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the
- * valid inputs are +/-1.
- * The modulator will silently accept any other inputs, though.
- * The output is the phase-modulated signal.
- */
-class gr_gmskmod_bc : public gr_cpmmod_bc
-{
-	friend gr_gmskmod_bc_sptr gr_make_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L);
-	gr_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L);
-};
-
-#endif /* INCLUDED_GR_GMSKMOD_BC_H */
-
diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i
deleted file mode 100644
index dadf3be62..000000000
--- a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr, gmskmod_bc)
-
-gr_gmskmod_bc_sptr
-gr_make_gmskmod_bc(unsigned samples_per_sym=2, double bt=0.3, unsigned L=4);
-
-class gr_gmskmod_bc : public gr_hier_block2
-{
- private:
-  gr_cpmmod_bc(int type, float h, unsigned samples_per_sym, double beta, unsigned L);
-
- public:
-  std::vector<float> get_taps();
-};
-
diff --git a/gnuradio-core/src/lib/hier/hier.i b/gnuradio-core/src/lib/hier/hier.i
index b8915e15b..bec3de7ed 100644
--- a/gnuradio-core/src/lib/hier/hier.i
+++ b/gnuradio-core/src/lib/hier/hier.i
@@ -26,11 +26,7 @@
 #endif
 
 #include <gr_channel_model.h>
-#include <gr_cpmmod_bc.h>
-#include <gr_gmskmod_bc.h>
 %}
 
 %include "gr_channel_model.i"
-%include "gr_cpmmod_bc.i"
-%include "gr_gmskmod_bc.i"