<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14133">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23: Fix 'make distcheck'<br><br>Change-Id: Ic48e240ee1484aaa793af23c62a24d2949900b86<br>---<br>M src/host/layer23/include/osmocom/bb/common/Makefile.am<br>M src/host/layer23/include/osmocom/bb/misc/Makefile.am<br>M src/host/layer23/include/osmocom/bb/mobile/Makefile.am<br>M src/host/layer23/src/misc/Makefile.am<br>A src/host/layer23/src/misc/geo.c<br>A src/host/layer23/src/misc/geo.h<br>6 files changed, 65 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am</span><br><span>index d66be98..f9364cd 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/Makefile.am</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am</span><br><span>@@ -1,3 +1,3 @@</span><br><span> noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \</span><br><span> networks.h gps.h sysinfo.h osmocom_data.h utils.h \</span><br><span style="color: hsl(0, 100%, 40%);">- sap_proto.h sap_fsm.h sap_interface.h</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_proto.h sap_fsm.h sap_interface.h sim.h</span><br><span>diff --git a/src/host/layer23/include/osmocom/bb/misc/Makefile.am b/src/host/layer23/include/osmocom/bb/misc/Makefile.am</span><br><span>index 71c9d38..5976090 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/misc/Makefile.am</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/misc/Makefile.am</span><br><span>@@ -1 +1 @@</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = layer3.h rslms.h</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = layer3.h rslms.h cell_log.h</span><br><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am</span><br><span>index 8e4be1a..623964f 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am</span><br><span>@@ -1,3 +1,4 @@</span><br><span> noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \</span><br><span> gsm48_rr.h mncc.h settings.h subscriber.h support.h \</span><br><span style="color: hsl(0, 100%, 40%);">- transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h</span><br><span style="color: hsl(120, 100%, 40%);">+ transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ app_mobile.h voice.h</span><br><span>diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am</span><br><span>index f3d7e95..78ab962 100644</span><br><span>--- a/src/host/layer23/src/misc/Makefile.am</span><br><span>+++ b/src/host/layer23/src/misc/Makefile.am</span><br><span>@@ -4,12 +4,11 @@</span><br><span> </span><br><span> bin_PROGRAMS = bcch_scan ccch_scan echo_test cell_log cbch_sniff</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = bcch_scan.h</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = bcch_scan.h geo.h</span><br><span> </span><br><span> bcch_scan_SOURCES = ../common/main.c app_bcch_scan.c bcch_scan.c</span><br><span> ccch_scan_SOURCES = ../common/main.c app_ccch_scan.c rslms.c</span><br><span> echo_test_SOURCES = ../common/main.c app_echo_test.c</span><br><span> cell_log_LDADD = $(LDADD) -lm</span><br><span style="color: hsl(0, 100%, 40%);">-cell_log_SOURCES = ../common/main.c app_cell_log.c cell_log.c \</span><br><span style="color: hsl(0, 100%, 40%);">- ../../../gsmmap/geo.c</span><br><span style="color: hsl(120, 100%, 40%);">+cell_log_SOURCES = ../common/main.c app_cell_log.c cell_log.c geo.c</span><br><span> cbch_sniff_SOURCES = ../common/main.c app_cbch_sniff.c</span><br><span>diff --git a/src/host/layer23/src/misc/geo.c b/src/host/layer23/src/misc/geo.c</span><br><span>new file mode 100644</span><br><span>index 0000000..65633d2</span><br><span>--- /dev/null</span><br><span>+++ b/src/host/layer23/src/misc/geo.c</span><br><span>@@ -0,0 +1,47 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <math.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "geo.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void geo2space(double *x, double *y, double *z, double lon, double lat)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *z = sin(lat / 180.0 * PI) * POLE_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+ *x = sin(lon / 180.0 * PI) * cos(lat / 180.0 * PI) * EQUATOR_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+ *y = -cos(lon / 180.0 * PI) * cos(lat / 180.0 * PI) * EQUATOR_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void space2geo(double *lon, double *lat, double x, double y, double z)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ double r;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bring geoid to 1m radius */</span><br><span style="color: hsl(120, 100%, 40%);">+ z = z / POLE_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+ x = x / EQUATOR_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+ y = y / EQUATOR_RADIUS;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* normalize */</span><br><span style="color: hsl(120, 100%, 40%);">+ r = sqrt(x * x + y * y + z * z);</span><br><span style="color: hsl(120, 100%, 40%);">+ z = z / r;</span><br><span style="color: hsl(120, 100%, 40%);">+ x = x / r;</span><br><span style="color: hsl(120, 100%, 40%);">+ y = y / r;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *lat = asin(z) / PI * 180;</span><br><span style="color: hsl(120, 100%, 40%);">+ *lon = atan2(x, -y) / PI * 180;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+double distinspace(double x1, double y1, double z1, double x2, double y2,</span><br><span style="color: hsl(120, 100%, 40%);">+ double z2)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ double x = x1 - x2;</span><br><span style="color: hsl(120, 100%, 40%);">+ double y = y1 - y2;</span><br><span style="color: hsl(120, 100%, 40%);">+ double z = z1 - z2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sqrt(x * x + y * y + z * z);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+double distonplane(double x1, double y1, double x2, double y2)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ double x = x1 - x2;</span><br><span style="color: hsl(120, 100%, 40%);">+ double y = y1 - y2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sqrt(x * x + y * y);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/src/host/layer23/src/misc/geo.h b/src/host/layer23/src/misc/geo.h</span><br><span>new file mode 100644</span><br><span>index 0000000..25e26cb</span><br><span>--- /dev/null</span><br><span>+++ b/src/host/layer23/src/misc/geo.h</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* WGS 84 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define EQUATOR_RADIUS 6378137.0</span><br><span style="color: hsl(120, 100%, 40%);">+#define POLE_RADIUS 6356752.314</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define PI 3.1415926536</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void geo2space(double *x, double *y, double *z, double lat, double lon);</span><br><span style="color: hsl(120, 100%, 40%);">+void space2geo(double *lat, double *lon, double x, double y, double z);</span><br><span style="color: hsl(120, 100%, 40%);">+double distinspace(double x1, double y1, double z1, double x2, double y2,</span><br><span style="color: hsl(120, 100%, 40%);">+ double z2);</span><br><span style="color: hsl(120, 100%, 40%);">+double distonplane(double x1, double y1, double x2, double y2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14133">change 14133</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14133"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic48e240ee1484aaa793af23c62a24d2949900b86 </div>
<div style="display:none"> Gerrit-Change-Number: 14133 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>