diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-09-13 10:38:54 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-09-13 10:38:54 +0000 |
| commit | fa644e4d0bb65cea5214f3cc02ce4421c8000925 (patch) | |
| tree | 42183f085cf1ee9b57fc9e32dce928e1f1590d2b /driver_sirf.c | |
| parent | bfede96dcb989353be781759f337a7b34393aac2 (diff) | |
| download | gpsd-fa644e4d0bb65cea5214f3cc02ce4421c8000925.tar.gz | |
Fold the probe_wakup method into the new generic lifetime-event hook.
This finishes the bug refactoring; now we're ready to do actual
behavior changes.
Codebase splints clean. All regression tests pass.
Diffstat (limited to 'driver_sirf.c')
| -rw-r--r-- | driver_sirf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/driver_sirf.c b/driver_sirf.c index 5632e7ab..7145906e 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -1029,20 +1029,19 @@ const struct gps_type_t sirf_binary = .packet_type = SIRF_PACKET, /* associated lexer packet type */ .trigger = NULL, /* no trigger */ .channels = SIRF_CHANNELS, /* consumer-grade GPS */ - .probe_wakeup = NULL, /* no wakeup to be done before hunt */ .probe_detect = NULL, /* no probe */ .get_packet = sirf_get, /* be prepared for SiRF or NMEA */ .parse_packet = sirfbin_parse_input,/* parse message packets */ .rtcm_writer = pass_rtcm, /* send RTCM data straight */ -#ifdef ALLOW_CONTROLSEND - .control_send = sirf_control_send,/* how to send a control string */ -#endif /* ALLOW_CONTROLSEND */ + .event_hook = sirfbin_event_hook,/* lifetime event handler */ #ifdef ALLOW_RECONFIGURE - .event_hook = sirfbin_event_hook,/* initialize the device */ .speed_switcher = sirfbin_speed, /* we can change baud rate */ .mode_switcher = sirfbin_mode, /* there's a mode switcher */ .rate_switcher = NULL, /* no sample-rate switcher */ .min_cycle = 1, /* not relevant, no rate switch */ #endif /* ALLOW_RECONFIGURE */ +#ifdef ALLOW_CONTROLSEND + .control_send = sirf_control_send,/* how to send a control string */ +#endif /* ALLOW_CONTROLSEND */ }; #endif /* defined(SIRF_ENABLE) && defined(BINARY_ENABLE) */ |