[Commit-gnuradio] r4641 - gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general

[jcorgan]

Author: jcorgan
Date: 2007-02-25 22:07:15 -0700 (Sun, 25 Feb 2007)
New Revision: 4641

Modified:
   
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
   
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
Log:
Applied changeset r4585 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
 2007-02-26 02:25:11 UTC (rev 4640)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
 2007-02-26 05:07:15 UTC (rev 4641)
@@ -45,7 +45,7 @@
                   gr_make_io_signature (1, 1, sizeof(char)),
                   gr_make_io_signature (1, 1, sizeof(char))),
     d_data_reg(0), d_flag_reg(0), d_flag_bit(0), d_mask(0),
-    d_threshold(threshold), d_flip(0)
+    d_threshold(threshold)
 
 {
   if (!set_access_code(access_code)){
@@ -94,7 +94,7 @@
     // compute output value
     unsigned int t = 0;
 
-    t |= d_flip ^ (((d_data_reg >> 63) & 0x1) << 0);
+    t |= ((d_data_reg >> 63) & 0x1) << 0;
     t |= ((d_flag_reg >> 63) & 0x1) << 1;      // flag bit
     out[i] = t;
     
@@ -106,8 +106,8 @@
     wrong_bits  = (d_data_reg ^ d_access_code) & d_mask;
     nwrong = gr_count_bits64(wrong_bits);
 
-    // test for access code with up to threshold errors or its compelement
-    new_flag = (nwrong <= d_threshold) || (nwrong >= (64-d_threshold));
+    // test for access code with up to threshold errors
+    new_flag = (nwrong <= d_threshold);
 
 #if 0   
     if(new_flag) {
@@ -120,7 +120,6 @@
     d_flag_reg = (d_flag_reg << 1);
     if (new_flag) {
       d_flag_reg |= d_flag_bit;
-      d_flip = nwrong >= (64-d_threshold);   // flip bits if this is true
     }
   }
 

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
  2007-02-26 02:25:11 UTC (rev 4640)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
  2007-02-26 05:07:15 UTC (rev 4641)
@@ -62,9 +62,7 @@
   unsigned long long d_mask;           // masks access_code bits (top N bits 
are set where
                                         //   N is the number of bits in the 
access code)
   unsigned int      d_threshold;       // how many bits may be wrong in sync 
vector
-  unsigned int       d_flip;            // flip bits if 180 degress out of sync
 
-
  protected:
   gr_correlate_access_code_bb(const std::string &access_code, int threshold);