SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: Can't get the right status when device is busy

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-06-27 17:19:34 +08:00
parent 36291ef62f
commit 5b3d49f2fa
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libsigrok4DSL/hardware/DSL/dsl.c
View File

@@ -257,39 +257,58 @@ SR_PRIV gboolean dsl_check_conf_profile(libusb_device *dev)
{
struct libusb_device_descriptor des;
struct libusb_device_handle *hdl;
gboolean ret;
int ret;
gboolean bSucess;
unsigned char strdesc[64];
hdl = NULL;
ret = FALSE;
bSucess = FALSE;
ret = 0;
while (!ret) {
while (!bSucess) {
/* Assume the FW has not been loaded, unless proven wrong. */
if (libusb_get_device_descriptor(dev, &des) != 0)
if ((ret = libusb_get_device_descriptor(dev, &des)) < 0){
sr_err("%s:%d, Failed to get device descriptor: %s",
__func__, __LINE__, libusb_error_name(ret));
break;
}
if (libusb_open(dev, &hdl) != 0)
break;
if ((ret = libusb_open(dev, &hdl)) < 0){
sr_err("%s:%d, Failed to open device: %s",
__func__, __LINE__, libusb_error_name(ret));
// Mybe the device is busy, add it to list.
return TRUE;
}
if (libusb_get_string_descriptor_ascii(hdl,
des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
if ((ret = libusb_get_string_descriptor_ascii(hdl,
des.iManufacturer, strdesc, sizeof(strdesc))) < 0){
sr_err("%s:%d, Failed to get device descriptor ascii: %s",
__func__, __LINE__, libusb_error_name(ret));
break;
}
if (strncmp((const char *)strdesc, "DreamSourceLab", 14))
break;
if (libusb_get_string_descriptor_ascii(hdl,
des.iProduct, strdesc, sizeof(strdesc)) < 0)
if ((ret = libusb_get_string_descriptor_ascii(hdl,
des.iProduct, strdesc, sizeof(strdesc))) < 0){
sr_err("%s:%d, Failed to get device descriptor ascii: %s",
__func__, __LINE__, libusb_error_name(ret));
break;
}
if (strncmp((const char *)strdesc, "USB-based DSL Instrument v2", 27))
break;
/* If we made it here, it must be an dsl device. */
ret = TRUE;
bSucess = TRUE;
}
if (hdl)
libusb_close(hdl);
return ret;
if (hdl){
libusb_close(hdl);
}
return bSucess;
}
static int hw_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
@@ -329,9 +348,9 @@ static int hw_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
ret = libusb_open(dev_handel, &usb->devhdl);
if (ret != LIBUSB_SUCCESS){
sr_err("Failed to open device: %s, handle:%p",
libusb_error_name(ret), dev_handel);
ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR);
sr_err("%s: Failed to open device: %s, handle:%p",
__func__, libusb_error_name(ret), dev_handel);
ds_set_last_error(SR_ERR_DEVICE_IS_EXCLUSIVE);
return SR_ERR;
}
//sr_info("------------Open returns the libusb_device_handle: %p, struct:%p", usb->devhdl, usb);

3
libsigrok4DSL/hardware/common/ezusb.c
View File

@@ -105,7 +105,8 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
libusb_get_bus_number(dev), libusb_get_device_address(dev));
if ((ret = libusb_open(dev, &hdl)) < 0) {
sr_err("failed to open device: %s.", libusb_error_name(ret));
sr_err("%s: Failed to open device: %s.",
__func__, libusb_error_name(ret));
return SR_ERR;
}