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

USB in linux use the expected kernel config to check and detach - and set the configuration in linux also

Browse Source
This commit is contained in:
Kano 2013-01-26 21:49:20 +11:00
parent 128e3270fb
commit 05157e0802
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usbutils.c
View File

@ -77,6 +77,7 @@ static struct usb_find_devices find_dev[] = {
.name = "BFL", .name = "BFL",
.idVendor = 0x0403, .idVendor = 0x0403,
.idProduct = 0x6014, .idProduct = 0x6014,
.kernel = 0,
.config = 1, .config = 1,
.interface = 0, .interface = 0,
.timeout = BITFORCE_TIMEOUT_MS, .timeout = BITFORCE_TIMEOUT_MS,
@ -89,13 +90,14 @@ static struct usb_find_devices find_dev[] = {
.name = "MMQ", .name = "MMQ",
.idVendor = 0x1fc9, .idVendor = 0x1fc9,
.idProduct = 0x0003, .idProduct = 0x0003,
.kernel = 0,
.config = 1, .config = 1,
.interface = 1, .interface = 1,
.timeout = MODMINER_TIMEOUT_MS, .timeout = MODMINER_TIMEOUT_MS,
.epcount = ARRAY_SIZE(mmq_eps), .epcount = ARRAY_SIZE(mmq_eps),
.eps = mmq_eps }, .eps = mmq_eps },
#endif #endif
{ DRV_LAST, NULL, 0, 0, 0, 0, 0, 0, NULL } { DRV_LAST, NULL, 0, 0, 0, 0, 0, 0, 0, NULL }
}; };
#ifdef USE_BITFORCE #ifdef USE_BITFORCE
@ -924,9 +926,10 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
goto dame; goto dame;
} }
if (libusb_kernel_driver_active(cgusb->handle, found->config) == 1) { #ifndef WIN32
if (libusb_kernel_driver_active(cgusb->handle, found->kernel) == 1) {
applog(LOG_DEBUG, "USB init, kernel attached ... %s", devstr); applog(LOG_DEBUG, "USB init, kernel attached ... %s", devstr);
err = libusb_detach_kernel_driver(cgusb->handle, found->config); err = libusb_detach_kernel_driver(cgusb->handle, found->kernel);
if (err == 0) { if (err == 0) {
applog(LOG_DEBUG, applog(LOG_DEBUG,
"USB init, kernel detached successfully %s", "USB init, kernel detached successfully %s",
@ -938,6 +941,7 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
goto cldame; goto cldame;
} }
} }
#endif
err = libusb_set_configuration(cgusb->handle, found->config); err = libusb_set_configuration(cgusb->handle, found->config);
if (err) { if (err) {
@ -958,8 +962,8 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
err = libusb_get_active_config_descriptor(dev, &config); err = libusb_get_active_config_descriptor(dev, &config);
if (err) { if (err) {
applog(LOG_DEBUG, applog(LOG_DEBUG,
"USB init, failed to get config descriptor %d, err %d %s", "USB init, failed to get config descriptor, err %d %s",
found->config, err, devstr); err, devstr);
goto cldame; goto cldame;
} }

1
usbutils.h
View File

@ -55,6 +55,7 @@ struct usb_find_devices {
const char *name; const char *name;
uint16_t idVendor; uint16_t idVendor;
uint16_t idProduct; uint16_t idProduct;
int kernel;
int config; int config;
int interface; int interface;
unsigned int timeout; unsigned int timeout;