diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2005-07-01 17:48:32 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2005-07-01 17:48:32 +0000 |
| commit | a72363ad250b223fe4dd2d4a59723db03c5ef7c4 (patch) | |
| tree | 893069803ff290916e279fa86a62c24fa9cf8db2 /libgpsd_core.c | |
| parent | 0872169735abe3ecb174aa146c93bea66c943c18 (diff) | |
| download | gpsd-a72363ad250b223fe4dd2d4a59723db03c5ef7c4.tar.gz | |
Move driver-specific members into a union in order to save some storage.
Diffstat (limited to 'libgpsd_core.c')
| -rw-r--r-- | libgpsd_core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libgpsd_core.c b/libgpsd_core.c index 049b5874..f77dc4dc 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -150,7 +150,7 @@ int gpsd_activate(struct gps_device_t *session) else { session->gpsdata.online = timestamp(); #ifdef SIRFII_ENABLE - session->satcounter = 0; + session->sirf.satcounter = 0; #endif /* SIRFII_ENABLE */ session->counter = 0; gpsd_report(1, "gpsd_activate: opened GPS (%d)\n", session->gpsdata.gps_fd); @@ -295,13 +295,15 @@ static void gpsd_binary_satellite_dump(struct gps_device_t *session, } #ifdef ZODIAC_ENABLE - if (session->Zs[0] != 0) { + if (session->packet_type == ZODIAC_PACKET && session->zodiac.Zs[0] != 0) { bufp += strlen(bufp); bufp2 = bufp; strcpy(bufp, "$PRWIZCH"); for (i = 0; i < ZODIAC_CHANNELS; i++) { len -= snprintf(bufp+strlen(bufp), len, - ",%02u,%X", session->Zs[i], session->Zv[i] & 0x0f); + ",%02u,%X", + session->zodiac.Zs[i], + session->zodiac.Zv[i] & 0x0f); } nmea_add_checksum(bufp2); } |