t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes for mac

Browse Source
This commit is contained in:
Bastian Bloessl
2013-11-22 19:43:18 +01:00
parent 55432c7825
commit c662987d74
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ofdm_decode_mac.cc
+1 -1
View File
@@ -257,7 +257,7 @@ void descramble () {
for(int i = 7; i < decoded_bits.size(); i++) { for(int i = 7; i < decoded_bits.size(); i++) {
feedback = ((!!(state & 64))) ^ (!!(state & 8)); 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; state = ((state << 1) & 0x7e) | feedback;
} }
lib/ofdm_decode_signal.cc
+1 -1
View File
@@ -141,7 +141,7 @@ bool print_signal() {
d_len = 0; d_len = 0;
bool parity = false; bool parity = false;
for(int i = 0; i < 17; i++) { for(int i = 0; i < 17; i++) {
parity ^= decoded_bits[i]; parity ^= (bool)decoded_bits[i];
if((i < 4) && decoded_bits[i]) { if((i < 4) && decoded_bits[i]) {
r = r | (1 << i); r = r | (1 << i);
lib/ofdm_sync_long.cc
+3 -3
View File
@@ -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 += in[i] * conj(in[i + 16]);
d_freq_est_buf[d_offset] = d_freq_est; d_freq_est_buf[d_offset] = d_freq_est;
d_cor.push_back(std::tuple<double, int>(abs(d_correlation[i]), d_offset)); d_cor.push_back(pair<double, int>(abs(d_correlation[i]), d_offset));
i++; i++;
d_offset++; d_offset++;
@@ -197,7 +197,7 @@ void search_frame_start() {
d_cor.reverse(); d_cor.reverse();
// copy list in vector for nicer access // copy list in vector for nicer access
vector<tuple<double, int>> vec(d_cor.begin(), d_cor.end()); vector<pair<double, int> > vec(d_cor.begin(), d_cor.end());
d_cor.clear(); d_cor.clear();
// in case we don't find anything use SYNC_LENGTH // in case we don't find anything use SYNC_LENGTH
@@ -228,7 +228,7 @@ private:
gr_complex d_freq_est; gr_complex d_freq_est;
gr_complex *d_correlation; gr_complex *d_correlation;
gr_complex *d_freq_est_buf; gr_complex *d_freq_est_buf;
std::list<std::tuple<double, int>> d_cor; list<pair<double, int> > d_cor;
std::vector<gr::tag_t> d_tags; std::vector<gr::tag_t> d_tags;
gr::filter::kernel::fir_filter_ccc *d_fir; gr::filter::kernel::fir_filter_ccc *d_fir;