Changeset 4641

Timestamp:

02/25/07 22:07:15

Author:

jcorgan

Message:

Applied changeset r4585 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc (modified) (4 diffs)
• gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h (modified) (1 diff)

gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc

@@ -46 +46 @@
-                   gr_make_io_signature (1, 1, sizeof(char))),
-    d_data_reg(0), d_flag_reg(0), d_flag_bit(0), d_mask(0),
-, d_flip(0)
+
-
-{
@@ -95 +95 @@
-    unsigned int t = 0;
-
-d_flip ^ (((d_data_reg >> 63) & 0x1) << 0)
+((d_data_reg >> 63) & 0x1) << 0
-    t |= ((d_flag_reg >> 63) & 0x1) << 1;       // flag bit
-    out[i] = t;
@@ -107 +107 @@
-    nwrong = gr_count_bits64(wrong_bits);
-
- or its compelement
- || (nwrong >= (64-d_threshold))
+
+
-
-#if 0   
@@ -121 +121 @@
-    if (new_flag) {
-      d_flag_reg |= d_flag_bit;
-      d_flip = nwrong >= (64-d_threshold);   // flip bits if this is true
-    }
-  }

gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h

@@ -63 +63 @@
-                                        //   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: