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

ftdispi: cleanup + fix + add support for wpn and holdn pins

This commit is contained in:
Gwenhael Goavec-Merou 2020-10-31 07:45:30 +01:00
parent deefcd2d38
commit 1bc20fee85
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ftdispi.cpp
View File

@ -54,9 +54,9 @@ void FtdiSpi::setMode(uint8_t mode)
} }
/* for clk pin in idle state */ /* for clk pin in idle state */
if (_clk_idle) if (_clk_idle)
gpio_set(_clk, true); gpio_set(_clk);
else else
gpio_clear(_clk, true); gpio_clear(_clk);
} }
static FTDIpp_MPSSE::mpsse_bit_config bit_conf = static FTDIpp_MPSSE::mpsse_bit_config bit_conf =
@ -77,25 +77,22 @@ FtdiSpi::FtdiSpi(const FTDIpp_MPSSE::mpsse_bit_config &conf,
spi_pins_conf_t spi_config, spi_pins_conf_t spi_config,
uint32_t clkHZ, bool verbose): uint32_t clkHZ, bool verbose):
FTDIpp_MPSSE(conf, "", "", clkHZ, verbose), FTDIpp_MPSSE(conf, "", "", clkHZ, verbose),
_cs_bits(1 << 3), _clk(1 << 0) _cs_bits(1 << 3), _clk(1 << 0), _holdn(0), _wpn(0)
{ {
/* if cs not provided use pin 4 */
/*if (_cs == 0)
_cs = (1<<4);
_cable.low_dir |= _cs;*/
printf("cs pin : %d\n", spi_config.cs_pin);
if (spi_config.cs_pin) if (spi_config.cs_pin)
_cs_bits = spi_config.cs_pin; _cs_bits = spi_config.cs_pin;
if (spi_config.sck_pin) if (spi_config.sck_pin)
_clk = spi_config.sck_pin; _clk = spi_config.sck_pin;
if (spi_config.holdn_pin)
_holdn = spi_config.holdn_pin;
if (spi_config.wpn_pin)
_holdn = spi_config.wpn_pin;
/* clk is fixed by MPSSE engine /* clk is fixed by MPSSE engine
* but CS is free -> update bit direction * but CS, holdn, wpn are free -> update bits direction
*/ */
gpio_set_output(_cs_bits | _holdn | _wpn);
gpio_set_output(_cs_bits, true); gpio_set(_cs_bits | _holdn | _wpn);
gpio_set(_cs_bits, true);
setMode(0); setMode(0);
setCSmode(SPI_CS_AUTO); setCSmode(SPI_CS_AUTO);
@ -113,11 +110,11 @@ bool FtdiSpi::confCs(char stat)
{ {
bool ret; bool ret;
if (stat == 0) { if (stat == 0) {
ret = gpio_clear(_cs_bits, true); ret = gpio_clear(_cs_bits);
ret |= gpio_clear(_cs_bits, true); ret |= gpio_clear(_cs_bits);
} else { } else {
ret = gpio_set(_cs_bits, true); ret = gpio_set(_cs_bits);
ret |= gpio_set(_cs_bits, true); ret |= gpio_set(_cs_bits);
} }
if (!ret) if (!ret)
printf("Error: CS update\n"); printf("Error: CS update\n");

7
src/ftdispi.hpp
View File

@ -1,3 +1,6 @@
#ifndef SRC_FTDISPI_HPP_
#define SRC_FTDISPI_HPP_
#include <ftdi.h> #include <ftdi.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
@ -57,4 +60,8 @@ class FtdiSpi : public FTDIpp_MPSSE, SPIInterface {
uint8_t _rd_mode; uint8_t _rd_mode;
unsigned char _endian; unsigned char _endian;
uint8_t _cs_mode; uint8_t _cs_mode;
uint8_t _holdn;
uint8_t _wpn;
}; };
#endif // SRC_FTDISPI_HPP_