cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

sysmobts_mgr: Add support for gpsd < 2.39 

This allows running sysmobts-mgr on systems with old gpsd releases
(which may have other software depending on such old release).

Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b
This commit is contained in:
Pau Espin 2018-12-17 18:22:18 +01:00
parent 9492551e77
commit 0c8d9ef989
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osmo-bts-sysmo/misc/sysmobts_mgr.h
View File

@ -9,6 +9,10 @@
#include <gps.h> #include <gps.h>
#if !defined(GPSD_API_MAJOR_VERSION) || GPSD_API_MAJOR_VERSION < 5
#define USE_GPSD2_API 1
#endif
#include <stdint.h> #include <stdint.h>
enum { enum {
@ -97,7 +101,9 @@ struct sysmobts_mgr_instance {
int gps_open; int gps_open;
struct osmo_fd gpsfd; struct osmo_fd gpsfd;
struct gps_data_t *gpsdata; struct gps_data_t *gpsdata;
#if !USE_GPSD2_API
struct gps_data_t gpsdata_buf; struct gps_data_t gpsdata_buf;
#endif
struct osmo_timer_list fix_timeout; struct osmo_timer_list fix_timeout;
/* Loop/Re-try control */ /* Loop/Re-try control */

18
src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
View File

@ -59,8 +59,10 @@ enum calib_result {
static inline int compat_gps_read(struct gps_data_t *data) static inline int compat_gps_read(struct gps_data_t *data)
{ {
#if USE_GPSD2_API
return gps_poll(data);
/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ /* 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); return gps_read(data, NULL, 0);
#else #else
return gps_read(data); return gps_read(data);
@ -87,7 +89,9 @@ static void mgr_gps_close(struct sysmobts_mgr_instance *mgr)
osmo_fd_unregister(&mgr->calib.gpsfd); osmo_fd_unregister(&mgr->calib.gpsfd);
gps_close(mgr->calib.gpsdata); gps_close(mgr->calib.gpsdata);
#if !USE_GPSD2_API
memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata))); memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata)));
#endif
mgr->calib.gps_open = 0; mgr->calib.gps_open = 0;
} }
@ -143,7 +147,13 @@ static void mgr_gps_open(struct sysmobts_mgr_instance *mgr)
{ {
int rc; 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); rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata);
#endif
if (rc != 0) { if (rc != 0) {
LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc); LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc);
calib_state_reset(mgr, CALIB_FAIL_GPS); 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; 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.data = mgr;
mgr->calib.gpsfd.cb = mgr_gps_read; mgr->calib.gpsfd.cb = mgr_gps_read;
mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT; mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;