gsmmap: move this utility to 'layer23/src/misc/'
What I find weird is that the gsmmap is using files from layer23, and vice-versa cell_log from layer23 is using files from this utility. And somehow they are separate sub-projects. I see no reason why gsmmap must be in its own sub-project. Change-Id: I2bc9c8897f3c7ccf207be0146f7b55fc733a6abb
This commit is contained in:
parent
48c3243dd7
commit
5d634b6118
|
@ -47,7 +47,7 @@ done
|
||||||
|
|
||||||
# TODO: make sure 'distcheck' passes also for these
|
# TODO: make sure 'distcheck' passes also for these
|
||||||
# TODO: make sure '--enable-werror' passes also for these
|
# TODO: make sure '--enable-werror' passes also for these
|
||||||
for dir in gsmmap osmocon; do
|
for dir in osmocon; do
|
||||||
cd $base/src/host/$dir
|
cd $base/src/host/$dir
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
./configure
|
./configure
|
||||||
|
@ -65,7 +65,7 @@ if [ "$WITH_MANUALS" = "1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Test 'maintainer-clean'
|
# Test 'maintainer-clean'
|
||||||
for dir in gprsdecode layer23 gsmmap osmocon trxcon virt_phy; do
|
for dir in gprsdecode layer23 osmocon trxcon virt_phy; do
|
||||||
cd "$base/src/host/$dir"
|
cd "$base/src/host/$dir"
|
||||||
make maintainer-clean
|
make maintainer-clean
|
||||||
done
|
done
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
# autoreconf by-products
|
|
||||||
*.in
|
|
||||||
|
|
||||||
aclocal.m4
|
|
||||||
autom4te.cache/
|
|
||||||
configure
|
|
||||||
depcomp
|
|
||||||
install-sh
|
|
||||||
missing
|
|
||||||
|
|
||||||
# configure by-products
|
|
||||||
.deps/
|
|
||||||
Makefile
|
|
||||||
|
|
||||||
config.status
|
|
||||||
version.h
|
|
||||||
|
|
||||||
# build by-products
|
|
||||||
*.o
|
|
||||||
|
|
||||||
gsmmap
|
|
||||||
|
|
||||||
# various
|
|
||||||
.version
|
|
||||||
.tarball-version
|
|
||||||
|
|
||||||
# IDA file
|
|
||||||
*.id*
|
|
||||||
*.nam
|
|
||||||
*.til
|
|
||||||
|
|
||||||
# Other test files
|
|
||||||
*.dump
|
|
||||||
*.bin
|
|
||||||
*.log
|
|
|
@ -1,17 +0,0 @@
|
||||||
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
|
|
||||||
|
|
||||||
# versioning magic
|
|
||||||
BUILT_SOURCES = $(top_srcdir)/.version
|
|
||||||
$(top_srcdir)/.version:
|
|
||||||
echo $(VERSION) > $@-t && mv $@-t $@
|
|
||||||
dist-hook:
|
|
||||||
echo $(VERSION) > $(distdir)/.tarball-version
|
|
||||||
|
|
||||||
INCLUDES = $(all_includes) -I../layer23/include -DHOST_BUILD
|
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
|
||||||
|
|
||||||
sbin_PROGRAMS = gsmmap
|
|
||||||
|
|
||||||
gsmmap_SOURCES = gsmmap.c geo.c locate.c log.c ../layer23/src/common/sysinfo.c ../layer23/src/common/networks.c ../layer23/src/common/logging.c
|
|
||||||
gsmmap_LDADD = $(LIBOSMOGSM_LIBS) $(LIBOSMOCORE_LIBS) -lm
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
dnl Process this file with autoconf to produce a configure script
|
|
||||||
AC_INIT([gsmmap],
|
|
||||||
m4_esyscmd([./git-version-gen .tarball-version]),
|
|
||||||
[baseband-devel@lists.osmocom.org])
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
|
||||||
|
|
||||||
dnl kernel style compile messages
|
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
|
||||||
|
|
||||||
dnl checks for programs
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
|
|
||||||
dnl checks for libraries
|
|
||||||
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore)
|
|
||||||
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm)
|
|
||||||
|
|
||||||
dnl checks for header files
|
|
||||||
AC_HEADER_STDC
|
|
||||||
|
|
||||||
dnl Checks for typedefs, structures and compiler characteristics
|
|
||||||
|
|
||||||
AC_OUTPUT(
|
|
||||||
Makefile)
|
|
|
@ -1,47 +0,0 @@
|
||||||
#include <math.h>
|
|
||||||
#include "geo.h"
|
|
||||||
|
|
||||||
void geo2space(double *x, double *y, double *z, double lon, double lat)
|
|
||||||
{
|
|
||||||
*z = sin(lat / 180.0 * PI) * POLE_RADIUS;
|
|
||||||
*x = sin(lon / 180.0 * PI) * cos(lat / 180.0 * PI) * EQUATOR_RADIUS;
|
|
||||||
*y = -cos(lon / 180.0 * PI) * cos(lat / 180.0 * PI) * EQUATOR_RADIUS;
|
|
||||||
}
|
|
||||||
|
|
||||||
void space2geo(double *lon, double *lat, double x, double y, double z)
|
|
||||||
{
|
|
||||||
double r;
|
|
||||||
|
|
||||||
/* bring geoid to 1m radius */
|
|
||||||
z = z / POLE_RADIUS;
|
|
||||||
x = x / EQUATOR_RADIUS;
|
|
||||||
y = y / EQUATOR_RADIUS;
|
|
||||||
|
|
||||||
/* normalize */
|
|
||||||
r = sqrt(x * x + y * y + z * z);
|
|
||||||
z = z / r;
|
|
||||||
x = x / r;
|
|
||||||
y = y / r;
|
|
||||||
|
|
||||||
*lat = asin(z) / PI * 180;
|
|
||||||
*lon = atan2(x, -y) / PI * 180;
|
|
||||||
}
|
|
||||||
|
|
||||||
double distinspace(double x1, double y1, double z1, double x2, double y2,
|
|
||||||
double z2)
|
|
||||||
{
|
|
||||||
double x = x1 - x2;
|
|
||||||
double y = y1 - y2;
|
|
||||||
double z = z1 - z2;
|
|
||||||
|
|
||||||
return sqrt(x * x + y * y + z * z);
|
|
||||||
}
|
|
||||||
|
|
||||||
double distonplane(double x1, double y1, double x2, double y2)
|
|
||||||
{
|
|
||||||
double x = x1 - x2;
|
|
||||||
double y = y1 - y2;
|
|
||||||
|
|
||||||
return sqrt(x * x + y * y);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,151 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# Print a version string.
|
|
||||||
scriptversion=2010-01-28.01
|
|
||||||
|
|
||||||
# Copyright (C) 2007-2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# This program 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 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
|
|
||||||
# It may be run two ways:
|
|
||||||
# - from a git repository in which the "git describe" command below
|
|
||||||
# produces useful output (thus requiring at least one signed tag)
|
|
||||||
# - from a non-git-repo directory containing a .tarball-version file, which
|
|
||||||
# presumes this script is invoked like "./git-version-gen .tarball-version".
|
|
||||||
|
|
||||||
# In order to use intra-version strings in your project, you will need two
|
|
||||||
# separate generated version string files:
|
|
||||||
#
|
|
||||||
# .tarball-version - present only in a distribution tarball, and not in
|
|
||||||
# a checked-out repository. Created with contents that were learned at
|
|
||||||
# the last time autoconf was run, and used by git-version-gen. Must not
|
|
||||||
# be present in either $(srcdir) or $(builddir) for git-version-gen to
|
|
||||||
# give accurate answers during normal development with a checked out tree,
|
|
||||||
# but must be present in a tarball when there is no version control system.
|
|
||||||
# Therefore, it cannot be used in any dependencies. GNUmakefile has
|
|
||||||
# hooks to force a reconfigure at distribution time to get the value
|
|
||||||
# correct, without penalizing normal development with extra reconfigures.
|
|
||||||
#
|
|
||||||
# .version - present in a checked-out repository and in a distribution
|
|
||||||
# tarball. Usable in dependencies, particularly for files that don't
|
|
||||||
# want to depend on config.h but do want to track version changes.
|
|
||||||
# Delete this file prior to any autoconf run where you want to rebuild
|
|
||||||
# files to pick up a version string change; and leave it stale to
|
|
||||||
# minimize rebuild time after unrelated changes to configure sources.
|
|
||||||
#
|
|
||||||
# It is probably wise to add these two files to .gitignore, so that you
|
|
||||||
# don't accidentally commit either generated file.
|
|
||||||
#
|
|
||||||
# Use the following line in your configure.ac, so that $(VERSION) will
|
|
||||||
# automatically be up-to-date each time configure is run (and note that
|
|
||||||
# since configure.ac no longer includes a version string, Makefile rules
|
|
||||||
# should not depend on configure.ac for version updates).
|
|
||||||
#
|
|
||||||
# AC_INIT([GNU project],
|
|
||||||
# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
|
|
||||||
# [bug-project@example])
|
|
||||||
#
|
|
||||||
# Then use the following lines in your Makefile.am, so that .version
|
|
||||||
# will be present for dependencies, and so that .tarball-version will
|
|
||||||
# exist in distribution tarballs.
|
|
||||||
#
|
|
||||||
# BUILT_SOURCES = $(top_srcdir)/.version
|
|
||||||
# $(top_srcdir)/.version:
|
|
||||||
# echo $(VERSION) > $@-t && mv $@-t $@
|
|
||||||
# dist-hook:
|
|
||||||
# echo $(VERSION) > $(distdir)/.tarball-version
|
|
||||||
|
|
||||||
case $# in
|
|
||||||
1) ;;
|
|
||||||
*) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
tarball_version_file=$1
|
|
||||||
nl='
|
|
||||||
'
|
|
||||||
|
|
||||||
# First see if there is a tarball-only version file.
|
|
||||||
# then try "git describe", then default.
|
|
||||||
if test -f $tarball_version_file
|
|
||||||
then
|
|
||||||
v=`cat $tarball_version_file` || exit 1
|
|
||||||
case $v in
|
|
||||||
*$nl*) v= ;; # reject multi-line output
|
|
||||||
[0-9]*) ;;
|
|
||||||
*) v= ;;
|
|
||||||
esac
|
|
||||||
test -z "$v" \
|
|
||||||
&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$v"
|
|
||||||
then
|
|
||||||
: # use $v
|
|
||||||
elif
|
|
||||||
v=`git describe --abbrev=4 --match='osmocon_v*' HEAD 2>/dev/null \
|
|
||||||
|| git describe --abbrev=4 HEAD 2>/dev/null` \
|
|
||||||
&& case $v in
|
|
||||||
osmocon_[0-9]*) ;;
|
|
||||||
osmocon_v[0-9]*) ;;
|
|
||||||
*) (exit 1) ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
# Is this a new git that lists number of commits since the last
|
|
||||||
# tag or the previous older version that did not?
|
|
||||||
# Newer: v6.10-77-g0f8faeb
|
|
||||||
# Older: v6.10-g0f8faeb
|
|
||||||
case $v in
|
|
||||||
*-*-*) : git describe is okay three part flavor ;;
|
|
||||||
*-*)
|
|
||||||
: git describe is older two part flavor
|
|
||||||
# Recreate the number of commits and rewrite such that the
|
|
||||||
# result is the same as if we were using the newer version
|
|
||||||
# of git describe.
|
|
||||||
vtag=`echo "$v" | sed 's/-.*//'`
|
|
||||||
numcommits=`git rev-list "$vtag"..HEAD | wc -l`
|
|
||||||
v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Change the first '-' to a '.', so version-comparing tools work properly.
|
|
||||||
# Remove the "g" in git describe's output string, to save a byte.
|
|
||||||
v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/;s/^osmocon_//'`;
|
|
||||||
else
|
|
||||||
v="UNKNOWN"
|
|
||||||
fi
|
|
||||||
|
|
||||||
v=`echo "$v" |sed 's/^v//'`
|
|
||||||
|
|
||||||
# Don't declare a version "dirty" merely because a time stamp has changed.
|
|
||||||
git status > /dev/null 2>&1
|
|
||||||
|
|
||||||
dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
|
|
||||||
case "$dirty" in
|
|
||||||
'') ;;
|
|
||||||
*) # Append the suffix only if there isn't one already.
|
|
||||||
case $v in
|
|
||||||
*-dirty) ;;
|
|
||||||
*) v="$v-dirty" ;;
|
|
||||||
esac ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Omit the trailing newline, so that m4_esyscmd can use the result directly.
|
|
||||||
echo "$v" | tr -d '\012'
|
|
||||||
|
|
||||||
# Local variables:
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-end: "$"
|
|
||||||
# End:
|
|
|
@ -33,5 +33,6 @@ src/misc/echo_test
|
||||||
src/misc/cbch_sniff
|
src/misc/cbch_sniff
|
||||||
src/misc/ccch_scan
|
src/misc/ccch_scan
|
||||||
src/misc/layer23
|
src/misc/layer23
|
||||||
|
src/misc/gsmmap
|
||||||
src/mobile/mobile
|
src/mobile/mobile
|
||||||
src/modem/modem
|
src/modem/modem
|
||||||
|
|
|
@ -1 +1,8 @@
|
||||||
noinst_HEADERS = layer3.h rslms.h cell_log.h
|
noinst_HEADERS = \
|
||||||
|
cell_log.h \
|
||||||
|
geo.h \
|
||||||
|
layer3.h \
|
||||||
|
locate.h \
|
||||||
|
log.h \
|
||||||
|
rslms.h \
|
||||||
|
$(NULL)
|
||||||
|
|
|
@ -26,11 +26,11 @@ bin_PROGRAMS = \
|
||||||
echo_test \
|
echo_test \
|
||||||
cell_log \
|
cell_log \
|
||||||
cbch_sniff \
|
cbch_sniff \
|
||||||
|
gsmmap \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
bcch_scan.h \
|
bcch_scan.h \
|
||||||
geo.h \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
bcch_scan_SOURCES = \
|
bcch_scan_SOURCES = \
|
||||||
|
@ -62,3 +62,11 @@ cbch_sniff_SOURCES = \
|
||||||
$(top_srcdir)/src/common/main.c \
|
$(top_srcdir)/src/common/main.c \
|
||||||
app_cbch_sniff.c \
|
app_cbch_sniff.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
gsmmap_LDADD = $(LDADD) -lm
|
||||||
|
gsmmap_SOURCES = \
|
||||||
|
gsmmap.c \
|
||||||
|
geo.c \
|
||||||
|
locate.c \
|
||||||
|
log.c \
|
||||||
|
$(NULL)
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include <osmocom/bb/common/networks.h>
|
#include <osmocom/bb/common/networks.h>
|
||||||
#include <osmocom/bb/common/gps.h>
|
#include <osmocom/bb/common/gps.h>
|
||||||
#include <osmocom/bb/misc/cell_log.h>
|
#include <osmocom/bb/misc/cell_log.h>
|
||||||
#include "../../../gsmmap/geo.h"
|
#include <osmocom/bb/misc/geo.h>
|
||||||
|
|
||||||
#define READ_WAIT 2, 0
|
#define READ_WAIT 2, 0
|
||||||
#define RACH_WAIT 0, 900000
|
#define RACH_WAIT 0, 900000
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "geo.h"
|
|
||||||
|
#include <osmocom/bb/misc/geo.h>
|
||||||
|
|
||||||
void geo2space(double *x, double *y, double *z, double lon, double lat)
|
void geo2space(double *x, double *y, double *z, double lon, double lat)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
/* WGS 84 */
|
|
||||||
#define EQUATOR_RADIUS 6378137.0
|
|
||||||
#define POLE_RADIUS 6356752.314
|
|
||||||
|
|
||||||
#define PI 3.1415926536
|
|
||||||
|
|
||||||
void geo2space(double *x, double *y, double *z, double lat, double lon);
|
|
||||||
void space2geo(double *lat, double *lon, double x, double y, double z);
|
|
||||||
double distinspace(double x1, double y1, double z1, double x2, double y2,
|
|
||||||
double z2);
|
|
||||||
double distonplane(double x1, double y1, double x2, double y2);
|
|
||||||
|
|
|
@ -30,9 +30,9 @@
|
||||||
#include <osmocom/bb/common/networks.h>
|
#include <osmocom/bb/common/networks.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmocom/bb/common/logging.h>
|
||||||
|
|
||||||
#include "log.h"
|
#include <osmocom/bb/misc/log.h>
|
||||||
#include "geo.h"
|
#include <osmocom/bb/misc/geo.h>
|
||||||
#include "locate.h"
|
#include <osmocom/bb/misc/locate.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* structure of power and cell infos
|
* structure of power and cell infos
|
|
@ -5,8 +5,8 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "geo.h"
|
#include <osmocom/bb/misc/geo.h>
|
||||||
#include "locate.h"
|
#include <osmocom/bb/misc/locate.h>
|
||||||
|
|
||||||
#define CIRCLE_PROBE 30.0
|
#define CIRCLE_PROBE 30.0
|
||||||
#define FINETUNE_RADIUS 5.0
|
#define FINETUNE_RADIUS 5.0
|
|
@ -20,8 +20,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
#include <osmocom/bb/common/osmocom_data.h>
|
||||||
|
#include <osmocom/bb/misc/log.h>
|
||||||
#include "log.h"
|
|
||||||
|
|
||||||
extern struct power power;
|
extern struct power power;
|
||||||
extern struct sysinfo sysinfo;
|
extern struct sysinfo sysinfo;
|
Loading…
Reference in New Issue