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

usbtils - interfaces dont work yet in libusb windows so disable for that only

Browse Source
This commit is contained in:
Kano 2013-09-22 00:12:57 +10:00
parent 1910e37121
commit 95eb948053
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
usbutils.c
View File

@ -179,6 +179,7 @@ static struct usb_epinfo cmr2_epinfos0[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(1), 0 }, { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(1), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0 } { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0 }
}; };
#ifndef WIN32
static struct usb_epinfo cmr2_epinfos1[] = { static struct usb_epinfo cmr2_epinfos1[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(3), 0 }, { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(3), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(4), 0 }, { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(4), 0 },
@ -191,12 +192,16 @@ static struct usb_epinfo cmr2_epinfos3[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(7), 0 }, { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(7), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(8), 0 } { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(8), 0 }
}; };
#endif
static struct usb_intinfo cmr2_ints[] = { static struct usb_intinfo cmr2_ints[] = {
USB_EPS(0, cmr2_epinfos0), USB_EPS(0, cmr2_epinfos0)
#ifndef WIN32
,
USB_EPS(1, cmr2_epinfos1), USB_EPS(1, cmr2_epinfos1),
USB_EPS(2, cmr2_epinfos2), USB_EPS(2, cmr2_epinfos2),
USB_EPS(3, cmr2_epinfos3) USB_EPS(3, cmr2_epinfos3)
#endif
}; };
#endif #endif
@ -1470,8 +1475,10 @@ static void release_cgpu(struct cgpu_info *cgpu)
cgminer_usb_unlock_bd(cgpu->drv, cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address); cgminer_usb_unlock_bd(cgpu->drv, cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address);
} }
// Used by MMQ - use the same usbdev thus locking is across all 4 related devices /*
// since they must use the same USB handle since they use the same interface * Used by MMQ - use the same usbdev thus locking is across all 4 related devices
* since they must use the same USB handle since they use the same interface
*/
struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig) struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig)
{ {
struct cgpu_info *copy; struct cgpu_info *copy;
@ -1501,8 +1508,13 @@ struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig)
return copy; return copy;
} }
// Used by CMR - use a different usbdev - since they must use a different /*
// USB handle due to using different interfaces (libusb requirement) * Used by CMR - use a different usbdev - since they must use a different
* USB handle due to using different interfaces (libusb requirement)
* N.B. multiple interfaces don't as yet work in windows libusb
* so the CMR defines above that use them are defined out in windows
* Nothing else uses multiple interfaces as at 20130922
*/
static struct cgpu_info *usb_dup_cgpu(struct cgpu_info *orig, int intinfo) static struct cgpu_info *usb_dup_cgpu(struct cgpu_info *orig, int intinfo)
{ {
struct cgpu_info *copy; struct cgpu_info *copy;
@ -1622,9 +1634,16 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
cgpu->usbinfo.bus_number = libusb_get_bus_number(dev); cgpu->usbinfo.bus_number = libusb_get_bus_number(dev);
cgpu->usbinfo.device_address = libusb_get_device_address(dev); cgpu->usbinfo.device_address = libusb_get_device_address(dev);
snprintf(devpath, sizeof(devpath), "%d:%d", if (found->intinfo_count > 1) {
(int)(cgpu->usbinfo.bus_number), snprintf(devpath, sizeof(devpath), "%d:%d-i%d",
(int)(cgpu->usbinfo.device_address)); (int)(cgpu->usbinfo.bus_number),
(int)(cgpu->usbinfo.device_address),
FOUNDIF(found));
} else {
snprintf(devpath, sizeof(devpath), "%d:%d",
(int)(cgpu->usbinfo.bus_number),
(int)(cgpu->usbinfo.device_address));
}
cgpu->device_path = strdup(devpath); cgpu->device_path = strdup(devpath);
@ -1930,7 +1949,7 @@ struct cgpu_info *usb_init_intinfo(struct cgpu_info *orig, int intinfo)
DEVLOCK(orig, pstate); DEVLOCK(orig, pstate);
snprintf(msgstr, sizeof(msgstr), "USB %s init_intinfo (%d:%d:ii%d)", snprintf(msgstr, sizeof(msgstr), "USB %s init_intinfo (%d:%d-i%d)",
orig->drv->dname, orig->drv->dname,
(int)(orig->usbinfo.bus_number), (int)(orig->usbinfo.bus_number),
(int)(orig->usbinfo.device_address), (int)(orig->usbinfo.device_address),
@ -1942,7 +1961,7 @@ struct cgpu_info *usb_init_intinfo(struct cgpu_info *orig, int intinfo)
} }
if (orig->usbdev->found->which_intinfo != 0) { if (orig->usbdev->found->which_intinfo != 0) {
applog(LOG_ERR, "%s incorrect cgpu (must be ii0)", msgstr); applog(LOG_ERR, "%s incorrect cgpu (must be i0)", msgstr);
goto Hitagi; goto Hitagi;
} }
@ -1965,10 +1984,10 @@ struct cgpu_info *usb_init_intinfo(struct cgpu_info *orig, int intinfo)
found = copy->usbdev->found; found = copy->usbdev->found;
snprintf(devpath, sizeof(devpath), "%d:%d:%d", snprintf(devpath, sizeof(devpath), "%d:%d-i%d",
(int)(copy->usbinfo.bus_number), (int)(copy->usbinfo.bus_number),
(int)(copy->usbinfo.device_address), (int)(copy->usbinfo.device_address),
intinfo); FOUNDIF(found));
copy->device_path = strdup(devpath); copy->device_path = strdup(devpath);