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

Remove magic control sequences on open/close on BF1 and just flush the read buffers.

Browse Source
This commit is contained in:
Con Kolivas 2013-09-27 12:38:02 +10:00
parent b994a4c64d
commit ce16bd2ba4
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
driver-bitfury.c
View File

@ -23,39 +23,31 @@ static void bitfury_empty_buffer(struct cgpu_info *bitfury)
int amount;
do {
usb_read_ii(bitfury, 1, buf, 512, &amount, C_BF1_FLUSH);
usb_read_ii_once(bitfury, 1, buf, 512, &amount, C_BF1_FLUSH);
} while (amount);
}
static void bitfury_empty_intbuf(struct cgpu_info *bitfury)
{
char buf[8];
char buf[512];
int amount;
usb_read_ii(bitfury, 0, buf, 8, &amount, C_BF1_IFLUSH);
do {
usb_read_ii_once(bitfury, 0, buf, 512, &amount, C_BF1_IFLUSH);
} while (amount);
}
static bool bitfury_open(struct cgpu_info *bitfury)
static void bitfury_open(struct cgpu_info *bitfury)
{
int err;
bitfury_empty_intbuf(bitfury);
/* Magic open sequence */
err = usb_transfer(bitfury, 0x21, 0x22, 0x0003, 0, C_BF1_OPEN);
if (!err)
bitfury_empty_buffer(bitfury);
return !err;
}
static void bitfury_close(struct cgpu_info *bitfury)
{
bitfury_empty_buffer(bitfury);
/* Magic close sequence */
usb_transfer(bitfury, 0x21, 0x22, 0, 0, C_BF1_CLOSE);
bitfury_empty_intbuf(bitfury);
bitfury_empty_buffer(bitfury);
usb_transfer(bitfury, 0x23, 0x08, 0x9053, 1, C_BF1_CLOSE);
bitfury_empty_buffer(bitfury);
}
static void bitfury_identify(struct cgpu_info *bitfury)
@ -144,11 +136,7 @@ static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_device
usb_buffer_enable(bitfury);
if (!bitfury_open(bitfury)) {
applog(LOG_INFO, "%s %d: Failed to open", bitfury->drv->name,
bitfury->device_id);
goto out_close;
}
bitfury_open(bitfury);
/* Send getinfo request */
if (!bitfury_getinfo(bitfury, info))

3
usbutils.h
View File

@ -393,6 +393,9 @@ void *usb_resource_thread(void *userdata);
#define usb_read_once(cgpu, buf, bufsiz, read, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, true)
#define usb_read_ii_once(cgpu, intinfo, buf, bufsiz, read, cmd) \
_usb_read(cgpu, intinfo, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, true)
#define usb_read_once_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, true)