diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 13:12:10 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 13:12:10 +0000 |
| commit | 6b070fe325b731a967f8ace8dc2b5d2786676014 (patch) | |
| tree | 252cf17959eb80572d6088ed7d67f9ce6d647005 /driver_superstar2.c | |
| parent | 894add2589562cf783f444ca7e83943045ffae43 (diff) | |
| download | gpsd-6b070fe325b731a967f8ace8dc2b5d2786676014.tar.gz | |
Major rearrangement of device members in struct gpsdata_t...
...documented in the protocol-transition white paper. All regression
tests pass.
Diffstat (limited to 'driver_superstar2.c')
| -rw-r--r-- | driver_superstar2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver_superstar2.c b/driver_superstar2.c index d4a5a9b0..f95197f6 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -535,13 +535,13 @@ static gps_mask_t superstar2_parse_input(struct gps_device_t *session) if (session->packet.type == SUPERSTAR2_PACKET){ st = superstar2_dispatch(session, session->packet.outbuffer, session->packet.length); - session->gpsdata.driver_mode = MODE_BINARY; + session->gpsdata.dev.driver_mode = MODE_BINARY; return st; #ifdef NMEA_ENABLE } else if (session->packet.type == NMEA_PACKET) { st = nmea_parse((char *)session->packet.outbuffer, session); (void)gpsd_switch_driver(session, "Generic NMEA"); - session->gpsdata.driver_mode = MODE_NMEA; + session->gpsdata.dev.driver_mode = MODE_NMEA; return st; #endif /* NMEA_ENABLE */ } else @@ -569,7 +569,7 @@ static bool superstar2_set_speed(struct gps_device_t *session, speed_t speed, char parity, int stopbits) { /* parity and stopbit switching aren't available on this chip */ - if (parity!=(char)session->gpsdata.parity || (unsigned int)stopbits!=session->gpsdata.stopbits) { + if (parity!=(char)session->gpsdata.dev.parity || (unsigned int)stopbits!=session->gpsdata.dev.stopbits) { return false; } else { /*@ +charint @*/ @@ -590,7 +590,7 @@ static void superstar2_set_mode(struct gps_device_t *session, int mode) char mode_msg[] = {0x01, 0x48, 0xB7, 0x01, 0x00, 0x00, 0x00}; /* high bit 0 in the mode word means set NMEA mode */ - mode_msg[4] = (char)(session->gpsdata.baudrate / 300); + mode_msg[4] = (char)(session->gpsdata.dev.baudrate / 300); (void)superstar2_write(session, mode_msg, 7); /*@ -charint @*/ } else { |