Restructure: Move timer from common code to 'libtimer'

.gitignore

@@ -20,6 +20,7 @@ compile
 .libs
 .dirstamp
 m4
+src/libtimer/libtimer.a
 src/libsamplerate/libsamplerate.a
 src/libfilter/libfilter.a
 src/common/libcommon.a

configure.ac

@@ -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 )])
 
 AC_OUTPUT(
+    src/libtimer/Makefile
     src/libsamplerate/Makefile
     src/libfilter/Makefile
     src/common/Makefile

src/Makefile.am

@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libsamplerate libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libtimer libsamplerate libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
 

src/amps/Makefile.am

@@ -28,6 +28,7 @@ amps_LDADD = \
 	libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/amps/amps.c

@@ -44,7 +44,6 @@
 #include <errno.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "amps.h"

src/amps/amps.h

@@ -1,5 +1,6 @@
 #include "../common/goertzel.h"
 #include "../common/sender.h"
+#include "../libtimer/timer.h"
 #include "../common/compandor.h"
 #include "sysinfo.h"
 #include "transaction.h"

src/amps/amps_tacs_main.c

@@ -25,7 +25,6 @@
 #include "../common/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "amps.h"

src/amps/dsp.c

@@ -83,7 +83,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "amps.h"
 #include "frame.h"

src/amps/frame.c

@@ -28,7 +28,6 @@
 #include <inttypes.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "amps.h"
 #include "dsp.h"
 #include "frame.h"

src/amps/sysinfo.c

@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <time.h>
 #include "../common/sample.h"
-#include "../common/timer.h"
 #include "amps.h"
 #include "frame.h"
 #include "main.h"

src/amps/transaction.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "amps.h"

src/anetz/Makefile.am

@@ -14,6 +14,7 @@ anetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/anetz/anetz.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
+#include "../libtimer/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "anetz.h"

src/anetz/dsp.c

@@ -27,7 +27,7 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
+#include "../libtimer/timer.h"
 #include "../common/call.h"
 #include "anetz.h"
 #include "dsp.h"

src/anetz/main.c

@@ -26,7 +26,7 @@
 #include "../common/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
+#include "../libtimer/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/freiton.h"

src/bnetz/Makefile.am

@@ -16,6 +16,7 @@ bnetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/bnetz/bnetz.c

@@ -26,7 +26,6 @@
 #include <errno.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "bnetz.h"

src/bnetz/bnetz.h

@@ -1,6 +1,7 @@
 #include "../common/squelch.h"
 #include "../common/fsk.h"
 #include "../common/sender.h"
+#include "../libtimer/timer.h"
 
 /* fsk modes of transmission */
 enum dsp_mode {

src/bnetz/dsp.c

@@ -27,7 +27,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/goertzel.h"
 #include "bnetz.h"

src/bnetz/main.c

@@ -25,7 +25,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/main_mobile.h"

src/cnetz/Makefile.am

@@ -20,6 +20,7 @@ cnetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/cnetz/cnetz.c

@@ -144,7 +144,6 @@
 #include <inttypes.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "cnetz.h"

src/cnetz/cnetz.h

@@ -1,4 +1,5 @@
 #include "../common/compandor.h"
+#include "../libtimer/timer.h"
 #include "../common/sender.h"
 #include "fsk_demod.h"
 #include "scrambler.h"

src/cnetz/database.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "cnetz.h"
 #include "database.h"
 

src/cnetz/dsp.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "cnetz.h"
 #include "sysinfo.h"

src/cnetz/fsk_demod.c

@@ -129,7 +129,6 @@
 #include <string.h>
 #include <math.h>
 #include "../common/sample.h"
-#include "../common/timer.h"
 #include "../common/debug.h"
 #include "cnetz.h"
 #include "dsp.h"

src/cnetz/main.c

@@ -25,7 +25,6 @@
 #include "../common/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/freiton.h"

src/cnetz/telegramm.c

@@ -28,7 +28,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "cnetz.h"
 #include "dsp.h"
 #include "sysinfo.h"

src/cnetz/transaction.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
 #include "cnetz.h"

src/common/Makefile.am

@@ -5,7 +5,6 @@ noinst_LIBRARIES = libcommon.a libmobile.a libgermanton.a libimage.a
 libcommon_a_SOURCES = \
 	sample.c \
 	debug.c \
-	timer.c \
 	sound_alsa.c \
 	wave.c \
 	goertzel.c \

src/common/call.c

@@ -29,7 +29,7 @@
 #include "sender.h"
 #include "cause.h"
 #include "call.h"
-#include "timer.h"
+#include "../libtimer/timer.h"
 #include "mncc.h"
 
 #define DISC_TIMEOUT	30

src/common/main_mobile.c

@@ -33,7 +33,7 @@
 #include "main_mobile.h"
 #include "debug.h"
 #include "sender.h"
-#include "timer.h"
+#include "../libtimer/timer.h"
 #include "call.h"
 #include "mncc_console.h"
 #include "mncc_sock.h"

src/common/sdr.c

@@ -31,7 +31,7 @@ enum paging_signal;
 #include <unistd.h>
 #include "sample.h"
 #include "fm_modulation.h"
-#include "timer.h"
+#include "../libtimer/timer.h"
 #include "sender.h"
 #include "sdr_config.h"
 #include "sdr.h"

src/common/sender.c

@@ -27,7 +27,7 @@
 #include "sample.h"
 #include "debug.h"
 #include "sender.h"
-#include "timer.h"
+#include "../libtimer/timer.h"
 
 /* debug time consumption of audio processing */
 //#define DEBUG_TIME_CONSUMPTION

src/jtacs/Makefile.am

@@ -14,6 +14,7 @@ jtacs_LDADD = \
 	../amps/libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/libtimer/Makefile.am

@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libtimer.a
+
+libtimer_a_SOURCES = \
+	timer.c

src/nmt/Makefile.am

@@ -24,6 +24,7 @@ nmt_LDADD = \
 	libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/nmt/dms.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "nmt.h"
 
 #define MUTE_DURATION		0.300	/* 200ms, and about 95ms for the frame itself */

src/nmt/dsp.c

@@ -27,7 +27,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "nmt.h"
 #include "transaction.h"
 #include "dsp.h"

src/nmt/frame.c

@@ -24,7 +24,6 @@
 #include <inttypes.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/hagelbarger.h"
 #include "nmt.h"
 #include "frame.h"

src/nmt/main.c

@@ -29,7 +29,6 @@
 #include "../common/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/mncc_sock.h"
 #include "nmt.h"
 #include "frame.h"

src/nmt/nmt.c

@@ -27,7 +27,6 @@
 #include <time.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/cause.h"
 #include "nmt.h"
 #include "transaction.h"

src/nmt/nmt.h

@@ -1,4 +1,5 @@
 #include "../common/sender.h"
+#include "../libtimer/timer.h"
 #include "../common/compandor.h"
 #include "../common/dtmf.h"
 #include "../common/call.h"

src/nmt/sms.c

@@ -25,7 +25,6 @@
 #include <errno.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "nmt.h"
 
 #define SMS_RECEIVE_TO		5.0

src/nmt/transaction.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "nmt.h"
 #include "transaction.h"
 

src/r2000/Makefile.am

@@ -14,6 +14,7 @@ radiocom2000_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/r2000/dsp.c

@@ -27,7 +27,6 @@
 #include <math.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "r2000.h"
 #include "dsp.h"
 

src/r2000/main.c

@@ -29,7 +29,6 @@
 #include "../common/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/mncc_sock.h"
 #include "r2000.h"
 #include "dsp.h"

src/r2000/r2000.c

@@ -27,7 +27,6 @@
 #include <time.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../common/cause.h"
 #include "r2000.h"
 //#include "transaction.h"

src/r2000/r2000.h

@@ -1,4 +1,5 @@
 #include "../common/compandor.h"
+#include "../libtimer/timer.h"
 #include "../common/sender.h"
 #include "../common/call.h"
 #include "../common/fsk.h"

src/tacs/Makefile.am

@@ -15,6 +15,7 @@ tacs_LDADD = \
 	../amps/libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/test/Makefile.am

@@ -15,6 +15,7 @@ test_filter_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
@@ -39,6 +40,7 @@ test_emphasis_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
@@ -53,6 +55,7 @@ test_dms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
@@ -67,6 +70,7 @@ test_sms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \

src/test/test_dms.c

@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../nmt/nmt.h"
 
 extern int dms_allow_loopback;

src/test/test_sms.c

@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/timer.h"
 #include "../nmt/nmt.h"
 
 static const uint8_t test_mo_sms_data1[] = {

src/tv/Makefile.am

@@ -16,6 +16,7 @@ osmotv_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libimage.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \