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_ubx.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_ubx.c')
| -rw-r--r-- | driver_ubx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/driver_ubx.c b/driver_ubx.c index 3fca7947..cb045ffa 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -725,19 +725,18 @@ const struct gps_type_t ubx_binary = { .trigger = NULL, /* Response string that identifies device (not active) */ .channels = 50, /* Number of satellite channels supported by the device */ .probe_detect = NULL, /* Startup-time device detector */ - .probe_wakeup = NULL, /* Wakeup to be done before each baud hunt */ .get_packet = generic_get, /* Packet getter (using default routine) */ .parse_packet = parse_input, /* Parse message packets */ .rtcm_writer = NULL, /* RTCM handler (using default routine) */ -#ifdef ALLOW_CONTROLSEND - .control_send = ubx_control_send, /* no control sender yet */ -#endif /* ALLOW_CONTROLSEND */ + .event_hook = ubx_event_hook, /* Fiew in variious lifetime events */ #ifdef ALLOW_RECONFIGURE - .event_hook = ubx_event_hook, /* Enable what reports we need */ .speed_switcher = ubx_speed, /* Speed (baudrate) switch */ .mode_switcher = ubx_nmea_mode, /* Switch to NMEA mode */ .rate_switcher = ubx_rate, /* Message delivery rate switcher */ .min_cycle = 0.25, /* Maximum 4Hz sample rate */ #endif /* ALLOW_RECONFIGURE */ +#ifdef ALLOW_CONTROLSEND + .control_send = ubx_control_send, /* no control sender yet */ +#endif /* ALLOW_CONTROLSEND */ }; #endif /* defined(UBX_ENABLE) && defined(BINARY_ENABLE) */ |