Commit 36454f601221797cf8f6d06e61e0af6a36ce1c2c
2014-01-08T21:27:04
Revert "Pad all larger spi transfers to 60 bytes since intermediate sized ones make it expect more data." This reverts commit e0623430cf7fd6a0477ecd463410627394f77c41.
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
diff --git a/mcp2210.c b/mcp2210.c
index db4cc0c..e7c97db 100644
--- a/mcp2210.c
+++ b/mcp2210.c
@@ -302,8 +302,8 @@ mcp2210_set_spi_transfer_settings(struct cgpu_info *cgpu, unsigned int bitrate,
bool mcp2210_spi_transfer(struct cgpu_info *cgpu, char *data, unsigned int *length)
{
unsigned int bitrate, icsv, acsv, cstdd, ldbtcsd, sdbd, bpst, spimode;
+ uint8_t res, status, orig_len, len, offset = 0;
char buf[MCP2210_BUFFER_LENGTH];
- uint8_t res, status, orig_len;
if (unlikely(*length > MCP2210_TRANSFER_MAX || !*length)) {
applog(LOG_ERR, "%s %d: Unable to spi transfer %u bytes", cgpu->drv->name,
@@ -313,34 +313,34 @@ bool mcp2210_spi_transfer(struct cgpu_info *cgpu, char *data, unsigned int *leng
if (!mcp2210_get_spi_transfer_settings(cgpu, &bitrate, &icsv, &acsv, &cstdd,
&ldbtcsd, &sdbd, &bpst, &spimode))
return false;
- orig_len = *length;
- bpst = *length > 2 ? MCP2210_TRANSFER_MAX : *length;
+ bpst = *length;
if (!mcp2210_set_spi_transfer_settings(cgpu, bitrate, icsv, acsv, cstdd,
ldbtcsd, sdbd, bpst, spimode))
return false;
+ orig_len = len = *length;
retry:
applog(LOG_DEBUG, "%s %d: SPI sending %u bytes", cgpu->drv->name, cgpu->device_id,
*length);
memset(buf, 0, MCP2210_BUFFER_LENGTH);
buf[0] = MCP2210_SPI_TRANSFER;
- buf[1] = *length > 2 ? MCP2210_TRANSFER_MAX : *length;
+ buf[1] = *length;
if (*length)
- memcpy(buf + 4, data, *length);
+ memcpy(buf + 4, data + offset, *length);
if (!mcp2210_send_recv(cgpu, buf, C_MCP_SPITRANSFER))
return false;
res = (uint8_t)buf[1];
switch(res) {
case MCP2210_SPI_TRANSFER_SUCCESS:
+ len -= *length;
*length = buf[2];
status = buf[3];
applog(LOG_DEBUG, "%s %d: SPI transfer success, received %u bytes status 0x%x",
cgpu->drv->name, cgpu->device_id, *length, status);
if (*length) {
- memcpy(data, buf + 4, orig_len);
- *length = orig_len;
- return true;
+ memcpy(data + offset, buf + 4, *length);
+ offset += *length;
}
if (status == 0x30) {
/* This shouldn't happen */
@@ -348,8 +348,12 @@ retry:
cgpu->drv->name, cgpu->device_id);
return false;
}
- *length = 0;
- goto retry;
+ if (offset < orig_len) {
+ *length = 0;
+ goto retry;
+ }
+ *length = orig_len;
+ return true;
case MCP2210_SPI_TRANSFER_ERROR_IP:
applog(LOG_DEBUG, "%s %d: SPI transfer error in progress",
cgpu->drv->name, cgpu->device_id);