while (!devices && retry < 3) {
retry++;
serial_flush(serial);
- if (serial_write_blocking(serial, "ID\r", 3) < 0) {
+ if (serial_write_blocking(serial, "ID\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
sr_err("Unable to send ID string");
continue;
}
continue;
/* Skip leading spaces in version number. */
for (s = 0; tokens[1][s] == ' '; s++);
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Fluke",
- tokens[0] + 6, tokens[1] + s)))
- return NULL;
+ sdi = sr_dev_inst_new();
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup("Fluke");
+ sdi->model = g_strdup(tokens[0] + 6);
+ sdi->version = g_strdup(tokens[1] + s);
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
sr_err("Device context malloc failed.");
return NULL;
if (!conn)
return NULL;
+ devices = NULL;
if (serialcomm) {
/* Use the provided comm specs. */
devices = fluke_scan(conn, serialcomm);
serial_source_add(sdi->session, serial, G_IO_IN, 50,
fluke_receive_data, (void *)sdi);
- if (serial_write_blocking(serial, "QM\r", 3) < 0) {
+ if (serial_write_blocking(serial, "QM\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
sr_err("Unable to send QM.");
return SR_ERR;
}