Browse Source

Merge pull request #457 from kanoi/master

bflsc get volts stats needs its own GETVOLTS
nfactor-troky
kanoi 12 years ago
parent
commit
951ec31142
  1. 2
      driver-bflsc.c
  2. 2
      usbutils.c
  3. 1
      usbutils.h

2
driver-bflsc.c

@ -1394,7 +1394,7 @@ static bool bflsc_get_temp(struct cgpu_info *bflsc, int dev) @@ -1394,7 +1394,7 @@ static bool bflsc_get_temp(struct cgpu_info *bflsc, int dev)
err = send_recv_ss(bflsc, dev, &sent, &amount,
BFLSC_VOLTAGE, BFLSC_VOLTAGE_LEN, C_REQUESTVOLTS,
volt_buf, sizeof(volt_buf)-1, C_GETTEMPERATURE, READ_NL);
volt_buf, sizeof(volt_buf)-1, C_GETVOLTS, READ_NL);
mutex_unlock(&(bflsc->device_mutex));
if (!sent) {

2
usbutils.c

@ -517,6 +517,7 @@ static const char *C_QUEJOBSTATUS_S = "QueJobStatus"; @@ -517,6 +517,7 @@ static const char *C_QUEJOBSTATUS_S = "QueJobStatus";
static const char *C_QUEFLUSH_S = "QueFlush";
static const char *C_QUEFLUSHREPLY_S = "QueFlushReply";
static const char *C_REQUESTVOLTS_S = "RequestVolts";
static const char *C_GETVOLTS_S = "GetVolts";
static const char *C_SENDTESTWORK_S = "SendTestWork";
static const char *C_LATENCY_S = "SetLatency";
static const char *C_SETLINE_S = "SetLine";
@ -1004,6 +1005,7 @@ static void cgusb_check_init() @@ -1004,6 +1005,7 @@ static void cgusb_check_init()
usb_commands[C_QUEFLUSH] = C_QUEFLUSH_S;
usb_commands[C_QUEFLUSHREPLY] = C_QUEFLUSHREPLY_S;
usb_commands[C_REQUESTVOLTS] = C_REQUESTVOLTS_S;
usb_commands[C_GETVOLTS] = C_GETVOLTS_S;
usb_commands[C_SENDTESTWORK] = C_SENDTESTWORK_S;
usb_commands[C_LATENCY] = C_LATENCY_S;
usb_commands[C_SETLINE] = C_SETLINE_S;

1
usbutils.h

@ -265,6 +265,7 @@ enum usb_cmds { @@ -265,6 +265,7 @@ enum usb_cmds {
C_QUEFLUSH,
C_QUEFLUSHREPLY,
C_REQUESTVOLTS,
C_GETVOLTS,
C_SENDTESTWORK,
C_LATENCY,
C_SETLINE,

Loading…
Cancel
Save