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

ftdispi: fixed ft2232_spi_wr_and_rd: buffer is empty when transaction is read-only

This commit is contained in:
Gwenhael Goavec-Merou 2025-03-09 08:37:29 +01:00
parent b9c2ab5cdc
commit 6f29d9ecd1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ftdispi.cpp
View File

@ -171,7 +171,7 @@ int FtdiSpi::ft2232_spi_wr_and_rd(//struct ftdi_spi *spi,
const uint8_t * writearr, uint8_t * readarr) const uint8_t * writearr, uint8_t * readarr)
{ {
// -3: for MPSSE instruction // -3: for MPSSE instruction
const uint32_t max_xfer = ((readarr) ? _buffer_size : 4096); const uint16_t max_xfer = ((readarr) ? _buffer_size : 4096);
uint8_t buf[max_xfer]; uint8_t buf[max_xfer];
uint8_t cmd[] = { uint8_t cmd[] = {
static_cast<uint8_t>(((readarr) ? (MPSSE_DO_READ | _rd_mode) : 0) | static_cast<uint8_t>(((readarr) ? (MPSSE_DO_READ | _rd_mode) : 0) |
@ -195,16 +195,18 @@ int FtdiSpi::ft2232_spi_wr_and_rd(//struct ftdi_spi *spi,
* operations. * operations.
*/ */
while (len > 0) { while (len > 0) {
const uint32_t xfer = (len > max_xfer) ? max_xfer : len; const uint16_t xfer = (len > max_xfer) ? max_xfer : len;
cmd[1] = ((xfer - 1) >> 0) & 0xff; cmd[1] = static_cast<uint8_t>(((xfer - 1) >> 0) & 0xff);
cmd[2] = ((xfer - 1) >> 8) & 0xff; cmd[2] = static_cast<uint8_t>(((xfer - 1) >> 8) & 0xff);
uint16_t xfer_len = 0; // 0 when read-only
mpsse_store(cmd, 3); mpsse_store(cmd, 3);
if (writearr) { if (writearr) {
memcpy(buf, tx_ptr, xfer); memcpy(buf, tx_ptr, xfer);
tx_ptr += xfer; tx_ptr += xfer;
xfer_len = xfer;
} }
ret = mpsse_store(buf, xfer_len);
ret = mpsse_store(buf, xfer);
if (ret) { if (ret) {
printError("send_buf failed before read with error: " + printError("send_buf failed before read with error: " +
std::string(ftdi_get_error_string(_ftdi)) + " (" + std::string(ftdi_get_error_string(_ftdi)) + " (" +