diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 14:56:04 +0000 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 14:56:04 +0000 |
commit | 447a4137a696299725e3dc9840efc1fb94a629e6 (patch) | |
tree | fe629c5d13ff789339f5ad2e5e351dfe03e9a9ff /gps.h | |
parent | 6b070fe325b731a967f8ace8dc2b5d2786676014 (diff) | |
download | gpsd-447a4137a696299725e3dc9840efc1fb94a629e6.tar.gz |
Merge two structures that didn't need to exist separately.
All regression tests pass.
Diffstat (limited to 'gps.h')
-rw-r--r-- | gps.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -821,7 +821,7 @@ struct version_t { int api_major, api_minor; /* API major and minor versions */ }; -struct device_t { +struct devconfig_t { char path[GPS_PATH_MAX]; int flags; #define SEEN_GPS 0x01 @@ -831,9 +831,9 @@ struct device_t { char driver[64]; char subtype[64]; double activated; - unsigned int baudrate, parity, stopbits; /* RS232 link parameters */ + int baudrate, parity, stopbits; /* RS232 link parameters */ double cycle, mincycle; /* refresh cycle time in seconds */ - unsigned int driver_mode; /* is driver in native mode or not? */ + int driver_mode; /* is driver in native mode or not? */ }; struct watch_t { @@ -916,7 +916,7 @@ struct gps_data_t { int azimuth[MAXCHANNELS]; /* azimuth */ double ss[MAXCHANNELS]; /* signal-to-noise ratio (dB) */ - struct device_t dev; /* device that shipped last update */ + struct devconfig_t dev; /* device that shipped last update */ /* pack things that are never reported together to reduce structure size */ union { @@ -931,7 +931,7 @@ struct gps_data_t { struct { double time; int ndevices; - struct device_t list[MAXDEVICES_PER_USER]; + struct devconfig_t list[MAXDEVICES_PER_USER]; } devices; }; |