Commit 6aed9a51224341bf046cbccb1adcc5ab63bb1b70
2013-06-05T01:49:48
bflsc & icarus use usb_ftdi_set_latency
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
diff --git a/driver-bflsc.c b/driver-bflsc.c
index 1f813e9..9177d57 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -565,25 +565,6 @@ static bool bflsc_qres(struct cgpu_info *bflsc, char *buf, size_t bufsiz, int de
return readok;
}
-static void __set_latency(struct cgpu_info *bflsc)
-{
- int err;
-
- if (bflsc->usbinfo.nodev)
- return;
-
- // Latency
- err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY,
- bflsc->usbdev->found->latency,
- bflsc->usbdev->found->interface, C_LATENCY);
-
- applog(LOG_DEBUG, "%s%i: latency got err %d",
- bflsc->drv->name, bflsc->device_id, err);
-
- if (bflsc->usbinfo.nodev)
- return;
-}
-
static void __bflsc_initialise(struct cgpu_info *bflsc)
{
int err;
@@ -604,7 +585,7 @@ static void __bflsc_initialise(struct cgpu_info *bflsc)
if (bflsc->usbinfo.nodev)
return;
- __set_latency(bflsc);
+ usb_ftdi_set_latency(bflsc);
if (bflsc->usbinfo.nodev)
return;
@@ -944,7 +925,7 @@ reinit:
if (latency != bflsc->usbdev->found->latency) {
bflsc->usbdev->found->latency = latency;
- __set_latency(bflsc);
+ usb_ftdi_set_latency(bflsc);
}
for (i = 0; i < sc_info->sc_count; i++)
diff --git a/driver-icarus.c b/driver-icarus.c
index d782a71..f4d50cb 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -256,10 +256,6 @@ static void icarus_initialise(struct cgpu_info *icarus, int baud)
case IDENT_LLT:
case IDENT_CMR1:
case IDENT_CMR2:
- if (icarus->usbdev->found->latency == LATENCY_UNUSED)
- quit(1, "%s: cgid %d invalid latency (UNUSED)",
- icarus->drv->name, icarus->cgminer_id);
-
// Reset
transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_RESET, FTDI_VALUE_RESET,
icarus->usbdev->found->interface, C_RESET);
@@ -268,9 +264,7 @@ static void icarus_initialise(struct cgpu_info *icarus, int baud)
return;
// Latency
- transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY,
- icarus->usbdev->found->latency,
- icarus->usbdev->found->interface, C_LATENCY);
+ usb_ftdi_set_latency(icarus);
if (icarus->usbinfo.nodev)
return;