diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-11-13 20:03:04 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-11-13 21:10:58 -0500 |
| commit | cfc75901928f2eb1ce3de20a747b2d01fb11093d (patch) | |
| tree | 42844e11b2198d864b03b4c235c3e64cd8bf225a | |
| parent | bf5b00068962e2ca62e3ce1a79fd588232fe4e06 (diff) | |
| download | gpsd-cfc75901928f2eb1ce3de20a747b2d01fb11093d.tar.gz | |
Clean up an obsolete comment and redundant #ifdef.
All regression tests pass. PPS is live in both gpsd and gpsmon.
| -rw-r--r-- | driver_ais.c | 1 | ||||
| -rw-r--r-- | gpsd.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/driver_ais.c b/driver_ais.c index a5c48cb2..0bc40361 100644 --- a/driver_ais.c +++ b/driver_ais.c @@ -1056,6 +1056,7 @@ bool ais_binary_decode(const int debug, * the destination MMSI */ ais->type25.bitcount = bitlen - 40 - 16*ais->type25.structured; + /* bit 40 is exactly 5 bytes in; 2 bytes is 16 bits */ (void)memcpy(ais->type25.bitdata, (char *)bits+5 + 2 * ais->type25.structured, (ais->type25.bitcount + 7) / 8); @@ -1680,7 +1680,6 @@ static void ship_pps_drift_message(struct gps_device_t *session, /* on PPS interrupt, ship a drift message to all clients */ { #ifdef SOCKET_EXPORT_ENABLE -#ifdef PPS_ENABLE #define PPSBAR "#----------------------------------- PPS -----------------------------------#\n" struct subscriber_t *sub; @@ -1689,13 +1688,8 @@ static void ship_pps_drift_message(struct gps_device_t *session, (void)throttled_write(sub, PPSBAR, strlen(PPSBAR)); } } -#endif /* PPS_ENABLE */ #undef PPSBAR /*@-type@*//* splint is confused about struct timespec */ - /* - * Yes, real_nsec is constant 0 because our "real time" is top of GPS - * second. This will change when we support 5Hz devices fully. - */ notify_watchers(session, "{\"class\":\"PPS\",\"device\":\"%s\",\"real_sec\":%ld, \"real_nsec\":%ld,\"clock_sec\":%ld,\"clock_nsec\":%ld}\r\n", session->gpsdata.dev.path, td->real.tv_sec, td->real.tv_nsec, |