From c3e86888599068dd5f3c571778678b03dd6862e3 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Tue, 17 Dec 2019 17:39:29 +0100 Subject: [PATCH] rename includes to match GR naming scheme --- CMakeLists.txt | 2 +- .../{ieee802-11 => ieee802_11}/CMakeLists.txt | 2 +- include/{ieee802-11 => ieee802_11}/api.h | 0 .../chunks_to_symbols.h | 2 +- .../constellations.h | 2 +- .../{ieee802-11 => ieee802_11}/decode_mac.h | 2 +- .../{ieee802-11 => ieee802_11}/ether_encap.h | 2 +- .../frame_equalizer.h | 2 +- include/{ieee802-11 => ieee802_11}/mac.h | 2 +- include/{ieee802-11 => ieee802_11}/mapper.h | 2 +- .../moving_average_XX.h.t | 2 +- .../{ieee802-11 => ieee802_11}/parse_mac.h | 2 +- .../{ieee802-11 => ieee802_11}/signal_field.h | 2 +- .../{ieee802-11 => ieee802_11}/sync_long.h | 2 +- .../{ieee802-11 => ieee802_11}/sync_short.h | 2 +- lib/chunks_to_symbols_impl.h | 4 +- lib/constellations_impl.h | 2 +- lib/decode_mac.cc | 2 +- lib/ether_encap_impl.h | 2 +- lib/frame_equalizer_impl.h | 4 +- lib/mac.cc | 2 +- lib/mapper.cc | 2 +- lib/parse_mac.cc | 2 +- lib/signal_field_impl.h | 2 +- lib/sync_long.cc | 2 +- lib/sync_short.cc | 2 +- lib/utils.h | 4 +- swig/ieee802_11_swig.i | 44 +++++++++---------- 28 files changed, 51 insertions(+), 51 deletions(-) rename include/{ieee802-11 => ieee802_11}/CMakeLists.txt (95%) rename include/{ieee802-11 => ieee802_11}/api.h (100%) rename include/{ieee802-11 => ieee802_11}/chunks_to_symbols.h (97%) rename include/{ieee802-11 => ieee802_11}/constellations.h (98%) rename include/{ieee802-11 => ieee802_11}/decode_mac.h (97%) rename include/{ieee802-11 => ieee802_11}/ether_encap.h (97%) rename include/{ieee802-11 => ieee802_11}/frame_equalizer.h (98%) rename include/{ieee802-11 => ieee802_11}/mac.h (97%) rename include/{ieee802-11 => ieee802_11}/mapper.h (97%) rename include/{ieee802-11 => ieee802_11}/moving_average_XX.h.t (97%) rename include/{ieee802-11 => ieee802_11}/parse_mac.h (97%) rename include/{ieee802-11 => ieee802_11}/signal_field.h (97%) rename include/{ieee802-11 => ieee802_11}/sync_long.h (97%) rename include/{ieee802-11 => ieee802_11}/sync_short.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d551ad..fc8475e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ add_custom_target(uninstall ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/ieee802-11) +add_subdirectory(include/ieee802_11) add_subdirectory(lib) add_subdirectory(swig) add_subdirectory(python) diff --git a/include/ieee802-11/CMakeLists.txt b/include/ieee802_11/CMakeLists.txt similarity index 95% rename from include/ieee802-11/CMakeLists.txt rename to include/ieee802_11/CMakeLists.txt index 07d853f..5b65039 100644 --- a/include/ieee802-11/CMakeLists.txt +++ b/include/ieee802_11/CMakeLists.txt @@ -36,6 +36,6 @@ list(APPEND include_sources install( FILES ${include_sources} - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/ieee802_11 + DESTINATION ${GR_INCLUDE_DIR} COMPONENT "ieee802_11_devel" ) diff --git a/include/ieee802-11/api.h b/include/ieee802_11/api.h similarity index 100% rename from include/ieee802-11/api.h rename to include/ieee802_11/api.h diff --git a/include/ieee802-11/chunks_to_symbols.h b/include/ieee802_11/chunks_to_symbols.h similarity index 97% rename from include/ieee802-11/chunks_to_symbols.h rename to include/ieee802_11/chunks_to_symbols.h index f6aa33f..7666337 100644 --- a/include/ieee802-11/chunks_to_symbols.h +++ b/include/ieee802_11/chunks_to_symbols.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H #define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/constellations.h b/include/ieee802_11/constellations.h similarity index 98% rename from include/ieee802-11/constellations.h rename to include/ieee802_11/constellations.h index bcc79a5..ac2e833 100644 --- a/include/ieee802-11/constellations.h +++ b/include/ieee802_11/constellations.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_IEEE802_11_CONSTELLATIONS_H #define INCLUDED_IEEE802_11_CONSTELLATIONS_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/decode_mac.h b/include/ieee802_11/decode_mac.h similarity index 97% rename from include/ieee802-11/decode_mac.h rename to include/ieee802_11/decode_mac.h index c7e5bef..eb2774a 100644 --- a/include/ieee802-11/decode_mac.h +++ b/include/ieee802_11/decode_mac.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_DECODE_MAC_H #define INCLUDED_IEEE802_11_DECODE_MAC_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/ether_encap.h b/include/ieee802_11/ether_encap.h similarity index 97% rename from include/ieee802-11/ether_encap.h rename to include/ieee802_11/ether_encap.h index f91fbca..8a577ab 100644 --- a/include/ieee802-11/ether_encap.h +++ b/include/ieee802_11/ether_encap.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_ETHER_ENCAP_H #define INCLUDED_IEEE802_11_ETHER_ENCAP_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/frame_equalizer.h b/include/ieee802_11/frame_equalizer.h similarity index 98% rename from include/ieee802-11/frame_equalizer.h rename to include/ieee802_11/frame_equalizer.h index 45ebbd0..a224e7a 100644 --- a/include/ieee802-11/frame_equalizer.h +++ b/include/ieee802_11/frame_equalizer.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_IEEE802_11_FRAME_EQUALIZER_H #define INCLUDED_IEEE802_11_FRAME_EQUALIZER_H -#include +#include #include enum Equalizer { diff --git a/include/ieee802-11/mac.h b/include/ieee802_11/mac.h similarity index 97% rename from include/ieee802-11/mac.h rename to include/ieee802_11/mac.h index 3d68af3..c0b3fb7 100644 --- a/include/ieee802-11/mac.h +++ b/include/ieee802_11/mac.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_MAC_H #define INCLUDED_IEEE802_11_MAC_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/mapper.h b/include/ieee802_11/mapper.h similarity index 97% rename from include/ieee802-11/mapper.h rename to include/ieee802_11/mapper.h index eb98f9d..e94d05d 100644 --- a/include/ieee802-11/mapper.h +++ b/include/ieee802_11/mapper.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_MAPPER_H #define INCLUDED_IEEE802_11_MAPPER_H -#include +#include #include enum Encoding { diff --git a/include/ieee802-11/moving_average_XX.h.t b/include/ieee802_11/moving_average_XX.h.t similarity index 97% rename from include/ieee802-11/moving_average_XX.h.t rename to include/ieee802_11/moving_average_XX.h.t index 9b9023e..64f5bff 100644 --- a/include/ieee802-11/moving_average_XX.h.t +++ b/include/ieee802_11/moving_average_XX.h.t @@ -17,7 +17,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include +#include #include namespace gr { diff --git a/include/ieee802-11/parse_mac.h b/include/ieee802_11/parse_mac.h similarity index 97% rename from include/ieee802-11/parse_mac.h rename to include/ieee802_11/parse_mac.h index 3b93997..48d1680 100644 --- a/include/ieee802-11/parse_mac.h +++ b/include/ieee802_11/parse_mac.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_PARSE_MAC_H #define INCLUDED_IEEE802_11_PARSE_MAC_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/signal_field.h b/include/ieee802_11/signal_field.h similarity index 97% rename from include/ieee802-11/signal_field.h rename to include/ieee802_11/signal_field.h index 909f1cb..116ea3d 100644 --- a/include/ieee802-11/signal_field.h +++ b/include/ieee802_11/signal_field.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_IEEE802_11_SIGNAL_FIELD_H #define INCLUDED_IEEE802_11_SIGNAL_FIELD_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/sync_long.h b/include/ieee802_11/sync_long.h similarity index 97% rename from include/ieee802-11/sync_long.h rename to include/ieee802_11/sync_long.h index 75122e1..9fce524 100644 --- a/include/ieee802-11/sync_long.h +++ b/include/ieee802_11/sync_long.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_SYNC_LONG_H #define INCLUDED_IEEE802_11_SYNC_LONG_H -#include +#include #include namespace gr { diff --git a/include/ieee802-11/sync_short.h b/include/ieee802_11/sync_short.h similarity index 97% rename from include/ieee802-11/sync_short.h rename to include/ieee802_11/sync_short.h index 5810d12..2c9f91c 100644 --- a/include/ieee802-11/sync_short.h +++ b/include/ieee802_11/sync_short.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_SYNC_SHORT_H #define INCLUDED_IEEE802_11_SYNC_SHORT_H -#include +#include #include namespace gr { diff --git a/lib/chunks_to_symbols_impl.h b/lib/chunks_to_symbols_impl.h index ef689de..d97ed31 100644 --- a/lib/chunks_to_symbols_impl.h +++ b/lib/chunks_to_symbols_impl.h @@ -17,8 +17,8 @@ #ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H #define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H -#include -#include +#include +#include namespace gr { namespace ieee802_11 { diff --git a/lib/constellations_impl.h b/lib/constellations_impl.h index 7519d0b..cc9b5b4 100644 --- a/lib/constellations_impl.h +++ b/lib/constellations_impl.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_CONSTELLATIONS_IMPL_H #define INCLUDED_IEEE802_11_CONSTELLATIONS_IMPL_H -#include +#include namespace gr { namespace ieee802_11 { diff --git a/lib/decode_mac.cc b/lib/decode_mac.cc index 4b7795e..c23ddc2 100644 --- a/lib/decode_mac.cc +++ b/lib/decode_mac.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include "utils.h" #include "viterbi_decoder/viterbi_decoder.h" diff --git a/lib/ether_encap_impl.h b/lib/ether_encap_impl.h index 036b220..6b873bb 100644 --- a/lib/ether_encap_impl.h +++ b/lib/ether_encap_impl.h @@ -17,7 +17,7 @@ #ifndef INCLUDED_IEEE802_11_ETHER_ENCAP_IMPL_H #define INCLUDED_IEEE802_11_ETHER_ENCAP_IMPL_H -#include +#include namespace gr { namespace ieee802_11 { diff --git a/lib/frame_equalizer_impl.h b/lib/frame_equalizer_impl.h index fcd1282..c055786 100644 --- a/lib/frame_equalizer_impl.h +++ b/lib/frame_equalizer_impl.h @@ -18,8 +18,8 @@ #ifndef INCLUDED_IEEE802_11_FRAME_EQUALIZER_IMPL_H #define INCLUDED_IEEE802_11_FRAME_EQUALIZER_IMPL_H -#include -#include +#include +#include #include "equalizer/base.h" #include "viterbi_decoder/viterbi_decoder.h" diff --git a/lib/mac.cc b/lib/mac.cc index 11e3f9f..942691d 100644 --- a/lib/mac.cc +++ b/lib/mac.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include #include diff --git a/lib/mapper.cc b/lib/mapper.cc index c30c2cb..50af8f2 100644 --- a/lib/mapper.cc +++ b/lib/mapper.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include "utils.h" #include diff --git a/lib/parse_mac.cc b/lib/parse_mac.cc index 49115d1..bb5866c 100644 --- a/lib/parse_mac.cc +++ b/lib/parse_mac.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include "utils.h" #include diff --git a/lib/signal_field_impl.h b/lib/signal_field_impl.h index 115c191..06a88a7 100644 --- a/lib/signal_field_impl.h +++ b/lib/signal_field_impl.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_IEEE802_11_SIGNAL_FIELD_IMPL_H #define INCLUDED_IEEE802_11_SIGNAL_FIELD_IMPL_H -#include +#include #include "utils.h" namespace gr { diff --git a/lib/sync_long.cc b/lib/sync_long.cc index 1765d26..46e0c0f 100644 --- a/lib/sync_long.cc +++ b/lib/sync_long.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include "utils.h" #include #include diff --git a/lib/sync_short.cc b/lib/sync_short.cc index dde1401..b58a7f9 100644 --- a/lib/sync_short.cc +++ b/lib/sync_short.cc @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include #include "utils.h" diff --git a/lib/utils.h b/lib/utils.h index 110c0c8..b264f25 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -17,8 +17,8 @@ #ifndef INCLUDED_IEEE802_11_UTILS_H #define INCLUDED_IEEE802_11_UTILS_H -#include -#include +#include +#include #include #include #include diff --git a/swig/ieee802_11_swig.i b/swig/ieee802_11_swig.i index fd03009..7ffbc23 100644 --- a/swig/ieee802_11_swig.i +++ b/swig/ieee802_11_swig.i @@ -24,17 +24,17 @@ %include "ieee802_11_swig_doc.i" %{ -#include "ieee802-11/chunks_to_symbols.h" -#include "ieee802-11/constellations.h" -#include "ieee802-11/decode_mac.h" -#include "ieee802-11/ether_encap.h" -#include "ieee802-11/frame_equalizer.h" -#include "ieee802-11/mac.h" -#include "ieee802-11/mapper.h" -#include "ieee802-11/parse_mac.h" -#include "ieee802-11/signal_field.h" -#include "ieee802-11/sync_long.h" -#include "ieee802-11/sync_short.h" +#include "ieee802_11/chunks_to_symbols.h" +#include "ieee802_11/constellations.h" +#include "ieee802_11/decode_mac.h" +#include "ieee802_11/ether_encap.h" +#include "ieee802_11/frame_equalizer.h" +#include "ieee802_11/mac.h" +#include "ieee802_11/mapper.h" +#include "ieee802_11/parse_mac.h" +#include "ieee802_11/signal_field.h" +#include "ieee802_11/sync_long.h" +#include "ieee802_11/sync_short.h" %} %include "gnuradio/digital/packet_header_default.h" @@ -44,17 +44,17 @@ %ignore gr::digital::constellation_16qam; %include "gnuradio/digital/constellation.h" -%include "ieee802-11/chunks_to_symbols.h" -%include "ieee802-11/constellations.h" -%include "ieee802-11/decode_mac.h" -%include "ieee802-11/ether_encap.h" -%include "ieee802-11/frame_equalizer.h" -%include "ieee802-11/mac.h" -%include "ieee802-11/mapper.h" -%include "ieee802-11/parse_mac.h" -%include "ieee802-11/signal_field.h" -%include "ieee802-11/sync_long.h" -%include "ieee802-11/sync_short.h" +%include "ieee802_11/chunks_to_symbols.h" +%include "ieee802_11/constellations.h" +%include "ieee802_11/decode_mac.h" +%include "ieee802_11/ether_encap.h" +%include "ieee802_11/frame_equalizer.h" +%include "ieee802_11/mac.h" +%include "ieee802_11/mapper.h" +%include "ieee802_11/parse_mac.h" +%include "ieee802_11/signal_field.h" +%include "ieee802_11/sync_long.h" +%include "ieee802_11/sync_short.h" GR_SWIG_BLOCK_MAGIC2(ieee802_11, chunks_to_symbols); GR_SWIG_BLOCK_MAGIC2(ieee802_11, decode_mac);