Browse Source

Merge branch 'icarus-dev' of github.com:ckolivas/cgminer into icarus-dev

nfactor-troky
Con Kolivas 12 years ago
parent
commit
430416da35
  1. 4
      driver-icarus.c
  2. 2
      usbutils.c
  3. 1
      usbutils.h

4
driver-icarus.c

@ -235,9 +235,9 @@ static void icarus_initialise(struct cgpu_info *icarus, __maybe_unused int baud)
switch (icarus->usbdev->ident) { switch (icarus->usbdev->ident) {
case IDENT_BLT: case IDENT_BLT:
case IDENT_LLT: case IDENT_LLT:
// Reset // Latency
transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY, FTDI_VALUE_LATENCY, transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY, FTDI_VALUE_LATENCY,
icarus->usbdev->found->interface, C_RESET); icarus->usbdev->found->interface, C_LATENCY);
if (icarus->usbinfo.nodev) if (icarus->usbinfo.nodev)
return; return;

2
usbutils.c

@ -408,6 +408,7 @@ static const char *C_QUEFLUSH_S = "QueFlush";
static const char *C_QUEFLUSHREPLY_S = "QueFlushReply"; static const char *C_QUEFLUSHREPLY_S = "QueFlushReply";
static const char *C_REQUESTVOLTS_S = "RequestVolts"; static const char *C_REQUESTVOLTS_S = "RequestVolts";
static const char *C_SENDTESTWORK_S = "SendTestWork"; static const char *C_SENDTESTWORK_S = "SendTestWork";
static const char *C_LATENCY_S = "SetLatency";
#ifdef EOL #ifdef EOL
#undef EOL #undef EOL
@ -877,6 +878,7 @@ static void cgusb_check_init()
usb_commands[C_QUEFLUSHREPLY] = C_QUEFLUSHREPLY_S; usb_commands[C_QUEFLUSHREPLY] = C_QUEFLUSHREPLY_S;
usb_commands[C_REQUESTVOLTS] = C_REQUESTVOLTS_S; usb_commands[C_REQUESTVOLTS] = C_REQUESTVOLTS_S;
usb_commands[C_SENDTESTWORK] = C_SENDTESTWORK_S; usb_commands[C_SENDTESTWORK] = C_SENDTESTWORK_S;
usb_commands[C_LATENCY] = C_LATENCY_S;
stats_initialised = true; stats_initialised = true;
} }

1
usbutils.h

@ -171,6 +171,7 @@ enum usb_cmds {
C_QUEFLUSHREPLY, C_QUEFLUSHREPLY,
C_REQUESTVOLTS, C_REQUESTVOLTS,
C_SENDTESTWORK, C_SENDTESTWORK,
C_LATENCY,
C_MAX C_MAX
}; };

Loading…
Cancel
Save