[Commit-gnuradio] r6851 - gnuradio/trunk/gnuradio-core/src/lib/general

[jcorgan]

Author: jcorgan
Date: 2007-11-09 17:53:09 -0700 (Fri, 09 Nov 2007)
New Revision: 6851

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_math.h
Log:
Reverted changesets r6841 and r6840 on the trunk.  Passes make check.

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc     
2007-11-10 00:46:59 UTC (rev 6850)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc     
2007-11-10 00:53:09 UTC (rev 6851)
@@ -151,19 +151,17 @@
       out[oo++] = d_p_0T;
       
       // limit mm_val
-
       if (mm_val > 1.0)
        mm_val = 1.0;
       else if (mm_val < -1.0)
        mm_val = -1.0;
-
+      
       d_omega = d_omega + d_gain_omega * mm_val;
-
       if (d_omega > d_max_omega)
        d_omega = d_max_omega;
       else if (d_omega < d_min_omega)
        d_omega = d_min_omega;
-
+      
       d_mu = d_mu + d_omega + d_gain_mu * mm_val;
       ii += (int)floor(d_mu);
       d_mu -= floor(d_mu);

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h      
2007-11-10 00:46:59 UTC (rev 6850)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h      
2007-11-10 00:53:09 UTC (rev 6851)
@@ -25,7 +25,6 @@
 
 #include <gr_block.h>
 #include <gr_complex.h>
-#include <gr_math.h>
 
 class gri_mmse_fir_interpolator_cc;
 

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2007-11-10 00:46:59 UTC (rev 6850)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2007-11-10 00:53:09 UTC (rev 6851)
@@ -118,7 +118,6 @@
     d_last_sample = out[oo];
 
     d_omega = d_omega + d_gain_omega * mm_val;
-
     if (d_omega > d_max_omega)
       d_omega = d_max_omega;
     else if (d_omega < d_min_omega)

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h      
2007-11-10 00:46:59 UTC (rev 6850)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h      
2007-11-10 00:53:09 UTC (rev 6851)
@@ -24,7 +24,6 @@
 #define        INCLUDED_GR_CLOCK_RECOVERY_MM_FF_H
 
 #include <gr_block.h>
-#include <gr_math.h>
 #include <stdio.h>
 
 class gri_mmse_fir_interpolator;
@@ -68,7 +67,6 @@
     d_omega = omega;
     d_min_omega = omega*(1.0 - d_omega_relative_limit);
     d_max_omega = omega*(1.0 + d_omega_relative_limit);
-    d_omega_mid = 0.5*(d_min_omega+d_max_omega);
   }
 
 protected:
@@ -78,8 +76,7 @@
  private:
   float                        d_mu;           // fractional sample position 
[0.0, 1.0]
   float                        d_omega;        // nominal frequency
-  float                                d_min_omega;    // minimum allowed 
omega 
-  float                         d_omega_mid;   // average omega
+  float                                d_min_omega;    // minimum allowed omega
   float                                d_max_omega;    // maximum allowed omega
   float                         d_gain_omega;  // gain for adjusting omega
   float                         d_gain_mu;     // gain for adjusting mu

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_math.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_math.h      2007-11-10 
00:46:59 UTC (rev 6850)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_math.h      2007-11-10 
00:53:09 UTC (rev 6851)
@@ -64,13 +64,4 @@
   return gr_fast_atan2f(z.imag(), z.real()); 
 }
 
-static inline float gr_branchless_clip(float x, float clip)
-{
-  float x1 = fabs(x+clip);
-  float x2 = fabs(x-clip);
-  x1 -= x2;
-  return 0.5*x1;
-}
-
-
 #endif /* _GR_MATH_H_ */