if (revents == G_IO_IN) { /* Serial data arrived. */
while (GMC_BUFSIZE - devc->buflen - 1 > 0) {
- len = serial_read(serial, devc->buf + devc->buflen, 1);
+ len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
if (len < 1)
break;
buf = *(devc->buf + devc->buflen);
if (revents == G_IO_IN) { /* Serial data arrived. */
while (GMC_BUFSIZE - devc->buflen - 1 > 0) {
- len = serial_read(serial, devc->buf + devc->buflen, 1);
+ len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
if (len < 1)
break;
buf = *(devc->buf + devc->buflen);
devc->cmd_idx = 0;
create_cmd_14(devc->addr, 8, params, msg);
devc->req_sent_at = g_get_monotonic_time();
- if (serial_write(serial, msg, sizeof(msg)) == -1) {
+ if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) {
return SR_ERR;
}
if (power_on) {
sr_info("Write some data and wait 3s to turn on powered off device...");
- if (serial_write(serial, msg, sizeof(msg)) < 0)
+ if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
return SR_ERR;
g_usleep(1*1000*1000);
- if (serial_write(serial, msg, sizeof(msg)) < 0)
+ if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
return SR_ERR;
g_usleep(1*1000*1000);
- if (serial_write(serial, msg, sizeof(msg)) < 0)
+ if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
return SR_ERR;
g_usleep(1*1000*1000);
serial_flush(serial);
/* Write message and wait for reply */
devc->req_sent_at = g_get_monotonic_time();
- if (serial_write(serial, msg, sizeof(msg)) == -1) {
+ if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) {
return SR_ERR;
}
params[0] = 5;
params[1] = 5;
create_cmd_14(devc->addr, 6, params, msg);
- if (serial_write(sdi->conn, msg, sizeof(msg)) == -1)
+ if (serial_write_blocking(sdi->conn, msg, sizeof(msg), 0) < 0)
return SR_ERR;
else
g_usleep(2000000); /* Wait to ensure transfer before interface switched off. */