diff options
| -rw-r--r-- | gpsctl.c | 6 | ||||
| -rw-r--r-- | gpsd.h-tail | 2 | ||||
| -rw-r--r-- | sirf.c | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -319,7 +319,7 @@ int main(int argc, char **argv) gpsd_set_speed(&session, 4800, 'N', 1); for (i = 0; i < 3; i++) if (session.device_type->mode_switcher) - session.device_type->mode_switcher(&session, 0); + session.device_type->mode_switcher(&session, MODE_NMEA); gpsd_wrap(&session); exit(0); } else { @@ -409,7 +409,7 @@ int main(int argc, char **argv) if (session.gpsdata.driver_mode == 0) (void)fprintf(stderr, "gpsctl: already in NMEA mode.\n"); else { - session.device_type->mode_switcher(&session, 0); + session.device_type->mode_switcher(&session, MODE_NMEA); if (session.gpsdata.driver_mode != 0) { (void)fprintf(stderr, "gpsctl: mode change failed\n"); status = 1; @@ -421,7 +421,7 @@ int main(int argc, char **argv) (void)fprintf(stderr, "gpsctl: already in native mode.\n"); session.back_to_nmea = false; } else { - session.device_type->mode_switcher(&session, 1); + session.device_type->mode_switcher(&session, MODE_BINARY); if (session.gpsdata.driver_mode != 1) { (void)fprintf(stderr, "gpsctl: mode change failed\n"); status = 1; diff --git a/gpsd.h-tail b/gpsd.h-tail index 909bf97d..135a33bd 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -194,6 +194,8 @@ struct gps_type_t { /*@null@*/ssize_t (*rtcm_writer)(struct gps_device_t *session, char *rtcmbuf, size_t rtcmbytes); /*@null@*/bool (*speed_switcher)(struct gps_device_t *session, speed_t speed); /*@null@*/void (*mode_switcher)(struct gps_device_t *session, int mode); +#define MODE_NMEA 0 +#define MODE_BINARY 1 /*@null@*/bool (*rate_switcher)(struct gps_device_t *session, double rate); int cycle_chars; #ifdef ALLOW_RECONFIGURE @@ -182,7 +182,7 @@ static bool sirf_to_nmea(int ttyfd, speed_t speed) static void sirfbin_mode(struct gps_device_t *session, int mode) { - if (mode == 0) { + if (mode == MODE_NMEA) { (void)sirf_to_nmea(session->gpsdata.gps_fd,session->gpsdata.baudrate); session->gpsdata.driver_mode = 0; /* NMEA */ (void)gpsd_switch_driver(session, "Generic NMEA"); |