struct dev_context *devc;
struct sr_dev_inst *sdi;
struct sr_config *src;
- GSList *devices, *l;
+ GSList *l;
const char *conn, *serialcomm;
struct sr_serial_dev_inst *serial;
char reply[50], **tokens, *dummy;
- devices = NULL;
conn = NULL;
serialcomm = NULL;
devc = NULL;
devc->voltage_max_device = g_strtod(tokens[0], &dummy) * devc->model->voltage[2];
g_strfreev(tokens);
- devices = g_slist_append(devices, sdi);
-
serial_close(serial);
- if (!devices)
- sr_serial_dev_inst_free(serial);
- return std_scan_complete(di, devices);
+ return std_scan_complete(di, g_slist_append(NULL, sdi));
exit_err:
sr_dev_inst_free(sdi);
devc = sdi->priv;
sr_sw_limits_acquisition_start(&devc->limits);
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
devc->reply_pending = FALSE;
devc->req_sent_at = 0;
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- return std_serial_dev_acquisition_stop(sdi,
- std_serial_dev_close, sdi->conn, LOG_PREFIX);
-}
-
static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
.name = "manson-hcs-3xxx",
.longname = "Manson HCS-3xxx",
.dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
- .dev_acquisition_stop = dev_acquisition_stop,
+ .dev_acquisition_stop = std_serial_dev_acquisition_stop,
.context = NULL,
};
SR_REGISTER_DEV_DRIVER(manson_hcs_3xxx_driver_info);