summaryrefslogtreecommitdiff
path: root/gpsdecode.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-03-01 02:05:12 -0500
committerEric S. Raymond <esr@thyrsus.com>2011-03-01 02:05:12 -0500
commit88c470d67e400fde5d3ecd2eb07116581fb80a6e (patch)
tree93d88c6dfc46b2cf54320afb0a3c5519cabde5d0 /gpsdecode.c
parent049cfc6b80f96d56eb8e1a470cbef7e66db4e8aa (diff)
downloadgpsd-88c470d67e400fde5d3ecd2eb07116581fb80a6e.tar.gz
Replace the crappy old RTCM3 dumper with one that emits JSON.
Diffstat (limited to 'gpsdecode.c')
-rw-r--r--gpsdecode.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/gpsdecode.c b/gpsdecode.c
index 6ccfb104..a8530688 100644
--- a/gpsdecode.c
+++ b/gpsdecode.c
@@ -387,26 +387,18 @@ static void decode(FILE *fpin, FILE*fpout)
(void)fputs((char *)session.packet.outbuffer, fpout);
if ((changed & (REPORT_IS|SUBFRAME_IS|AIS_IS|RTCM2_IS|RTCM3_IS)) == 0)
continue;
- /*
- * We really ought to get rid of the non-JSON cases someday.
- * They're not used for production, only regression testing.
- */
else if (json) {
json_data_report(changed,
&session.gpsdata, &policy,
buf, sizeof(buf));
(void)fputs(buf, fpout);
-#ifdef RTCM104V3_ENABLE
- } else if (session.packet.type == RTCM3_PACKET) {
- rtcm3_dump(&session.gpsdata.rtcm3, fpout);
-#endif
#ifdef AIVDM_ENABLE
} else if (session.packet.type == AIVDM_PACKET) {
if ((changed & AIS_IS)!=0) {
aivdm_csv_dump(&session.gpsdata.ais, buf, sizeof(buf));
(void)fputs(buf, fpout);
}
-#endif
+#endif /* AIVDM_ENABLE */
}
}
}