GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 10:04:33 +00:00
Code Issues Releases Wiki Activity

libztex: Read bitstream file in 2kb blocks with simpler and faster code

Browse Source 
optimized libztex_configureFpgaLS() like it was done some commits
ago to libztex_configureFpgaHS()
This commit is contained in:
Denis Ahrens 2012-12-06 14:06:30 +01:00
parent a4fead5468
commit b48b2cc8c4
1 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
libztex.c
View File

@ -421,9 +421,8 @@ static int libztex_configureFpgaLS(struct libztex_device *ztex, const char* firm
{ {
struct libztex_fpgastate state; struct libztex_fpgastate state;
const int transactionBytes = 2048; const int transactionBytes = 2048;
unsigned char buf[transactionBytes], cs; unsigned char buf[transactionBytes];
int tries, cnt, buf_p, i; int tries, cnt, i;
ssize_t pos = 0;
FILE *fp; FILE *fp;
if (!libztex_checkCapability(ztex, CAPABILITY_FPGA)) if (!libztex_checkCapability(ztex, CAPABILITY_FPGA))
@ -442,18 +441,6 @@ static int libztex_configureFpgaLS(struct libztex_device *ztex, const char* firm
return -2; return -2;
} }
cs = 0;
while (pos < transactionBytes && !feof(fp)) {
buf[pos] = getc(fp);
cs += buf[pos++];
}
if (feof(fp))
pos--;
if (bs != 0 && bs != 1)
bs = libztex_detectBitstreamBitOrder(buf, transactionBytes < pos? transactionBytes: pos);
//* Reset fpga //* Reset fpga
cnt = libztex_resetFpga(ztex); cnt = libztex_resetFpga(ztex);
if (unlikely(cnt < 0)) { if (unlikely(cnt < 0)) {
@ -461,36 +448,24 @@ static int libztex_configureFpgaLS(struct libztex_device *ztex, const char* firm
continue; continue;
} }
if (bs == 1) do
libztex_swapBits(buf, pos); {
int length = fread(buf, 1, transactionBytes, fp);
buf_p = pos;
while (1) { if (bs != 0 && bs != 1)
i = 0; bs = libztex_detectBitstreamBitOrder(buf, length);
while (i < buf_p) {
cnt = libusb_control_transfer(ztex->hndl, 0x40, 0x32, 0, 0, &buf[i], buf_p - i, 5000);
if (unlikely(cnt < 0)) {
applog(LOG_ERR, "%s: Failed send fpga data with err %d", ztex->repr, cnt);
break;
}
i += cnt;
}
if (i < buf_p || buf_p < transactionBytes)
break;
buf_p = 0;
while (buf_p < transactionBytes && !feof(fp)) {
buf[buf_p] = getc(fp);
cs += buf[buf_p++];
}
if (feof(fp))
buf_p--;
pos += buf_p;
if (buf_p == 0)
break;
if (bs == 1) if (bs == 1)
libztex_swapBits(buf, buf_p); libztex_swapBits(buf, length);
cnt = libusb_control_transfer(ztex->hndl, 0x40, 0x32, 0, 0, buf, length, 5000);
if (cnt != length)
{
applog(LOG_ERR, "%s: Failed send hs fpga data", ztex->repr);
break;
}
} }
if (cnt >= 0) while (!feof(fp));
if (cnt > 0)
tries = 0; tries = 0;
fclose(fp); fclose(fp);