From 7b09b24d830dd6c8f1ea7877b76792655a28410d Mon Sep 17 00:00:00 2001 From: drowe67 Date: Sat, 22 Dec 2012 07:15:02 +0000 Subject: [PATCH] changed fifo.h and fdmdv.h to more unique names codec2_fifo.h & codec2_fdmdv.h to make them more suitable for make installing git-svn-id: https://svn.code.sf.net/p/freetel/code@1150 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/src/Makefile.am | 2 +- codec2-dev/src/{fdmdv.h => codec2_fdmdv.h} | 7 +++++-- codec2-dev/src/{fifo.h => codec2_fifo.h} | 5 ++++- codec2-dev/src/fdmdv.c | 2 +- codec2-dev/src/fdmdv_demod.c | 2 +- codec2-dev/src/fdmdv_get_test_bits.c | 2 +- codec2-dev/src/fdmdv_interleave.c | 2 +- codec2-dev/src/fdmdv_internal.h | 2 +- codec2-dev/src/fdmdv_mod.c | 2 +- codec2-dev/src/fdmdv_put_test_bits.c | 2 +- codec2-dev/src/fifo.c | 2 +- codec2-dev/unittest/t48_8.c | 2 +- codec2-dev/unittest/tfdmdv.c | 2 +- codec2-dev/unittest/tfifo.c | 2 +- 14 files changed, 21 insertions(+), 15 deletions(-) rename codec2-dev/src/{fdmdv.h => codec2_fdmdv.h} (97%) rename codec2-dev/src/{fifo.h => codec2_fifo.h} (91%) diff --git a/codec2-dev/src/Makefile.am b/codec2-dev/src/Makefile.am index 8d0d990c..853b644b 100644 --- a/codec2-dev/src/Makefile.am +++ b/codec2-dev/src/Makefile.am @@ -144,7 +144,7 @@ libcodec2_la_CFLAGS = $(AM_CFLAGS) libcodec2_la_LDFLAGS = $(LIBS) library_includedir = $(prefix)/include -library_include_HEADERS = codec2.h +library_include_HEADERS = codec2.h codec2_fdmdv.h codec2_fifo.h bin_PROGRAMS = c2demo c2enc c2dec c2sim fdmdv_get_test_bits fdmdv_mod fdmdv_demod fdmdv_put_test_bits fdmdv_interleave diff --git a/codec2-dev/src/fdmdv.h b/codec2-dev/src/codec2_fdmdv.h similarity index 97% rename from codec2-dev/src/fdmdv.h rename to codec2-dev/src/codec2_fdmdv.h index 3ad83e6d..46b3a6a1 100644 --- a/codec2-dev/src/fdmdv.h +++ b/codec2-dev/src/codec2_fdmdv.h @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*\ - FILE........: fdmdv.h + FILE........: codec2_fdmdv.h AUTHOR......: David Rowe DATE CREATED: April 14 2012 @@ -8,7 +8,10 @@ modem. Used for digital audio over HF SSB. See README_fdmdv.txt for more information, and fdmdv_mod.c and fdmdv_demod.c for example usage. - + + The name codec2_fdmdv.h is used to make it unique when "make + installed". + References: [1] http://n1su.com/fdmdv/FDMDV_Docs_Rel_1_4b.pdf diff --git a/codec2-dev/src/fifo.h b/codec2-dev/src/codec2_fifo.h similarity index 91% rename from codec2-dev/src/fifo.h rename to codec2-dev/src/codec2_fifo.h index a6a10395..dc93e157 100644 --- a/codec2-dev/src/fifo.h +++ b/codec2-dev/src/codec2_fifo.h @@ -1,11 +1,14 @@ /*---------------------------------------------------------------------------*\ - FILE........: fifo.h + FILE........: codec2_fifo.h AUTHOR......: David Rowe DATE CREATED: Oct 15 2012 A FIFO design useful in gluing the FDMDV modem and codec together in integrated applications. + + The name codec2_fifo.h is used to make it unique when "make + installed". \*---------------------------------------------------------------------------*/ diff --git a/codec2-dev/src/fdmdv.c b/codec2-dev/src/fdmdv.c index a6204f41..703bd4cc 100644 --- a/codec2-dev/src/fdmdv.c +++ b/codec2-dev/src/fdmdv.c @@ -38,7 +38,7 @@ #include #include "fdmdv_internal.h" -#include "fdmdv.h" +#include "codec2_fdmdv.h" #include "rn.h" #include "test_bits.h" #include "pilot_coeff.h" diff --git a/codec2-dev/src/fdmdv_demod.c b/codec2-dev/src/fdmdv_demod.c index 96090d03..a1f1dd39 100644 --- a/codec2-dev/src/fdmdv_demod.c +++ b/codec2-dev/src/fdmdv_demod.c @@ -40,7 +40,7 @@ #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #include "octave.h" #define BITS_PER_CODEC_FRAME (2*FDMDV_BITS_PER_FRAME) diff --git a/codec2-dev/src/fdmdv_get_test_bits.c b/codec2-dev/src/fdmdv_get_test_bits.c index e3120e93..3a18b8ca 100644 --- a/codec2-dev/src/fdmdv_get_test_bits.c +++ b/codec2-dev/src/fdmdv_get_test_bits.c @@ -33,7 +33,7 @@ #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #define BITS_PER_CODEC_FRAME (2*FDMDV_BITS_PER_FRAME) #define BYTES_PER_CODEC_FRAME (BITS_PER_CODEC_FRAME/8) diff --git a/codec2-dev/src/fdmdv_interleave.c b/codec2-dev/src/fdmdv_interleave.c index 010aa1a7..5e3aa643 100644 --- a/codec2-dev/src/fdmdv_interleave.c +++ b/codec2-dev/src/fdmdv_interleave.c @@ -34,7 +34,7 @@ #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #define MAX_INTERLEAVER 1024 diff --git a/codec2-dev/src/fdmdv_internal.h b/codec2-dev/src/fdmdv_internal.h index 7f3c779c..d4120733 100644 --- a/codec2-dev/src/fdmdv_internal.h +++ b/codec2-dev/src/fdmdv_internal.h @@ -30,7 +30,7 @@ #define __FDMDV_INTERNAL__ #include "comp.h" -#include "fdmdv.h" +#include "codec2_fdmdv.h" #include "kiss_fft.h" /*---------------------------------------------------------------------------*\ diff --git a/codec2-dev/src/fdmdv_mod.c b/codec2-dev/src/fdmdv_mod.c index b85f8d1f..9339cf09 100644 --- a/codec2-dev/src/fdmdv_mod.c +++ b/codec2-dev/src/fdmdv_mod.c @@ -36,7 +36,7 @@ #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #define BITS_PER_CODEC_FRAME (2*FDMDV_BITS_PER_FRAME) #define BYTES_PER_CODEC_FRAME (BITS_PER_CODEC_FRAME/8) diff --git a/codec2-dev/src/fdmdv_put_test_bits.c b/codec2-dev/src/fdmdv_put_test_bits.c index ed773e7c..4af6d7ac 100644 --- a/codec2-dev/src/fdmdv_put_test_bits.c +++ b/codec2-dev/src/fdmdv_put_test_bits.c @@ -34,7 +34,7 @@ #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #define BITS_PER_CODEC_FRAME (2*FDMDV_BITS_PER_FRAME) #define BYTES_PER_CODEC_FRAME (BITS_PER_CODEC_FRAME/8) diff --git a/codec2-dev/src/fifo.c b/codec2-dev/src/fifo.c index 4d224da7..be4995e8 100644 --- a/codec2-dev/src/fifo.c +++ b/codec2-dev/src/fifo.c @@ -32,7 +32,7 @@ #include #include #include -#include "fifo.h" +#include "codec2_fifo.h" struct FIFO { short *buf; diff --git a/codec2-dev/unittest/t48_8.c b/codec2-dev/unittest/t48_8.c index 1eff979b..61a1bfa2 100644 --- a/codec2-dev/unittest/t48_8.c +++ b/codec2-dev/unittest/t48_8.c @@ -20,7 +20,7 @@ #include #include #include -#include "fdmdv.h" +#include "codec2_fdmdv.h" #define N8 160 /* procssing buffer size at 8 kHz */ #define N48 (N8*FDMDV_OS) diff --git a/codec2-dev/unittest/tfdmdv.c b/codec2-dev/unittest/tfdmdv.c index f9c09cb5..583d0e18 100644 --- a/codec2-dev/unittest/tfdmdv.c +++ b/codec2-dev/unittest/tfdmdv.c @@ -36,7 +36,7 @@ #include #include "fdmdv_internal.h" -#include "fdmdv.h" +#include "codec2_fdmdv.h" #include "octave.h" #define FRAMES 25 diff --git a/codec2-dev/unittest/tfifo.c b/codec2-dev/unittest/tfifo.c index f52c4cf5..12e0d2b6 100644 --- a/codec2-dev/unittest/tfifo.c +++ b/codec2-dev/unittest/tfifo.c @@ -9,7 +9,7 @@ #include #include #include -#include "fifo.h" +#include "codec2_fifo.h" #define FIFO_SZ 1024 #define WRITE_SZ 10 -- 2.25.1