Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-23 04:04:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from wjwwood/clearpathrobotics-timespec-refactor

Browse Source 
whitespace clean up
This commit is contained in:
Mike Purvis 2013-10-15 15:18:37 -07:00
commit 8938a13753
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/impl/unix.cc
View File

@ -523,12 +523,12 @@ Serial::SerialImpl::read (uint8_t *buf, size_t size)
read_timeout_constant_ + (read_timeout_multiplier_ * size)); read_timeout_constant_ + (read_timeout_multiplier_ * size));
// If there are already some bytes waiting to read, put those in the return // If there are already some bytes waiting to read, put those in the return
// buffer before setting up the first select call. This is important for // buffer before setting up the first select call. This is important for
// performance reasons, as select/pselect can relinquish the thread even // performance reasons, as select/pselect can relinquish the thread even
// with data waiting. // with data waiting.
size_t bytes_read = 0; size_t bytes_read = 0;
if (available() > 0) { if (available() > 0) {
ssize_t bytes_read_now = ::read (fd_, buf, size); ssize_t bytes_read_now = ::read (fd_, buf, size);
if (bytes_read_now < 1) { if (bytes_read_now < 1) {
throw SerialException ("device reports readiness to read but " throw SerialException ("device reports readiness to read but "
"returned no data (device disconnected?)"); "returned no data (device disconnected?)");
@ -599,7 +599,7 @@ Serial::SerialImpl::read (uint8_t *buf, size_t size)
} }
// This shouldn't happen, if r > 0 our fd has to be in the list! // This shouldn't happen, if r > 0 our fd has to be in the list!
THROW (IOException, "pselect reports ready to read, but our fd isn't" THROW (IOException, "pselect reports ready to read, but our fd isn't"
" in the list, this shouldn't happen!"); " in the list, this shouldn't happen!");
} }
} }
return bytes_read; return bytes_read;
@ -699,7 +699,7 @@ void
Serial::SerialImpl::setTimeout (const serial::Timeout &timeout) Serial::SerialImpl::setTimeout (const serial::Timeout &timeout)
{ {
timeout_ = timeout; timeout_ = timeout;
// Cache the timespec conversions, as that's what the rest of the inner // Cache the timespec conversions, as that's what the rest of the inner
// class operates on. // class operates on.
inter_byte_timeout_ = timespec_from_millis(timeout.inter_byte_timeout); inter_byte_timeout_ = timespec_from_millis(timeout.inter_byte_timeout);