BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial: Deduplicate log messages a bit.

This commit is contained in:
Uwe Hermann 2012-11-10 01:42:32 +01:00
parent c073af80f8
commit 302c4b5ab5
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/common/serial.c
View File

@ -197,8 +197,6 @@ SR_PRIV int serial_flush(int fd)
*/ */
SR_PRIV int serial_write(int fd, const void *buf, size_t count) SR_PRIV int serial_write(int fd, const void *buf, size_t count)
{ {
sr_spew("FD %d: Writing %d bytes.", fd, count);
#ifdef _WIN32 #ifdef _WIN32
DWORD tmp = 0; DWORD tmp = 0;
@ -212,8 +210,8 @@ SR_PRIV int serial_write(int fd, const void *buf, size_t count)
ret = write(fd, buf, count); ret = write(fd, buf, count);
if (ret < 0) if (ret < 0)
sr_err("FD %d: Write error: %s.", fd, strerror(errno)); sr_err("FD %d: Write error: %s.", fd, strerror(errno));
else if ((size_t)ret != count) else
sr_spew("FD %d: Only wrote %d/%d bytes.", fd, ret, count); sr_spew("FD %d: Wrote %d/%d bytes.", fd, ret, count);
return ret; return ret;
#endif #endif
@ -230,8 +228,6 @@ SR_PRIV int serial_write(int fd, const void *buf, size_t count)
*/ */
SR_PRIV int serial_read(int fd, void *buf, size_t count) SR_PRIV int serial_read(int fd, void *buf, size_t count)
{ {
sr_spew("FD %d: Reading %d bytes.", fd, count);
#ifdef _WIN32 #ifdef _WIN32
DWORD tmp = 0; DWORD tmp = 0;
@ -249,8 +245,8 @@ SR_PRIV int serial_read(int fd, void *buf, size_t count)
* "Resource temporarily unavailable" messages. * "Resource temporarily unavailable" messages.
*/ */
sr_spew("FD %d: Read error: %s.", fd, strerror(errno)); sr_spew("FD %d: Read error: %s.", fd, strerror(errno));
} else if ((size_t)ret != count) { } else {
sr_spew("FD %d: Only read %d/%d bytes.", fd, ret, count); sr_spew("FD %d: Read %d/%d bytes.", fd, ret, count);
} }
return ret; return ret;