X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fgeneral%2Fgr_correlate_access_code_bb.cc;fp=gnuradio-core%2Fsrc%2Flib%2Fgeneral%2Fgr_correlate_access_code_bb.cc;h=18253e968000416d269870d2f659ba525cbc1846;hb=51a76e998bffe391683f0abc9d411c589b386d18;hp=4656f8c527d2450c445e01997ecb6daeb35bab3c;hpb=2f782b6ece27a7467c788f37632468f6a9444044;p=debian%2Fgnuradio diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc index 4656f8c5..18253e96 100644 --- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc +++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc @@ -45,7 +45,7 @@ gr_correlate_access_code_bb::gr_correlate_access_code_bb ( 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 @@ gr_correlate_access_code_bb::work (int noutput_items, // 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 @@ gr_correlate_access_code_bb::work (int noutput_items, 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 @@ gr_correlate_access_code_bb::work (int noutput_items, 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 } }