static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-static struct sr_dev_inst *hantek_6xxx_dev_new(struct sr_dev_driver *di,
- const struct hantek_6xxx_profile *prof)
+static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile *prof)
{
struct sr_dev_inst *sdi;
struct sr_channel *ch;
struct sr_channel_group *cg;
- struct drv_context *drvc;
struct dev_context *devc;
unsigned int i;
sdi->status = SR_ST_INITIALIZING;
sdi->vendor = g_strdup(prof->vendor);
sdi->model = g_strdup(prof->model);
- sdi->driver = di;
for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
devc->samplerate = DEFAULT_SAMPLERATE;
sdi->priv = devc;
- drvc = sdi->driver->context;
- drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
}
/* Device matches the pre-firmware profile. */
prof = &dev_profiles[j];
sr_dbg("Found a %s %s.", prof->vendor, prof->model);
- sdi = hantek_6xxx_dev_new(di, prof);
+ sdi = hantek_6xxx_dev_new(prof);
sdi->connection_id = g_strdup(connection_id);
devices = g_slist_append(devices, sdi);
devc = sdi->priv;
/* Device matches the post-firmware profile. */
prof = &dev_profiles[j];
sr_dbg("Found a %s %s.", prof->vendor, prof->model);
- sdi = hantek_6xxx_dev_new(di, prof);
+ sdi = hantek_6xxx_dev_new(prof);
sdi->connection_id = g_strdup(connection_id);
sdi->status = SR_ST_INACTIVE;
devices = g_slist_append(devices, sdi);
}
libusb_free_device_list(devlist, 1);
- return devices;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
*/
usb_source_remove(sdi->session, drvc->sr_ctx);
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
devc->dev_state = IDLE;
if (hantek_6xxx_init(sdi) != SR_OK)
return SR_ERR;
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
devc->samp_received = 0;
devc->dev_state = FLUSH;
return SR_OK;
}
-SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info = {
+static struct sr_dev_driver hantek_6xxx_driver_info = {
.name = "hantek-6xxx",
.longname = "Hantek 6xxx",
.api_version = 1,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(hantek_6xxx_driver_info);