Merge remote branch 'bitshark/burx_support' into wip/burx_support

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_mpsk_receiver_cc.h

diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h
index f718b541e34064146434bb760d4949ff311ded7e..024d74adaf4960e8e0e565f916fa6f12ddc47c4f 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h
+++ b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2007 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -43,7 +43,8 @@ gr_make_mpsk_receiver_cc (unsigned int M, float theta,
 /*!
  * \brief This block takes care of receiving M-PSK modulated signals through phase, frequency, and symbol
  * synchronization. 
- * \ingroup block
+ * \ingroup sync_blk
+ * \ingroup demod_blk
  *
  * This block takes care of receiving M-PSK modulated signals through phase, frequency, and symbol
  * synchronization. It performs carrier frequency and phase locking as well as symbol timing recovery. 
@@ -100,6 +101,7 @@ class gr_mpsk_receiver_cc : public gr_block
     d_omega = omega;
     d_min_omega = omega*(1.0 - d_omega_rel);
     d_max_omega = omega*(1.0 + d_omega_rel);
+    d_omega_mid = 0.5*(d_min_omega+d_max_omega);
   }
 
   //! (M&M) Sets value for mu gain factor
@@ -275,7 +277,7 @@ protected:
 
   // Members related to symbol timing
   float d_mu, d_gain_mu;
-  float d_omega, d_gain_omega, d_omega_rel, d_max_omega, d_min_omega;
+  float d_omega, d_gain_omega, d_omega_rel, d_max_omega, d_min_omega, d_omega_mid;
   gr_complex d_p_2T, d_p_1T, d_p_0T;
   gr_complex d_c_2T, d_c_1T, d_c_0T;
 
@@ -297,7 +299,7 @@ protected:
   static const unsigned int DLLEN = 8;
   
   //! delay line plus some length for overflow protection
-  gr_complex d_dl[2*DLLEN];
+  gr_complex d_dl[2*DLLEN] __attribute__ ((aligned(8)));
   
   //! index to delay line
   unsigned int d_dl_idx;