GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-03-10 04:31:03 +00:00
Code Issues Releases Wiki Activity

Remove unnecessary steps in communicating with BF1 and just use USB interface 1.

Browse Source
This commit is contained in:
Con Kolivas 2013-09-27 15:04:07 +10:00
parent 2ba7fbe597
commit 8d133706c9
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
driver-bitfury.c
View File

@ -23,38 +23,25 @@ static void bitfury_empty_buffer(struct cgpu_info *bitfury)
int amount; int amount;
do { do {
usb_read_ii_once(bitfury, 1, buf, 512, &amount, C_BF1_FLUSH); usb_read_once(bitfury, buf, 512, &amount, C_BF1_FLUSH);
} while (amount);
}
static void bitfury_empty_intbuf(struct cgpu_info *bitfury)
{
char buf[512];
int amount;
do {
usb_read_ii_once(bitfury, 0, buf, 512, &amount, C_BF1_IFLUSH);
} while (amount); } while (amount);
} }
static void bitfury_open(struct cgpu_info *bitfury) static void bitfury_open(struct cgpu_info *bitfury)
{ {
bitfury_empty_intbuf(bitfury);
bitfury_empty_buffer(bitfury); bitfury_empty_buffer(bitfury);
} }
static void bitfury_close(struct cgpu_info *bitfury) static void bitfury_close(struct cgpu_info *bitfury)
{ {
bitfury_empty_buffer(bitfury); bitfury_empty_buffer(bitfury);
bitfury_empty_intbuf(bitfury);
bitfury_empty_buffer(bitfury);
} }
static void bitfury_identify(struct cgpu_info *bitfury) static void bitfury_identify(struct cgpu_info *bitfury)
{ {
int amount; int amount;
usb_write_ii(bitfury, 1, "L", 1, &amount, C_BF1_IDENTIFY); usb_write(bitfury, "L", 1, &amount, C_BF1_IDENTIFY);
} }
static bool bitfury_getinfo(struct cgpu_info *bitfury, struct bitfury_info *info) static bool bitfury_getinfo(struct cgpu_info *bitfury, struct bitfury_info *info)
@ -62,13 +49,13 @@ static bool bitfury_getinfo(struct cgpu_info *bitfury, struct bitfury_info *info
int amount, err; int amount, err;
char buf[16]; char buf[16];
err = usb_write_ii(bitfury, 1, "I", 1, &amount, C_BF1_REQINFO); err = usb_write(bitfury, "I", 1, &amount, C_BF1_REQINFO);
if (err) { if (err) {
applog(LOG_INFO, "%s %d: Failed to write REQINFO", applog(LOG_INFO, "%s %d: Failed to write REQINFO",
bitfury->drv->name, bitfury->device_id); bitfury->drv->name, bitfury->device_id);
return false; return false;
} }
err = usb_read_ii(bitfury, 1, buf, 14, &amount, C_BF1_GETINFO); err = usb_read(bitfury, buf, 14, &amount, C_BF1_GETINFO);
if (err) { if (err) {
applog(LOG_INFO, "%s %d: Failed to read GETINFO", applog(LOG_INFO, "%s %d: Failed to read GETINFO",
bitfury->drv->name, bitfury->device_id); bitfury->drv->name, bitfury->device_id);
@ -94,13 +81,13 @@ static bool bitfury_reset(struct cgpu_info *bitfury)
int amount, err; int amount, err;
char buf[16]; char buf[16];
err = usb_write_ii(bitfury, 1, "R", 1, &amount, C_BF1_REQRESET); err = usb_write(bitfury, "R", 1, &amount, C_BF1_REQRESET);
if (err) { if (err) {
applog(LOG_INFO, "%s %d: Failed to write REQRESET", applog(LOG_INFO, "%s %d: Failed to write REQRESET",
bitfury->drv->name, bitfury->device_id); bitfury->drv->name, bitfury->device_id);
return false; return false;
} }
err = usb_read_ii_timeout(bitfury, 1, buf, 7, &amount, BF1WAIT, C_BF1_GETRESET); err = usb_read_timeout(bitfury, buf, 7, &amount, BF1WAIT, C_BF1_GETRESET);
if (err) { if (err) {
applog(LOG_INFO, "%s %d: Failed to read GETRESET", applog(LOG_INFO, "%s %d: Failed to read GETRESET",
bitfury->drv->name, bitfury->device_id); bitfury->drv->name, bitfury->device_id);
@ -227,7 +214,7 @@ static int64_t bitfury_scanhash(struct thr_info *thr, struct work *work,
cgtime(&tv_now); cgtime(&tv_now);
ms_diff = 600 - ms_tdiff(&tv_now, &info->tv_start); ms_diff = 600 - ms_tdiff(&tv_now, &info->tv_start);
if (ms_diff > 0) { if (ms_diff > 0) {
usb_read_ii_timeout(bitfury, 1, info->buf, 512, &amount, ms_diff, C_BF1_GETRES); usb_read_timeout(bitfury, info->buf, 512, &amount, ms_diff, C_BF1_GETRES);
info->tot += amount; info->tot += amount;
} }
@ -240,10 +227,10 @@ static int64_t bitfury_scanhash(struct thr_info *thr, struct work *work,
ms_diff = BF1WAIT - ms_tdiff(&tv_now, &info->tv_start); ms_diff = BF1WAIT - ms_tdiff(&tv_now, &info->tv_start);
if (unlikely(ms_diff < 10)) if (unlikely(ms_diff < 10))
ms_diff = 10; ms_diff = 10;
usb_read_ii_once_timeout(bitfury, 1, info->buf + info->tot, 7, &amount, ms_diff, C_BF1_GETRES); usb_read_once_timeout(bitfury, info->buf + info->tot, 7, &amount, ms_diff, C_BF1_GETRES);
info->tot += amount; info->tot += amount;
while (amount) { while (amount) {
usb_read_ii_once_timeout(bitfury, 1, info->buf + info->tot, 512, &amount, 10, C_BF1_GETRES); usb_read_once_timeout(bitfury, info->buf + info->tot, 512, &amount, 10, C_BF1_GETRES);
info->tot += amount; info->tot += amount;
}; };
@ -251,10 +238,10 @@ static int64_t bitfury_scanhash(struct thr_info *thr, struct work *work,
goto cascade; goto cascade;
/* Send work */ /* Send work */
usb_write_ii(bitfury, 1, buf, 45, &amount, C_BF1_REQWORK); usb_write(bitfury, buf, 45, &amount, C_BF1_REQWORK);
cgtime(&info->tv_start); cgtime(&info->tv_start);
/* Get response acknowledging work */ /* Get response acknowledging work */
usb_read_ii(bitfury, 1, buf, 7, &amount, C_BF1_GETWORK); usb_read(bitfury, buf, 7, &amount, C_BF1_GETWORK);
/* Only happens on startup */ /* Only happens on startup */
if (unlikely(!info->prevwork[BF1ARRAY_SIZE])) if (unlikely(!info->prevwork[BF1ARRAY_SIZE]))

5
usbutils.c
View File

@ -140,9 +140,10 @@ static struct usb_epinfo bfu1_epinfos[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 16, EPO(4), 0, 16, 0 } { LIBUSB_TRANSFER_TYPE_BULK, 16, EPO(4), 0, 16, 0 }
}; };
/* Default to interface 1 */
static struct usb_intinfo bfu_ints[] = { static struct usb_intinfo bfu_ints[] = {
USB_EPS(0, bfu0_epinfos), USB_EPS(1, bfu1_epinfos),
USB_EPS(1, bfu1_epinfos) USB_EPS(0, bfu0_epinfos)
}; };
#endif #endif