From ee59ee2864254fc6a6788083fcaae46bea2fa877 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 6 Jul 2012 18:10:20 -0400
Subject: digital: updated CPM and GMSK modulators to use blocks out of
gr-filter.
---
gr-digital/include/digital_cpmmod_bc.h | 7 +++----
gr-digital/include/digital_gmskmod_bc.h | 5 +++--
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'gr-digital/include')
diff --git a/gr-digital/include/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h
index f0f11ee30e..55837230cb 100644
--- a/gr-digital/include/digital_cpmmod_bc.h
+++ b/gr-digital/include/digital_cpmmod_bc.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010,2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -26,10 +26,9 @@
#include <digital_api.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>
-
+#include <filter/interp_fir_filter_fff.h>
class digital_cpmmod_bc;
typedef boost::shared_ptr<digital_cpmmod_bc> digital_cpmmod_bc_sptr;
@@ -81,7 +80,7 @@ class DIGITAL_API digital_cpmmod_bc : public gr_hier_block2
std::vector<float> d_taps;
gr_char_to_float_sptr d_char_to_float;
- gr_interp_fir_filter_fff_sptr d_pulse_shaper;
+ gr::filter::interp_fir_filter_fff::sptr d_pulse_shaper;
gr_frequency_modulator_fc_sptr d_fm;
protected:
diff --git a/gr-digital/include/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h
index 9f378c8a70..b47f35879f 100644
--- a/gr-digital/include/digital_gmskmod_bc.h
+++ b/gr-digital/include/digital_gmskmod_bc.h
@@ -53,8 +53,9 @@ digital_make_gmskmod_bc(unsigned samples_per_sym=2,
*/
class DIGITAL_API digital_gmskmod_bc : public digital_cpmmod_bc
{
- friend DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym,
- double bt, unsigned L);
+ friend DIGITAL_API digital_gmskmod_bc_sptr
+ digital_make_gmskmod_bc(unsigned samples_per_sym,
+ double bt, unsigned L);
digital_gmskmod_bc(unsigned samples_per_sym,
double bt, unsigned L);
};
--
cgit v1.2.3