summaryrefslogtreecommitdiff
path: root/net_dgpsip.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-02-26 11:01:01 -0500
committerEric S. Raymond <esr@thyrsus.com>2011-02-26 11:01:01 -0500
commitee75e310841eeef11216d1f3ebf6206f532cc325 (patch)
tree60c1df0f91484a6f7baae785533dfd701ced7410 /net_dgpsip.c
parent02c04edab6f0ef82d1c72f5ee344590650110989 (diff)
downloadgpsd-ee75e310841eeef11216d1f3ebf6206f532cc325.tar.gz
Eliminate the ntrip_state global.
Diffstat (limited to 'net_dgpsip.c')
-rw-r--r--net_dgpsip.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/net_dgpsip.c b/net_dgpsip.c
index 87c7a188..acb463e3 100644
--- a/net_dgpsip.c
+++ b/net_dgpsip.c
@@ -59,22 +59,24 @@ int dgpsip_open(struct gps_device_t *device, const char *dgpsserver)
/*@ +branchstate */
-void dgpsip_report(struct gps_device_t *session)
+void dgpsip_report(struct gps_context_t *context,
+ struct gps_device_t *gps,
+ struct gps_device_t *dgpsip)
/* may be time to ship a usage report to the DGPSIP server */
{
/*
* 10 is an arbitrary number, the point is to have gotten several good
* fixes before reporting usage to our DGPSIP server.
*/
- if (session->context->fixcnt > 10 && !session->dgpsip.reported) {
- session->dgpsip.reported = true;
- if (session->gpsdata.gps_fd > -1) {
+ if (context->fixcnt > 10 && !dgpsip->dgpsip.reported) {
+ dgpsip->dgpsip.reported = true;
+ if (dgpsip->gpsdata.gps_fd > -1) {
char buf[BUFSIZ];
(void)snprintf(buf, sizeof(buf), "R %0.8f %0.8f %0.2f\r\n",
- session->gpsdata.fix.latitude,
- session->gpsdata.fix.longitude,
- session->gpsdata.fix.altitude);
- if (write(session->gpsdata.gps_fd, buf, strlen(buf)) ==
+ gps->gpsdata.fix.latitude,
+ gps->gpsdata.fix.longitude,
+ gps->gpsdata.fix.altitude);
+ if (write(dgpsip->gpsdata.gps_fd, buf, strlen(buf)) ==
(ssize_t) strlen(buf))
gpsd_report(LOG_IO, "=> dgps %s\n", buf);
else