From abb7c5d31235af27b4b3ac620b97a8c5260f26a3 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 1 Apr 2011 04:29:17 -0400 Subject: Regularize some names. --- driver_zodiac.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'driver_zodiac.c') diff --git a/driver_zodiac.c b/driver_zodiac.c index 92b5ced8..cbc4cee2 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -419,7 +419,7 @@ static gps_mask_t zodiac_analyze(struct gps_device_t *session) } } -#ifdef ALLOW_CONTROLSEND +#ifdef CONTROLSEND_ENABLE static ssize_t zodiac_control_send(struct gps_device_t *session, char *msg, size_t len) { @@ -429,9 +429,9 @@ static ssize_t zodiac_control_send(struct gps_device_t *session, return zodiac_spew(session, shortwords[0], shortwords + 1, (int)(len / 2 - 1)); } -#endif /* ALLOW_CONTROLSEND */ +#endif /* CONTROLSEND_ENABLE */ -#ifdef ALLOW_RECONFIGURE +#ifdef RECONFIGURE_ENABLE static bool zodiac_speed_switch(struct gps_device_t *session, speed_t speed, char parity, int stopbits) { @@ -469,7 +469,7 @@ static bool zodiac_speed_switch(struct gps_device_t *session, (void)zodiac_spew(session, 1330, data, 15); return true; /* it would be nice to error-check this */ } -#endif /* ALLOW_RECONFIGURE */ +#endif /* RECONFIGURE_ENABLE */ #ifdef NTPSHM_ENABLE static double zodiac_ntp_offset(struct gps_device_t *session UNUSED) @@ -496,15 +496,15 @@ const struct gps_type_t zodiac_binary = .parse_packet = zodiac_analyze, /* parse message packets */ .rtcm_writer = zodiac_send_rtcm, /* send DGPS correction */ .event_hook = NULL, /* no configuration */ -#ifdef ALLOW_RECONFIGURE +#ifdef RECONFIGURE_ENABLE .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 +#endif /* RECONFIGURE_ENABLE */ +#ifdef CONTROLSEND_ENABLE .control_send = zodiac_control_send, /* for gpsctl and friends */ -#endif /* ALLOW_CONTROLSEND */ +#endif /* CONTROLSEND_ENABLE */ #ifdef NTPSHM_ENABLE .ntp_offset = zodiac_ntp_offset, /* compute NTO fudge factor */ #endif /* NTPSHM_ENABLE */ -- cgit v1.2.1