Commit 54ac35553fa7d1509f3082b2553e8e1f4ab11ace
2013-09-24T22:28:56
Add commands for getting BF1 bitfury info
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/driver-bitfury.c b/driver-bitfury.c
index 6ec794a..66f35ff 100644
--- a/driver-bitfury.c
+++ b/driver-bitfury.c
@@ -26,27 +26,37 @@ static void bitfury_close(struct cgpu_info *bitfury)
usb_transfer(bitfury, 0x21, 0x22, 0, 0, C_BFO_CLOSE);
}
-static void bitfury_initialise(struct cgpu_info *bitfury)
-{
- bitfury_open(bitfury);
-}
-
static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_devices *found)
{
struct cgpu_info *bitfury;
+ char buf[512];
+ int amount;
bitfury = usb_alloc_cgpu(&bitfury_drv, 1);
if (!usb_init(bitfury, dev, found)) {
bitfury = usb_free_cgpu(bitfury);
- return false;
+ goto out;
}
- applog(LOG_WARNING, "%s%d: Found at %s", bitfury->drv->name,
+ applog(LOG_INFO, "%s%d: Found at %s", bitfury->drv->name,
bitfury->device_id, bitfury->device_path);
- bitfury_initialise(bitfury);
+ usb_buffer_enable(bitfury);
+ bitfury_open(bitfury);
+ usb_write(bitfury, "I", 1, &amount, C_BFO_REQINFO);
+ usb_read(bitfury, buf, 14, &amount, C_BFO_GETINFO);
+ if (amount != 14) {
+ applog(LOG_WARNING, "%s%d: Getinfo received %d",
+ bitfury->drv->name, bitfury->device_id, amount);
+ goto out_close;
+ }
+ applog(LOG_INFO, "%s%d: Getinfo returned %s", bitfury->drv->name,
+ bitfury->device_id, buf);
+ //return true;
+out_close:
bitfury_close(bitfury);
+out:
return false;
}
diff --git a/usbutils.h b/usbutils.h
index 29501e2..3119e4a 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -323,7 +323,11 @@ struct cg_usb_info {
USB_ADD_COMMAND(C_BB_SET_VOLTAGE, "SetCoreVoltage") \
USB_ADD_COMMAND(C_BB_GET_VOLTAGE, "GetCoreVoltage") \
USB_ADD_COMMAND(C_BFO_OPEN, "BF1Open") \
- USB_ADD_COMMAND(C_BFO_CLOSE, "BF1Close")
+ USB_ADD_COMMAND(C_BFO_CLOSE, "BF1Close") \
+ USB_ADD_COMMAND(C_BFO_REQINFO, "BF1RequestInfo") \
+ USB_ADD_COMMAND(C_BFO_GETINFO, "BF1GetInfo") \
+ USB_ADD_COMMAND(C_BFO_REQRESET, "BF1RequestReset") \
+ USB_ADD_COMMAND(C_BFO_GETRESET, "BF1GetReset")
/* Create usb_cmds enum from USB_PARSE_COMMANDS macro */
#define USB_ADD_COMMAND(X, Y) X,