Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: device/serial/serial_io_handler_posix.cc

Issue 2644543003: Rename device.serial.ParityBit.NO to avoid a clash with NO in objective C. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « device/serial/serial_io_handler.cc ('k') | device/serial/serial_io_handler_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/serial/serial_io_handler_posix.h" 5 #include "device/serial/serial_io_handler_posix.h"
6 6
7 #include <sys/ioctl.h> 7 #include <sys/ioctl.h>
8 #include <termios.h> 8 #include <termios.h>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 DCHECK(options().parity_bit != serial::ParityBit::NONE); 217 DCHECK(options().parity_bit != serial::ParityBit::NONE);
218 switch (options().parity_bit) { 218 switch (options().parity_bit) {
219 case serial::ParityBit::EVEN: 219 case serial::ParityBit::EVEN:
220 config.c_cflag |= PARENB; 220 config.c_cflag |= PARENB;
221 config.c_cflag &= ~PARODD; 221 config.c_cflag &= ~PARODD;
222 break; 222 break;
223 case serial::ParityBit::ODD: 223 case serial::ParityBit::ODD:
224 config.c_cflag |= (PARODD | PARENB); 224 config.c_cflag |= (PARODD | PARENB);
225 break; 225 break;
226 case serial::ParityBit::NO: 226 case serial::ParityBit::NO_PARITY:
227 default: 227 default:
228 config.c_cflag &= ~(PARODD | PARENB); 228 config.c_cflag &= ~(PARODD | PARENB);
229 break; 229 break;
230 } 230 }
231 231
232 error_detect_state_ = ErrorDetectState::NO_ERROR; 232 error_detect_state_ = ErrorDetectState::NO_ERROR;
233 num_chars_stashed_ = 0; 233 num_chars_stashed_ = 0;
234 234
235 if (config.c_cflag & PARENB) { 235 if (config.c_cflag & PARENB) {
236 config.c_iflag &= ~IGNPAR; 236 config.c_iflag &= ~IGNPAR;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 info->data_bits = serial::DataBits::SEVEN; 485 info->data_bits = serial::DataBits::SEVEN;
486 } else if ((config.c_cflag & CSIZE) == CS8) { 486 } else if ((config.c_cflag & CSIZE) == CS8) {
487 info->data_bits = serial::DataBits::EIGHT; 487 info->data_bits = serial::DataBits::EIGHT;
488 } else { 488 } else {
489 info->data_bits = serial::DataBits::NONE; 489 info->data_bits = serial::DataBits::NONE;
490 } 490 }
491 if (config.c_cflag & PARENB) { 491 if (config.c_cflag & PARENB) {
492 info->parity_bit = (config.c_cflag & PARODD) ? serial::ParityBit::ODD 492 info->parity_bit = (config.c_cflag & PARODD) ? serial::ParityBit::ODD
493 : serial::ParityBit::EVEN; 493 : serial::ParityBit::EVEN;
494 } else { 494 } else {
495 info->parity_bit = serial::ParityBit::NO; 495 info->parity_bit = serial::ParityBit::NO_PARITY;
496 } 496 }
497 info->stop_bits = 497 info->stop_bits =
498 (config.c_cflag & CSTOPB) ? serial::StopBits::TWO : serial::StopBits::ONE; 498 (config.c_cflag & CSTOPB) ? serial::StopBits::TWO : serial::StopBits::ONE;
499 info->cts_flow_control = (config.c_cflag & CRTSCTS) != 0; 499 info->cts_flow_control = (config.c_cflag & CRTSCTS) != 0;
500 return info; 500 return info;
501 } 501 }
502 502
503 bool SerialIoHandlerPosix::SetBreak() { 503 bool SerialIoHandlerPosix::SetBreak() {
504 if (ioctl(file().GetPlatformFile(), TIOCSBRK, 0) != 0) { 504 if (ioctl(file().GetPlatformFile(), TIOCSBRK, 0) != 0) {
505 VPLOG(1) << "Failed to set break"; 505 VPLOG(1) << "Failed to set break";
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 memcpy(buffer, chars_stashed_, std::min(new_bytes_read, 2)); 631 memcpy(buffer, chars_stashed_, std::min(new_bytes_read, 2));
632 memcpy(chars_stashed_, tmp, num_chars_stashed_); 632 memcpy(chars_stashed_, tmp, num_chars_stashed_);
633 return new_bytes_read; 633 return new_bytes_read;
634 } 634 }
635 635
636 std::string SerialIoHandler::MaybeFixUpPortName(const std::string& port_name) { 636 std::string SerialIoHandler::MaybeFixUpPortName(const std::string& port_name) {
637 return port_name; 637 return port_name;
638 } 638 }
639 639
640 } // namespace device 640 } // namespace device
OLDNEW
« no previous file with comments | « device/serial/serial_io_handler.cc ('k') | device/serial/serial_io_handler_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698