diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 17:10:16 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 17:10:16 -0500 |
| commit | 731747140e5064a5157835e9f8c1251a69bb1e89 (patch) | |
| tree | 07e4610932dcb18fb5312dea99eb6428a027346e | |
| parent | 968ccc37450f6ef0f49eb8a4adc75b86c8d19ec3 (diff) | |
fec: moving rs.h and viterbi.h to be installed in the public include directory.
| -rw-r--r-- | gr-fec/include/fec/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fec/include/fec/rs.h (renamed from gr-fec/lib/reed-solomon/rs.h) | 7 | ||||
| -rw-r--r-- | gr-fec/include/fec/viterbi.h (renamed from gr-fec/lib/viterbi/viterbi.h) | 0 | ||||
| -rw-r--r-- | gr-fec/lib/decode_ccsds_27_fb_impl.h | 2 | ||||
| -rw-r--r-- | gr-fec/lib/encode_ccsds_27_bb_impl.cc | 2 | ||||
| -rw-r--r-- | gr-fec/lib/reed-solomon/rstest.c | 2 | ||||
| -rw-r--r-- | gr-fec/lib/viterbi/decode.cc | 2 | ||||
| -rw-r--r-- | gr-fec/lib/viterbi/encode.cc | 2 | ||||
| -rw-r--r-- | gr-fec/lib/viterbi/viterbi.c | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/gr-fec/include/fec/CMakeLists.txt b/gr-fec/include/fec/CMakeLists.txt index 5ef1ab01b5..2d49dbe301 100644 --- a/gr-fec/include/fec/CMakeLists.txt +++ b/gr-fec/include/fec/CMakeLists.txt @@ -78,6 +78,8 @@ install(FILES api.h decode_ccsds_27_fb.h encode_ccsds_27_bb.h + rs.h + viterbi.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec COMPONENT "fec_devel" ) diff --git a/gr-fec/lib/reed-solomon/rs.h b/gr-fec/include/fec/rs.h index be7ed51b42..27551f5407 100644 --- a/gr-fec/lib/reed-solomon/rs.h +++ b/gr-fec/include/fec/rs.h @@ -6,17 +6,16 @@ /* General purpose RS codec, 8-bit symbols */ FEC_API void encode_rs_char(void *rs,unsigned char *data,unsigned char *parity); -FEC_API int decode_rs_char(void *rs,unsigned char *data,int *eras_pos, - int no_eras); +FEC_API int decode_rs_char(void *rs,unsigned char *data,int *eras_pos, int no_eras); FEC_API void *init_rs_char(unsigned int symsize,unsigned int gfpoly, - unsigned int fcr,unsigned int prim,unsigned int nroots); + unsigned int fcr,unsigned int prim,unsigned int nroots); FEC_API void free_rs_char(void *rs); /* General purpose RS codec, integer symbols */ FEC_API void encode_rs_int(void *rs,int *data,int *parity); FEC_API int decode_rs_int(void *rs,int *data,int *eras_pos,int no_eras); FEC_API void *init_rs_int(unsigned int symsize,unsigned int gfpoly,unsigned int fcr, - unsigned int prim,unsigned int nroots); + unsigned int prim,unsigned int nroots); FEC_API void free_rs_int(void *rs); /* CCSDS standard (255,223) RS codec with conventional (*not* dual-basis) diff --git a/gr-fec/lib/viterbi/viterbi.h b/gr-fec/include/fec/viterbi.h index 97e09d4a8d..97e09d4a8d 100644 --- a/gr-fec/lib/viterbi/viterbi.h +++ b/gr-fec/include/fec/viterbi.h diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.h b/gr-fec/lib/decode_ccsds_27_fb_impl.h index c02e284e70..c28ee77b1a 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.h +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.h @@ -26,7 +26,7 @@ #include <fec/decode_ccsds_27_fb.h> extern "C" { -#include "viterbi/viterbi.h" +#include <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 28ee450ef4..0a348f372f 100644 --- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc +++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc @@ -28,7 +28,7 @@ #include <gr_io_signature.h> extern "C" { -#include "viterbi/viterbi.h" +#include <fec/viterbi.h> } namespace gr { diff --git a/gr-fec/lib/reed-solomon/rstest.c b/gr-fec/lib/reed-solomon/rstest.c index d8fc5448a7..5e3f55bcea 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 "rs.h" +#include <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 368e697134..f4ea829d55 100644 --- a/gr-fec/lib/viterbi/decode.cc +++ b/gr-fec/lib/viterbi/decode.cc @@ -28,7 +28,7 @@ */ extern "C" { -#include "viterbi.h" +#include <fec/viterbi.h> } #include <cstdio> diff --git a/gr-fec/lib/viterbi/encode.cc b/gr-fec/lib/viterbi/encode.cc index 83a85fcacb..101678718c 100644 --- a/gr-fec/lib/viterbi/encode.cc +++ b/gr-fec/lib/viterbi/encode.cc @@ -30,7 +30,7 @@ */ extern "C" { -#include "viterbi.h" +#include <fec/viterbi.h> } #include <cstdio> diff --git a/gr-fec/lib/viterbi/viterbi.c b/gr-fec/lib/viterbi/viterbi.c index fc88866035..526c9504a2 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 "viterbi.h" +#include <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 |