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

spiInterface: increase spi_put len param

This commit is contained in:
Gwenhael Goavec-Merou 2020-08-23 17:16:21 +02:00
parent 4bfb764e75
commit b3ef97f95e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lattice.cpp
View File

@ -901,7 +901,7 @@ bool Lattice::loadConfiguration()
/* SPI implementation */ /* SPI implementation */
/* ------------------ */ /* ------------------ */
int Lattice::spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, uint16_t len) int Lattice::spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, uint32_t len)
{ {
int xfer_len = len + 1; int xfer_len = len + 1;
uint8_t jtx[xfer_len]; uint8_t jtx[xfer_len];
@ -927,7 +927,7 @@ int Lattice::spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, uint16_t len)
return 0; return 0;
} }
int Lattice::spi_put(uint8_t *tx, uint8_t *rx, uint16_t len) int Lattice::spi_put(uint8_t *tx, uint8_t *rx, uint32_t len)
{ {
int xfer_len = len; int xfer_len = len;
uint8_t jtx[xfer_len]; uint8_t jtx[xfer_len];

4
src/lattice.hpp
View File

@ -43,8 +43,8 @@ class Lattice: public Device, SPIInterface {
/* spi interface */ /* spi interface */
int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx,
uint16_t len) override; uint32_t len) override;
int spi_put(uint8_t *tx, uint8_t *rx, uint16_t len) override; int spi_put(uint8_t *tx, uint8_t *rx, uint32_t len) override;
int spi_wait(uint8_t cmd, uint8_t mask, uint8_t cond, int spi_wait(uint8_t cmd, uint8_t mask, uint8_t cond,
uint32_t timeout, bool verbose=false) override; uint32_t timeout, bool verbose=false) override;

4
src/spiInterface.hpp
View File

@ -42,7 +42,7 @@ class SPIInterface {
* \return 0 when success * \return 0 when success
*/ */
virtual int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, virtual int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx,
uint16_t len) = 0; uint32_t len) = 0;
/*! /*!
* \brief send a command, followed by len byte. * \brief send a command, followed by len byte.
@ -51,7 +51,7 @@ class SPIInterface {
* \param[in] len: number of byte to send/receive * \param[in] len: number of byte to send/receive
* \return 0 when success * \return 0 when success
*/ */
virtual int spi_put(uint8_t *tx, uint8_t *rx, uint16_t len) = 0; virtual int spi_put(uint8_t *tx, uint8_t *rx, uint32_t len) = 0;
/*! /*!
* \brief wait until register content and mask match cond, or timeout * \brief wait until register content and mask match cond, or timeout

4
src/xilinx.cpp
View File

@ -217,7 +217,7 @@ void Xilinx::program_mem(BitParser &bitfile)
* so to send only a cmd set len to 0 (or omit this param) * so to send only a cmd set len to 0 (or omit this param)
*/ */
int Xilinx::spi_put(uint8_t cmd, int Xilinx::spi_put(uint8_t cmd,
uint8_t *tx, uint8_t *rx, uint16_t len) uint8_t *tx, uint8_t *rx, uint32_t len)
{ {
int xfer_len = len + 1 + ((rx == NULL) ? 0 : 1); int xfer_len = len + 1 + ((rx == NULL) ? 0 : 1);
uint8_t jtx[xfer_len]; uint8_t jtx[xfer_len];
@ -243,7 +243,7 @@ int Xilinx::spi_put(uint8_t cmd,
return 0; return 0;
} }
int Xilinx::spi_put(uint8_t *tx, uint8_t *rx, uint16_t len) int Xilinx::spi_put(uint8_t *tx, uint8_t *rx, uint32_t len)
{ {
int xfer_len = len + ((rx == NULL) ? 0 : 1); int xfer_len = len + ((rx == NULL) ? 0 : 1);
uint8_t jtx[xfer_len]; uint8_t jtx[xfer_len];

4
src/xilinx.hpp
View File

@ -21,8 +21,8 @@ class Xilinx: public Device, SPIInterface {
/* spi interface */ /* spi interface */
int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx, int spi_put(uint8_t cmd, uint8_t *tx, uint8_t *rx,
uint16_t len) override; uint32_t len) override;
int spi_put(uint8_t *tx, uint8_t *rx, uint16_t len) override; int spi_put(uint8_t *tx, uint8_t *rx, uint32_t len) override;
int spi_wait(uint8_t cmd, uint8_t mask, uint8_t cond, int spi_wait(uint8_t cmd, uint8_t mask, uint8_t cond,
uint32_t timeout, bool verbose = false) override; uint32_t timeout, bool verbose = false) override;
}; };