3 files changed, 117 insertions, 3 deletions
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index dc86bbd5b..17baf2101 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -40,10 +40,11 @@ libgnuradio_digital_la_SOURCES = 		\
 	digital_fll_band_edge_cc.cc		\
 	digital_lms_dd_equalizer_cc.cc		\
 	digital_kurtotic_equalizer_cc.cc	\
-	digital_mpsk_receiver_cc.cc
+	digital_mpsk_receiver_cc.cc		\
+	digital_gmskmod_bc.cc			\
+	digital_cpmmod_bc.cc
 
 libgnuradio_digital_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)	\
-	$(abs_top_builddir)/gr-digital/hier/libdigital_hier.la
+	$(GNURADIO_CORE_LA)
 
 libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-digital/lib/digital_cpmmod_bc.cc b/gr-digital/lib/digital_cpmmod_bc.cc
new file mode 100644
index 000000000..a95b604d1
--- /dev/null
+++ b/gr-digital/lib/digital_cpmmod_bc.cc
@@ -0,0 +1,69 @@
+/* -*- 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 <digital_cpmmod_bc.h>
+#include <gr_io_signature.h>
+
+
+// Shared pointer constructor
+digital_cpmmod_bc_sptr
+digital_make_cpmmod_bc(int type, float h,
+		       unsigned samples_per_sym,
+		       unsigned L, double beta)
+{
+  return gnuradio::get_initial_sptr(new digital_cpmmod_bc((gr_cpm::cpm_type)type,
+							  h, samples_per_sym,
+							  L, beta));
+}
+
+
+digital_cpmmod_bc::digital_cpmmod_bc(gr_cpm::cpm_type type, float h,
+				     unsigned samples_per_sym,
+				     unsigned L, double beta)
+  : gr_hier_block2("digital_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/gr-digital/lib/digital_gmskmod_bc.cc b/gr-digital/lib/digital_gmskmod_bc.cc
new file mode 100644
index 000000000..e53e90037
--- /dev/null
+++ b/gr-digital/lib/digital_gmskmod_bc.cc
@@ -0,0 +1,44 @@
+/* -*- 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_gmskmod_bc.h>
+#include <gr_io_signature.h>
+
+// Shared pointer constructor
+digital_gmskmod_bc_sptr
+digital_make_gmskmod_bc(unsigned samples_per_sym,
+			double bt, unsigned L)
+{
+  return gnuradio::get_initial_sptr(new digital_gmskmod_bc(samples_per_sym, bt, L));
+}
+
+
+digital_gmskmod_bc::digital_gmskmod_bc(unsigned samples_per_sym,
+				       double bt, unsigned L)
+	: digital_cpmmod_bc(gr_cpm::GAUSSIAN, 0.5, samples_per_sym, L, bt)
+{
+}
+