Commit b70edef9f53bf566de70b7a563f1a0aff3c91e87
2012-12-03T08:53:22
libztex: Read bitstream file in 64kb blocks with simpler and faster code
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 72 73 74 75 76 77 78 79 80 81
diff --git a/libztex.c b/libztex.c
index 14cdba6..ebcfe67 100644
--- a/libztex.c
+++ b/libztex.c
@@ -276,8 +276,7 @@ static int libztex_configureFpgaHS(struct libztex_device *ztex, const char* firm
struct libztex_fpgastate state;
const int transactionBytes = 65536;
unsigned char buf[transactionBytes], settings[2];
- int tries, cnt, buf_p, i;
- ssize_t pos = 0;
+ int tries, cnt, err, i;
FILE *fp;
if (!libztex_checkCapability(ztex, CAPABILITY_HS_FPGA))
@@ -302,52 +301,25 @@ static int libztex_configureFpgaHS(struct libztex_device *ztex, const char* firm
return -2;
}
- while (pos < transactionBytes && !feof(fp)) {
- buf[pos++] = getc(fp);
- }
-
- if (feof(fp))
- pos--;
-
- if (bs != 0 && bs != 1)
- bs = libztex_detectBitstreamBitOrder(buf, transactionBytes < pos? transactionBytes: pos);
-
-
- if (bs == 1)
- libztex_swapBits(buf, pos);
-
libusb_control_transfer(ztex->hndl, 0x40, 0x34, 0, 0, NULL, 0, 1000);
// 0x34 - initHSFPGAConfiguration
- buf_p = pos;
- while (1) {
- i = 0;
- while (i < buf_p) {
- if (libusb_bulk_transfer(ztex->hndl,
- settings[0],
- &buf[i],
- buf_p - i,
- &cnt, 1000) != 0) {
- applog(LOG_ERR, "%s: Failed send hs fpga data", ztex->repr);
- break;
- }
- usleep(500);
- i += cnt;
- }
- if (i < buf_p || buf_p < transactionBytes)
- break;
- buf_p = 0;
- while (buf_p < transactionBytes && !feof(fp)) {
- buf[buf_p++] = getc(fp);
- }
- if (feof(fp))
- buf_p--;
- pos += buf_p;
- if (buf_p == 0)
- break;
+ do
+ {
+ int length = fread(buf,1,transactionBytes,fp);
+
+ if (bs != 0 && bs != 1)
+ bs = libztex_detectBitstreamBitOrder(buf, length);
if (bs == 1)
- libztex_swapBits(buf, buf_p);
+ libztex_swapBits(buf, length);
+
+ err = libusb_bulk_transfer(ztex->hndl, settings[0], buf, length, &cnt, 1000);
+ if (cnt != length)
+ applog(LOG_ERR, "%s: cnt != length", ztex->repr);
+ if (err != 0)
+ applog(LOG_ERR, "%s: Failed send hs fpga data", ztex->repr);
}
+ while (!feof(fp));
libusb_control_transfer(ztex->hndl, 0x40, 0x35, 0, 0, NULL, 0, 1000);
// 0x35 - finishHSFPGAConfiguration