BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: use default libusb context

This commit is contained in:
Bert Vermeulen 2012-09-11 21:16:16 +02:00
parent 7c1cb432b8
commit 19b0cce312
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hardware/hantek-dso/api.c
View File

@ -262,7 +262,7 @@ static int hw_init(void)
return SR_ERR; return SR_ERR;
} }
if (libusb_init(&drvc->usb_context) != 0) { if (libusb_init(NULL) != 0) {
g_free(drvc); g_free(drvc);
sr_err("hantek-dso: Failed to initialize USB."); sr_err("hantek-dso: Failed to initialize USB.");
return SR_ERR; return SR_ERR;
@ -293,7 +293,7 @@ static GSList *hw_scan(GSList *options)
clear_instances(); clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */ /* 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++) { for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("hantek-dso: failed to get device descriptor: %d", ret); sr_err("hantek-dso: failed to get device descriptor: %d", ret);
@ -418,9 +418,7 @@ static int hw_cleanup(void)
clear_instances(); clear_instances();
if (drvc->usb_context) libusb_exit(NULL);
libusb_exit(drvc->usb_context);
drvc->usb_context = NULL;
return SR_OK; return SR_OK;
} }
@ -732,7 +730,6 @@ static int handle_event(int fd, int revents, void *cb_data)
const struct sr_dev_inst *sdi; const struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct timeval tv; struct timeval tv;
struct drv_context *drvc;
struct dev_context *devc; struct dev_context *devc;
const struct libusb_pollfd **lupfd; const struct libusb_pollfd **lupfd;
int num_probes, i; int num_probes, i;
@ -743,7 +740,6 @@ static int handle_event(int fd, int revents, void *cb_data)
(void)fd; (void)fd;
(void)revents; (void)revents;
drvc = hdi->priv;
sdi = cb_data; sdi = cb_data;
devc = sdi->priv; devc = sdi->priv;
if (devc->dev_state == STOPPING) { if (devc->dev_state == STOPPING) {
@ -751,7 +747,7 @@ static int handle_event(int fd, int revents, void *cb_data)
sr_dbg("hantek-dso: stopping acquisition"); sr_dbg("hantek-dso: stopping acquisition");
/* TODO: doesn't really cancel pending transfers so they might /* TODO: doesn't really cancel pending transfers so they might
* come in after SR_DF_END is sent. */ * 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++) for (i = 0; lupfd[i]; i++)
sr_source_remove(lupfd[i]->fd); sr_source_remove(lupfd[i]->fd);
free(lupfd); free(lupfd);
@ -766,7 +762,7 @@ static int handle_event(int fd, int revents, void *cb_data)
/* Always handle pending libusb events. */ /* Always handle pending libusb events. */
tv.tv_sec = tv.tv_usec = 0; tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(drvc->usb_context, &tv); libusb_handle_events_timeout(NULL, &tv);
/* TODO: ugh */ /* TODO: ugh */
if (devc->dev_state == NEW_CAPTURE) { if (devc->dev_state == NEW_CAPTURE) {
@ -846,11 +842,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_header header; struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta; struct sr_datafeed_meta_analog meta;
struct drv_context *drvc;
struct dev_context *devc; struct dev_context *devc;
int i; int i;
drvc = hdi->priv;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR; return SR_ERR;
@ -869,7 +863,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
return SR_ERR; return SR_ERR;
devc->dev_state = CAPTURE; devc->dev_state = CAPTURE;
lupfd = libusb_get_pollfds(drvc->usb_context); lupfd = libusb_get_pollfds(NULL);
for (i = 0; lupfd[i]; i++) for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event, sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
(void *)sdi); (void *)sdi);

5
hardware/hantek-dso/dso.c
View File

@ -28,7 +28,6 @@
#include <libusb.h> #include <libusb.h>
extern struct sr_dev_driver hantek_dso_driver_info; extern struct sr_dev_driver hantek_dso_driver_info;
static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
static int send_begin(struct dev_context *devc) static int send_begin(struct dev_context *devc)
@ -108,11 +107,9 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
{ {
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct drv_context *drvc;
struct dev_context *devc; struct dev_context *devc;
int err, skip, i; int err, skip, i;
drvc = hdi->priv;
devc = sdi->priv; devc = sdi->priv;
if (sdi->status == SR_ST_ACTIVE) if (sdi->status == SR_ST_ACTIVE)
@ -120,7 +117,7 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
skip = 0; skip = 0;
libusb_get_device_list(drvc->usb_context, &devlist); libusb_get_device_list(NULL, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
if ((err = libusb_get_device_descriptor(devlist[i], &des))) { if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("hantek-dso: failed to get device descriptor: %d", err); sr_err("hantek-dso: failed to get device descriptor: %d", err);

1
hardware/hantek-dso/dso.h
View File

@ -160,7 +160,6 @@ struct dso_profile {
}; };
struct drv_context { struct drv_context {
libusb_context *usb_context;
GSList *instances; GSList *instances;
}; };