summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-09 01:54:47 +0000
committerrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-09 01:54:47 +0000
commit49f1409173c38a9d9c42575aa23226bf85a279e5 (patch)
treea6ff54b3ef79d5aab427037a4c25642fdcb7757b
parent4eede601f86955bafe1d6d0f5f436725c34761d9 (diff)
downloadchromium_src-49f1409173c38a9d9c42575aa23226bf85a279e5.zip
chromium_src-49f1409173c38a9d9c42575aa23226bf85a279e5.tar.gz
chromium_src-49f1409173c38a9d9c42575aa23226bf85a279e5.tar.bz2
Revert 249835 "Add fallback support for custom serial baud rates..."
This has created more problems than it has resolved. > Add fallback support for custom serial baud rates on OS X. > > Many drivers do not support the IOSSIOSPEED ioctl, but do > support arbitrary baud rates. This adds a fallback for cases > where IOSSIOSPEED fails. > > BUG=337482 > TEST=manual > > Review URL: https://codereview.chromium.org/137653005 TBR=rockot@chromium.org Review URL: https://codereview.chromium.org/137433014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249955 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/api/serial/serial_connection_posix.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/extensions/api/serial/serial_connection_posix.cc b/chrome/browser/extensions/api/serial/serial_connection_posix.cc
index ba35cca..18a2119 100644
--- a/chrome/browser/extensions/api/serial/serial_connection_posix.cc
+++ b/chrome/browser/extensions/api/serial/serial_connection_posix.cc
@@ -107,13 +107,7 @@ bool SetCustomBitrate(base::PlatformFile file,
return ioctl(file, TIOCSSERIAL, &serial) >= 0;
#elif defined(OS_MACOSX)
speed_t speed = static_cast<speed_t>(bitrate);
- if (ioctl(file, IOSSIOSPEED, &speed) >= 0)
- return true;
- // Where IOSSIOSPEED is unsupported, attempt to set
- // the speed directly to the requested value.
- cfsetispeed(config, speed);
- cfsetospeed(config, speed);
- return true;
+ return ioctl(file, IOSSIOSPEED, &speed) != -1;
#else
return false;
#endif