struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int err, i;
+ int err = SR_ERR, i;
char connection_id[64];
devc = sdi->priv;
usb = sdi->conn;
- if (sdi->status == SR_ST_ACTIVE)
- /* Already in use. */
- return SR_ERR;
-
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
libusb_get_device_descriptor(devlist[i], &des);
/*
* Check device by its physical USB bus/port address.
*/
- usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+ if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+ continue;
+
if (strcmp(sdi->connection_id, connection_id))
/* This is not the one. */
continue;
usb->address = libusb_get_device_address(devlist[i]);
}
- sdi->status = SR_ST_ACTIVE;
sr_info("Opened device on %d.%d (logical) / "
"%s (physical) interface %d.",
usb->bus, usb->address,
sdi->connection_id, USB_INTERFACE);
+
+ err = SR_OK;
} else {
sr_err("Failed to open device: %s.",
libusb_error_name(err));
+ err = SR_ERR;
}
/* If we made it here, we handled the device (somehow). */
libusb_free_device_list(devlist, 1);
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
-
- return SR_OK;
+ return err;
}
SR_PRIV void hantek_6xxx_close(struct sr_dev_inst *sdi)
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl, HANTEK_EP_IN, buf,
data_amount, cb, (void *)sdi, 4000);
- if ((ret = libusb_submit_transfer(transfer)) != 0) {
+ if ((ret = libusb_submit_transfer(transfer)) < 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));
/* TODO: Free them all. */
return MIN(ret1, ret2);
}
+SR_PRIV int hantek_6xxx_update_coupling(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc = sdi->priv;
+ uint8_t coupling = 0xFF & ((devc->coupling[1] << 4) | devc->coupling[0]);
+
+ if (devc->has_coupling) {
+ sr_dbg("update coupling 0x%x", coupling);
+ return write_control(sdi, COUPLING_REG, coupling);
+ } else {
+ sr_dbg("coupling not supported");
+ return SR_OK;
+ }
+}
+
SR_PRIV int hantek_6xxx_update_channels(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
hantek_6xxx_update_samplerate(sdi);
hantek_6xxx_update_vdiv(sdi);
+ hantek_6xxx_update_coupling(sdi);
// hantek_6xxx_update_channels(sdi); /* Only 2 channel mode supported. */
return SR_OK;