if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
return NULL;
- if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return NULL;
serial_flush(serial);
nmadmm_requests[NMADMM_REQ_IDN].req_str);
g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */
for (cnt = 0; cnt < 7; cnt++) {
- if (serial_write_blocking(serial, req, strlen(req)) < 0) {
+ if (serial_write_blocking(serial, req, strlen(req), 0) < 0) {
sr_err("Unable to send identification request.");
return NULL;
}
auxtype = xgittoint(buf[7]);
sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9);
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
- get_brandstr(drv), get_typestr(auxtype, drv), buf + 9)))
- return NULL;
+ sdi = sr_dev_inst_new();
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup(get_brandstr(drv));
+ sdi->model = g_strdup(get_typestr(auxtype, drv));
+ sdi->version = g_strdup(buf + 9);
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
sr_err("Device context malloc failed.");
return NULL;