struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
GSList *l;
struct sr_dev_driver *di;
continue;
if (!(devc = sdi->priv))
continue;
- sr_serial_dev_inst_free(devc->serial);
+ serial = sdi->conn;
+ sr_serial_dev_inst_free(serial);
sr_dev_inst_free(sdi);
}
goto scan_cleanup;
}
- devc->serial = serial;
+ sdi->inst_type = SR_INST_SERIAL;
+ sdi->conn = serial;
sdi->priv = devc;
sdi->driver = mic_devs[idx].di;
static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
-
- devc = sdi->priv;
+ struct sr_serial_dev_inst *serial;
- if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ serial = sdi->conn;
+ if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
-
- devc = sdi->priv;
+ struct sr_serial_dev_inst *serial;
- if (devc->serial && devc->serial->fd != -1) {
- serial_close(devc->serial);
+ serial = sdi->conn;
+ if (serial && serial->fd != -1) {
+ serial_close(serial);
sdi->status = SR_ST_INACTIVE;
}
struct dev_context *devc;
if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
+ return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
void *cb_data, int idx)
{
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
- devc = sdi->priv;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+ devc = sdi->priv;
devc->cb_data = cb_data;
-
devc->num_samples = 0;
devc->starttime = g_get_monotonic_time();
std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
/* Poll every 100ms, or whenever some data comes in. */
- sr_source_add(devc->serial->fd, G_IO_IN, 100,
+ serial = sdi->conn;
+ sr_source_add(serial->fd, G_IO_IN, 100,
mic_devs[idx].receive_data, (void *)sdi);
return SR_OK;
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
- ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN);
+ sdi->conn, DRIVER_LOG_DOMAIN);
}
/* Driver-specific API function wrappers */