Commit 1d7d7310e4205d2635827b5fb86a06590b4f68b4
2014-01-04T22:10:04
Separate out the send and receive functions for mcp2210 and check response value in return.
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
diff --git a/mcp2210.c b/mcp2210.c
index efba6cc..16ea389 100644
--- a/mcp2210.c
+++ b/mcp2210.c
@@ -10,9 +10,8 @@
#include "usbutils.h"
#include "mcp2210.h"
-bool mcp2210_send_recv(struct cgpu_info *cgpu, char *buf, enum usb_cmds cmd)
+static bool mcp2210_send(struct cgpu_info *cgpu, char *buf, enum usb_cmds cmd)
{
- uint8_t mcp_cmd = buf[0];
int amount, err;
if (unlikely(cgpu->usbinfo.nodev))
@@ -25,14 +24,35 @@ bool mcp2210_send_recv(struct cgpu_info *cgpu, char *buf, enum usb_cmds cmd)
amount, MCP2210_BUFFER_LENGTH);
return false;
}
+ return true;
+}
+
+static bool mcp2210_recv(struct cgpu_info *cgpu, char *buf, enum usb_cmds cmd)
+{
+ int amount, err;
+
+ if (unlikely(cgpu->usbinfo.nodev))
+ return false;
- err = usb_read_timeout(cgpu, buf, MCP2210_BUFFER_LENGTH, &amount, 10, cmd);
+ err = usb_read_once_timeout(cgpu, buf, MCP2210_BUFFER_LENGTH, &amount, 1, cmd);
if (err || amount != MCP2210_BUFFER_LENGTH) {
applog(LOG_WARNING, "%s %d: Error %d receiving %s received %d of %d",
cgpu->drv->name, cgpu->device_id, err, usb_cmdname(cmd),
amount, MCP2210_BUFFER_LENGTH);
return false;
}
+ return true;
+}
+
+bool mcp2210_send_recv(struct cgpu_info *cgpu, char *buf, enum usb_cmds cmd)
+{
+ uint8_t mcp_cmd = buf[0];
+
+ if (!mcp2210_send(cgpu, buf, cmd))
+ return false;
+
+ if (!mcp2210_recv(cgpu, buf, cmd))
+ return false;
/* Return code should always echo original command */
if (buf[0] != mcp_cmd) {
@@ -345,8 +365,8 @@ retry:
switch(res) {
case MCP2210_SPI_TRANSFER_SUCCESS:
*length = buf[2];
- applog(LOG_DEBUG, "%s %d: SPI transfer success, received %u bytes",
- cgpu->drv->name, cgpu->device_id, *length);
+ applog(LOG_DEBUG, "%s %d: SPI transfer success, received %u bytes status 0x%x",
+ cgpu->drv->name, cgpu->device_id, *length, buf[3]);
if (*length)
memcpy(data, buf + 4, *length);
return true;