diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-09-13 03:30:05 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-09-13 03:30:05 +0000 |
| commit | 00cd07ffcaa670709bc492e01d5c97be0262580b (patch) | |
| tree | 4f21deae21586a533b279d272d74af3a0899b5e1 /driver_evermore.c | |
| parent | bff151b7897e75612f871d44087c6f90cf412b52 (diff) | |
| download | gpsd-00cd07ffcaa670709bc492e01d5c97be0262580b.tar.gz | |
Merge the configurator and probe_subtype methods.
They're now distinguished by an event argument passed to the common
hook function. This is a refactoring step - later, we'll define more
and different events for finer-grained control. All regression tests
pass.
Diffstat (limited to 'driver_evermore.c')
| -rw-r--r-- | driver_evermore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver_evermore.c b/driver_evermore.c index f24495e1..454781f9 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -483,12 +483,13 @@ static void evermore_mode(struct gps_device_t *session, int mode) } } -static void evermore_configurator(struct gps_device_t *session, unsigned int seq) +static void evermore_configurator(struct gps_device_t *session, + event_t event, unsigned int seq) { gpsd_report(LOG_PROG, "evermore_configurator(%d)\n", seq); - (void) evermore_nmea_config(session, 1); /* configure NMEA messages for gpsd (GPGSV every 5s) */ - if (seq == 0) { + if (event == event_configure && seq == 0) { if (session->packet.type == NMEA_PACKET) { + (void) evermore_nmea_config(session, 1); /* configure NMEA messages for gpsd (GPGSV every 5s) */ gpsd_report(LOG_WARN, "NMEA_PACKET packet\n"); } (void) evermore_mode(session, 1); /* switch GPS to binary mode */ @@ -535,7 +536,6 @@ const struct gps_type_t evermore_binary = .channels = EVERMORE_CHANNELS, /* consumer-grade GPS */ .probe_wakeup = NULL, /* no wakeup to be done before hunt */ .probe_detect = NULL, /* no probe */ - .probe_subtype = NULL, /* no subtype probing */ .get_packet = generic_get, /* use generic one */ .parse_packet = evermore_parse_input, /* parse message packets */ .rtcm_writer = pass_rtcm, /* send RTCM data straight */ |