Restructure: Move filters from common code to 'libfilter'
This commit is contained in:
parent
fc1c5de547
commit
669705c6ed
|
@ -20,6 +20,7 @@ compile
|
||||||
.libs
|
.libs
|
||||||
.dirstamp
|
.dirstamp
|
||||||
m4
|
m4
|
||||||
|
src/libfilter/libfilter.a
|
||||||
src/common/libcommon.a
|
src/common/libcommon.a
|
||||||
src/common/libmobile.a
|
src/common/libmobile.a
|
||||||
src/common/libimage.a
|
src/common/libimage.a
|
||||||
|
|
|
@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
|
||||||
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
|
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
|
||||||
|
|
||||||
AC_OUTPUT(
|
AC_OUTPUT(
|
||||||
|
src/libfilter/Makefile
|
||||||
src/common/Makefile
|
src/common/Makefile
|
||||||
src/anetz/Makefile
|
src/anetz/Makefile
|
||||||
src/bnetz/Makefile
|
src/bnetz/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
SUBDIRS = common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
SUBDIRS = libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@ amps_LDADD = \
|
||||||
libamps.a \
|
libamps.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -14,6 +14,7 @@ anetz_LDADD = \
|
||||||
$(top_builddir)/src/common/libgermanton.a \
|
$(top_builddir)/src/common/libgermanton.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -16,6 +16,7 @@ bnetz_LDADD = \
|
||||||
$(top_builddir)/src/common/libgermanton.a \
|
$(top_builddir)/src/common/libgermanton.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -20,6 +20,7 @@ cnetz_LDADD = \
|
||||||
$(top_builddir)/src/common/libgermanton.a \
|
$(top_builddir)/src/common/libgermanton.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
|
|
||||||
typedef struct scrambler {
|
typedef struct scrambler {
|
||||||
double carrier_phaseshift65536;/* carrier phase shift per sample */
|
double carrier_phaseshift65536;/* carrier phase shift per sample */
|
||||||
|
|
|
@ -10,7 +10,6 @@ libcommon_a_SOURCES = \
|
||||||
wave.c \
|
wave.c \
|
||||||
goertzel.c \
|
goertzel.c \
|
||||||
jitter.c \
|
jitter.c \
|
||||||
iir_filter.c \
|
|
||||||
dtmf.c \
|
dtmf.c \
|
||||||
samplerate.c \
|
samplerate.c \
|
||||||
emphasis.c \
|
emphasis.c \
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "sample.h"
|
#include "sample.h"
|
||||||
#include "iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "emphasis.h"
|
#include "emphasis.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
|
|
||||||
enum fm_mod_state {
|
enum fm_mod_state {
|
||||||
MOD_STATE_OFF, /* transmitter off, no IQ vector */
|
MOD_STATE_OFF, /* transmitter off, no IQ vector */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
|
|
||||||
typedef struct samplerate {
|
typedef struct samplerate {
|
||||||
double factor;
|
double factor;
|
||||||
|
|
|
@ -14,6 +14,7 @@ jtacs_LDADD = \
|
||||||
../amps/libamps.a \
|
../amps/libamps.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
|
||||||
|
|
||||||
|
noinst_LIBRARIES = libfilter.a
|
||||||
|
|
||||||
|
libfilter_a_SOURCES = \
|
||||||
|
iir_filter.c
|
|
@ -22,7 +22,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "sample.h"
|
#include "../common/sample.h"
|
||||||
#include "iir_filter.h"
|
#include "iir_filter.h"
|
||||||
|
|
||||||
#define PI M_PI
|
#define PI M_PI
|
|
@ -24,6 +24,7 @@ nmt_LDADD = \
|
||||||
libdmssms.a \
|
libdmssms.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -14,6 +14,7 @@ radiocom2000_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -15,6 +15,7 @@ tacs_LDADD = \
|
||||||
../amps/libamps.a \
|
../amps/libamps.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -15,6 +15,7 @@ test_filter_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
@ -37,6 +38,7 @@ test_emphasis_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
@ -49,6 +51,7 @@ test_dms_LDADD = \
|
||||||
$(top_builddir)/src/nmt/libdmssms.a \
|
$(top_builddir)/src/nmt/libdmssms.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
@ -61,6 +64,7 @@ test_sms_LDADD = \
|
||||||
$(top_builddir)/src/nmt/libdmssms.a \
|
$(top_builddir)/src/nmt/libdmssms.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
@ -72,6 +76,7 @@ test_performance_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "../common/emphasis.h"
|
#include "../common/emphasis.h"
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
|
|
||||||
#define level2db(level) (20 * log10(level))
|
#define level2db(level) (20 * log10(level))
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "../common/fm_modulation.h"
|
#include "../common/fm_modulation.h"
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ osmotv_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(top_builddir)/src/common/libimage.a \
|
$(top_builddir)/src/common/libimage.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(UHD_LIBS) \
|
$(UHD_LIBS) \
|
||||||
$(SOAPY_LIBS) \
|
$(SOAPY_LIBS) \
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "bas.h"
|
#include "bas.h"
|
||||||
#include "vcr.h"
|
#include "vcr.h"
|
||||||
#include "fubk.h"
|
#include "fubk.h"
|
||||||
|
|
|
@ -28,7 +28,7 @@ enum paging_signal;
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/iir_filter.h"
|
#include "../libfilter/iir_filter.h"
|
||||||
#include "../common/fm_modulation.h"
|
#include "../common/fm_modulation.h"
|
||||||
#include "../common/wave.h"
|
#include "../common/wave.h"
|
||||||
#include "../common/img.h"
|
#include "../common/img.h"
|
||||||
|
@ -260,7 +260,7 @@ static int handle_options(int argc, char **argv)
|
||||||
return skip_args;
|
return skip_args;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tx_bas(sample_t *sample_bas, __attribute__((__unused__)) sample_t *sample_tone, uint8_t *power_tone, int samples)
|
static void tx_bas(sample_t *sample_bas, __attribute__((__unused__)) sample_t *sample_tone, __attribute__((__unused__)) uint8_t *power_tone, int samples)
|
||||||
{
|
{
|
||||||
/* catch signals */
|
/* catch signals */
|
||||||
signal(SIGINT, sighandler);
|
signal(SIGINT, sighandler);
|
||||||
|
|
Loading…
Reference in New Issue