struct sr_config *src;
struct sr_serial_dev_inst *serial;
struct sr_dev_inst *sdi;
- GSList *l, *devices;
+ GSList *l;
const char *conn;
conn = NULL;
if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
return NULL;
- devices = NULL;
-
sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("PCE");
sdi->inst_type = SR_INST_SERIAL;
sdi->priv = devc;
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "SPL");
- devices = g_slist_append(devices, sdi);
serial_close(serial);
- return std_scan_complete(di, devices);
+ return std_scan_complete(di, g_slist_append(NULL, sdi));
}
static int dev_clear(const struct sr_dev_driver *di)
devc = sdi->priv;
devc->buffer_len = 0;
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
/* Poll every 150ms, or whenever some data comes in. */
serial = sdi->conn;
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- pce_322a_disconnect(sdi);
-
- return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
- sdi->conn, LOG_PREFIX);
-}
-
static struct sr_dev_driver pce_322a_driver_info = {
.name = "pce-322a",
.longname = "PCE PCE-322A",
.dev_open = dev_open,
.dev_close = 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(pce_322a_driver_info);