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

cables: verbose type coherency

This commit is contained in:
Gwenhael Goavec-Merou 2023-07-30 08:39:15 +02:00
parent 469e1c3669
commit 4bf4b94bbb
18 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ch347jtag.cpp
View File

@ -144,8 +144,8 @@ int CH347Jtag::setClk(const uint8_t &factor) {
return 0;
}
CH347Jtag::CH347Jtag(uint32_t clkHZ, uint8_t verbose):
_verbose(verbose), dev_handle(NULL), usb_ctx(NULL)
CH347Jtag::CH347Jtag(uint32_t clkHZ, int8_t verbose):
_verbose(verbose>1), dev_handle(NULL), usb_ctx(NULL)
{
int actual_length = 0;
struct libusb_device_descriptor desc;

4
src/ch347jtag.hpp
View File

@ -10,7 +10,7 @@
class CH347Jtag : public JtagInterface {
public:
CH347Jtag(uint32_t clkHZ, uint8_t verbose);
CH347Jtag(uint32_t clkHZ, int8_t verbose);
virtual ~CH347Jtag();
int setClkFreq(uint32_t clkHZ) override;
@ -29,7 +29,7 @@ class CH347Jtag : public JtagInterface {
int flush() override {return 0;}
private:
uint8_t _verbose;
bool _verbose;
int setClk(const uint8_t &factor);
libusb_device_handle *dev_handle;

2
src/ch552_jtag.cpp
View File

@ -31,7 +31,7 @@ using namespace std;
CH552_jtag::CH552_jtag(const cable_t &cable,
const string &dev, const string &serial, uint32_t clkHZ,
uint8_t verbose):
int8_t verbose):
FTDIpp_MPSSE(cable, dev, serial, clkHZ, verbose), _to_read(0)
{
init_internal(cable.config);

2
src/ch552_jtag.hpp
View File

@ -24,7 +24,7 @@
class CH552_jtag : public JtagInterface, private FTDIpp_MPSSE {
public:
CH552_jtag(const cable_t &cable, const std::string &dev,
const std::string &serial, uint32_t clkHZ, uint8_t verbose = false);
const std::string &serial, uint32_t clkHZ, int8_t verbose = false);
virtual ~CH552_jtag();
int setClkFreq(uint32_t clkHZ) override;

2
src/cmsisDAP.cpp
View File

@ -88,7 +88,7 @@ enum cmsisdap_status {
DAP_ERROR = 0xff
};
CmsisDAP::CmsisDAP(const cable_t &cable, int index, uint8_t verbose):_verbose(verbose),
CmsisDAP::CmsisDAP(const cable_t &cable, int index, int8_t verbose):_verbose(verbose>0),
_device_idx(0), _vid(cable.vid), _pid(cable.pid),
_serial_number(L""), _dev(NULL), _num_tms(0), _is_connect(false)
{

4
src/cmsisDAP.hpp
View File

@ -25,7 +25,7 @@ class CmsisDAP: public JtagInterface {
* \param[in] index: interface number
* \param[in] verbose: verbose level 0 normal, 1 verbose
*/
CmsisDAP(const cable_t &cable, int index, uint8_t verbose);
CmsisDAP(const cable_t &cable, int index, int8_t verbose);
~CmsisDAP();
@ -98,7 +98,7 @@ class CmsisDAP: public JtagInterface {
int writeJtagSequence(uint8_t tms, uint8_t *tx, uint8_t *rx,
uint32_t len, bool end);
uint8_t _verbose; /**< display more message */
bool _verbose; /**< display more message */
int16_t _device_idx; /**< device index */
uint16_t _vid; /**< device Vendor ID */
uint16_t _pid; /**< device Product ID */

2
src/dirtyJtag.cpp
View File

@ -60,7 +60,7 @@ enum dirtyJtagSig {
SIG_TMS = (1 << 4)
};
DirtyJtag::DirtyJtag(uint32_t clkHZ, uint8_t verbose):
DirtyJtag::DirtyJtag(uint32_t clkHZ, int8_t verbose):
_verbose(verbose),
dev_handle(NULL), usb_ctx(NULL), _tdi(0), _tms(0)
{

4
src/dirtyJtag.hpp
View File

@ -19,7 +19,7 @@
class DirtyJtag : public JtagInterface {
public:
DirtyJtag(uint32_t clkHZ, uint8_t verbose);
DirtyJtag(uint32_t clkHZ, int8_t verbose);
virtual ~DirtyJtag();
int setClkFreq(uint32_t clkHZ) override;
@ -43,7 +43,7 @@ class DirtyJtag : public JtagInterface {
int flush() override;
private:
uint8_t _verbose;
int8_t _verbose;
int sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last);
bool getVersion();

2
src/ftdiJtagBitbang.cpp
View File

@ -32,7 +32,7 @@ using namespace std;
FtdiJtagBitBang::FtdiJtagBitBang(const cable_t &cable,
const jtag_pins_conf_t *pin_conf, const string &dev,
const std::string &serial, uint32_t clkHZ, uint8_t verbose):
const std::string &serial, uint32_t clkHZ, int8_t verbose):
FTDIpp_MPSSE(cable, dev, serial, clkHZ, verbose), _bitmode(0),
_curr_tms(0), _rx_size(0)
{

2
src/ftdiJtagBitbang.hpp
View File

@ -25,7 +25,7 @@ class FtdiJtagBitBang : public JtagInterface, private FTDIpp_MPSSE {
public:
FtdiJtagBitBang(const cable_t &cable,
const jtag_pins_conf_t *pin_conf, const std::string &dev,
const std::string &serial, uint32_t clkHZ, uint8_t verbose = 0);
const std::string &serial, uint32_t clkHZ, int8_t verbose = 0);
virtual ~FtdiJtagBitBang();
int setClkFreq(uint32_t clkHZ) override;

4
src/jetsonNanoJtagBitbang.cpp
View File

@ -60,12 +60,10 @@
JetsonNanoJtagBitbang::JetsonNanoJtagBitbang(
const jtag_pins_conf_t *pin_conf,
const std::string &dev, __attribute__((unused)) uint32_t clkHZ,
uint8_t verbose)
int8_t verbose):_verbose(verbose>1);
{
uint32_t tms_port_reg, tck_port_reg, tdi_port_reg, tdo_port_reg;
_verbose = verbose;
_tck_pin = pin_conf->tck_pin;
_tms_pin = pin_conf->tms_pin;
_tdi_pin = pin_conf->tdi_pin;

2
src/jetsonNanoJtagBitbang.hpp
View File

@ -49,7 +49,7 @@
class JetsonNanoJtagBitbang : public JtagInterface {
public:
JetsonNanoJtagBitbang(const jtag_pins_conf_t *pin_conf,
const std::string &dev, uint32_t clkHZ, uint8_t verbose);
const std::string &dev, uint32_t clkHZ, int8_t verbose);
virtual ~JetsonNanoJtagBitbang();
int setClkFreq(uint32_t clkHZ) override;

4
src/libgpiodJtagBitbang.cpp
View File

@ -35,10 +35,8 @@
LibgpiodJtagBitbang::LibgpiodJtagBitbang(
const jtag_pins_conf_t *pin_conf,
const std::string &dev, __attribute__((unused)) uint32_t clkHZ,
uint8_t verbose)
int8_t verbose):_verbose(verbose>1)
{
_verbose = verbose;
_tck_pin = pin_conf->tck_pin;
_tms_pin = pin_conf->tms_pin;
_tdi_pin = pin_conf->tdi_pin;

2
src/libgpiodJtagBitbang.hpp
View File

@ -29,7 +29,7 @@ struct gpiod_line;
class LibgpiodJtagBitbang : public JtagInterface {
public:
LibgpiodJtagBitbang(const jtag_pins_conf_t *pin_conf,
const std::string &dev, uint32_t clkHZ, uint8_t verbose);
const std::string &dev, uint32_t clkHZ, int8_t verbose);
virtual ~LibgpiodJtagBitbang();
int setClkFreq(uint32_t clkHZ) override;

2
src/spiInterface.cpp
View File

@ -14,7 +14,7 @@ SPIInterface::SPIInterface():_spif_verbose(0), _spif_rd_burst(0),
_spif_verify(false), _skip_load_bridge(false)
{}
SPIInterface::SPIInterface(const std::string &filename, uint8_t verbose,
SPIInterface::SPIInterface(const std::string &filename, int8_t verbose,
uint32_t rd_burst, bool verify, bool skip_load_bridge,
bool skip_reset):
_spif_verbose(verbose), _spif_rd_burst(rd_burst),

4
src/spiInterface.hpp
View File

@ -21,7 +21,7 @@
class SPIInterface {
public:
SPIInterface();
SPIInterface(const std::string &filename, uint8_t verbose,
SPIInterface(const std::string &filename, int8_t verbose,
uint32_t rd_burst, bool verify, bool skip_load_bridge = false,
bool skip_reset = false);
virtual ~SPIInterface() {}
@ -111,7 +111,7 @@ class SPIInterface {
*/
virtual bool post_flash_access() {return false;}
uint8_t _spif_verbose;
int8_t _spif_verbose;
uint32_t _spif_rd_burst;
bool _spif_verify;
bool _skip_load_bridge;

4
src/usbBlaster.cpp
View File

@ -38,8 +38,8 @@ using namespace std;
#endif
UsbBlaster::UsbBlaster(const cable_t &cable, const std::string &firmware_path,
uint8_t verbose):
_verbose(verbose), _nb_bit(0),
int8_t verbose):
_verbose(verbose>1), _nb_bit(0),
_curr_tms(0), _buffer_size(64)
{
if (cable.pid == 0x6001)

4
src/usbBlaster.hpp
View File

@ -41,7 +41,7 @@ class UsbBlaster_ll {
class UsbBlaster : public JtagInterface {
public:
UsbBlaster(const cable_t &cable, const std::string &firmware_path,
uint8_t verbose = 0);
int8_t verbose = 0);
virtual ~UsbBlaster();
int setClkFreq(uint32_t clkHZ) override;
@ -86,7 +86,7 @@ class UsbBlaster : public JtagInterface {
int setBitmode(uint8_t mode);
uint8_t *_in_buf;
uint8_t _verbose;
int8_t _verbose;
uint8_t _tck_pin; /*!< tck pin: 1 << pin id */
uint8_t _tms_pin; /*!< tms pin: 1 << pin id */
uint8_t _tdi_pin; /*!< tdi pin: 1 << pin id */