diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-02-24 10:22:21 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-02-24 10:22:21 -0500 |
| commit | afe3e0bd526f25089307ddd1482fffd6abf4a51a (patch) | |
| tree | 8e76161b40656c2596f66c11d3ba7d8a3eb6b473 /net_gnss_dispatch.c | |
| parent | e9f0b59325f6ea938ff8ff892cf181c6d209db9a (diff) | |
| download | gpsd-afe3e0bd526f25089307ddd1482fffd6abf4a51a.tar.gz | |
Eliminate the dsock member in the context structure.
Another step towards integrating NTRIP support in a way that's
actually correct for the daemon architecture. This involved
conditioning out code for DGPSIP server lookups, a feature which was
never documented and has probably been broken forever.
It's actually not even clear there are still any DGPSIP servers still running;
the dgpsip package was removed from Debiann at maintainer request in 2008
(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392666). I may
yet just rip out that code entirely.
Diffstat (limited to 'net_gnss_dispatch.c')
| -rw-r--r-- | net_gnss_dispatch.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c index 064b0f7f..cc54d1dd 100644 --- a/net_gnss_dispatch.c +++ b/net_gnss_dispatch.c @@ -18,9 +18,6 @@ #define NETGNSS_DGPSIP "dgpsip://" #define NETGNSS_NTRIP "ntrip://" -/* Where to find the list of DGPSIP correction servers, if there is one */ -#define DGPSIP_SERVER_LIST "/usr/share/gpsd/dgpsip-servers" - bool netgnss_uri_check(char *name) /* is given string a valid URI for GNSS/DGPS service? */ { @@ -40,10 +37,10 @@ int netgnss_uri_open(struct gps_device_t *dev, char *netgnss_service) #endif if (strncmp(netgnss_service, NETGNSS_DGPSIP, strlen(NETGNSS_DGPSIP)) == 0) - return dgpsip_open(dev->context, netgnss_service + strlen(NETGNSS_DGPSIP)); + return dgpsip_open(dev, netgnss_service + strlen(NETGNSS_DGPSIP)); #ifndef REQUIRE_DGNSS_PROTO - return dgpsip_open(dev->context, netgnss_service); + return dgpsip_open(dev, netgnss_service); #else gpsd_report(LOG_ERROR, "Unknown or unspecified DGNSS protocol for service %s\n", @@ -65,14 +62,6 @@ void netgnss_report(struct gps_device_t *session) #endif } -void netgnss_autoconnect(struct gps_context_t *context, double lat, - double lon) -{ - if (context->netgnss_service == netgnss_dgpsip) { - dgpsip_autoconnect(context, lat, lon, DGPSIP_SERVER_LIST); - } -} - /* *INDENT-OFF* */ void rtcm_relay(struct gps_device_t *session) /* pass a DGNSS connection report to a session */ |