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

dirtyJtag: rework error messages in constructor. Added a method to close USB (and to avoids to have multiple time the same piece of code)

This commit is contained in:
Gwenhael Goavec-Merou 2026-03-12 18:45:25 +01:00
parent 54595299d5
commit bb37f1ed4d
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/dirtyJtag.cpp
View File

@ -67,41 +67,51 @@ DirtyJtag::DirtyJtag(uint32_t clkHz, int8_t verbose, uint16_t vid, uint16_t pid)
{ {
int ret; int ret;
if (libusb_init(&usb_ctx) < 0) { if (libusb_init(&usb_ctx) < 0)
cerr << "libusb init failed" << endl; throw std::runtime_error("DirtyJtag: libusb init failed");
throw std::exception();
}
dev_handle = libusb_open_device_with_vid_pid(usb_ctx, vid, pid); dev_handle = libusb_open_device_with_vid_pid(usb_ctx, vid, pid);
if (!dev_handle) { if (!dev_handle) {
cerr << "fails to open device" << endl;
libusb_exit(usb_ctx); libusb_exit(usb_ctx);
throw std::exception(); throw std::runtime_error("DirtyJtag: fails to open device");
} }
ret = libusb_claim_interface(dev_handle, DIRTYJTAG_INTF); ret = libusb_claim_interface(dev_handle, DIRTYJTAG_INTF);
if (ret) { if (ret) {
cerr << "libusb error while claiming DirtyJTAG interface" << endl;
libusb_close(dev_handle); libusb_close(dev_handle);
dev_handle = NULL;
libusb_exit(usb_ctx); libusb_exit(usb_ctx);
throw std::exception(); usb_ctx = NULL;
throw std::runtime_error("DirtyJtag: libusb error while claiming interface");
} }
if (!getVersion()) if (!getVersion()) {
throw std::runtime_error("Fail to get version"); close_usb();
throw std::runtime_error("DirtyJtag: Fail to get version");
}
if (setClkFreq(clkHz) < 0) { if (setClkFreq(clkHz) < 0) {
cerr << "Fail to set frequency" << endl; close_usb();
throw std::exception(); throw std::runtime_error("Fail to set frequency");
}
}
void DirtyJtag::close_usb()
{
if (dev_handle) {
libusb_release_interface(dev_handle, DIRTYJTAG_INTF);
libusb_close(dev_handle);
dev_handle = NULL;
}
if (usb_ctx) {
libusb_exit(usb_ctx);
usb_ctx = NULL;
} }
} }
DirtyJtag::~DirtyJtag() DirtyJtag::~DirtyJtag()
{ {
if (dev_handle) close_usb();
libusb_close(dev_handle);
if (usb_ctx)
libusb_exit(usb_ctx);
} }
bool DirtyJtag::getVersion() bool DirtyJtag::getVersion()

3
src/dirtyJtag.hpp
View File

@ -76,8 +76,11 @@ class DirtyJtag : public JtagInterface {
bool getVersion(); bool getVersion();
bool _set_gpio_level(uint8_t gpio, uint8_t val); bool _set_gpio_level(uint8_t gpio, uint8_t val);
/* USB */
void close_usb();
libusb_device_handle *dev_handle; libusb_device_handle *dev_handle;
libusb_context *usb_ctx; libusb_context *usb_ctx;
uint8_t _tdi; uint8_t _tdi;
uint8_t _tms; uint8_t _tms;
uint8_t _version; uint8_t _version;