X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_usbtmc_libusb.c;h=9f49dd1d2ea8ec2e8f2fd7446b4df1852eb232c0;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=a6eb922b9a67eb1e9aceb57b1a627747370f1657;hpb=baed0211a1ecada69c5ab53cf979e2e543a0ceaa;p=libsigrok.git diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c index a6eb922b..9f49dd1d 100644 --- a/src/scpi/scpi_usbtmc_libusb.c +++ b/src/scpi/scpi_usbtmc_libusb.c @@ -45,7 +45,6 @@ struct scpi_usbtmc_libusb { int response_length; int response_bytes_read; int remaining_length; - int rigol_ds1000; }; /* Some USBTMC-specific enums, as defined in the USBTMC standard. */ @@ -97,6 +96,19 @@ enum { #define EOM 0x01 #define TERM_CHAR_ENABLED 0x02 +struct usbtmc_blacklist { + uint16_t vid; + uint16_t pid; +}; + +/* Devices that publish RL1 support, but don't support it. */ +static struct usbtmc_blacklist blacklist_remote[] = { + { 0x1ab1, 0x0588 }, /* Rigol DS1000 series */ + { 0x1ab1, 0x04b0 }, /* Rigol DS2000 series */ + { 0x0957, 0x0588 }, /* Agilent DSO1000 series (rebadged Rigol DS1000) */ + ALL_ZERO +}; + static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc) { struct libusb_device **devlist; @@ -114,11 +126,7 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc) return NULL; } for (i = 0; devlist[i]; i++) { - if ((ret = libusb_get_device_descriptor(devlist[i], &des)) < 0) { - sr_err("Failed to get device descriptor: %s.", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor(devlist[i], &des); for (confidx = 0; confidx < des.bNumConfigurations; confidx++) { if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) { @@ -178,17 +186,121 @@ static int scpi_usbtmc_libusb_dev_inst_new(void *priv, struct drv_context *drvc, return SR_OK; } -static int scpi_usbtmc_libusb_open(void *priv) +static int check_usbtmc_blacklist(struct usbtmc_blacklist *blacklist, + uint16_t vid, uint16_t pid) +{ + int i; + + for (i = 0; blacklist[i].vid; i++) { + if (blacklist[i].vid == vid && blacklist[i].pid == pid) + return TRUE; + } + + return FALSE; +} + +static int scpi_usbtmc_remote(struct scpi_usbtmc_libusb *uscpi) { - struct scpi_usbtmc_libusb *uscpi = priv; + struct sr_usb_dev_inst *usb = uscpi->usb; + struct libusb_device *dev; + struct libusb_device_descriptor des; + int ret; + uint8_t status; + + if (!(uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1)) + return SR_OK; + + dev = libusb_get_device(usb->devhdl); + libusb_get_device_descriptor(dev, &des); + if (check_usbtmc_blacklist(blacklist_remote, des.idVendor, des.idProduct)) + return SR_OK; + + sr_dbg("Locking out local control."); + ret = libusb_control_transfer(usb->devhdl, + LIBUSB_ENDPOINT_IN | + LIBUSB_REQUEST_TYPE_CLASS | + LIBUSB_RECIPIENT_INTERFACE, + REN_CONTROL, 1, + uscpi->interface, + &status, 1, + TRANSFER_TIMEOUT); + if (ret < 0 || status != USBTMC_STATUS_SUCCESS) { + if (ret < 0) + sr_dbg("Failed to enter REN state: %s.", libusb_error_name(ret)); + else + sr_dbg("Failed to enter REN state: USBTMC status %d.", status); + return SR_ERR; + } + + ret = libusb_control_transfer(usb->devhdl, + LIBUSB_ENDPOINT_IN | + LIBUSB_REQUEST_TYPE_CLASS | + LIBUSB_RECIPIENT_INTERFACE, + LOCAL_LOCKOUT, 1, + uscpi->interface, + &status, 1, + TRANSFER_TIMEOUT); + if (ret < 0 || status != USBTMC_STATUS_SUCCESS) { + if (ret < 0) + sr_dbg("Failed to enter local lockout state: %s.", + libusb_error_name(ret)); + else + sr_dbg("Failed to enter local lockout state: USBTMC " + "status %d.", status); + return SR_ERR; + } + + return SR_OK; +} + +static void scpi_usbtmc_local(struct scpi_usbtmc_libusb *uscpi) +{ + struct sr_usb_dev_inst *usb = uscpi->usb; + struct libusb_device *dev; + struct libusb_device_descriptor des; + int ret; + uint8_t status; + + if (!(uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1)) + return; + + dev = libusb_get_device(usb->devhdl); + libusb_get_device_descriptor(dev, &des); + if (check_usbtmc_blacklist(blacklist_remote, des.idVendor, des.idProduct)) + return; + + sr_dbg("Returning local control."); + ret = libusb_control_transfer(usb->devhdl, + LIBUSB_ENDPOINT_IN | + LIBUSB_REQUEST_TYPE_CLASS | + LIBUSB_RECIPIENT_INTERFACE, + GO_TO_LOCAL, 1, + uscpi->interface, + &status, 1, + TRANSFER_TIMEOUT); + if (ret < 0 || status != USBTMC_STATUS_SUCCESS) { + if (ret < 0) + sr_dbg("Failed to clear local lockout state: %s.", + libusb_error_name(ret)); + else + sr_dbg("Failed to clear local lockout state: USBTMC " + "status %d.", status); + } + + return; +} + +static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi) +{ + struct scpi_usbtmc_libusb *uscpi = scpi->priv; struct sr_usb_dev_inst *usb = uscpi->usb; struct libusb_device *dev; struct libusb_device_descriptor des; struct libusb_config_descriptor *confdes; const struct libusb_interface_descriptor *intfdes; const struct libusb_endpoint_descriptor *ep; - int confidx, intfidx, epidx, config = 0; - uint8_t capabilities[24], status; + int confidx, intfidx, epidx, config = 0, current_config; + uint8_t capabilities[24]; int ret, found = 0; if (usb->devhdl) @@ -198,11 +310,7 @@ static int scpi_usbtmc_libusb_open(void *priv) return SR_ERR; dev = libusb_get_device(usb->devhdl); - if ((ret = libusb_get_device_descriptor(dev, &des)) < 0) { - sr_err("Failed to get device descriptor: %s.", - libusb_error_name(ret)); - return SR_ERR; - } + libusb_get_device_descriptor(dev, &des); for (confidx = 0; confidx < des.bNumConfigurations; confidx++) { if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) { @@ -238,8 +346,6 @@ static int scpi_usbtmc_libusb_open(void *priv) } } found = 1; - uscpi->rigol_ds1000 = des.idVendor == 0x1ab1 && - des.idProduct == 0x0588; } libusb_free_config_descriptor(confdes); if (found) @@ -261,10 +367,13 @@ static int scpi_usbtmc_libusb_open(void *priv) uscpi->detached_kernel_driver = 1; } - if ((ret = libusb_set_configuration(usb->devhdl, config)) < 0) { - sr_err("Failed to set configuration: %s.", - libusb_error_name(ret)); - return SR_ERR; + if (libusb_get_configuration(usb->devhdl, ¤t_config) == 0 + && current_config != config) { + if ((ret = libusb_set_configuration(usb->devhdl, config)) < 0) { + sr_err("Failed to set configuration: %s.", + libusb_error_name(ret)); + return SR_ERR; + } } if ((ret = libusb_claim_interface(usb->devhdl, uscpi->interface)) < 0) { @@ -273,24 +382,6 @@ static int scpi_usbtmc_libusb_open(void *priv) return SR_ERR; } - if (!uscpi->rigol_ds1000) { - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0) { - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->bulk_in_ep, libusb_error_name(ret)); - return SR_ERR; - } - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0) { - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->bulk_out_ep, libusb_error_name(ret)); - return SR_ERR; - } - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->interrupt_ep)) < 0) { - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->interrupt_ep, libusb_error_name(ret)); - return SR_ERR; - } - } - /* Get capabilities. */ ret = libusb_control_transfer(usb->devhdl, LIBUSB_ENDPOINT_IN | @@ -316,31 +407,7 @@ static int scpi_usbtmc_libusb_open(void *priv) uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1 ? "RL1" : "RL0", uscpi->usb488_dev_cap & USB488_DEV_CAP_DT1 ? "DT1" : "DT0"); - if (uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1) { - sr_dbg("Locking out local control."); - ret = libusb_control_transfer(usb->devhdl, - LIBUSB_ENDPOINT_IN | - LIBUSB_REQUEST_TYPE_CLASS | - LIBUSB_RECIPIENT_INTERFACE, - REN_CONTROL, 1, - uscpi->interface, - &status, 1, - TRANSFER_TIMEOUT); - if (ret < 0 || status != USBTMC_STATUS_SUCCESS) { - sr_dbg("Failed to enter REN state."); - return SR_OK; - } - ret = libusb_control_transfer(usb->devhdl, - LIBUSB_ENDPOINT_IN | - LIBUSB_REQUEST_TYPE_CLASS | - LIBUSB_RECIPIENT_INTERFACE, - LOCAL_LOCKOUT, 1, - uscpi->interface, - &status, 1, - TRANSFER_TIMEOUT); - if (ret < 0 || status != USBTMC_STATUS_SUCCESS) - sr_dbg("Failed to enter local lockout state."); - } + scpi_usbtmc_remote(uscpi); return SR_OK; } @@ -551,41 +618,16 @@ static int scpi_usbtmc_libusb_read_complete(void *priv) uscpi->bulkin_attributes & EOM; } -static int scpi_usbtmc_libusb_close(void *priv) +static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi) { - int ret; - struct scpi_usbtmc_libusb *uscpi = priv; + struct scpi_usbtmc_libusb *uscpi = scpi->priv; struct sr_usb_dev_inst *usb = uscpi->usb; - uint8_t status; + int ret; if (!usb->devhdl) return SR_ERR; - if (!uscpi->rigol_ds1000) { - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0) - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->bulk_in_ep, libusb_error_name(ret)); - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0) - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->bulk_out_ep, libusb_error_name(ret)); - if ((ret = libusb_clear_halt(usb->devhdl, uscpi->interrupt_ep)) < 0) - sr_err("Failed to clear halt/stall condition for EP %d: %s.", - uscpi->interrupt_ep, libusb_error_name(ret)); - } - - if (uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1) { - sr_dbg("Returning local control."); - ret = libusb_control_transfer(usb->devhdl, - LIBUSB_ENDPOINT_IN | - LIBUSB_REQUEST_TYPE_CLASS | - LIBUSB_RECIPIENT_INTERFACE, - GO_TO_LOCAL, 1, - uscpi->interface, - &status, 1, - TRANSFER_TIMEOUT); - if (ret < 0 || status != USBTMC_STATUS_SUCCESS) - sr_dbg("Failed to clear local lockout state."); - } + scpi_usbtmc_local(uscpi); if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0) sr_err("Failed to release interface: %s.",