diff options
Diffstat (limited to 'gr-fec')
21 files changed, 35 insertions, 35 deletions
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index 01806565a4..05e63cf510 100644 --- a/gr-fec/CMakeLists.txt +++ b/gr-fec/CMakeLists.txt @@ -87,7 +87,7 @@ CPACK_COMPONENT("fec_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/fec) +add_subdirectory(include/gnuradio/fec) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) diff --git a/gr-fec/include/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt index 7ab0498000..7ab0498000 100644 --- a/gr-fec/include/fec/CMakeLists.txt +++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt diff --git a/gr-fec/include/fec/api.h b/gr-fec/include/gnuradio/fec/api.h index 62c0fd98de..51315f6c03 100644 --- a/gr-fec/include/fec/api.h +++ b/gr-fec/include/gnuradio/fec/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_FEC_API_H #define INCLUDED_FEC_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_fec_EXPORTS # define FEC_API __GR_ATTR_EXPORT diff --git a/gr-fec/include/fec/decode_ccsds_27_fb.h b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h index f55f8d5c08..c0c4efa2d0 100644 --- a/gr-fec/include/fec/decode_ccsds_27_fb.h +++ b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FEC_DECODE_CCSDS_27_FB_H #define INCLUDED_FEC_DECODE_CCSDS_27_FB_H -#include <fec/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/fec/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace fec { @@ -49,7 +49,7 @@ namespace gr { * from the corresponding inputs. */ - class FEC_API decode_ccsds_27_fb : virtual public gr_sync_decimator + class FEC_API decode_ccsds_27_fb : virtual public sync_decimator { public: diff --git a/gr-fec/include/fec/encode_ccsds_27_bb.h b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h index 9f89982288..d920b60983 100644 --- a/gr-fec/include/fec/encode_ccsds_27_bb.h +++ b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FEC_ENCODE_CCSDS_27_BB_H #define INCLUDED_FEC_ENCODE_CCSDS_27_BB_H -#include <fec/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/fec/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace fec { @@ -46,7 +46,7 @@ namespace gr { * There is no provision to "flush" the encoder. */ - class FEC_API encode_ccsds_27_bb : virtual public gr_sync_interpolator + class FEC_API encode_ccsds_27_bb : virtual public sync_interpolator { public: diff --git a/gr-fec/include/fec/rs.h b/gr-fec/include/gnuradio/fec/rs.h index 27551f5407..8a28cd31ac 100644 --- a/gr-fec/include/fec/rs.h +++ b/gr-fec/include/gnuradio/fec/rs.h @@ -1,4 +1,4 @@ -#include <fec/api.h> +#include <gnuradio/fec/api.h> /* User include file for the Reed-Solomon codec * Copyright 2002, Phil Karn KA9Q * May be used under the terms of the GNU General Public License (GPL) diff --git a/gr-fec/include/fec/viterbi.h b/gr-fec/include/gnuradio/fec/viterbi.h index 97e09d4a8d..5827f1e9b6 100644 --- a/gr-fec/include/fec/viterbi.h +++ b/gr-fec/include/gnuradio/fec/viterbi.h @@ -24,7 +24,7 @@ * But it fits so nicely into a 32-bit machine word... */ -#include <fec/api.h> +#include <gnuradio/fec/api.h> struct viterbi_state { unsigned long path; /* Decoded path to this state */ diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc index 87bdc46402..51033a86c0 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc @@ -25,7 +25,7 @@ #endif #include "decode_ccsds_27_fb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace fec { @@ -36,9 +36,9 @@ namespace gr { } decode_ccsds_27_fb_impl::decode_ccsds_27_fb_impl() - : gr_sync_decimator("decode_ccsds_27_fb", - gr_make_io_signature (1, 1, sizeof(float)), - gr_make_io_signature (1, 1, sizeof(char)), + : sync_decimator("decode_ccsds_27_fb", + io_signature::make (1, 1, sizeof(float)), + io_signature::make (1, 1, sizeof(char)), 2*8) // Rate 1/2 code, unpacked to packed conversion { float RATE = 0.5; diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.h b/gr-fec/lib/decode_ccsds_27_fb_impl.h index c28ee77b1a..cd16c6ab1c 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.h +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_FEC_DECODE_CCSDS_27_FB_IMPL_H #define INCLUDED_FEC_DECODE_CCSDS_27_FB_IMPL_H -#include <fec/decode_ccsds_27_fb.h> +#include <gnuradio/fec/decode_ccsds_27_fb.h> extern "C" { -#include <fec/viterbi.h> +#include <gnuradio/fec/viterbi.h> } namespace gr { diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.cc b/gr-fec/lib/encode_ccsds_27_bb_impl.cc index 0a348f372f..56518777c7 100644 --- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc +++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc @@ -25,10 +25,10 @@ #endif #include "encode_ccsds_27_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> extern "C" { -#include <fec/viterbi.h> +#include <gnuradio/fec/viterbi.h> } namespace gr { @@ -40,9 +40,9 @@ namespace gr { } encode_ccsds_27_bb_impl::encode_ccsds_27_bb_impl() - : gr_sync_interpolator("encode_ccsds_27_bb", - gr_make_io_signature (1, 1, sizeof(char)), - gr_make_io_signature (1, 1, sizeof(char)), + : sync_interpolator("encode_ccsds_27_bb", + io_signature::make (1, 1, sizeof(char)), + io_signature::make (1, 1, sizeof(char)), 16) // Rate 1/2 code, packed to unpacked conversion { d_encstate = 0; diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.h b/gr-fec/lib/encode_ccsds_27_bb_impl.h index 140f8c2ae4..b48c1a47f1 100644 --- a/gr-fec/lib/encode_ccsds_27_bb_impl.h +++ b/gr-fec/lib/encode_ccsds_27_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FEC_ENCODE_CCSDS_27_BB_IMPL_H #define INCLUDED_FEC_ENCODE_CCSDS_27_BB_IMPL_H -#include <fec/encode_ccsds_27_bb.h> +#include <gnuradio/fec/encode_ccsds_27_bb.h> namespace gr { namespace fec { diff --git a/gr-fec/lib/reed-solomon/char.h b/gr-fec/lib/reed-solomon/char.h index bc4fd8a1ba..f76ad95cd4 100644 --- a/gr-fec/lib/reed-solomon/char.h +++ b/gr-fec/lib/reed-solomon/char.h @@ -6,7 +6,7 @@ #define DTYPE unsigned char -#include <fec/api.h> +#include <gnuradio/fec/api.h> /* Reed-Solomon codec control block */ struct rs { diff --git a/gr-fec/lib/reed-solomon/fixed.h b/gr-fec/lib/reed-solomon/fixed.h index ee4ae2e714..d45f4d47b5 100644 --- a/gr-fec/lib/reed-solomon/fixed.h +++ b/gr-fec/lib/reed-solomon/fixed.h @@ -7,7 +7,7 @@ */ #define DTYPE unsigned char -#include <fec/api.h> +#include <gnuradio/fec/api.h> static inline int mod255(int x){ while (x >= 255) { diff --git a/gr-fec/lib/reed-solomon/int.h b/gr-fec/lib/reed-solomon/int.h index 6bb00fd102..818629abb4 100644 --- a/gr-fec/lib/reed-solomon/int.h +++ b/gr-fec/lib/reed-solomon/int.h @@ -5,7 +5,7 @@ */ #define DTYPE int -#include <fec/api.h> +#include <gnuradio/fec/api.h> /* Reed-Solomon codec control block */ struct FEC_API rs { diff --git a/gr-fec/lib/reed-solomon/rstest.c b/gr-fec/lib/reed-solomon/rstest.c index 5e3f55bcea..767c01d848 100644 --- a/gr-fec/lib/reed-solomon/rstest.c +++ b/gr-fec/lib/reed-solomon/rstest.c @@ -12,7 +12,7 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> -#include <fec/rs.h> +#include <gnuradio/fec/rs.h> int exercise_char(void *,int); diff --git a/gr-fec/lib/viterbi/decode.cc b/gr-fec/lib/viterbi/decode.cc index f4ea829d55..0af0b34483 100644 --- a/gr-fec/lib/viterbi/decode.cc +++ b/gr-fec/lib/viterbi/decode.cc @@ -28,7 +28,7 @@ */ extern "C" { -#include <fec/viterbi.h> +#include <gnuradio/fec/viterbi.h> } #include <cstdio> diff --git a/gr-fec/lib/viterbi/encode.cc b/gr-fec/lib/viterbi/encode.cc index 101678718c..4e152781f0 100644 --- a/gr-fec/lib/viterbi/encode.cc +++ b/gr-fec/lib/viterbi/encode.cc @@ -30,7 +30,7 @@ */ extern "C" { -#include <fec/viterbi.h> +#include <gnuradio/fec/viterbi.h> } #include <cstdio> diff --git a/gr-fec/lib/viterbi/viterbi.c b/gr-fec/lib/viterbi/viterbi.c index 526c9504a2..3c247a3868 100644 --- a/gr-fec/lib/viterbi/viterbi.c +++ b/gr-fec/lib/viterbi/viterbi.c @@ -25,7 +25,7 @@ * Some modifications from original Karn code by Matt Ettus */ -#include <fec/viterbi.h> +#include <gnuradio/fec/viterbi.h> /* The two generator polynomials for the NASA Standard K=7 code. * Since these polynomials are known to be optimal for this constraint diff --git a/gr-fec/python/__init__.py b/gr-fec/python/__init__.py index 7488f4cf44..05e75ea39a 100644 --- a/gr-fec/python/__init__.py +++ b/gr-fec/python/__init__.py @@ -20,7 +20,7 @@ # ''' -This is the gr-fec package. +Blocks for forward error correction. ''' from fec_swig import * diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt index 587e9ff97c..d1dc556c8a 100644 --- a/gr-fec/swig/CMakeLists.txt +++ b/gr-fec/swig/CMakeLists.txt @@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fec) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/fec) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-fec) diff --git a/gr-fec/swig/fec_swig.i b/gr-fec/swig/fec_swig.i index 5a50b63777..ad0d213500 100644 --- a/gr-fec/swig/fec_swig.i +++ b/gr-fec/swig/fec_swig.i @@ -28,12 +28,12 @@ %include "fec_swig_doc.i" %{ -#include "fec/decode_ccsds_27_fb.h" -#include "fec/encode_ccsds_27_bb.h" +#include "gnuradio/fec/decode_ccsds_27_fb.h" +#include "gnuradio/fec/encode_ccsds_27_bb.h" %} -%include "fec/decode_ccsds_27_fb.h" -%include "fec/encode_ccsds_27_bb.h" +%include "gnuradio/fec/decode_ccsds_27_fb.h" +%include "gnuradio/fec/encode_ccsds_27_bb.h" GR_SWIG_BLOCK_MAGIC2(fec, decode_ccsds_27_fb); GR_SWIG_BLOCK_MAGIC2(fec, encode_ccsds_27_bb); |