diff --git a/grc/ieee802_11_ofdm_freq_est.xml b/grc/ieee802_11_ofdm_freq_est.xml deleted file mode 100644 index 3c202b1..0000000 --- a/grc/ieee802_11_ofdm_freq_est.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - OFDM Freq Est - ieee802_11_ofdm_freq_est - IEEE802.11 - import ieee802_11 - ieee802_11.ofdm_freq_est($log, $debug) - - - Log - log - False - bool - - - - - - - Debug - debug - False - bool - - - - - - - in - complex - 1 - - - - out - complex - 1 - - - diff --git a/include/ieee802-11/CMakeLists.txt b/include/ieee802-11/CMakeLists.txt index f4492dd..f9b17af 100644 --- a/include/ieee802-11/CMakeLists.txt +++ b/include/ieee802-11/CMakeLists.txt @@ -74,7 +74,6 @@ list(APPEND include_sources ofdm_decode_mac.h ofdm_decode_signal.h ofdm_equalize_symbols.h - ofdm_freq_est.h ofdm_mac.h ofdm_mapper.h ofdm_parse_mac.h diff --git a/include/ieee802-11/ofdm_freq_est.h b/include/ieee802-11/ofdm_freq_est.h deleted file mode 100644 index b891a81..0000000 --- a/include/ieee802-11/ofdm_freq_est.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#ifndef INCLUDED_IEEE802_11_OFDM_FREQ_EST_H -#define INCLUDED_IEEE802_11_OFDM_FREQ_EST_H - -#include -#include - -namespace gr { -namespace ieee802_11 { - -class IEEE802_11_API ofdm_freq_est : virtual public block -{ -public: - - typedef boost::shared_ptr sptr; - static sptr make(bool log = false, bool debug = false); - -}; - -} // namespace ieee802_11 -} // namespace gr - -#endif /* INCLUDED_IEEE802_11_OFDM_FREQ_EST_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2a84c35..b615b10 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -99,7 +99,6 @@ list(APPEND gr_ieee802_11_sources ofdm_decode_mac.cc ofdm_decode_signal.cc ofdm_equalize_symbols.cc - ofdm_freq_est.cc ofdm_mac.cc ofdm_mapper.cc ofdm_parse_mac.cc diff --git a/lib/ofdm_freq_est.cc b/lib/ofdm_freq_est.cc deleted file mode 100644 index b45f0f1..0000000 --- a/lib/ofdm_freq_est.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include -#include "utils.h" -#include - -using namespace gr::ieee802_11; - - -class ofdm_freq_est_impl : public ofdm_freq_est { - -public: -ofdm_freq_est_impl(bool log, bool debug) : block("ofdm_freq_est", - gr::io_signature::make2(2, 2, sizeof(gr_complex), sizeof(gr_complex)), - gr::io_signature::make(1, 1, sizeof(gr_complex))), - d_log(log), - d_debug(debug), - d_state(SYNC) { - - set_tag_propagation_policy(block::TPP_DONT); -} - -int general_work (int noutput, gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) { - - const gr_complex *in = (const gr_complex*)input_items[0]; - gr_complex *out = (gr_complex*)output_items[0]; - - - return 0; -} - -void forecast (int noutput_items, gr_vector_int &ninput_items_required) { - ninput_items_required[0] = noutput_items; -} - -private: - enum {SYNC, COPY, RESET} d_state; - std::vector d_tags; - - const bool d_log; - const bool d_debug; -}; - -ofdm_freq_est::sptr -ofdm_freq_est::make(bool log, bool debug) { - return gnuradio::get_initial_sptr(new ofdm_freq_est_impl(log, debug)); -} - diff --git a/swig/ieee802_11_swig.i b/swig/ieee802_11_swig.i index 4fb6f7e..02d6a9c 100644 --- a/swig/ieee802_11_swig.i +++ b/swig/ieee802_11_swig.i @@ -31,7 +31,6 @@ #include "ieee802-11/ofdm_decode_mac.h" #include "ieee802-11/ofdm_decode_signal.h" #include "ieee802-11/ofdm_equalize_symbols.h" -#include "ieee802-11/ofdm_freq_est.h" #include "ieee802-11/ofdm_mac.h" #include "ieee802-11/ofdm_mapper.h" #include "ieee802-11/ofdm_parse_mac.h" @@ -50,7 +49,6 @@ %include "ieee802-11/ofdm_decode_mac.h" %include "ieee802-11/ofdm_decode_signal.h" %include "ieee802-11/ofdm_equalize_symbols.h" -%include "ieee802-11/ofdm_freq_est.h" %include "ieee802-11/ofdm_mac.h" %include "ieee802-11/ofdm_mapper.h" %include "ieee802-11/ofdm_parse_mac.h" @@ -66,7 +64,6 @@ GR_SWIG_BLOCK_MAGIC2(ieee802_11, moving_average_ff); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_decode_mac); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_decode_signal); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_equalize_symbols); -GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_freq_est); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mac); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mapper); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac);