Commit 1b7737d8093517afbc835d1a3081649b2fc1ad2e
2013-12-24T08:34:56
Fix BXF being inappropriately dependent on drillbit.
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 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/usbutils.c b/usbutils.c
index 6b7a0e1..3556ed9 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -139,6 +139,20 @@ static struct usb_intinfo bfu_ints[] = {
USB_EPS(1, bfu1_epinfos),
USB_EPS(0, bfu0_epinfos)
};
+
+static struct usb_epinfo bxf0_epinfos[] = {
+ { LIBUSB_TRANSFER_TYPE_INTERRUPT, 8, EPI(1), 0, 0 }
+};
+
+static struct usb_epinfo bxf1_epinfos[] = {
+ { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(2), 0, 0 },
+ { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0, 0 }
+};
+
+static struct usb_intinfo bxf_ints[] = {
+ USB_EPS(1, bxf1_epinfos),
+ USB_EPS(0, bxf0_epinfos)
+};
#endif
#ifdef USE_DRILLBIT
@@ -157,20 +171,6 @@ static struct usb_intinfo drillbit_ints[] = {
USB_EPS(1, drillbit_bulk_epinfos),
USB_EPS(0, drillbit_int_epinfos)
};
-
-static struct usb_epinfo bxf0_epinfos[] = {
- { LIBUSB_TRANSFER_TYPE_INTERRUPT, 8, EPI(1), 0, 0 }
-};
-
-static struct usb_epinfo bxf1_epinfos[] = {
- { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(2), 0, 0 },
- { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0, 0 }
-};
-
-static struct usb_intinfo bxf_ints[] = {
- USB_EPS(1, bxf1_epinfos),
- USB_EPS(0, bxf0_epinfos)
-};
#endif
#ifdef USE_HASHFAST
@@ -355,6 +355,19 @@ static struct usb_find_devices find_dev[] = {
.iProduct = "Bitfury BF1",
INTINFO(bfu_ints)
},
+ {
+ .drv = DRIVER_bitfury,
+ .name = "BXF",
+ .ident = IDENT_BXF,
+ .idVendor = 0x198c,
+ .idProduct = 0xb1f1,
+ .config = 1,
+ .timeout = BITFURY_TIMEOUT_MS,
+ .latency = LATENCY_UNUSED,
+ .iManufacturer = "c-scape",
+ .iProduct = "bi?fury",
+ INTINFO(bxf_ints)
+ },
#endif
#ifdef USE_DRILLBIT
{
@@ -370,19 +383,6 @@ static struct usb_find_devices find_dev[] = {
.iProduct = NULL, /* Can be Thumb or Eight, same driver */
INTINFO(drillbit_ints)
},
- {
- .drv = DRIVER_bitfury,
- .name = "BXF",
- .ident = IDENT_BXF,
- .idVendor = 0x198c,
- .idProduct = 0xb1f1,
- .config = 1,
- .timeout = BITFURY_TIMEOUT_MS,
- .latency = LATENCY_UNUSED,
- .iManufacturer = "c-scape",
- .iProduct = "bi?fury",
- INTINFO(bxf_ints)
- },
#endif
#ifdef USE_MODMINER
{