Restructure: Move timer from common code to 'libtimer'

This commit is contained in:
Andreas Eversberg 2017-11-13 20:00:52 +01:00
parent 1b183864bb
commit b605da1aff
57 changed files with 34 additions and 37 deletions

1
.gitignore vendored
View File

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

View File

@ -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

View File

@ -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

View File

@ -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) \

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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) \

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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) \

View File

@ -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"

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -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) \

View File

@ -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"

View File

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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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 \

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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) \

6
src/libtimer/Makefile.am Normal file
View File

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

View File

@ -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) \

View File

@ -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 */

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

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

View File

@ -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

View File

@ -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"

View File

@ -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) \

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

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

View File

@ -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) \

View File

@ -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) \

View File

@ -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;

View File

@ -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[] = {

View File

@ -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) \