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

fx2lafw: use default libusb context

This commit is contained in:
Bert Vermeulen 2012-09-11 21:20:50 +02:00
parent 19b0cce312
commit f5cfe894ec
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hardware/fx2lafw/fx2lafw.c
View File

@ -195,13 +195,11 @@ static int fx2lafw_dev_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;
struct version_info vi; struct version_info vi;
int ret, skip, i; int ret, skip, i;
uint8_t revid; uint8_t revid;
drvc = fdi->priv;
devc = sdi->priv; devc = sdi->priv;
if (sdi->status == SR_ST_ACTIVE) if (sdi->status == SR_ST_ACTIVE)
@ -209,7 +207,7 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
skip = 0; skip = 0;
const int device_count = libusb_get_device_list(drvc->usb_context, &devlist); const int device_count = libusb_get_device_list(NULL, &devlist);
if (device_count < 0) { if (device_count < 0) {
sr_err("fx2lafw: Failed to retrieve device list (%d)", sr_err("fx2lafw: Failed to retrieve device list (%d)",
device_count); device_count);
@ -412,7 +410,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_warn("fx2lafw: Failed to initialize libusb."); sr_warn("fx2lafw: Failed to initialize libusb.");
return SR_ERR; return SR_ERR;
@ -444,7 +442,7 @@ static GSList *hw_scan(GSList *options)
/* Find all fx2lafw compatible devices and upload firmware to them. */ /* Find all fx2lafw compatible devices and upload firmware to them. */
devices = NULL; devices = NULL;
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( if ((ret = libusb_get_device_descriptor(
@ -616,9 +614,7 @@ static int hw_cleanup(void)
ret = clear_instances(); ret = clear_instances();
if (drvc->usb_context) libusb_exit(NULL);
libusb_exit(drvc->usb_context);
drvc->usb_context = NULL;
g_free(drvc); g_free(drvc);
fdi->priv = NULL; fdi->priv = NULL;
@ -690,7 +686,6 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
static int receive_data(int fd, int revents, void *cb_data) static int receive_data(int fd, int revents, void *cb_data)
{ {
struct drv_context *drvc;
struct timeval tv; struct timeval tv;
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
@ -698,9 +693,8 @@ static int receive_data(int fd, int revents, void *cb_data)
(void)revents; (void)revents;
(void)cb_data; (void)cb_data;
drvc = fdi->priv;
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);
return TRUE; return TRUE;
} }
@ -719,11 +713,9 @@ static void abort_acquisition(struct dev_context *devc)
static void finish_acquisition(struct dev_context *devc) static void finish_acquisition(struct dev_context *devc)
{ {
struct drv_context *drvc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
int i; int i;
drvc = fdi->priv;
/* Terminate session */ /* Terminate session */
packet.type = SR_DF_END; packet.type = SR_DF_END;
@ -731,7 +723,7 @@ static void finish_acquisition(struct dev_context *devc)
/* Remove fds from polling */ /* Remove fds from polling */
const struct libusb_pollfd **const lupfd = const struct libusb_pollfd **const lupfd =
libusb_get_pollfds(drvc->usb_context); 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); /* NOT g_free()! */ free(lupfd); /* NOT g_free()! */
@ -956,7 +948,6 @@ 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_logic meta; struct sr_datafeed_meta_logic meta;
struct drv_context *drvc;
struct dev_context *devc; struct dev_context *devc;
struct libusb_transfer *transfer; struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd; const struct libusb_pollfd **lupfd;
@ -964,7 +955,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
int ret; int ret;
unsigned char *buf; unsigned char *buf;
drvc = fdi->priv;
devc = sdi->priv; devc = sdi->priv;
if (devc->submitted_transfers != 0) if (devc->submitted_transfers != 0)
return SR_ERR; return SR_ERR;
@ -1007,7 +997,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
devc->submitted_transfers++; devc->submitted_transfers++;
} }
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, sr_source_add(lupfd[i]->fd, lupfd[i]->events,
timeout, receive_data, NULL); timeout, receive_data, NULL);

1
hardware/fx2lafw/fx2lafw.h
View File

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