[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4586 - gnuradio/branches/developers/n4hy/ofdm/gnuradi
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4586 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general |
Date: |
Thu, 22 Feb 2007 08:23:04 -0700 (MST) |
Author: trondeau
Date: 2007-02-22 08:23:04 -0700 (Thu, 22 Feb 2007)
New Revision: 4586
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
Log:
duplicate fix of r4585 in ofdm branch
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
2007-02-22 15:16:10 UTC (rev 4585)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
2007-02-22 15:23:04 UTC (rev 4586)
@@ -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/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
2007-02-22 15:16:10 UTC (rev 4585)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
2007-02-22 15:23:04 UTC (rev 4586)
@@ -62,7 +62,6 @@
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:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4586 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general,
trondeau <=