1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-23 04:54:26 +00:00

Merge pull request #411 from kanoi/bflsc

BFL FPGA Windows timeout set to 999ms + usbutils.c usb_cmdname() usb_cmds -> string name
This commit is contained in:
Con Kolivas 2013-03-29 07:27:26 -07:00
commit 125194d879
2 changed files with 9 additions and 1 deletions

View File

@ -54,7 +54,7 @@
#ifdef WIN32 #ifdef WIN32
#define BFLSC_TIMEOUT_MS 500 #define BFLSC_TIMEOUT_MS 500
#define BITFORCE_TIMEOUT_MS 500 #define BITFORCE_TIMEOUT_MS 999
#define MODMINER_TIMEOUT_MS 200 #define MODMINER_TIMEOUT_MS 200
#define AVALON_TIMEOUT_MS 500 #define AVALON_TIMEOUT_MS 500
#else #else
@ -752,6 +752,13 @@ static void cgusb_check_init()
mutex_unlock(&cgusb_lock); mutex_unlock(&cgusb_lock);
} }
const char *usb_cmdname(enum usb_cmds cmd)
{
cgusb_check_init();
return usb_commands[cmd];
}
#ifndef WIN32 #ifndef WIN32
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>

View File

@ -132,6 +132,7 @@ struct device_drv;
struct cgpu_info; struct cgpu_info;
void usb_all(int level); void usb_all(int level);
const char *usb_cmdname(enum usb_cmds cmd);
void usb_uninit(struct cgpu_info *cgpu); void usb_uninit(struct cgpu_info *cgpu);
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found); bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found);
void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *)); void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *));