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

Oops, bugfixes.

This commit is contained in:
Uwe Hermann 2010-04-15 23:24:44 +02:00
parent 408e719989
commit 9a4988343f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,33 +143,34 @@ static unsigned int get_memory_size(int type)
static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev, static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
struct libusb_device_descriptor *des) struct libusb_device_descriptor *des)
{ {
int j, err; unsigned int i;
int err;
if ((err = libusb_get_device_descriptor(dev, des))) { if ((err = libusb_get_device_descriptor(dev, des))) {
g_warning("failed to get device descriptor: %d", err); g_warning("failed to get device descriptor: %d", err);
return -1; return -1;
} }
if (des.idVendor != USB_VENDOR) if (des->idVendor != USB_VENDOR)
return 0; return 0;
if (libusb_get_bus_number(dev) == (*sdi)->usb->bus if (libusb_get_bus_number(dev) == (*sdi)->usb->bus
&& libusb_get_device_address(dev) == (*sdi)->usb->address) { && libusb_get_device_address(dev) == (*sdi)->usb->address) {
for (j = 0; j < ARRAY_SIZE(zeroplus_models); j++) { for (i = 0; i < ARRAY_SIZE(zeroplus_models); i++) {
if (!(des.idProduct == zeroplus_models[j].pid)) if (!(des->idProduct == zeroplus_models[i].pid))
continue; continue;
g_message("Found PID=%04X (%s)", des.idProduct, g_message("Found PID=%04X (%s)", des->idProduct,
zeroplus_models[j].model_name); zeroplus_models[i].model_name);
num_channels = zeroplus_models[j].channels; num_channels = zeroplus_models[i].channels;
memory_size = zeroplus_models[j].sample_depth * 1024; memory_size = zeroplus_models[i].sample_depth * 1024;
break; break;
} }
if (num_channels == 0) { if (num_channels == 0) {
g_warning("Unknown ZeroPlus device %04X", g_warning("Unknown ZeroPlus device %04X",
des.idProduct); des->idProduct);
return -2; return -2;
} }
@ -193,7 +194,6 @@ struct sigrok_device_instance *zp_open_device(int device_index)
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
unsigned int j;
int err, i; int err, i;
if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))