From c662987d74c8bfaa5264a122a7fa463948687371 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Fri, 22 Nov 2013 19:43:18 +0100 Subject: [PATCH] changes for mac --- lib/ofdm_decode_mac.cc | 2 +- lib/ofdm_decode_signal.cc | 2 +- lib/ofdm_sync_long.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ofdm_decode_mac.cc b/lib/ofdm_decode_mac.cc index a770087..d9b3790 100644 --- a/lib/ofdm_decode_mac.cc +++ b/lib/ofdm_decode_mac.cc @@ -257,7 +257,7 @@ void descramble () { for(int i = 7; i < decoded_bits.size(); i++) { feedback = ((!!(state & 64))) ^ (!!(state & 8)); - out_bits[i] = feedback ^ decoded_bits(i); + out_bits[i] = feedback ^ (int)decoded_bits(i); state = ((state << 1) & 0x7e) | feedback; } diff --git a/lib/ofdm_decode_signal.cc b/lib/ofdm_decode_signal.cc index 54ceb11..f4b15b2 100644 --- a/lib/ofdm_decode_signal.cc +++ b/lib/ofdm_decode_signal.cc @@ -141,7 +141,7 @@ bool print_signal() { d_len = 0; bool parity = false; for(int i = 0; i < 17; i++) { - parity ^= decoded_bits[i]; + parity ^= (bool)decoded_bits[i]; if((i < 4) && decoded_bits[i]) { r = r | (1 << i); diff --git a/lib/ofdm_sync_long.cc b/lib/ofdm_sync_long.cc index 7b84cb4..8dc5e59 100644 --- a/lib/ofdm_sync_long.cc +++ b/lib/ofdm_sync_long.cc @@ -97,7 +97,7 @@ int general_work (int noutput, gr_vector_int& ninput_items, d_freq_est += in[i] * conj(in[i + 16]); d_freq_est_buf[d_offset] = d_freq_est; - d_cor.push_back(std::tuple(abs(d_correlation[i]), d_offset)); + d_cor.push_back(pair(abs(d_correlation[i]), d_offset)); i++; d_offset++; @@ -197,7 +197,7 @@ void search_frame_start() { d_cor.reverse(); // copy list in vector for nicer access - vector> vec(d_cor.begin(), d_cor.end()); + vector > vec(d_cor.begin(), d_cor.end()); d_cor.clear(); // in case we don't find anything use SYNC_LENGTH @@ -228,7 +228,7 @@ private: gr_complex d_freq_est; gr_complex *d_correlation; gr_complex *d_freq_est_buf; - std::list> d_cor; + list > d_cor; std::vector d_tags; gr::filter::kernel::fir_filter_ccc *d_fir;