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

fluke-dmm: Make serial write calls block, and fix error handling. 

These calls are executed from an event handler and were previously nonblocking,
but have no partial write handling. They send short packets so should be OK to
block, most likely the output buffer will be empty anyway.

Also fix error handling for these calls, which seems to have been retained from
previous direct usage of write() to a serial port fd.
This commit is contained in:
Martin Ling 2014-09-21 18:26:16 +01:00 committed by Uwe Hermann
parent 50276118ca
commit bb27c76513
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hardware/fluke-dmm/fluke.c
View File

@ -456,9 +456,8 @@ static void handle_line(const struct sr_dev_inst *sdi)
/* Slip the request in now, before the main
* timer loop asks for metadata again. */
n = sprintf(cmd, "QM %d\r", devc->meas_type);
if (serial_write(serial, cmd, n) == -1)
sr_err("Unable to send QM (measurement): %s.",
strerror(errno));
if (serial_write_blocking(serial, cmd, n) < 0)
sr_err("Unable to send QM (measurement).");
}
} else {
/* Response to QM <n> measurement request. */
@ -526,8 +525,8 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
* out-of-sync or temporary disconnect issues. */
if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
|| elapsed > devc->profile->timeout) {
if (serial_write(serial, "QM\r", 3) == -1)
sr_err("Unable to send QM: %s.", strerror(errno));
if (serial_write_blocking(serial, "QM\r", 3) < 0)
sr_err("Unable to send QM.");
devc->cmd_sent_at = now;
devc->expect_response = TRUE;
}