Merge remote-tracking branch 'origin/master' into code_quality

cjcliffe · Apr 11, 2019 · 44fd77e · 44fd77e
2 parents c67330e + 61f6eac
commit 44fd77e
Show file tree

Hide file tree

Showing 13 changed files with 3,341 additions and 3,107 deletions.
diff --git a/external/liquid-dsp/gcc/32/libliquid.a b/external/liquid-dsp/gcc/32/libliquid.a
diff --git a/external/liquid-dsp/gcc/32/libliquid.dll b/external/liquid-dsp/gcc/32/libliquid.dll
diff --git a/external/liquid-dsp/gcc/64/libliquid.a b/external/liquid-dsp/gcc/64/libliquid.a
diff --git a/external/liquid-dsp/gcc/64/libliquid.dll b/external/liquid-dsp/gcc/64/libliquid.dll
diff --git a/external/liquid-dsp/include/liquid/liquid.h b/external/liquid-dsp/include/liquid/liquid.h
diff --git a/external/liquid-dsp/makefile.mingw32 b/external/liquid-dsp/makefile.mingw32
@@ -22,22 +22,22 @@
 # Makefile for liquid-dsp libraries
 #
 # Targets:
-#    all                 :   dynamic shared-library object (e.g. libliquid.so)
-#    install             : install the dynamic shared library object and headers
-#    uninstall           :   uninstall the library and header file(s)
-#    clean               :   clean all targets (bench, check, examples, etc)
-#    distclean           :   removes everything except the originally distributed files
-#    check               :   build and run autotest program
-#    bench               :   build and run benchmarking program
-#    examples            :   build all examples
-#    sandbox             :   build all sandbox examples
-#    world               :   build absolutely everything (but don't install)
+#    all            : dynamic shared-library object (e.g. libliquid.so)
+#    install        : install the dynamic shared library object and headers
+#    uninstall      : uninstall the library and header file(s)
+#    clean          : clean all targets (bench, check, examples, etc)
+#    distclean      : removes everything except the originally distributed files
+#    check          : build and run autotest program
+#    bench          : build and run benchmarking program
+#    examples       : build all examples
+#    sandbox        : build all sandbox examples
+#    world          : build absolutely everything (but don't install)
 #
-#    clean-modules       :   clean all modules
-#    clean-examples      :   clean examples programs
-#    clean-sandbox       :   clean sandbox programs
-#    clean-check         :   clean autotest program
-#    clean-bench         :   clean benchmark program
+#    clean-modules  : clean all modules
+#    clean-examples : clean examples programs
+#    clean-sandbox  : clean sandbox programs
+#    clean-check    : clean autotest program
+#    clean-bench    : clean benchmark program
 #
 
 # autoconf initialization macros
@@ -63,14 +63,14 @@ LIBTOOL		:=
 RANLIB		:= ranlib
 
 # flags
-INCLUDE_CFLAGS	= $(addprefix -I ,$(include_dirs))
+INCLUDE_CFLAGS	= $(addprefix -I,$(include_dirs))
 #MINGW: optimizations goes here 
 CONFIG_CFLAGS	= -m32 -O3 -msse3 -ffast-math
 CPPFLAGS	=  $(INCLUDE_CFLAGS)
 CFLAGS		= $(CONFIG_CFLAGS) -Wall -fPIC
 LDFLAGS		= 
 #MINGW:
-LIBS		+= -lmsvcrt
+LIBS		= -lmsvcrt
 PATHSEP		= /
 
 # 
@@ -601,6 +601,8 @@ framing_objects :=						\
 	src/framing/src/framesync64.o				\
 	src/framing/src/flexframegen.o				\
 	src/framing/src/flexframesync.o				\
+	src/framing/src/fskframegen.o				\
+	src/framing/src/fskframesync.o				\
 	src/framing/src/gmskframegen.o				\
 	src/framing/src/gmskframesync.o				\
 	src/framing/src/msourcecf.o				\
@@ -709,6 +711,7 @@ math_autotests :=						\
 	src/math/tests/math_gamma_autotest.c			\
 	src/math/tests/math_complex_autotest.c			\
 	src/math/tests/polynomial_autotest.c			\
+	src/math/tests/polynomial_findroots_autotest.c		\
 	src/math/tests/prime_autotest.c				\
 
 
@@ -872,6 +875,7 @@ $(multichannel_objects) : %.o : %.c $(include_headers)
 multichannel_includes :=					\
 	src/multichannel/src/firpfbch.c				\
 	src/multichannel/src/firpfbch2.c			\
+	src/multichannel/src/firpfbchr.c			\
 
 src/multichannel/src/firpfbch_crcf.o : %.o : %.c $(include_headers) $(multichannel_includes)
 src/multichannel/src/firpfbch_cccf.o : %.o : %.c $(include_headers) $(multichannel_includes)
@@ -887,6 +891,7 @@ multichannel_autotests :=					\
 multichannel_benchmarks :=					\
 	src/multichannel/bench/firpfbch_crcf_benchmark.c	\
 	src/multichannel/bench/firpfbch2_crcf_benchmark.c	\
+	src/multichannel/bench/firpfbchr_crcf_benchmark.c	\
 	src/multichannel/bench/ofdmframesync_acquire_benchmark.c	\
 	src/multichannel/bench/ofdmframesync_rxsymbol_benchmark.c	\
 
@@ -1194,7 +1199,7 @@ libliquid.so: libliquid.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
 #MINGW:
 libliquid.dll: libliquid.a
-	$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
 
 # static archive and library objects
 all: ${ARCHIVE_LIB} ${SHARED_LIB}
@@ -1431,6 +1436,7 @@ example_programs :=						\
 	examples/firhilb_filter_example				\
 	examples/firhilb_interp_example				\
 	examples/firpfbch2_crcf_example				\
+	examples/firpfbchr_crcf_example				\
 	examples/firinterp_crcf_example				\
 	examples/firinterp_firdecim_crcf_example		\
 	examples/firpfbch_crcf_example				\
@@ -1440,6 +1446,7 @@ example_programs :=						\
 	examples/flexframesync_reconfig_example			\
 	examples/framesync64_example				\
 	examples/freqmodem_example				\
+	examples/fskframesync_example				\
 	examples/fskmodem_example				\
 	examples/fskmodem_waterfall_example			\
 	examples/gasearch_example				\
@@ -1499,6 +1506,8 @@ example_programs :=						\
 	examples/random_histogram_example			\
 	examples/repack_bytes_example				\
 	examples/rresamp_crcf_example				\
+	examples/rresamp_crcf_rnyquist_example			\
+	examples/rresamp_rrrf_example				\
 	examples/resamp_crcf_example				\
 	examples/resamp_crcf_noise_example			\
 	examples/resamp2_cccf_example				\
@@ -1576,6 +1585,7 @@ sandbox_programs =						\
 	sandbox/fecsoft_hamming128_gentab			\
 	sandbox/fecsoft_ldpc_test				\
 	sandbox/fec_sumproduct_test				\
+	sandbox/fskcorr_test					\
 	sandbox/fskmodem_test					\
 	sandbox/fft_dual_radix_test				\
 	sandbox/fft_mixed_radix_test				\

diff --git a/external/liquid-dsp/makefile.mingw64 b/external/liquid-dsp/makefile.mingw64
@@ -22,22 +22,22 @@
 # Makefile for liquid-dsp libraries
 #
 # Targets:
-#    all                 :   dynamic shared-library object (e.g. libliquid.so)
-#    install             : install the dynamic shared library object and headers
-#    uninstall           :   uninstall the library and header file(s)
-#    clean               :   clean all targets (bench, check, examples, etc)
-#    distclean           :   removes everything except the originally distributed files
-#    check               :   build and run autotest program
-#    bench               :   build and run benchmarking program
-#    examples            :   build all examples
-#    sandbox             :   build all sandbox examples
-#    world               :   build absolutely everything (but don't install)
+#    all            : dynamic shared-library object (e.g. libliquid.so)
+#    install        : install the dynamic shared library object and headers
+#    uninstall      : uninstall the library and header file(s)
+#    clean          : clean all targets (bench, check, examples, etc)
+#    distclean      : removes everything except the originally distributed files
+#    check          : build and run autotest program
+#    bench          : build and run benchmarking program
+#    examples       : build all examples
+#    sandbox        : build all sandbox examples
+#    world          : build absolutely everything (but don't install)
 #
-#    clean-modules       :   clean all modules
-#    clean-examples      :   clean examples programs
-#    clean-sandbox       :   clean sandbox programs
-#    clean-check         :   clean autotest program
-#    clean-bench         :   clean benchmark program
+#    clean-modules  : clean all modules
+#    clean-examples : clean examples programs
+#    clean-sandbox  : clean sandbox programs
+#    clean-check    : clean autotest program
+#    clean-bench    : clean benchmark program
 #
 
 # autoconf initialization macros
@@ -63,14 +63,14 @@ LIBTOOL		:=
 RANLIB		:= ranlib
 
 # flags
-INCLUDE_CFLAGS	= $(addprefix -I ,$(include_dirs))
+INCLUDE_CFLAGS	= $(addprefix -I,$(include_dirs))
 #MINGW: optimizations goes here, use SSSE42 for 64bit 
 CONFIG_CFLAGS	= -O3 -msse4.2 -ffast-math
 CPPFLAGS	=  $(INCLUDE_CFLAGS)
 CFLAGS		= $(CONFIG_CFLAGS) -Wall -fPIC
 LDFLAGS		= 
 #MINGW:
-LIBS		+= -static-libgcc
+LIBS		= -static-libgcc
 PATHSEP		= /
 
 # 
@@ -601,6 +601,8 @@ framing_objects :=						\
 	src/framing/src/framesync64.o				\
 	src/framing/src/flexframegen.o				\
 	src/framing/src/flexframesync.o				\
+	src/framing/src/fskframegen.o				\
+	src/framing/src/fskframesync.o				\
 	src/framing/src/gmskframegen.o				\
 	src/framing/src/gmskframesync.o				\
 	src/framing/src/msourcecf.o				\
@@ -709,6 +711,7 @@ math_autotests :=						\
 	src/math/tests/math_gamma_autotest.c			\
 	src/math/tests/math_complex_autotest.c			\
 	src/math/tests/polynomial_autotest.c			\
+	src/math/tests/polynomial_findroots_autotest.c		\
 	src/math/tests/prime_autotest.c				\
 
 
@@ -872,6 +875,7 @@ $(multichannel_objects) : %.o : %.c $(include_headers)
 multichannel_includes :=					\
 	src/multichannel/src/firpfbch.c				\
 	src/multichannel/src/firpfbch2.c			\
+	src/multichannel/src/firpfbchr.c			\
 
 src/multichannel/src/firpfbch_crcf.o : %.o : %.c $(include_headers) $(multichannel_includes)
 src/multichannel/src/firpfbch_cccf.o : %.o : %.c $(include_headers) $(multichannel_includes)
@@ -887,6 +891,7 @@ multichannel_autotests :=					\
 multichannel_benchmarks :=					\
 	src/multichannel/bench/firpfbch_crcf_benchmark.c	\
 	src/multichannel/bench/firpfbch2_crcf_benchmark.c	\
+	src/multichannel/bench/firpfbchr_crcf_benchmark.c	\
 	src/multichannel/bench/ofdmframesync_acquire_benchmark.c	\
 	src/multichannel/bench/ofdmframesync_rxsymbol_benchmark.c	\
 
@@ -1194,7 +1199,7 @@ libliquid.so: libliquid.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
 #MINGW:
 libliquid.dll: libliquid.a
-	$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
 
 # static archive and library objects
 all: ${ARCHIVE_LIB} ${SHARED_LIB}
@@ -1431,6 +1436,7 @@ example_programs :=						\
 	examples/firhilb_filter_example				\
 	examples/firhilb_interp_example				\
 	examples/firpfbch2_crcf_example				\
+	examples/firpfbchr_crcf_example				\
 	examples/firinterp_crcf_example				\
 	examples/firinterp_firdecim_crcf_example		\
 	examples/firpfbch_crcf_example				\
@@ -1440,6 +1446,7 @@ example_programs :=						\
 	examples/flexframesync_reconfig_example			\
 	examples/framesync64_example				\
 	examples/freqmodem_example				\
+	examples/fskframesync_example				\
 	examples/fskmodem_example				\
 	examples/fskmodem_waterfall_example			\
 	examples/gasearch_example				\
@@ -1499,6 +1506,8 @@ example_programs :=						\
 	examples/random_histogram_example			\
 	examples/repack_bytes_example				\
 	examples/rresamp_crcf_example				\
+	examples/rresamp_crcf_rnyquist_example			\
+	examples/rresamp_rrrf_example				\
 	examples/resamp_crcf_example				\
 	examples/resamp_crcf_noise_example			\
 	examples/resamp2_cccf_example				\
@@ -1576,6 +1585,7 @@ sandbox_programs =						\
 	sandbox/fecsoft_hamming128_gentab			\
 	sandbox/fecsoft_ldpc_test				\
 	sandbox/fec_sumproduct_test				\
+	sandbox/fskcorr_test					\
 	sandbox/fskmodem_test					\
 	sandbox/fft_dual_radix_test				\
 	sandbox/fft_mixed_radix_test				\