diff options
| author | Gary E. Miller <gem@rellim.com> | 2016-05-26 13:08:01 -0700 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2016-05-26 13:08:01 -0700 |
| commit | b3d513f898a760de624b34a2655ce251708f3d67 (patch) | |
| tree | f3833ea872ecbac6f00e69609da515435d90e26e /serial.c | |
| parent | b62f1c15d20e58d87e8a26c2b151397ba98ae80d (diff) | |
| download | gpsd-b3d513f898a760de624b34a2655ce251708f3d67.tar.gz | |
Basically revert 56a2a6eb494c6dbc454bad518df8861c9258ad5b
This was the wrong place to stop calls to gpsd_set_speed().
Other places call gpsd_set_speed() so the check for devices that
should not have their speed set with tcsetattr() should be in in
gpsd_set_speed.
More on this soon.
Diffstat (limited to 'serial.c')
| -rw-r--r-- | serial.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -419,7 +419,6 @@ int gpsd_serial_open(struct gps_device_t *session) */ { - bool no_ttyset = false; mode_t mode = (mode_t) O_RDWR; session->sourcetype = gpsd_classify(session->gpsdata.dev.path); @@ -530,7 +529,6 @@ int gpsd_serial_open(struct gps_device_t *session) return UNALLOCATED_FD; } #endif /* __linux__ */ - no_ttyset = true; } #ifdef FIXED_PORT_SPEED @@ -549,7 +547,7 @@ int gpsd_serial_open(struct gps_device_t *session) } session->lexer.type = BAD_PACKET; - if ( 0 != isatty(session->gpsdata.gps_fd) && false == no_ttyset ) { + if ( 0 != isatty(session->gpsdata.gps_fd) ) { /* Save original terminal parameters */ if (tcgetattr(session->gpsdata.gps_fd, &session->ttyset_old) != 0) |