summaryrefslogtreecommitdiff
path: root/gpsd.h
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2005-08-17 15:56:19 +0000
committerEric S. Raymond <esr@thyrsus.com>2005-08-17 15:56:19 +0000
commiteb3c59bffd9478063638c00c29c036cbaac16066 (patch)
treec9093c1b179f121bc216fb4357f977f6946404ab /gpsd.h
parent52c1506c788a9bccd847001a47de42a7551b55c4 (diff)
downloadgpsd-eb3c59bffd9478063638c00c29c036cbaac16066.tar.gz
Minor changes to SiRF initialization.
splint cleanup. BINARY_ENABLE won't be needed for NMEA.
Diffstat (limited to 'gpsd.h')
-rw-r--r--gpsd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpsd.h b/gpsd.h
index dddc1741..98ceb499 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -147,7 +147,6 @@ struct gps_device_t {
# endif /* PPS_ENABLE */
#endif /* NTPSHM_ENABLE */
struct gps_fix_t lastfix; /* use to compute uncertainties */
-#ifdef BINARY_ENABLE
double mag_var; /* Magnetic variation in degrees */
/*
* The rest of this structure is driver-specific private storage.
@@ -163,6 +162,7 @@ struct gps_device_t {
double subseconds;
} nmea;
#endif /* NMEA_ENABLE */
+#ifdef BINARY_ENABLE
#ifdef SIRFII_ENABLE
struct {
unsigned int driverstate; /* for private use */
@@ -222,8 +222,8 @@ struct gps_device_t {
isgps30bits_t buf[RTCM_WORDS_MAX];
unsigned int bufindex;
} isgps;
- } driver;
#endif /* BINARY_ENABLE */
+ } driver;
};
#define IS_HIGHEST_BIT(v,m) (v & ~((m<<1)-1))==0