luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ftdispi: ft2232_spi_wr_and_rd: use dedicated buffer for MPSSE command to 

avoid overflow. Simplify code, improve error message (issue #524 and
This commit is contained in:
Gwenhael Goavec-Merou 2025-03-02 08:47:34 +01:00
parent 564485036e
commit ecb22b2eeb
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ftdispi.cpp
View File

@ -168,15 +168,18 @@ int FtdiSpi::ft2232_spi_wr_and_rd(//struct ftdi_spi *spi,
uint32_t writecnt, uint32_t writecnt,
const uint8_t * writearr, uint8_t * readarr) const uint8_t * writearr, uint8_t * readarr)
{ {
uint32_t max_xfer = (readarr) ? _buffer_size : 4096; // -3: for MPSSE instruction
const uint32_t max_xfer = ((readarr) ? _buffer_size : 4096);
uint8_t buf[max_xfer]; uint8_t buf[max_xfer];
int i = 0; uint8_t cmd[] = {
static_cast<uint8_t>(((readarr) ? (MPSSE_DO_READ | _rd_mode) : 0) |
((writearr) ? (MPSSE_DO_WRITE | _wr_mode) : 0)),
0, 0};
int ret = 0; int ret = 0;
uint8_t *rx_ptr = readarr; uint8_t *rx_ptr = readarr;
uint8_t *tx_ptr = (uint8_t *)writearr; uint8_t *tx_ptr = (uint8_t *)writearr;
uint32_t len = writecnt; uint32_t len = writecnt;
uint32_t xfer;
if (_cs_mode == SPI_CS_AUTO) { if (_cs_mode == SPI_CS_AUTO) {
clearCs(); clearCs();
@ -190,33 +193,27 @@ int FtdiSpi::ft2232_spi_wr_and_rd(//struct ftdi_spi *spi,
* operations. * operations.
*/ */
while (len > 0) { while (len > 0) {
xfer = (len > max_xfer) ? max_xfer : len; const uint32_t xfer = (len > max_xfer) ? max_xfer : len;
cmd[1] = ((xfer - 1) >> 0) & 0xff;
buf[i++] = ((readarr) ? (MPSSE_DO_READ | _rd_mode) : 0) | cmd[2] = ((xfer - 1) >> 8) & 0xff;
((writearr) ? (MPSSE_DO_WRITE | _wr_mode) : 0); mpsse_store(cmd, 3);
buf[i++] = (xfer - 1) & 0xff;
buf[i++] = ((xfer - 1) >> 8) & 0xff;
if (writearr) { if (writearr) {
memcpy(buf + i, tx_ptr, xfer); memcpy(buf, tx_ptr, xfer);
tx_ptr += xfer; tx_ptr += xfer;
i += xfer;
} }
ret = mpsse_store(buf, i); ret = mpsse_store(buf, xfer);
if (ret) if (ret)
printf("send_buf failed before read: %i %s\n", ret, ftdi_get_error_string(_ftdi)); printf("send_buf failed before read: %i %s\n", ret, ftdi_get_error_string(_ftdi));
i = 0;
if (readarr) { if (readarr) {
//if (ret == 0) {
ret = mpsse_read(rx_ptr, xfer); ret = mpsse_read(rx_ptr, xfer);
if ((uint32_t)ret != xfer) if (ret < 0)
printf("get_buf failed: %i\n", ret); printf("get_buf failed: %i %s\n", ret, ftdi_get_error_string(_ftdi));
//}
rx_ptr += xfer; rx_ptr += xfer;
} else { } else {
ret = mpsse_write(); ret = mpsse_write();
if ((uint32_t)ret != xfer+3) if (ret < 0)
printf("error %d %d\n", ret, i); printf("error: %i %s\n", ret, ftdi_get_error_string(_ftdi));
} }
len -= xfer; len -= xfer;