From 5fea9ab85029df7b3a4b16a24b4d58c353e811b2 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 13 May 2011 01:46:41 +0200 Subject: gsm-receiver: Migrate to more recent gnuradio autotools integration These changes forward-port gsm-receiver to the gnuradio autotools magic as per "gr-howto-write-a-block-3.2.2" It also updates to libosmocore >= 0.3.0 and fixes other minor compilation issues. --- gsm-receiver/src/lib/Makefile.am | 96 ++------ gsm-receiver/src/lib/Makefile.swig.gen | 258 +++++++++++++++++++++ gsm-receiver/src/lib/decoder/Makefile.am | 2 - gsm-receiver/src/lib/decoder/a5-1-2.h | 3 + gsm-receiver/src/lib/decoder/gsmstack.c | 6 +- .../src/lib/decoder/openbtsstuff/Makefile.am | 2 - gsm-receiver/src/lib/decoder/sch.c | 2 +- gsm-receiver/src/lib/gsm_receiver_cf.cc | 3 +- gsm-receiver/src/lib/gsm_receiver_cf.h | 5 +- 9 files changed, 287 insertions(+), 90 deletions(-) create mode 100644 gsm-receiver/src/lib/Makefile.swig.gen (limited to 'gsm-receiver/src/lib') diff --git a/gsm-receiver/src/lib/Makefile.am b/gsm-receiver/src/lib/Makefile.am index 71ea8fe..a4aa2a6 100644 --- a/gsm-receiver/src/lib/Makefile.am +++ b/gsm-receiver/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,90 +21,30 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = decoder -# Install this stuff so that it ends up as the gnuradio.howto module -# This usually ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio - -ourpythondir = $(grpythondir) -ourlibdir = $(grpyexecdir) - -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -# -I$(OPEN_BTS_INCLUDES) - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -ALL_IFILES = \ - $(LOCAL_IFILES) \ - $(NON_LOCAL_IFILES) - -NON_LOCAL_IFILES = \ - $(GNURADIO_CORE_INCLUDEDIR)/swig/gnuradio.i - - -LOCAL_IFILES = \ - $(top_srcdir)/src/lib/gsm.i - -# These files are built by SWIG. The first is the C++ glue. -# The second is the python wrapper that loads the _howto shared library -# and knows how to call our extensions. - -BUILT_SOURCES = \ - gsm.cc \ - gsm.py +grinclude_HEADERS = \ + gsm_receiver_cf.h \ + gsm_receiver_config.h \ + viterbi_detector.h -# This gets howto.py installed in the right place -ourpython_PYTHON = \ - gsm.py +SUBDIRS = decoder -ourlib_LTLIBRARIES = _gsm.la +TOP_SWIG_IFILES = \ + gsm.i -lib_LTLIBRARIES = libgsmdemod.la +gsm_pythondir_category = \ + gnuradio -# These are the source files that go into the shared library -_gsm_la_SOURCES = \ - gsm.cc - -libgsmdemod_la_SOURCES = \ - gsm_receiver_cf.cc \ - gsm_receiver_config.cc \ +gsm_la_swig_sources = \ + gsm_receiver_cf.cc \ + gsm_receiver_config.cc \ viterbi_detector.cc -# magic flags -_gsm_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version - -# link the library against some comon swig runtime code and the -# c++ standard library -_gsm_la_LIBADD = \ - $(PYTHON_LDFLAGS) \ - libgsmdemod.la \ +gsm_la_swig_libadd = \ $(LIBOSMOCORE_LIBS) \ - -lstdc++ \ - $(DECODER_LA) - -#libgsmdemod_la_LIBADD = - -gsm.cc gsm.py: $(LOCAL_IFILES) $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module gsm -o gsm.cc $(LOCAL_IFILES) - -# These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - gsm_receiver_cf.h \ - gsm_receiver_config.h - -noinst_HEADERS = \ - gsm_constants.h \ - viterbi_detector.h - -# These swig headers get installed in ${prefix}/include/gnuradio/swig -swiginclude_HEADERS = \ - $(LOCAL_IFILES) + decoder/libdecoder.la +include $(top_srcdir)/Makefile.swig -MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc +BUILT_SOURECS = $(swig_built_sources) -# Don't distribute output of swig -dist-hook: - @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done - @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done +no_dist_file = $(swig_built_sources) diff --git a/gsm-receiver/src/lib/Makefile.swig.gen b/gsm-receiver/src/lib/Makefile.swig.gen new file mode 100644 index 0000000..20074ef --- /dev/null +++ b/gsm-receiver/src/lib/Makefile.swig.gen @@ -0,0 +1,258 @@ +# -*- Makefile -*- +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +# Makefile.swig.gen for gsm.i + +## Default install locations for these files: +## +## Default location for the Python directory is: +## ${prefix}/lib/python${python_version}/site-packages/[category]/gsm +## Default location for the Python exec directory is: +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gsm +## +## The following can be overloaded to change the install location, but +## this has to be done in the including Makefile.am -before- +## Makefile.swig is included. + +gsm_pythondir_category ?= gnuradio/gsm +gsm_pylibdir_category ?= $(gsm_pythondir_category) +gsm_pythondir = $(pythondir)/$(gsm_pythondir_category) +gsm_pylibdir = $(pyexecdir)/$(gsm_pylibdir_category) + +## SWIG headers are always installed into the same directory. + +gsm_swigincludedir = $(swigincludedir) + +## This is a template file for a "generated" Makefile addition (in +## this case, "Makefile.swig.gen"). By including the top-level +## Makefile.swig, this file will be used to generate the SWIG +## dependencies. Assign the variable TOP_SWIG_FILES to be the list of +## SWIG .i files to generated wrappings for; there can be more than 1 +## so long as the names are unique (no sorting is done on the +## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i +## file will generate .cc, .py, and possibly .h files -- meaning that +## all of these files will have the same base name (that provided for +## the SWIG .i file). +## +## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the +## right thing. For more info, see < +## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > + +## Stamps used to ensure parallel make does the right thing. These +## are removed by "make clean", but otherwise unused except during the +## parallel built. These will not be included in a tarball, because +## the SWIG-generated files will be removed from the distribution. + +STAMPS += $(DEPDIR)/gsm-generate-* + +## Other cleaned files: dependency files generated by SWIG or this Makefile + +MOSTLYCLEANFILES += $(DEPDIR)/*.S* + +## Add the .py and .cc files to the list of SWIG built sources. The +## .h file is sometimes built, but not always ... so that one has to +## be added manually by the including Makefile.am . + +swig_built_sources += gsm.py gsm.cc + +## Various SWIG variables. These can be overloaded in the including +## Makefile.am by setting the variable value there, then including +## Makefile.swig . + +gsm_swiginclude_HEADERS = \ + gsm.i \ + $(gsm_swiginclude_headers) + +gsm_pylib_LTLIBRARIES = \ + _gsm.la + +_gsm_la_SOURCES = \ + gsm.cc \ + $(gsm_la_swig_sources) + +_gsm_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gsm_la_swig_libadd) + +_gsm_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gsm_la_swig_ldflags) + +_gsm_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + $(gsm_la_swig_cxxflags) + +gsm_python_PYTHON = \ + gsm.py \ + $(gsm_python) + +## Entry rule for running SWIG + +gsm.h gsm.py gsm.cc: gsm.i +## This rule will get called only when MAKE decides that one of the +## targets needs to be created or re-created, because: +## +## * The .i file is newer than any or all of the generated files; +## +## * Any or all of the .cc, .h, or .py files does not exist and is +## needed (in the case this file is not needed, the rule for it is +## ignored); or +## +## * Some SWIG-based dependecy of the .cc file isn't met and hence the +## .cc file needs be be regenerated. Explanation: Because MAKE +## knows how to handle dependencies for .cc files (regardless of +## their name or extension), then the .cc file is used as a target +## instead of the .i file -- but with the dependencies of the .i +## file. It is this last reason why the line: +## +## if test -f $@; then :; else +## +## cannot be used in this case: If a .i file dependecy is not met, +## then the .cc file needs to be rebuilt. But if the stamp is newer +## than the .cc file, and the .cc file exists, then in the original +## version (with the 'test' above) the internal MAKE call will not +## be issued and hence the .cc file will not be rebuilt. +## +## Once execution gets to here, it should always proceed no matter the +## state of a stamp (as discussed in link above). The +## $(DEPDIR)/gsm-generate stuff is used to allow for parallel +## builds to "do the right thing". The stamp has no relationship with +## either the target files or dependency file; it is used solely for +## the protection of multiple builds during a given call to MAKE. +## +## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM +## (15). At a caught signal, the quoted command will be issued before +## exiting. In this case, remove any stamp, whether temporary of not. +## The trap is valid until the process exits; the process includes all +## commands appended via "\"s. +## + trap 'rm -rf $(DEPDIR)/gsm-generate-*' 1 2 13 15; \ +## +## Create a temporary directory, which acts as a lock. The first +## process to create the directory will succeed and issue the MAKE +## command to do the actual work, while all subsequent processes will +## fail -- leading them to wait for the first process to finish. +## + if mkdir $(DEPDIR)/gsm-generate-lock 2>/dev/null; then \ +## +## This code is being executed by the first process to succeed in +## creating the directory lock. +## +## Remove the stamp associated with this filename. +## + rm -f $(DEPDIR)/gsm-generate-stamp; \ +## +## Tell MAKE to run the rule for creating this stamp. +## + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm-generate-stamp WHAT=$<; \ +## +## Now that the .cc, .h, and .py files have been (re)created from the +## .i file, future checking of this rule during the same MAKE +## execution will come back that the rule doesn't need to be executed +## because none of the conditions mentioned at the start of this rule +## will be positive. Remove the the directory lock, which frees up +## any waiting process(es) to continue. +## + rmdir $(DEPDIR)/gsm-generate-lock; \ + else \ +## +## This code is being executed by any follower processes while the +## directory lock is in place. +## +## Wait until the first process is done, testing once per second. +## + while test -d $(DEPDIR)/gsm-generate-lock; do \ + sleep 1; \ + done; \ +## +## Succeed if and only if the first process succeeded; exit this +## process returning the status of the generated stamp. +## + test -f $(DEPDIR)/gsm-generate-stamp; \ + exit $$?; \ + fi; + +$(DEPDIR)/gsm-generate-stamp: +## This rule will be called only by the first process issuing the +## above rule to succeed in creating the lock directory, after +## removing the actual stamp file in order to guarantee that MAKE will +## execute this rule. +## +## Call SWIG to generate the various output files; special +## post-processing on 'mingw32' host OS for the dependency file. +## + if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_swig_args) \ + -MD -MF $(DEPDIR)/gsm.Std \ + -module gsm -o gsm.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gsm.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm.Std \ + > $(DEPDIR)/gsm.Sd; \ + $(RM) $(DEPDIR)/gsm.Std; \ + $(MV) $(DEPDIR)/gsm.Sd $(DEPDIR)/gsm.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gsm.S*; exit 1; \ + fi; +## +## Mess with the SWIG output .Std dependency file, to create a +## dependecy file valid for the input .i file: Basically, simulate the +## dependency file created for libraries by GNU's libtool for C++, +## where all of the dependencies for the target are first listed, then +## each individual dependency is listed as a target with no further +## dependencies. +## +## (1) remove the current dependency file +## + $(RM) $(DEPDIR)/gsm.d +## +## (2) Copy the whole SWIG file: +## + cp $(DEPDIR)/gsm.Std $(DEPDIR)/gsm.d +## +## (3) all a carriage return to the end of the dependency file. +## + echo "" >> $(DEPDIR)/gsm.d +## +## (4) from the SWIG file, remove the first line (the target); remove +## trailing " \" and " " from each line. Append ":" to each line, +## followed by 2 carriage returns, then append this to the end of +## the dependency file. +## + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm.d +## +## (5) remove the SWIG-generated file +## + $(RM) $(DEPDIR)/gsm.Std +## +## Create the stamp for this filename generation, to signal success in +## executing this rule; allows other threads waiting on this process +## to continue. +## + touch $(DEPDIR)/gsm-generate-stamp + +# KLUDGE: Force runtime include of a SWIG dependency file. This is +# not guaranteed to be portable, but will probably work. If it works, +# we have accurate dependencies for our swig stuff, which is good. + +@am__include@ @am__quote@./$(DEPDIR)/gsm.d@am__quote@ diff --git a/gsm-receiver/src/lib/decoder/Makefile.am b/gsm-receiver/src/lib/decoder/Makefile.am index 9582109..d6b9632 100644 --- a/gsm-receiver/src/lib/decoder/Makefile.am +++ b/gsm-receiver/src/lib/decoder/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) - SUBDIRS = openbtsstuff noinst_LTLIBRARIES = libdecoder.la diff --git a/gsm-receiver/src/lib/decoder/a5-1-2.h b/gsm-receiver/src/lib/decoder/a5-1-2.h index de764ee..38b2d25 100644 --- a/gsm-receiver/src/lib/decoder/a5-1-2.h +++ b/gsm-receiver/src/lib/decoder/a5-1-2.h @@ -110,6 +110,8 @@ * */ +#ifndef A5_1_2_H +#define A5_1_2_H #include @@ -451,3 +453,4 @@ void test() { } } +#endif /* A5_1_2_H */ diff --git a/gsm-receiver/src/lib/decoder/gsmstack.c b/gsm-receiver/src/lib/decoder/gsmstack.c index 3d09c13..73d9028 100644 --- a/gsm-receiver/src/lib/decoder/gsmstack.c +++ b/gsm-receiver/src/lib/decoder/gsmstack.c @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include static const int USEFUL_BITS = 142; diff --git a/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am b/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am index 1b0433c..e71634e 100644 --- a/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am +++ b/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) - noinst_LTLIBRARIES = libopenbtsdecoder.la libopenbtsdecoder_la_SOURCES = \ diff --git a/gsm-receiver/src/lib/decoder/sch.c b/gsm-receiver/src/lib/decoder/sch.c index 6f141dd..0eed12d 100644 --- a/gsm-receiver/src/lib/decoder/sch.c +++ b/gsm-receiver/src/lib/decoder/sch.c @@ -3,7 +3,7 @@ #include #include #include -#include "gsm_constants.h" +#include "../gsm_constants.h" /* * Synchronization channel. diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.cc b/gsm-receiver/src/lib/gsm_receiver_cf.cc index e7b8e81..0eb208f 100644 --- a/gsm-receiver/src/lib/gsm_receiver_cf.cc +++ b/gsm-receiver/src/lib/gsm_receiver_cf.cc @@ -34,7 +34,8 @@ #include #include #include -#include +#include +#include //!! #include "RxBurst.h" diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.h b/gsm-receiver/src/lib/gsm_receiver_cf.h index fef7882..039a774 100644 --- a/gsm-receiver/src/lib/gsm_receiver_cf.h +++ b/gsm-receiver/src/lib/gsm_receiver_cf.h @@ -30,9 +30,8 @@ #include #include -#include //TODO: remember to remove this line in the future! +#include //TODO: remember to remove this line in the future! #include "GSML1FEC.h" //!! -#include //!! #include //!! #include //!! @@ -58,7 +57,7 @@ class gsm_receiver_cf : public gr_block private: std::map d_hex_to_int; FILE * d_speech_file; //!! - byte d_KC[8]; //!! + uint8_t d_KC[8]; //!! GSM::TCHFACCHL1Decoder *d_tch_decoder[N_TCH_DECODER]; //!! bool d_trace_sch; -- cgit v1.2.3