summaryrefslogtreecommitdiff
path: root/libgpsd_core.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2008-06-30 10:14:20 +0000
committerEric S. Raymond <esr@thyrsus.com>2008-06-30 10:14:20 +0000
commitb4cc7d133f33f23dc6813452c971803329a25330 (patch)
tree23aa227f567609015a5779f0dce05aad85ddf9ed /libgpsd_core.c
parent8fc264c45005872f6a2fbf9365378b89c8a8b9e6 (diff)
downloadgpsd-b4cc7d133f33f23dc6813452c971803329a25330.tar.gz
RTCM104v3 packet detection.
This is without checksum support, and the daemon code does not do anything with the RTCM data yet.
Diffstat (limited to 'libgpsd_core.c')
-rw-r--r--libgpsd_core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 493fc039..5787b3c1 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -333,7 +333,7 @@ char /*@observer@*/ *gpsd_id(/*@in@*/struct gps_device_t *session)
return(buf);
}
-#if defined(BINARY_ENABLE) || defined(RTCM2_ENABLE) || defined(NTRIP_ENABLE)
+#if defined(BINARY_ENABLE) || defined(RTCM104V2_ENABLE) || defined(NTRIP_ENABLE)
/*
* Support for generic binary drivers. These functions dump NMEA for passing
* to the client in raw mode. They assume that (a) the public gps.h structure
@@ -732,11 +732,11 @@ gps_mask_t gpsd_poll(struct gps_device_t *session)
(void)gpsd_switch_driver(session, "iTalk binary");
break;
#endif /* ITRAX_ENABLE */
-#ifdef RTCM104_ENABLE
+#ifdef RTCM104V2_ENABLE
case RTCM2_PACKET:
(void)gpsd_switch_driver(session, "RTCM104");
break;
-#endif /* RTCM104_ENABLE */
+#endif /* RTCM104V2_ENABLE */
}
} else if (!gpsd_next_hunt_setting(session))
return ERROR_SET;
@@ -817,19 +817,19 @@ gps_mask_t gpsd_poll(struct gps_device_t *session)
char buf2[MAX_PACKET_LENGTH*3+2];
buf2[0] = '\0';
-#ifdef RTCM104_ENABLE
+#ifdef RTCM104V2_ENABLE
if ((session->gpsdata.set & RTCM2_SET) != 0)
rtcm2_dump(&session->gpsdata.rtcm,
buf2+strlen(buf2),
(sizeof(buf2)-strlen(buf2)));
else {
-#endif /* RTCM104_ENABLE */
+#endif /* RTCM104V2_ENABLE */
#ifdef BINARY_ENABLE
gpsd_binary_dump(session, buf2, sizeof(buf2));
#endif /* BINARY_ENABLE */
-#ifdef RTCM104_ENABLE
+#ifdef RTCM104V2_ENABLE
}
-#endif /* RTCM104_ENABLE */
+#endif /* RTCM104V2_ENABLE */
if (buf2[0] != '\0') {
gpsd_report(LOG_IO, "<= GPS: %s", buf2);
if (session->gpsdata.raw_hook)