Mirrors_Framework/c-periphery
1
0
Fork 0
mirror of https://github.com/vsergeev/c-periphery.git synced 2026-09-21 03:43:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

serial: clean up variables in serial_read()

Browse Source
This commit is contained in:
Vanya A. Sergeev
2020-05-28 00:04:13 -05:00
parent cd91ddd6fe
commit 42d9b38fb3
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serial.c
+6 -9
View File
@@ -238,18 +238,16 @@ int serial_open_advanced(serial_t *serial, const char *path, uint32_t baudrate,
}
int serial_read(serial_t *serial, uint8_t *buf, size_t len, int timeout_ms) {
size_t bytes_left, bytes_read;
ssize_t ret;
fd_set rfds;
struct timeval tv_timeout;
struct timeval tv_timeout;
tv_timeout.tv_sec = timeout_ms / 1000;
tv_timeout.tv_usec = (timeout_ms % 1000) * 1000;
bytes_left = len;
bytes_read = 0;
size_t bytes_read = 0;
do {
while (bytes_read < len) {
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(serial->fd, &rfds);
@@ -260,7 +258,7 @@ int serial_read(serial_t *serial, uint8_t *buf, size_t len, int timeout_ms) {
if (ret == 0)
break;
if ((ret = read(serial->fd, buf + bytes_read, bytes_left)) < 0)
if ((ret = read(serial->fd, buf + bytes_read, len - bytes_read)) < 0)
return _serial_error(serial, SERIAL_ERROR_IO, errno, "Reading serial port");
/* Empty read */
@@ -268,8 +266,7 @@ int serial_read(serial_t *serial, uint8_t *buf, size_t len, int timeout_ms) {
return _serial_error(serial, SERIAL_ERROR_IO, 0, "Reading serial port: unexpected empty read");
bytes_read += ret;
bytes_left -= ret;
} while (bytes_left > 0);
}
return bytes_read;
}