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

zeroplus-logic-cube: use new scan API

This commit is contained in:
Bert Vermeulen 2012-07-14 12:45:07 +02:00
parent 39cfdd75f9
commit 4ca3898445
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -336,14 +336,18 @@ 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; struct sr_dev_inst *sdi;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
GSList *devices;
libusb_device **devlist; libusb_device **devlist;
int ret, devcnt, i; int ret, devcnt, i;
struct context *ctx; struct context *ctx;
(void)options;
devices = NULL;
/* Allocate memory for our private driver context. */ /* Allocate memory for our private driver context. */
if (!(ctx = g_try_malloc(sizeof(struct context)))) { if (!(ctx = g_try_malloc(sizeof(struct context)))) {
sr_err("zp: %s: ctx malloc failed", __func__); sr_err("zp: %s: ctx malloc failed", __func__);
@ -394,6 +398,7 @@ static int hw_scan(void)
sdi->priv = ctx; sdi->priv = ctx;
devices = g_slist_append(devices, sdi);
zdi->instances = g_slist_append(zdi->instances, sdi); zdi->instances = g_slist_append(zdi->instances, sdi);
ctx->usb = sr_usb_dev_inst_new( ctx->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), libusb_get_bus_number(devlist[i]),
@ -403,7 +408,7 @@ static int hw_scan(void)
} }
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)