aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-12-17 18:22:18 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2018-12-17 18:28:57 +0100
commit0c8d9ef9892c9acadcd93d58368725e7a34aafc5 (patch)
treeaf0b3d5e011e2326dcf9a5cdd854b3968559a733
parent9492551e779f131acbcb36b978df9840efa7777c (diff)
sysmobts_mgr: Add support for gpsd < 2.39pespin/gpsd
This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr.h6
-rw-r--r--src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c18
2 files changed, 22 insertions, 2 deletions
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
index b62707c..668263d 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h
@@ -9,6 +9,10 @@
#include <gps.h>
+#if !defined(GPSD_API_MAJOR_VERSION) || GPSD_API_MAJOR_VERSION < 5
+#define USE_GPSD2_API 1
+#endif
+
#include <stdint.h>
enum {
@@ -97,7 +101,9 @@ struct sysmobts_mgr_instance {
int gps_open;
struct osmo_fd gpsfd;
struct gps_data_t *gpsdata;
+#if !USE_GPSD2_API
struct gps_data_t gpsdata_buf;
+#endif
struct osmo_timer_list fix_timeout;
/* Loop/Re-try control */
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
index ec8cb93..a0ba649 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
@@ -59,8 +59,10 @@ enum calib_result {
static inline int compat_gps_read(struct gps_data_t *data)
{
+#if USE_GPSD2_API
+ return gps_poll(data);
/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */
-#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0
+#elif GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0
return gps_read(data, NULL, 0);
#else
return gps_read(data);
@@ -87,7 +89,9 @@ static void mgr_gps_close(struct sysmobts_mgr_instance *mgr)
osmo_fd_unregister(&mgr->calib.gpsfd);
gps_close(mgr->calib.gpsdata);
+#if !USE_GPSD2_API
memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata)));
+#endif
mgr->calib.gps_open = 0;
}
@@ -143,7 +147,13 @@ static void mgr_gps_open(struct sysmobts_mgr_instance *mgr)
{
int rc;
+#if USE_GPSD2_API
+ mgr->calib.gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+ rc = mgr->calib.gpsdata ? 0 : -1;
+#else
+ mgr->calib.gpsdata = &mgr->calib.gpsdata_buf;
rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata);
+#endif
if (rc != 0) {
LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc);
calib_state_reset(mgr, CALIB_FAIL_GPS);
@@ -151,8 +161,12 @@ static void mgr_gps_open(struct sysmobts_mgr_instance *mgr)
}
mgr->calib.gps_open = 1;
- gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL);
+#if USE_GPSD2_API
+ gps_query(mgr->calib.gpsdata, "w+x");
+#else
+ gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL);
+#endif
mgr->calib.gpsfd.data = mgr;
mgr->calib.gpsfd.cb = mgr_gps_read;
mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;