cables: verbose type coherency
This commit is contained in:
parent
469e1c3669
commit
4bf4b94bbb
|
|
@ -144,8 +144,8 @@ int CH347Jtag::setClk(const uint8_t &factor) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
CH347Jtag::CH347Jtag(uint32_t clkHZ, uint8_t verbose):
|
CH347Jtag::CH347Jtag(uint32_t clkHZ, int8_t verbose):
|
||||||
_verbose(verbose), dev_handle(NULL), usb_ctx(NULL)
|
_verbose(verbose>1), dev_handle(NULL), usb_ctx(NULL)
|
||||||
{
|
{
|
||||||
int actual_length = 0;
|
int actual_length = 0;
|
||||||
struct libusb_device_descriptor desc;
|
struct libusb_device_descriptor desc;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
class CH347Jtag : public JtagInterface {
|
class CH347Jtag : public JtagInterface {
|
||||||
public:
|
public:
|
||||||
CH347Jtag(uint32_t clkHZ, uint8_t verbose);
|
CH347Jtag(uint32_t clkHZ, int8_t verbose);
|
||||||
virtual ~CH347Jtag();
|
virtual ~CH347Jtag();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
@ -29,7 +29,7 @@ class CH347Jtag : public JtagInterface {
|
||||||
int flush() override {return 0;}
|
int flush() override {return 0;}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t _verbose;
|
bool _verbose;
|
||||||
int setClk(const uint8_t &factor);
|
int setClk(const uint8_t &factor);
|
||||||
|
|
||||||
libusb_device_handle *dev_handle;
|
libusb_device_handle *dev_handle;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ using namespace std;
|
||||||
|
|
||||||
CH552_jtag::CH552_jtag(const cable_t &cable,
|
CH552_jtag::CH552_jtag(const cable_t &cable,
|
||||||
const string &dev, const string &serial, uint32_t clkHZ,
|
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)
|
FTDIpp_MPSSE(cable, dev, serial, clkHZ, verbose), _to_read(0)
|
||||||
{
|
{
|
||||||
init_internal(cable.config);
|
init_internal(cable.config);
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
class CH552_jtag : public JtagInterface, private FTDIpp_MPSSE {
|
class CH552_jtag : public JtagInterface, private FTDIpp_MPSSE {
|
||||||
public:
|
public:
|
||||||
CH552_jtag(const cable_t &cable, const std::string &dev,
|
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();
|
virtual ~CH552_jtag();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ enum cmsisdap_status {
|
||||||
DAP_ERROR = 0xff
|
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),
|
_device_idx(0), _vid(cable.vid), _pid(cable.pid),
|
||||||
_serial_number(L""), _dev(NULL), _num_tms(0), _is_connect(false)
|
_serial_number(L""), _dev(NULL), _num_tms(0), _is_connect(false)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ class CmsisDAP: public JtagInterface {
|
||||||
* \param[in] index: interface number
|
* \param[in] index: interface number
|
||||||
* \param[in] verbose: verbose level 0 normal, 1 verbose
|
* \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();
|
~CmsisDAP();
|
||||||
|
|
||||||
|
|
@ -98,7 +98,7 @@ class CmsisDAP: public JtagInterface {
|
||||||
int writeJtagSequence(uint8_t tms, uint8_t *tx, uint8_t *rx,
|
int writeJtagSequence(uint8_t tms, uint8_t *tx, uint8_t *rx,
|
||||||
uint32_t len, bool end);
|
uint32_t len, bool end);
|
||||||
|
|
||||||
uint8_t _verbose; /**< display more message */
|
bool _verbose; /**< display more message */
|
||||||
int16_t _device_idx; /**< device index */
|
int16_t _device_idx; /**< device index */
|
||||||
uint16_t _vid; /**< device Vendor ID */
|
uint16_t _vid; /**< device Vendor ID */
|
||||||
uint16_t _pid; /**< device Product ID */
|
uint16_t _pid; /**< device Product ID */
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ enum dirtyJtagSig {
|
||||||
SIG_TMS = (1 << 4)
|
SIG_TMS = (1 << 4)
|
||||||
};
|
};
|
||||||
|
|
||||||
DirtyJtag::DirtyJtag(uint32_t clkHZ, uint8_t verbose):
|
DirtyJtag::DirtyJtag(uint32_t clkHZ, int8_t verbose):
|
||||||
_verbose(verbose),
|
_verbose(verbose),
|
||||||
dev_handle(NULL), usb_ctx(NULL), _tdi(0), _tms(0)
|
dev_handle(NULL), usb_ctx(NULL), _tdi(0), _tms(0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
class DirtyJtag : public JtagInterface {
|
class DirtyJtag : public JtagInterface {
|
||||||
public:
|
public:
|
||||||
DirtyJtag(uint32_t clkHZ, uint8_t verbose);
|
DirtyJtag(uint32_t clkHZ, int8_t verbose);
|
||||||
virtual ~DirtyJtag();
|
virtual ~DirtyJtag();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
@ -43,7 +43,7 @@ class DirtyJtag : public JtagInterface {
|
||||||
int flush() override;
|
int flush() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t _verbose;
|
int8_t _verbose;
|
||||||
|
|
||||||
int sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last);
|
int sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last);
|
||||||
bool getVersion();
|
bool getVersion();
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ using namespace std;
|
||||||
|
|
||||||
FtdiJtagBitBang::FtdiJtagBitBang(const cable_t &cable,
|
FtdiJtagBitBang::FtdiJtagBitBang(const cable_t &cable,
|
||||||
const jtag_pins_conf_t *pin_conf, const string &dev,
|
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),
|
FTDIpp_MPSSE(cable, dev, serial, clkHZ, verbose), _bitmode(0),
|
||||||
_curr_tms(0), _rx_size(0)
|
_curr_tms(0), _rx_size(0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ class FtdiJtagBitBang : public JtagInterface, private FTDIpp_MPSSE {
|
||||||
public:
|
public:
|
||||||
FtdiJtagBitBang(const cable_t &cable,
|
FtdiJtagBitBang(const cable_t &cable,
|
||||||
const jtag_pins_conf_t *pin_conf, const std::string &dev,
|
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();
|
virtual ~FtdiJtagBitBang();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
|
||||||
|
|
@ -60,12 +60,10 @@
|
||||||
JetsonNanoJtagBitbang::JetsonNanoJtagBitbang(
|
JetsonNanoJtagBitbang::JetsonNanoJtagBitbang(
|
||||||
const jtag_pins_conf_t *pin_conf,
|
const jtag_pins_conf_t *pin_conf,
|
||||||
const std::string &dev, __attribute__((unused)) uint32_t clkHZ,
|
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;
|
uint32_t tms_port_reg, tck_port_reg, tdi_port_reg, tdo_port_reg;
|
||||||
|
|
||||||
_verbose = verbose;
|
|
||||||
|
|
||||||
_tck_pin = pin_conf->tck_pin;
|
_tck_pin = pin_conf->tck_pin;
|
||||||
_tms_pin = pin_conf->tms_pin;
|
_tms_pin = pin_conf->tms_pin;
|
||||||
_tdi_pin = pin_conf->tdi_pin;
|
_tdi_pin = pin_conf->tdi_pin;
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@
|
||||||
class JetsonNanoJtagBitbang : public JtagInterface {
|
class JetsonNanoJtagBitbang : public JtagInterface {
|
||||||
public:
|
public:
|
||||||
JetsonNanoJtagBitbang(const jtag_pins_conf_t *pin_conf,
|
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();
|
virtual ~JetsonNanoJtagBitbang();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,8 @@
|
||||||
LibgpiodJtagBitbang::LibgpiodJtagBitbang(
|
LibgpiodJtagBitbang::LibgpiodJtagBitbang(
|
||||||
const jtag_pins_conf_t *pin_conf,
|
const jtag_pins_conf_t *pin_conf,
|
||||||
const std::string &dev, __attribute__((unused)) uint32_t clkHZ,
|
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;
|
_tck_pin = pin_conf->tck_pin;
|
||||||
_tms_pin = pin_conf->tms_pin;
|
_tms_pin = pin_conf->tms_pin;
|
||||||
_tdi_pin = pin_conf->tdi_pin;
|
_tdi_pin = pin_conf->tdi_pin;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ struct gpiod_line;
|
||||||
class LibgpiodJtagBitbang : public JtagInterface {
|
class LibgpiodJtagBitbang : public JtagInterface {
|
||||||
public:
|
public:
|
||||||
LibgpiodJtagBitbang(const jtag_pins_conf_t *pin_conf,
|
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();
|
virtual ~LibgpiodJtagBitbang();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ SPIInterface::SPIInterface():_spif_verbose(0), _spif_rd_burst(0),
|
||||||
_spif_verify(false), _skip_load_bridge(false)
|
_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,
|
uint32_t rd_burst, bool verify, bool skip_load_bridge,
|
||||||
bool skip_reset):
|
bool skip_reset):
|
||||||
_spif_verbose(verbose), _spif_rd_burst(rd_burst),
|
_spif_verbose(verbose), _spif_rd_burst(rd_burst),
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
class SPIInterface {
|
class SPIInterface {
|
||||||
public:
|
public:
|
||||||
SPIInterface();
|
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,
|
uint32_t rd_burst, bool verify, bool skip_load_bridge = false,
|
||||||
bool skip_reset = false);
|
bool skip_reset = false);
|
||||||
virtual ~SPIInterface() {}
|
virtual ~SPIInterface() {}
|
||||||
|
|
@ -111,7 +111,7 @@ class SPIInterface {
|
||||||
*/
|
*/
|
||||||
virtual bool post_flash_access() {return false;}
|
virtual bool post_flash_access() {return false;}
|
||||||
|
|
||||||
uint8_t _spif_verbose;
|
int8_t _spif_verbose;
|
||||||
uint32_t _spif_rd_burst;
|
uint32_t _spif_rd_burst;
|
||||||
bool _spif_verify;
|
bool _spif_verify;
|
||||||
bool _skip_load_bridge;
|
bool _skip_load_bridge;
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@ using namespace std;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
UsbBlaster::UsbBlaster(const cable_t &cable, const std::string &firmware_path,
|
UsbBlaster::UsbBlaster(const cable_t &cable, const std::string &firmware_path,
|
||||||
uint8_t verbose):
|
int8_t verbose):
|
||||||
_verbose(verbose), _nb_bit(0),
|
_verbose(verbose>1), _nb_bit(0),
|
||||||
_curr_tms(0), _buffer_size(64)
|
_curr_tms(0), _buffer_size(64)
|
||||||
{
|
{
|
||||||
if (cable.pid == 0x6001)
|
if (cable.pid == 0x6001)
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ class UsbBlaster_ll {
|
||||||
class UsbBlaster : public JtagInterface {
|
class UsbBlaster : public JtagInterface {
|
||||||
public:
|
public:
|
||||||
UsbBlaster(const cable_t &cable, const std::string &firmware_path,
|
UsbBlaster(const cable_t &cable, const std::string &firmware_path,
|
||||||
uint8_t verbose = 0);
|
int8_t verbose = 0);
|
||||||
virtual ~UsbBlaster();
|
virtual ~UsbBlaster();
|
||||||
|
|
||||||
int setClkFreq(uint32_t clkHZ) override;
|
int setClkFreq(uint32_t clkHZ) override;
|
||||||
|
|
@ -86,7 +86,7 @@ class UsbBlaster : public JtagInterface {
|
||||||
int setBitmode(uint8_t mode);
|
int setBitmode(uint8_t mode);
|
||||||
uint8_t *_in_buf;
|
uint8_t *_in_buf;
|
||||||
|
|
||||||
uint8_t _verbose;
|
int8_t _verbose;
|
||||||
uint8_t _tck_pin; /*!< tck pin: 1 << pin id */
|
uint8_t _tck_pin; /*!< tck pin: 1 << pin id */
|
||||||
uint8_t _tms_pin; /*!< tms pin: 1 << pin id */
|
uint8_t _tms_pin; /*!< tms pin: 1 << pin id */
|
||||||
uint8_t _tdi_pin; /*!< tdi pin: 1 << pin id */
|
uint8_t _tdi_pin; /*!< tdi pin: 1 << pin id */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue