GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #356 from kanoi/api

Browse Source 
usb display message when device is in use/another cgminer
This commit is contained in:
Con Kolivas 2012-12-10 01:27:03 -08:00
commit b4908edd96
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usbutils.c
View File

@ -714,6 +714,10 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
cgusb = calloc(1, sizeof(*cgusb)); cgusb = calloc(1, sizeof(*cgusb));
cgusb->found = found; cgusb->found = found;
cgusb->bus_number = libusb_get_bus_number(dev);
cgusb->device_address = libusb_get_device_address(dev);
cgusb->descriptor = calloc(1, sizeof(*(cgusb->descriptor))); cgusb->descriptor = calloc(1, sizeof(*(cgusb->descriptor)));
err = libusb_get_device_descriptor(dev, cgusb->descriptor); err = libusb_get_device_descriptor(dev, cgusb->descriptor);
@ -737,7 +741,6 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
default: default:
applog(LOG_ERR, "USB init, open device failed, err %d", err); applog(LOG_ERR, "USB init, open device failed, err %d", err);
} }
goto dame; goto dame;
} }
@ -751,8 +754,15 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
err = libusb_set_configuration(cgusb->handle, found->config); err = libusb_set_configuration(cgusb->handle, found->config);
if (err) { if (err) {
applog(LOG_DEBUG, "USB init, failed to set config to %d, err %d", switch(err) {
found->config, err); case LIBUSB_ERROR_BUSY:
applog(LOG_WARNING, "USB init, %s device %d:%d in use",
found->name, cgusb->bus_number, cgusb->device_address);
break;
default:
applog(LOG_DEBUG, "USB init, failed to set config to %d, err %d",
found->config, err);
}
goto cldame; goto cldame;
} }
@ -797,8 +807,6 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
goto cldame; goto cldame;
} }
cgusb->bus_number = libusb_get_bus_number(dev);
cgusb->device_address = libusb_get_device_address(dev);
cgusb->usbver = cgusb->descriptor->bcdUSB; cgusb->usbver = cgusb->descriptor->bcdUSB;
// TODO: allow this with the right version of the libusb include and running library // TODO: allow this with the right version of the libusb include and running library