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

fx2lafw: use new init/scan API

This commit is contained in:
Bert Vermeulen 2012-07-08 19:03:36 +02:00
parent dd34b8d3c4
commit 3a7a22cb07
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hardware/fx2lafw/fx2lafw.c
View File

@ -393,17 +393,22 @@ static int hw_init(void)
return SR_OK; return SR_OK;
} }
static int hw_scan(void) static GSList *hw_scan(GSList *options)
{ {
struct sr_dev_inst *sdi; GSList *devices;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct sr_dev_inst *sdi;
const struct fx2lafw_profile *prof; const struct fx2lafw_profile *prof;
struct context *ctx; struct context *ctx;
struct sr_probe *probe;
libusb_device **devlist; libusb_device **devlist;
int devcnt, ret, i, j; int devcnt, num_logic_probes, ret, i, j;
/* Avoid compiler warnings. */
(void)options;
/* Find all fx2lafw compatible devices and upload firmware to them. */ /* Find all fx2lafw compatible devices and upload firmware to them. */
devcnt = 0; devices = NULL;
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
@ -453,12 +458,10 @@ static int hw_scan(void)
ctx->usb = sr_usb_dev_inst_new ctx->usb = sr_usb_dev_inst_new
(libusb_get_bus_number(devlist[i]), 0xff, NULL); (libusb_get_bus_number(devlist[i]), 0xff, NULL);
} }
devcnt++;
} }
libusb_free_device_list(devlist, 1); libusb_free_device_list(devlist, 1);
return devcnt; return devices;
} }
static int hw_dev_open(int dev_index) static int hw_dev_open(int dev_index)