static GSList *dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static int dev_clear(void)
return SR_OK;
}
-static int dev_close(struct sr_dev_inst *sdi)
-{
- struct sr_serial_dev_inst *serial;
-
- serial = sdi->conn;
- if (serial && serial->fd != -1) {
- serial_close(serial);
- sdi->status = SR_ST_INACTIVE;
- }
-
- return SR_OK;
-}
-
static int cleanup(void)
{
return dev_clear();
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
GVariant *range[2];
uint64_t low, high;
int tmp, ret;
+ (void)probe_group;
+
if (!sdi)
return SR_ERR_ARG;
return ret;
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
uint64_t tmp_u64, low, high;
int tmp, ret;
const char *tmp_str;
+ (void)probe_group;
+
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
GVariant *tuple, *range[2];
GVariantBuilder gvb;
int ret;
(void)sdi;
+ (void)probe_group;
ret = SR_OK;
switch (key) {
/* Poll every 100ms, or whenever some data comes in. */
serial = sdi->conn;
- sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data,
+ serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data,
(void *)sdi);
return SR_OK;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+ return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
-
- return SR_OK;
}
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
.config_set = config_set,
.config_list = config_list,
.dev_open = dev_open,
- .dev_close = dev_close,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,