From 3a7a22cb07937fcecef8b17b25e9638245f7f8c1 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Sun, 8 Jul 2012 19:03:36 +0200 Subject: [PATCH] fx2lafw: use new init/scan API --- hardware/fx2lafw/fx2lafw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 4344cf24..5bc5e262 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -393,17 +393,22 @@ static int hw_init(void) 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 sr_dev_inst *sdi; const struct fx2lafw_profile *prof; struct context *ctx; + struct sr_probe *probe; 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. */ - devcnt = 0; + devices = NULL; libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { @@ -453,12 +458,10 @@ static int hw_scan(void) ctx->usb = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), 0xff, NULL); } - - devcnt++; } libusb_free_device_list(devlist, 1); - return devcnt; + return devices; } static int hw_dev_open(int dev_index)