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

dfu: add debug level, only print device open fails in debug mode

This commit is contained in:
Gwenhael Goavec-Merou 2021-12-24 15:48:16 +01:00
parent 17a874fc04
commit 2c5a162cc4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dfu.cpp
View File

@ -48,7 +48,7 @@ enum dfu_cmd {
DFU::DFU(const string &filename, uint16_t vid, uint16_t pid, DFU::DFU(const string &filename, uint16_t vid, uint16_t pid,
int16_t altsetting, int16_t altsetting,
int verbose_lvl):_verbose(verbose_lvl > 0), int verbose_lvl):_verbose(verbose_lvl > 0), _debug(verbose_lvl > 1),
_quiet(verbose_lvl < 0), dev_idx(0), _vid(0), _pid(0), _quiet(verbose_lvl < 0), dev_idx(0), _vid(0), _pid(0),
_altsetting(altsetting), _altsetting(altsetting),
usb_ctx(NULL), dev_handle(NULL), curr_intf(0), transaction(0), usb_ctx(NULL), dev_handle(NULL), curr_intf(0), transaction(0),
@ -302,7 +302,12 @@ int DFU::searchDFUDevices()
} }
int ret = libusb_open(usb_dev, &handle); int ret = libusb_open(usb_dev, &handle);
if (ret != 0) { if (ret == 0) {
if (searchIfDFU(handle, usb_dev, &desc) != 0) {
return EXIT_FAILURE;
}
libusb_close(handle);
} else if (_debug) {
char mess[256]; char mess[256];
sprintf(mess,"Unable to open device: " sprintf(mess,"Unable to open device: "
"%04x:%04x (bus %d, device %2d) Error: %s -> skip\n", "%04x:%04x (bus %d, device %2d) Error: %s -> skip\n",
@ -311,11 +316,6 @@ int DFU::searchDFUDevices()
libusb_get_device_address(usb_dev), libusb_get_device_address(usb_dev),
libusb_error_name(ret)); libusb_error_name(ret));
printWarn(mess); printWarn(mess);
} else {
if (searchIfDFU(handle, usb_dev, &desc) != 0) {
return EXIT_FAILURE;
}
libusb_close(handle);
} }
} }

1
src/dfu.hpp
View File

@ -228,6 +228,7 @@ class DFU {
struct libusb_device_descriptor *desc); struct libusb_device_descriptor *desc);
bool _verbose; /**< display more message */ bool _verbose; /**< display more message */
bool _debug; /**< display debug message */
bool _quiet; /**< don't use progressBar */ bool _quiet; /**< don't use progressBar */
std::vector<struct dfu_dev> dfu_dev; /**< available dfu devices */ std::vector<struct dfu_dev> dfu_dev; /**< available dfu devices */
int dev_idx; /**< device index in dfu_dev */ int dev_idx; /**< device index in dfu_dev */