From deb3d0bed2ca47cb2cfe0875abbb0417e7520cea Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sun, 8 Mar 2020 07:52:17 +0100 Subject: [PATCH] jtag: re-add lost dev parameter --- src/jtag.cpp | 12 ++++++------ src/jtag.hpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/jtag.cpp b/src/jtag.cpp index 353197b..0090b6b 100644 --- a/src/jtag.cpp +++ b/src/jtag.cpp @@ -70,7 +70,7 @@ Jtag::Jtag(cable_t &cable, const jtag_pins_conf_t *pin_conf, string dev, _tms_buffer_size(128), _num_tms(0), _board_name("nope") { - init_internal(cable, pin_conf, clkHZ); + init_internal(cable, dev, pin_conf, clkHZ); } Jtag::Jtag(cable_t &cable, const jtag_pins_conf_t *pin_conf, @@ -80,7 +80,7 @@ Jtag::Jtag(cable_t &cable, const jtag_pins_conf_t *pin_conf, _tms_buffer_size(128), _num_tms(0), _board_name("nope") { - init_internal(cable, pin_conf, clkHZ); + init_internal(cable, NULL, pin_conf, clkHZ); } Jtag::~Jtag() @@ -89,15 +89,15 @@ Jtag::~Jtag() delete _jtag; } -void Jtag::init_internal(cable_t &cable, const jtag_pins_conf_t *pin_conf, - uint32_t clkHZ) +void Jtag::init_internal(cable_t &cable, const string &dev, + const jtag_pins_conf_t *pin_conf, uint32_t clkHZ) { if (cable.type == MODE_FTDI_BITBANG) { if (pin_conf == NULL) throw std::exception(); - _jtag = new FtdiJtagBitBang(cable.config, pin_conf, clkHZ, _verbose); + _jtag = new FtdiJtagBitBang(cable.config, pin_conf, dev, clkHZ, _verbose); } else { - _jtag = new FtdiJtagMPSSE(cable.config, clkHZ, _verbose); + _jtag = new FtdiJtagMPSSE(cable.config, dev, clkHZ, _verbose); } _tms_buffer = (unsigned char *)malloc(sizeof(unsigned char) * _tms_buffer_size); diff --git a/src/jtag.hpp b/src/jtag.hpp index 534d9f6..8469d49 100644 --- a/src/jtag.hpp +++ b/src/jtag.hpp @@ -82,8 +82,8 @@ class Jtag { void setVerbose(bool verbose){_verbose = verbose;} private: - void init_internal(cable_t &cable, const jtag_pins_conf_t *pin_conf, - uint32_t clkHZ); + void init_internal(cable_t &cable, const std::string &dev, + const jtag_pins_conf_t *pin_conf, uint32_t clkHZ); bool _verbose; int _state; int _tms_buffer_size;