SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
static struct sr_dev_driver *di = &brymen_bm857_driver_info;
-static int hw_init(struct sr_context *sr_ctx)
+static int init(struct sr_context *sr_ctx)
{
- return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
-}
-
-static void free_instance(void *inst)
-{
- struct sr_dev_inst *sdi;
- struct dev_context *devc;
-
- if (!(sdi = inst))
- return;
- if (!(devc = sdi->priv))
- return;
- sr_serial_dev_inst_free(devc->serial);
- sr_dev_inst_free(sdi);
-}
-
-/* Properly close and free all devices. */
-static int clear_instances(void)
-{
- struct drv_context *drvc;
-
- if (!(drvc = di->priv))
- return SR_OK;
-
- g_slist_free_full(drvc->instances, free_instance);
- drvc->instances = NULL;
-
- return SR_OK;
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
static GSList *brymen_scan(const char *conn, const char *serialcomm)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct drv_context *drvc;
- struct sr_probe *probe;
+ struct sr_channel *ch;
struct sr_serial_dev_inst *serial;
GSList *devices;
int ret;
sr_info("Found device on port %s.", conn);
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", "")))
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", NULL)))
goto scan_cleanup;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
goto scan_cleanup;
}
- devc->serial = serial;
+ sdi->inst_type = SR_INST_SERIAL;
+ sdi->conn = serial;
drvc = di->priv;
sdi->priv = devc;
sdi->driver = di;
- if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+ if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
goto scan_cleanup;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
return devices;
}
-static GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
{
struct drv_context *drvc;
struct sr_config *src;
GSList *devices, *l;
const char *conn, *serialcomm;
- (void)options;
-
devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
break;
}
}
- if (!conn) {
+ if (!conn)
return NULL;
- }
if (serialcomm) {
/* Use the provided comm specs. */
return devices;
}
-static GSList *hw_dev_list(void)
+static GSList *dev_list(void)
{
return ((struct drv_context *)(di->priv))->instances;
}
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int cleanup(void)
{
- struct dev_context *devc;
-
- if (!(devc = sdi->priv)) {
- sr_err("sdi->priv was NULL.");
- return SR_ERR_BUG;
- }
-
- if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
- return SR_ERR;
-
- sdi->status = SR_ST_ACTIVE;
-
- return SR_OK;
-}
-
-static int hw_dev_close(struct sr_dev_inst *sdi)
-{
- struct dev_context *devc;
-
- devc = sdi->priv;
-
- if (devc->serial && devc->serial->fd != -1) {
- serial_close(devc->serial);
- sdi->status = SR_ST_INACTIVE;
- }
-
- return SR_OK;
+ return std_dev_clear(di, NULL);
}
-static int hw_cleanup(void)
-{
- clear_instances();
-
- return SR_OK;
-}
-
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
int ret;
- if (sdi->status != SR_ST_ACTIVE) {
- sr_err("Device inactive, can't set config options.");
- return SR_ERR;
- }
+ (void)cg;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
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_channel_group *cg)
{
(void)sdi;
+ (void)cg;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
return SR_OK;
}
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
devc->starttime = g_get_monotonic_time();
/* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+ std_session_send_df_header(cb_data, LOG_PREFIX);
/* Poll every 50ms, or whenever some data comes in. */
- sr_source_add(devc->serial->fd, G_IO_IN, 50,
- brymen_dmm_receive_data, (void *)sdi);
+ serial = sdi->conn;
+ serial_source_add(sdi->session, serial, G_IO_IN, 50,
+ brymen_dmm_receive_data, (void *)sdi);
return SR_OK;
}
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int 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);
+ return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+ sdi->conn, LOG_PREFIX);
}
SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
.name = "brymen-bm857",
.longname = "Brymen BM857",
.api_version = 1,
- .init = hw_init,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
+ .init = init,
+ .cleanup = cleanup,
+ .scan = scan,
+ .dev_list = dev_list,
+ .dev_clear = NULL,
.config_get = NULL,
.config_set = config_set,
.config_list = config_list,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
+ .dev_open = std_serial_dev_open,
+ .dev_close = std_serial_dev_close,
+ .dev_acquisition_start = dev_acquisition_start,
+ .dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
};
projects / libsigrok.git / blobdiff