diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-14 15:37:42 -0400 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-14 15:37:42 -0400 |
commit | 8d151f4753029229bd0fd17596f25680dd79d36f (patch) | |
tree | c5fc2addd70fcd6aed067d7973044018c1769472 | |
parent | c2838b9d586e5febd50900ad0a04c13e7c1d24e2 (diff) | |
download | gpsd-8d151f4753029229bd0fd17596f25680dd79d36f.tar.gz |
OK, visualize as a method was a bad idea. All regression tests pass.
-rw-r--r-- | SConstruct | 1 | ||||
-rw-r--r-- | driver_evermore.c | 3 | ||||
-rw-r--r-- | driver_garmin.c | 9 | ||||
-rw-r--r-- | driver_geostar.c | 3 | ||||
-rw-r--r-- | driver_italk.c | 3 | ||||
-rw-r--r-- | driver_navcom.c | 3 | ||||
-rw-r--r-- | driver_nmea2000.c | 3 | ||||
-rw-r--r-- | driver_oncore.c | 3 | ||||
-rw-r--r-- | driver_proto.c | 3 | ||||
-rw-r--r-- | driver_sirf.c | 15 | ||||
-rw-r--r-- | driver_superstar2.c | 3 | ||||
-rw-r--r-- | driver_tsip.c | 3 | ||||
-rw-r--r-- | driver_ubx.c | 3 | ||||
-rw-r--r-- | driver_zodiac.c | 3 | ||||
-rw-r--r-- | drivers.c | 51 | ||||
-rw-r--r-- | gpsd.h-tail | 3 |
16 files changed, 0 insertions, 112 deletions
@@ -145,7 +145,6 @@ boolopts = ( ("libgpsmm", True, "build C++ bindings"), ("libQgpsmm", True, "build QT bindings"), # Daemon options - ("visualize", True, "visualizer functions for logging and gpsmon"), ("reconfigure", True, "allow gpsd to change device settings"), ("controlsend", True, "allow gpsctl/gpsmon to change device settings"), ("cheapfloats", True, "float ops are cheap, compute error estimates"), diff --git a/driver_evermore.c b/driver_evermore.c index dfbd5024..536d1fc6 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -633,9 +633,6 @@ const struct gps_type_t evermore_binary = #ifdef CONTROLSEND_ENABLE .control_send = evermore_control_send, /* how to send a control string */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/driver_garmin.c b/driver_garmin.c index 67d23cec..5263163b 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -1391,9 +1391,6 @@ const struct gps_type_t garmin_usb_binary_old = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = garmin_ntp_offset, #endif /* NTPSHM_ ENABLE */ @@ -1423,9 +1420,6 @@ const struct gps_type_t garmin_usb_binary = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = garmin_ntp_offset, #endif /* NTPSHM_ ENABLE */ @@ -1454,9 +1448,6 @@ const struct gps_type_t garmin_ser_binary = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = garmin_ntp_offset, #endif /* NTPSHM_ ENABLE */ diff --git a/driver_geostar.c b/driver_geostar.c index 193a2b2e..a65d168a 100644 --- a/driver_geostar.c +++ b/driver_geostar.c @@ -629,9 +629,6 @@ const struct gps_type_t geostar_binary = #ifdef CONTROLSEND_ENABLE .control_send = geostar_control_send,/* how to send commands */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = geostar_ntp_offset, #endif /* NTPSHM_ENABLE */ diff --git a/driver_italk.c b/driver_italk.c index bc3719ee..01e350ce 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -418,9 +418,6 @@ const struct gps_type_t italk_binary = #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* no control string sender */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/driver_navcom.c b/driver_navcom.c index 999e772e..03a984ad 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -1296,9 +1296,6 @@ const struct gps_type_t navcom_binary = #ifdef CONTROLSEND_ENABLE .control_send = navcom_control_send, /* how to send a control string */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/driver_nmea2000.c b/driver_nmea2000.c index 8df6a2cf..01a652f1 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -1313,9 +1313,6 @@ const struct gps_type_t nmea2000 = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ diff --git a/driver_oncore.c b/driver_oncore.c index e5686a7b..022d4280 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -540,9 +540,6 @@ const struct gps_type_t oncore_binary = { /* Control string sender - should provide checksum and headers/trailer */ .control_send = oncore_control_send, /* to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = oncore_ntp_offset, /* NTP offset array */ #endif /* NTPSHM_ENABLE */ diff --git a/driver_proto.c b/driver_proto.c index d4fe3179..dbeacc54 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -530,9 +530,6 @@ const struct gps_type_t _proto__binary = { /* Control string sender - should provide checksum and headers/trailer */ .control_send = _proto__control_send, #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = _proto_ntp_offset, #endif /* NTPSHM_ENABLE */ diff --git a/driver_sirf.c b/driver_sirf.c index ba410199..2fafd4c2 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -264,18 +264,6 @@ static ssize_t sirf_control_send(struct gps_device_t *session, char *msg, } #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE -static ssize_t sirfbin_visualize(struct gps_device_t *session, - char *buf, - size_t len) -{ - (void)snprintf(buf, len, "MID%d:", (int)buf[4]); - (void)gpsd_packetdump(session->msgbuf, sizeof(session->msgbuf), - buf + strlen(buf), len - strlen(buf)); - return (ssize_t)strlen(buf); -} -#endif /* VISUALIZE_ENABLE */ - #ifdef RECONFIGURE_ENABLE static bool sirfbin_speed(struct gps_device_t *session, speed_t speed, char parity, int stopbits) /* change speed in binary mode */ @@ -1397,9 +1385,6 @@ const struct gps_type_t sirf_binary = #ifdef CONTROLSEND_ENABLE .control_send = sirf_control_send,/* how to send a control string */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = sirfbin_visualize, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = sirf_ntp_offset, #endif /* NTP_SHM_ENABLE */ diff --git a/driver_superstar2.c b/driver_superstar2.c index 89aa4cfd..9cf22d24 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -575,9 +575,6 @@ const struct gps_type_t superstar2_binary = { /* Control string sender - should provide checksum and trailer */ .control_send = superstar2_control_send, #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/driver_tsip.c b/driver_tsip.c index de14dfec..c56a8054 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -1300,9 +1300,6 @@ const struct gps_type_t tsip_binary = #ifdef CONTROLSEND_ENABLE .control_send = tsip_control_send,/* how to send commands */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = tsip_ntp_offset, #endif /* NTPSHM_ENABLE */ diff --git a/driver_ubx.c b/driver_ubx.c index 6f92a570..3dc76822 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -840,9 +840,6 @@ const struct gps_type_t ubx_binary = { #ifdef CONTROLSEND_ENABLE .control_send = ubx_control_send, /* no control sender yet */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/driver_zodiac.c b/driver_zodiac.c index 1682acb0..1af2250d 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -522,9 +522,6 @@ const struct gps_type_t zodiac_binary = #ifdef CONTROLSEND_ENABLE .control_send = zodiac_control_send, /* for gpsctl and friends */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = zodiac_ntp_offset, /* compute NTO fudge factor */ #endif /* NTPSHM_ENABLE */ @@ -107,9 +107,6 @@ const struct gps_type_t unknown = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -274,9 +271,6 @@ const struct gps_type_t nmea = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -378,9 +372,6 @@ const struct gps_type_t garmin = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -443,9 +434,6 @@ const struct gps_type_t ashtech = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -497,9 +485,6 @@ const struct gps_type_t fv18 = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -554,9 +539,6 @@ const struct gps_type_t gpsclock = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -612,9 +594,6 @@ static const struct gps_type_t tripmate = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -666,9 +645,6 @@ static const struct gps_type_t earthmate = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ @@ -792,9 +768,6 @@ const struct gps_type_t trueNorth = { #ifdef CONTROLSEND_ENABLE .control_send = tnt_control_send, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -873,9 +846,6 @@ static const struct gps_type_t oceanServer = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -943,9 +913,6 @@ static const struct gps_type_t fury = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -1000,9 +967,6 @@ static const struct gps_type_t rtcm104v2 = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -1049,9 +1013,6 @@ static const struct gps_type_t rtcm104v3 = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -1087,9 +1048,6 @@ static const struct gps_type_t garmintxt = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -1179,9 +1137,6 @@ const struct gps_type_t mtk3301 = { #ifdef CONTROLSEND_ENABLE .control_send = nmea_write, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, #endif /* NTPSHM_ ENABLE */ @@ -1416,9 +1371,6 @@ const struct gps_type_t aivdm = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* no control sender */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no NTP communication */ #endif /* NTPSHM_ ENABLE */ @@ -1517,9 +1469,6 @@ const struct gps_type_t json_passthrough = { #ifdef CONTROLSEND_ENABLE .control_send = NULL, /* how to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef VISUALIZE_ENABLE - .visualize = NULL, /* no visualization method */ -#endif /* VISUALIZE_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = NULL, /* no method for NTP fudge factor */ #endif /* NTPSHM_ ENABLE */ diff --git a/gpsd.h-tail b/gpsd.h-tail index 9252c1d8..ced2f346 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -318,9 +318,6 @@ struct gps_type_t { #endif /* RECONFIGURE_ENABLE */ #ifdef CONTROLSEND_ENABLE /*@null@*/ssize_t (*control_send)(struct gps_device_t *session, char *buf, size_t buflen); -#ifdef VISUALIZE_ENABLE - /*@null@*/ssize_t (*visualize)(struct gps_device_t *session, char *buf, size_t buflen); -#endif /* VISUALIZE_ENABLE */ #endif /* CONTROLSEND_ENABLE */ #ifdef NTPSHM_ENABLE /*@null@*/double (*ntp_offset)(struct gps_device_t *session); |