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_zodiac.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_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 1ec5e425..e039a30b 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -496,21 +496,20 @@ const struct gps_type_t zodiac_binary = .packet_type = ZODIAC_PACKET, /* associated lexer packet type */ .trigger = NULL, /* no trigger */ .channels = 12, /* consumer-grade GPS */ - .probe_wakeup = NULL, /* no probe on baud rate change */ .probe_detect = NULL, /* no probe */ .get_packet = generic_get, /* use the generic packet getter */ .parse_packet = zodiac_analyze, /* parse message packets */ .rtcm_writer = zodiac_send_rtcm, /* send DGPS correction */ -#ifdef ALLOW_CONTROLSEND - .control_send = zodiac_control_send, /* for gpsctl and friends */ -#endif /* ALLOW_CONTROLSEND */ + .event_hook = NULL, /* no configuration */ #ifdef ALLOW_RECONFIGURE - .event_hook = NULL, /* no configuration */ .speed_switcher = zodiac_speed_switch,/* we can change baud rate */ .mode_switcher = NULL, /* no 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 = zodiac_control_send, /* for gpsctl and friends */ +#endif /* ALLOW_CONTROLSEND */ }; #endif /* ZODIAC_ENABLE */ |