[Commit-gnuradio] r7372 - gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2008-01-07 15:29:48 -0700 (Mon, 07 Jan 2008)
New Revision: 7372

Modified:
   
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_math.h
   
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
Log:
Making quad slicer return quadrant number.

Modified: 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_math.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_math.h
      2008-01-07 21:17:36 UTC (rev 7371)
+++ 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_math.h
      2008-01-07 22:29:48 UTC (rev 7372)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2005 Free Software Foundation, Inc.
+ * Copyright 2003,2005,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -113,13 +113,13 @@
     if(r > 0)
       ret = 0;
     else
-      ret = 3;
+      ret = 2;
   }
   else {
     if(i > 0)
       ret = 1;
     else
-      ret = 2;
+      ret = 3;
   }
 
   return ret;
@@ -145,7 +145,7 @@
 {
   char ret = (r <= 0);
   ret |= ((i <= 0) << 1);
-  return ret;
+  return (ret ^ ((ret & 0x2) >> 0x1));
 }
 
 static inline unsigned int gr_branchless_quad_45deg_slicer(gr_complex x)

Modified: 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
 2008-01-07 21:17:36 UTC (rev 7371)
+++ 
gnuradio/branches/developers/trondeau/receiver/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
 2008-01-07 22:29:48 UTC (rev 7372)
@@ -158,7 +158,7 @@
   unsigned int index;
 
   index = gr_quad_0deg_slicer(sample);
-  return index ^ ((index & 0x2) >> 0x1);  // switch 2's and 3's to fit 
constellation
+  return index;
 }
 
 unsigned int