cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

Move mobile phone specific code from libcommon.a to libmobile.a

This commit is contained in:
Andreas Eversberg 2017-08-20 08:27:02 +02:00
parent 3c0bcce97b
commit cff7622f5c
22 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,6 +21,7 @@ compile
.dirstamp
m4
src/common/libcommon.a
src/common/libmobile.a
src/anetz/anetz
src/bnetz/bnetz
src/cnetz/cnetz

1
src/amps/Makefile.am
View File

@ -26,6 +26,7 @@ amps_SOURCES = \
amps_LDADD = \
$(COMMON_LA) \
libamps.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/amps/amps_tacs_main.c
View File

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "../common/sample.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/call.h"
@ -405,7 +405,7 @@ int main_amps_tacs(int argc, char *argv[])
printf("Base station on channel %d ready (%s), please tune transmitter to %.4f MHz and receiver to %.4f MHz.\n", kanal[i], chan_type_long_name(chan_type[i]), amps_channel2freq(kanal[i], 0) / 1e6, amps_channel2freq(kanal[i], 1) / 1e6);
}
main_common(&quit, latency, interval, NULL, station_id, 10);
main_mobile(&quit, latency, interval, NULL, station_id, 10);
fail:
/* destroy transceiver instance */

1
src/anetz/Makefile.am
View File

@ -13,6 +13,7 @@ anetz_SOURCES = \
main.c
anetz_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/anetz/main.c
View File

@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "../common/sample.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/call.h"
@ -185,7 +185,7 @@ int main(int argc, char *argv[])
printf("Base station on channel %d ready, please tune transmitter to %.3f MHz and receiver to %.3f MHz.\n", kanal[i], anetz_kanal2freq(kanal[i], 0) / 1e6, anetz_kanal2freq(kanal[i], 1) / 1e6);
}
main_common(&quit, latency, interval, NULL, station_id, 5);
main_mobile(&quit, latency, interval, NULL, station_id, 5);
fail:
/* destroy transceiver instance */

1
src/bnetz/Makefile.am
View File

@ -16,6 +16,7 @@ bnetz_SOURCES = \
main.c
bnetz_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/bnetz/main.c
View File

@ -27,7 +27,7 @@
#include "../common/timer.h"
#include "../common/call.h"
#include "../common/mncc_sock.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../anetz/freiton.h"
#include "../anetz/besetztton.h"
#include "bnetz.h"
@ -201,7 +201,7 @@ int main(int argc, char *argv[])
printf("To call phone, switch transmitter (using paging signal) to %.3f MHz.\n", bnetz_kanal2freq(19, 0) / 1e6);
}
main_common(&quit, latency, interval, NULL, station_id, 5);
main_mobile(&quit, latency, interval, NULL, station_id, 5);
fail:
/* destroy transceiver instance */

1
src/cnetz/Makefile.am
View File

@ -20,6 +20,7 @@ cnetz_SOURCES = \
main.c
cnetz_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/cnetz/main.c
View File

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "../common/sample.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/call.h"
@ -348,7 +348,7 @@ int main(int argc, char *argv[])
}
}
main_common(&quit, latency, interval, NULL, station_id, 7);
main_mobile(&quit, latency, interval, NULL, station_id, 7);
fail:
flush_db();

18
src/common/Makefile.am
View File

@ -1,6 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(UHD_CFLAGS) $(SOAPY_CFLAGS)
noinst_LIBRARIES = libcommon.a
noinst_LIBRARIES = libcommon.a libmobile.a
libcommon_a_SOURCES = \
sample.c \
@ -14,20 +14,22 @@ libcommon_a_SOURCES = \
iir_filter.c \
dtmf.c \
samplerate.c \
call.c \
testton.c \
mncc_sock.c \
cause.c \
emphasis.c \
compandor.c \
fft.c \
fm_modulation.c \
fsk.c \
hagelbarger.c \
display_wave.c
libmobile_a_SOURCES = \
sender.c \
display_wave.c \
cause.c \
call.c \
testton.c \
mncc_sock.c \
hagelbarger.c \
display_status.c \
main_common.c
main_mobile.c
if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR

4
src/common/main_common.c → src/common/main_mobile.c
View File

@ -29,7 +29,7 @@
#include <termios.h>
#include <errno.h>
#include "sample.h"
#include "main.h"
#include "main_mobile.h"
#include "debug.h"
#include "sender.h"
#include "timer.h"
@ -547,7 +547,7 @@ static int get_char()
}
/* Loop through all transceiver instances of one network. */
void main_common(int *quit, int latency, int interval, void (*myhandler)(void), const char *station_id, int station_id_digits)
void main_mobile(int *quit, int latency, int interval, void (*myhandler)(void), const char *station_id, int station_id_digits)
{
int latspl;
sender_t *sender;

2
src/common/main.h → src/common/main_mobile.h
View File

@ -42,7 +42,7 @@ void opt_switch_common(int c, char *arg0, int *skip_args);
extern int quit;
void sighandler(int sigset);
void main_common(int *quit, int latency, int interval, void (*myhandler)(void), const char *station_id, int station_id_digits);
void main_mobile(int *quit, int latency, int interval, void (*myhandler)(void), const char *station_id, int station_id_digits);
void dump_info(void);

1
src/nmt/Makefile.am
View File

@ -17,6 +17,7 @@ nmt_SOURCES = \
main.c
nmt_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/nmt/main.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "../common/sample.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/mncc_sock.h"
@ -412,7 +412,7 @@ int main(int argc, char *argv[])
nmt_check_channels(nmt_system);
main_common(&quit, latency, interval, myhandler, station_id, 7);
main_mobile(&quit, latency, interval, myhandler, station_id, 7);
fail:
/* fifo */

1
src/r2000/Makefile.am
View File

@ -13,6 +13,7 @@ radiocom2000_SOURCES = \
main.c
radiocom2000_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

4
src/r2000/main.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "../common/sample.h"
#include "../common/main.h"
#include "../common/main_mobile.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/mncc_sock.h"
@ -385,7 +385,7 @@ int main(int argc, char *argv[])
r2000_check_channels();
main_common(&quit, latency, interval, NULL, station_id, 9);
main_mobile(&quit, latency, interval, NULL, station_id, 9);
fail:
/* destroy transceiver instance */

1
src/tacs/Makefile.am
View File

@ -13,6 +13,7 @@ tacs_SOURCES = \
tacs_LDADD = \
$(COMMON_LA) \
../amps/libamps.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

6
src/test/Makefile.am
View File

@ -14,6 +14,7 @@ test_filter_SOURCES = test_filter.c dummy.c
test_filter_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
@ -26,6 +27,7 @@ test_compandor_SOURCES = \
test_compandor_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
@ -36,6 +38,7 @@ test_emphasis_SOURCES = test_emphasis.c dummy.c
test_emphasis_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
@ -49,6 +52,7 @@ test_dms_SOURCES = \
test_dms_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
@ -62,6 +66,7 @@ test_sms_SOURCES = \
test_sms_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
@ -72,6 +77,7 @@ test_performance_SOURCES = dummy.c test_performance.c
test_performance_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

5
src/test/test_dms.c
View File

@ -72,12 +72,17 @@ void free_nmt(nmt_t *nmt)
free(nmt);
}
extern void main_mobile();
int main(void)
{
nmt_t *nmt;
dms_t *dms;
int i, j;
/* this is never called, it forces the linker to add mobile functions */
if (debuglevel == -1000) main_mobile();
debuglevel = DEBUG_DEBUG;
dms_allow_loopback = 1;

5
src/test/test_emphasis.c
View File

@ -35,6 +35,8 @@ static void gen_samples(sample_t *samples, double freq)
}
}
extern void main_mobile();
int main(void)
{
emphasis_t estate;
@ -43,6 +45,9 @@ int main(void)
double level;
double i;
/* this is never called, it forces the linker to add mobile functions */
if (debuglevel == -1000) main_mobile();
debuglevel = DEBUG_DEBUG;
init_emphasis(&estate, SAMPLERATE, cut_off);

5
src/test/test_filter.c
View File

@ -34,6 +34,8 @@ static void gen_samples(sample_t *samples, double freq)
}
}
extern void main_mobile();
int main(void)
{
iir_filter_t filter_low;
@ -43,6 +45,9 @@ int main(void)
int iter = 2;
int i;
/* this is never called, it forces the linker to add mobile functions */
if (debuglevel == -1000) main_mobile();
debuglevel = DEBUG_DEBUG;
printf("testing low-pass filter with %d iterations\n", iter);

4
src/test/test_sms.c
View File

@ -90,6 +90,7 @@ void sms_deliver_report(nmt_t *nmt, uint8_t ref, int error, uint8_t cause)
printf("(got deliver report from SMS layer)\n");
}
extern void main_mobile();
int main(void)
{
@ -97,6 +98,9 @@ int main(void)
int i;
int rc;
/* this is never called, it forces the linker to add mobile functions */
if (debuglevel == -1000) main_mobile();
debuglevel = DEBUG_DEBUG;
nmt = calloc(sizeof(*nmt), 1);