#include <libusb.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
-#include "config.h"
#include "dso.h"
}
/* Properly close and free all devices. */
-static void clear_instances(void)
+static int clear_instances(void)
{
struct sr_dev_inst *sdi;
struct drv_context *drvc;
g_slist_free(drvc->instances);
drvc->instances = NULL;
+ return SR_OK;
}
static int hw_init(void)
if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
sr_err("hantek-dso: driver context malloc failed.");
- return SR_ERR;
+ return SR_ERR_MALLOC;
}
- if (libusb_init(&drvc->usb_context) != 0) {
+ if (libusb_init(NULL) != 0) {
g_free(drvc);
sr_err("hantek-dso: Failed to initialize USB.");
return SR_ERR;
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
- libusb_get_device_list(drvc->usb_context, &devlist);
+ libusb_get_device_list(NULL, &devlist);
for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("hantek-dso: failed to get device descriptor: %d", ret);
return devices;
}
+static GSList *hw_dev_list(void)
+{
+ struct drv_context *drvc;
+
+ drvc = hdi->priv;
+
+ return drvc->instances;
+}
+
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
clear_instances();
- if (drvc->usb_context)
- libusb_exit(drvc->usb_context);
- drvc->usb_context = NULL;
+ libusb_exit(NULL);
return SR_OK;
}
analog.num_samples = num_samples;
analog.mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT;
+ /* TODO: Check malloc return value. */
analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_probes);
data_offset = 0;
for (i = 0; i < analog.num_samples; i++) {
const struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet;
struct timeval tv;
- struct drv_context *drvc;
struct dev_context *devc;
const struct libusb_pollfd **lupfd;
int num_probes, i;
(void)fd;
(void)revents;
- drvc = hdi->priv;
sdi = cb_data;
devc = sdi->priv;
if (devc->dev_state == STOPPING) {
sr_dbg("hantek-dso: stopping acquisition");
/* TODO: doesn't really cancel pending transfers so they might
* come in after SR_DF_END is sent. */
- lupfd = libusb_get_pollfds(drvc->usb_context);
+ lupfd = libusb_get_pollfds(NULL);
for (i = 0; lupfd[i]; i++)
sr_source_remove(lupfd[i]->fd);
free(lupfd);
/* Always handle pending libusb events. */
tv.tv_sec = tv.tv_usec = 0;
- libusb_handle_events_timeout(drvc->usb_context, &tv);
+ libusb_handle_events_timeout(NULL, &tv);
/* TODO: ugh */
if (devc->dev_state == NEW_CAPTURE) {
devc->trigger_offset = trigger_offset;
num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+ /* TODO: Check malloc return value. */
devc->framebuf = g_try_malloc(devc->framesize * num_probes * 2);
devc->samp_buffered = devc->samp_received = 0;
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta;
- struct drv_context *drvc;
struct dev_context *devc;
int i;
- drvc = hdi->priv;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
return SR_ERR;
devc->dev_state = CAPTURE;
- lupfd = libusb_get_pollfds(drvc->usb_context);
+ lupfd = libusb_get_pollfds(NULL);
for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
(void *)sdi);
.init = hw_init,
.cleanup = hw_cleanup,
.scan = hw_scan,
+ .dev_list = hw_dev_list,
+ .dev_clear = clear_instances,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.info_get = hw_info_get,